From 33fbce1ff76c8c1577f424263fb91fd22f1e1271 Mon Sep 17 00:00:00 2001 From: SaschaNaz Date: Sat, 12 Sep 2015 17:05:12 +0900 Subject: [PATCH 001/177] nodeWillIndentChild from #4609 --- src/services/formatting/formatting.ts | 36 +++++++----------------- src/services/formatting/smartIndenter.ts | 36 +++++++++++++++++------- 2 files changed, 36 insertions(+), 36 deletions(-) diff --git a/src/services/formatting/formatting.ts b/src/services/formatting/formatting.ts index fad3ebe6e2b..868683bb6af 100644 --- a/src/services/formatting/formatting.ts +++ b/src/services/formatting/formatting.ts @@ -282,19 +282,19 @@ namespace ts.formatting { */ function getOwnOrInheritedDelta(n: Node, options: FormatCodeOptions, sourceFile: SourceFile): number { let previousLine = Constants.Unknown; - let childKind = SyntaxKind.Unknown; + let child: Node = null; while (n) { let line = sourceFile.getLineAndCharacterOfPosition(n.getStart(sourceFile)).line; if (previousLine !== Constants.Unknown && line !== previousLine) { break; } - if (SmartIndenter.shouldIndentChildNode(n.kind, childKind)) { + if (SmartIndenter.shouldIndentChildNode(n, child)) { return options.IndentSize; } previousLine = line; - childKind = n.kind; + child = n; n = n.parent; } return 0; @@ -387,33 +387,17 @@ namespace ts.formatting { let indentation = inheritedIndentation; if (indentation === Constants.Unknown) { - if (isSomeBlock(node.kind)) { - // blocks should be indented in - // - other blocks - // - source file - // - switch\default clauses - if (isSomeBlock(parent.kind) || - parent.kind === SyntaxKind.SourceFile || - parent.kind === SyntaxKind.CaseClause || - parent.kind === SyntaxKind.DefaultClause) { + if (SmartIndenter.shouldInheritParentIndentation(parent, node) || + SmartIndenter.childStartsOnTheSameLineWithElseInIfStatement(parent, node, startLine, sourceFile)) { - indentation = parentDynamicIndentation.getIndentation() + parentDynamicIndentation.getDelta(); - } - else { - indentation = parentDynamicIndentation.getIndentation(); - } + indentation = parentDynamicIndentation.getIndentation(); } else { - if (SmartIndenter.childStartsOnTheSameLineWithElseInIfStatement(parent, node, startLine, sourceFile)) { - indentation = parentDynamicIndentation.getIndentation(); - } - else { - indentation = parentDynamicIndentation.getIndentation() + parentDynamicIndentation.getDelta(); - } + indentation = parentDynamicIndentation.getIndentation() + parentDynamicIndentation.getDelta(); } } - var delta = SmartIndenter.shouldIndentChildNode(node.kind, SyntaxKind.Unknown) ? options.IndentSize : 0; + var delta = SmartIndenter.shouldIndentChildNode(node, null) ? options.IndentSize : 0; if (effectiveParentStartLine === startLine) { // if node is located on the same line with the parent @@ -495,7 +479,7 @@ namespace ts.formatting { getIndentation: () => indentation, getDelta: () => delta, recomputeIndentation: lineAdded => { - if (node.parent && SmartIndenter.shouldIndentChildNode(node.parent.kind, node.kind)) { + if (node.parent && SmartIndenter.shouldIndentChildNode(node.parent, node)) { if (lineAdded) { indentation += options.IndentSize; } @@ -503,7 +487,7 @@ namespace ts.formatting { indentation -= options.IndentSize; } - if (SmartIndenter.shouldIndentChildNode(node.kind, SyntaxKind.Unknown)) { + if (SmartIndenter.shouldIndentChildNode(node, null)) { delta = options.IndentSize; } else { diff --git a/src/services/formatting/smartIndenter.ts b/src/services/formatting/smartIndenter.ts index 8355fac03f5..ab23f3da939 100644 --- a/src/services/formatting/smartIndenter.ts +++ b/src/services/formatting/smartIndenter.ts @@ -48,7 +48,7 @@ namespace ts.formatting { let indentationDelta: number; while (current) { - if (positionBelongsToNode(current, position, sourceFile) && shouldIndentChildNode(current.kind, previous ? previous.kind : SyntaxKind.Unknown)) { + if (positionBelongsToNode(current, position, sourceFile) && shouldIndentChildNode(current, previous)) { currentStart = getStartLineAndCharacterForNode(current, sourceFile); if (nextTokenIsCurlyBraceOnSameLineAsCursor(precedingToken, current, lineAtPosition, sourceFile)) { @@ -133,7 +133,7 @@ namespace ts.formatting { } // increase indentation if parent node wants its content to be indented and parent and child nodes don't start on the same line - if (shouldIndentChildNode(parent.kind, current.kind) && !parentAndChildShareLine) { + if (shouldIndentChildNode(parent, current) && !parentAndChildShareLine) { indentationDelta += options.IndentSize; } @@ -446,11 +446,12 @@ namespace ts.formatting { return false; } - export function shouldIndentChildNode(parent: SyntaxKind, child: SyntaxKind): boolean { - if (nodeContentIsAlwaysIndented(parent)) { - return true; - } - switch (parent) { + /** + * Function returns true when a node with conditional indentation rule will indent certain child node. + */ + function nodeWillIndentChild(parent: TextRangeWithKind, child: TextRangeWithKind, indentByDefault: boolean) { + let childKind = child ? child.kind : SyntaxKind.Unknown; + switch (parent.kind) { case SyntaxKind.DoStatement: case SyntaxKind.WhileStatement: case SyntaxKind.ForInStatement: @@ -464,10 +465,25 @@ namespace ts.formatting { case SyntaxKind.Constructor: case SyntaxKind.GetAccessor: case SyntaxKind.SetAccessor: - return child !== SyntaxKind.Block; - default: - return false; + return childKind !== SyntaxKind.Block; } + // No explicit rule for selected nodes, so result will follow the default value argument. + return indentByDefault; + } + + export function shouldIndentChildNode(parent: TextRangeWithKind, child: TextRangeWithKind): boolean { + if (nodeContentIsAlwaysIndented(parent.kind)) { + return true; + } + return nodeWillIndentChild(parent, child, false); + } + + /** + * Function returns true if a node should not get additional indentation in its parent node. + */ + export function shouldInheritParentIndentation(parent: TextRangeWithKind, child: TextRangeWithKind): boolean { + // Check if + return !nodeWillIndentChild(parent, child, true); } } } \ No newline at end of file From 07fbf8bfd1358a9048c6af3d2742b0decc461ee4 Mon Sep 17 00:00:00 2001 From: SaschaNaz Date: Sat, 12 Sep 2015 17:31:12 +0900 Subject: [PATCH 002/177] Fix some comments --- src/services/formatting/smartIndenter.ts | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/src/services/formatting/smartIndenter.ts b/src/services/formatting/smartIndenter.ts index ab23f3da939..4477ea760bb 100644 --- a/src/services/formatting/smartIndenter.ts +++ b/src/services/formatting/smartIndenter.ts @@ -447,7 +447,7 @@ namespace ts.formatting { } /** - * Function returns true when a node with conditional indentation rule will indent certain child node. + * Function returns true when a node with conditional indentation rule will indent certain child node */ function nodeWillIndentChild(parent: TextRangeWithKind, child: TextRangeWithKind, indentByDefault: boolean) { let childKind = child ? child.kind : SyntaxKind.Unknown; @@ -467,7 +467,7 @@ namespace ts.formatting { case SyntaxKind.SetAccessor: return childKind !== SyntaxKind.Block; } - // No explicit rule for selected nodes, so result will follow the default value argument. + // No explicit rule for selected nodes, so result will follow the default value argument return indentByDefault; } @@ -479,10 +479,11 @@ namespace ts.formatting { } /** - * Function returns true if a node should not get additional indentation in its parent node. + * Function returns true if existing node content indentation should be suppressed for a specific child */ export function shouldInheritParentIndentation(parent: TextRangeWithKind, child: TextRangeWithKind): boolean { - // Check if + // Consider parents without indentation rules can indent their children + // so that they can apply inherited delta value to them return !nodeWillIndentChild(parent, child, true); } } From f2329846cbc52074f9eb0affaecae2e406880dd5 Mon Sep 17 00:00:00 2001 From: SaschaNaz Date: Sun, 13 Sep 2015 04:02:18 +0900 Subject: [PATCH 003/177] apply suppression to tokens --- src/services/formatting/formatting.ts | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/src/services/formatting/formatting.ts b/src/services/formatting/formatting.ts index 868683bb6af..8a713dc032c 100644 --- a/src/services/formatting/formatting.ts +++ b/src/services/formatting/formatting.ts @@ -387,9 +387,7 @@ namespace ts.formatting { let indentation = inheritedIndentation; if (indentation === Constants.Unknown) { - if (SmartIndenter.shouldInheritParentIndentation(parent, node) || - SmartIndenter.childStartsOnTheSameLineWithElseInIfStatement(parent, node, startLine, sourceFile)) { - + if (SmartIndenter.childStartsOnTheSameLineWithElseInIfStatement(parent, node, startLine, sourceFile)) { indentation = parentDynamicIndentation.getIndentation(); } else { @@ -590,6 +588,10 @@ namespace ts.formatting { return inheritedIndentation; } + if (SmartIndenter.shouldInheritParentIndentation(parent, child)) { + parentDynamicIndentation = getDynamicIndentation(parent, parentStartLine, indentation, 0); + } + if (isToken(child)) { // if child node is a token, it does not impact indentation, proceed it using parent indentation scope rules let tokenInfo = formattingScanner.readTokenInfo(child); From 46c8af10245751fc51880191a559a1ae27706115 Mon Sep 17 00:00:00 2001 From: SaschaNaz Date: Sun, 13 Sep 2015 07:47:16 +0900 Subject: [PATCH 004/177] make getDelta call suppressor --- src/services/formatting/formatting.ts | 35 +++++++++++++++------------ 1 file changed, 19 insertions(+), 16 deletions(-) diff --git a/src/services/formatting/formatting.ts b/src/services/formatting/formatting.ts index 8a713dc032c..5d4938498e4 100644 --- a/src/services/formatting/formatting.ts +++ b/src/services/formatting/formatting.ts @@ -54,7 +54,7 @@ namespace ts.formatting { * so bar inherits indentation from foo and bar.delta will be 4 * */ - getDelta(): number; + getDelta(child: TextRangeWithKind): number; /** * Formatter calls this function when rule adds or deletes new lines from the text * so indentation scope can adjust values of indentation and delta. @@ -386,15 +386,6 @@ namespace ts.formatting { effectiveParentStartLine: number): Indentation { let indentation = inheritedIndentation; - if (indentation === Constants.Unknown) { - if (SmartIndenter.childStartsOnTheSameLineWithElseInIfStatement(parent, node, startLine, sourceFile)) { - indentation = parentDynamicIndentation.getIndentation(); - } - else { - indentation = parentDynamicIndentation.getIndentation() + parentDynamicIndentation.getDelta(); - } - } - var delta = SmartIndenter.shouldIndentChildNode(node, null) ? options.IndentSize : 0; if (effectiveParentStartLine === startLine) { @@ -404,8 +395,17 @@ namespace ts.formatting { indentation = startLine === lastIndentedLine ? indentationOnLastIndentedLine : parentDynamicIndentation.getIndentation(); - delta = Math.min(options.IndentSize, parentDynamicIndentation.getDelta() + delta); + delta = Math.min(options.IndentSize, parentDynamicIndentation.getDelta(node) + delta); } + else if (indentation === Constants.Unknown) { + if (SmartIndenter.childStartsOnTheSameLineWithElseInIfStatement(parent, node, startLine, sourceFile)) { + indentation = parentDynamicIndentation.getIndentation(); + } + else { + indentation = parentDynamicIndentation.getIndentation() + parentDynamicIndentation.getDelta(node); + } + } + return { indentation, delta @@ -475,7 +475,14 @@ namespace ts.formatting { } }, getIndentation: () => indentation, - getDelta: () => delta, + getDelta: (child: TextRangeWithKind) => { + if (SmartIndenter.shouldInheritParentIndentation(node, child)) { + return 0; + } + else { + return delta; + } + }, recomputeIndentation: lineAdded => { if (node.parent && SmartIndenter.shouldIndentChildNode(node.parent, node)) { if (lineAdded) { @@ -588,10 +595,6 @@ namespace ts.formatting { return inheritedIndentation; } - if (SmartIndenter.shouldInheritParentIndentation(parent, child)) { - parentDynamicIndentation = getDynamicIndentation(parent, parentStartLine, indentation, 0); - } - if (isToken(child)) { // if child node is a token, it does not impact indentation, proceed it using parent indentation scope rules let tokenInfo = formattingScanner.readTokenInfo(child); From 4d1c067d752cd165ce2b69545629621033b93e4c Mon Sep 17 00:00:00 2001 From: SaschaNaz Date: Sun, 13 Sep 2015 16:01:32 +0900 Subject: [PATCH 005/177] use undefined instead of null --- src/services/formatting/formatting.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/services/formatting/formatting.ts b/src/services/formatting/formatting.ts index 5d4938498e4..eeebfd1649d 100644 --- a/src/services/formatting/formatting.ts +++ b/src/services/formatting/formatting.ts @@ -282,7 +282,7 @@ namespace ts.formatting { */ function getOwnOrInheritedDelta(n: Node, options: FormatCodeOptions, sourceFile: SourceFile): number { let previousLine = Constants.Unknown; - let child: Node = null; + let child: Node; while (n) { let line = sourceFile.getLineAndCharacterOfPosition(n.getStart(sourceFile)).line; if (previousLine !== Constants.Unknown && line !== previousLine) { From b2cfddbe7a30c05ebac112af556974fa16913a9e Mon Sep 17 00:00:00 2001 From: SaschaNaz Date: Sun, 13 Sep 2015 23:42:24 +0900 Subject: [PATCH 006/177] re-fix token indentation --- src/services/formatting/formatting.ts | 23 ++++++++++++++--------- 1 file changed, 14 insertions(+), 9 deletions(-) diff --git a/src/services/formatting/formatting.ts b/src/services/formatting/formatting.ts index eeebfd1649d..9f300f1db7a 100644 --- a/src/services/formatting/formatting.ts +++ b/src/services/formatting/formatting.ts @@ -60,6 +60,11 @@ namespace ts.formatting { * so indentation scope can adjust values of indentation and delta. */ recomputeIndentation(lineAddedByFormatting: boolean): void; + + /** + * Returns DynamicIndentation object that includes modified delta value for specific child node. + */ + getCopyForSpecificChild(child: Node): DynamicIndentation; } interface Indentation { @@ -475,14 +480,7 @@ namespace ts.formatting { } }, getIndentation: () => indentation, - getDelta: (child: TextRangeWithKind) => { - if (SmartIndenter.shouldInheritParentIndentation(node, child)) { - return 0; - } - else { - return delta; - } - }, + getDelta: (child) => (!delta || SmartIndenter.shouldInheritParentIndentation(node, child)) ? 0 : delta, recomputeIndentation: lineAdded => { if (node.parent && SmartIndenter.shouldIndentChildNode(node.parent, node)) { if (lineAdded) { @@ -500,6 +498,13 @@ namespace ts.formatting { } } }, + getCopyForSpecificChild(child) { + if (!delta) { + // delta value is already 0, so do not copy + return this; + } + return getDynamicIndentation(node, nodeStartLine, indentation, (this).getDelta(child)); + } } } @@ -599,7 +604,7 @@ namespace ts.formatting { // if child node is a token, it does not impact indentation, proceed it using parent indentation scope rules let tokenInfo = formattingScanner.readTokenInfo(child); Debug.assert(tokenInfo.token.end === child.end); - consumeTokenAndAdvanceScanner(tokenInfo, node, parentDynamicIndentation); + consumeTokenAndAdvanceScanner(tokenInfo, node, parentDynamicIndentation.getCopyForSpecificChild(child)); return inheritedIndentation; } From 3dd7caafbfc0bf2cf15d910c27c585cd8237ae8e Mon Sep 17 00:00:00 2001 From: SaschaNaz Date: Tue, 22 Sep 2015 15:07:44 +0900 Subject: [PATCH 007/177] no null --- src/services/formatting/formatting.ts | 4 ++-- src/services/formatting/smartIndenter.ts | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/services/formatting/formatting.ts b/src/services/formatting/formatting.ts index 9f300f1db7a..412daaa8ab0 100644 --- a/src/services/formatting/formatting.ts +++ b/src/services/formatting/formatting.ts @@ -391,7 +391,7 @@ namespace ts.formatting { effectiveParentStartLine: number): Indentation { let indentation = inheritedIndentation; - var delta = SmartIndenter.shouldIndentChildNode(node, null) ? options.IndentSize : 0; + var delta = SmartIndenter.shouldIndentChildNode(node) ? options.IndentSize : 0; if (effectiveParentStartLine === startLine) { // if node is located on the same line with the parent @@ -490,7 +490,7 @@ namespace ts.formatting { indentation -= options.IndentSize; } - if (SmartIndenter.shouldIndentChildNode(node, null)) { + if (SmartIndenter.shouldIndentChildNode(node)) { delta = options.IndentSize; } else { diff --git a/src/services/formatting/smartIndenter.ts b/src/services/formatting/smartIndenter.ts index 4477ea760bb..dfe94b3fdbb 100644 --- a/src/services/formatting/smartIndenter.ts +++ b/src/services/formatting/smartIndenter.ts @@ -471,7 +471,7 @@ namespace ts.formatting { return indentByDefault; } - export function shouldIndentChildNode(parent: TextRangeWithKind, child: TextRangeWithKind): boolean { + export function shouldIndentChildNode(parent: TextRangeWithKind, child?: TextRangeWithKind): boolean { if (nodeContentIsAlwaysIndented(parent.kind)) { return true; } From f9e8d9562d91af7a77454b40d60c28162dac9079 Mon Sep 17 00:00:00 2001 From: SaschaNaz Date: Tue, 22 Sep 2015 16:32:24 +0900 Subject: [PATCH 008/177] slight condition change for getDelta --- src/services/formatting/formatting.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/services/formatting/formatting.ts b/src/services/formatting/formatting.ts index 412daaa8ab0..4995fb34b54 100644 --- a/src/services/formatting/formatting.ts +++ b/src/services/formatting/formatting.ts @@ -480,7 +480,7 @@ namespace ts.formatting { } }, getIndentation: () => indentation, - getDelta: (child) => (!delta || SmartIndenter.shouldInheritParentIndentation(node, child)) ? 0 : delta, + getDelta: (child) => (delta && SmartIndenter.shouldInheritParentIndentation(node, child)) ? 0 : delta, recomputeIndentation: lineAdded => { if (node.parent && SmartIndenter.shouldIndentChildNode(node.parent, node)) { if (lineAdded) { From f53f70d79e2ca35f3b653ee90a0b10152931073b Mon Sep 17 00:00:00 2001 From: SaschaNaz Date: Tue, 29 Sep 2015 16:09:07 +0900 Subject: [PATCH 009/177] getEffectiveDelta --- src/services/formatting/formatting.ts | 76 ++++++++++++--------------- 1 file changed, 34 insertions(+), 42 deletions(-) diff --git a/src/services/formatting/formatting.ts b/src/services/formatting/formatting.ts index 4995fb34b54..0bd2a47bb1e 100644 --- a/src/services/formatting/formatting.ts +++ b/src/services/formatting/formatting.ts @@ -31,8 +31,8 @@ namespace ts.formatting { * the first token in line so it should be indented */ interface DynamicIndentation { - getIndentationForToken(tokenLine: number, tokenKind: SyntaxKind): number; - getIndentationForComment(owningToken: SyntaxKind, tokenIndentation: number): number; + getIndentationForToken(tokenLine: number, tokenKind: SyntaxKind, container: Node): number; + getIndentationForComment(owningToken: SyntaxKind, tokenIndentation: number, container: Node): number; /** * Indentation for open and close tokens of the node if it is block or another node that needs special indentation * ... { @@ -60,11 +60,6 @@ namespace ts.formatting { * so indentation scope can adjust values of indentation and delta. */ recomputeIndentation(lineAddedByFormatting: boolean): void; - - /** - * Returns DynamicIndentation object that includes modified delta value for specific child node. - */ - getCopyForSpecificChild(child: Node): DynamicIndentation; } interface Indentation { @@ -330,7 +325,7 @@ namespace ts.formatting { let lastIndentedLine: number; let indentationOnLastIndentedLine: number; - + let edits: TextChange[] = []; formattingScanner.advance(); @@ -359,12 +354,12 @@ namespace ts.formatting { * If list element is in the range - its indentation will be equal * to inherited indentation from its predecessors. */ - function tryComputeIndentationForListItem(startPos: number, - endPos: number, - parentStartLine: number, - range: TextRange, + function tryComputeIndentationForListItem(startPos: number, + endPos: number, + parentStartLine: number, + range: TextRange, inheritedIndentation: number): number { - + if (rangeOverlapsWithStartEnd(range, startPos, endPos)) { if (inheritedIndentation !== Constants.Unknown) { return inheritedIndentation; @@ -381,7 +376,7 @@ namespace ts.formatting { return Constants.Unknown; } - + function computeIndentation( node: TextRangeWithKind, startLine: number, @@ -397,8 +392,8 @@ namespace ts.formatting { // if node is located on the same line with the parent // - inherit indentation from the parent // - push children if either parent of node itself has non-zero delta - indentation = startLine === lastIndentedLine - ? indentationOnLastIndentedLine + indentation = startLine === lastIndentedLine + ? indentationOnLastIndentedLine : parentDynamicIndentation.getIndentation(); delta = Math.min(options.IndentSize, parentDynamicIndentation.getDelta(node) + delta); } @@ -442,7 +437,7 @@ namespace ts.formatting { function getDynamicIndentation(node: Node, nodeStartLine: number, indentation: number, delta: number): DynamicIndentation { return { - getIndentationForComment: (kind, tokenIndentation) => { + getIndentationForComment: (kind, tokenIndentation, container) => { switch (kind) { // preceding comment to the token that closes the indentation scope inherits the indentation from the scope // .. { @@ -451,11 +446,11 @@ namespace ts.formatting { case SyntaxKind.CloseBraceToken: case SyntaxKind.CloseBracketToken: case SyntaxKind.CloseParenToken: - return indentation + delta; + return indentation + getEffectiveDelta(delta, container); } return tokenIndentation !== Constants.Unknown ? tokenIndentation : indentation; }, - getIndentationForToken: (line, kind) => { + getIndentationForToken: (line, kind, container) => { if (nodeStartLine !== line && node.decorators) { if (kind === getFirstNonDecoratorTokenOfNode(node)) { // if this token is the first token following the list of decorators, we do not need to indent @@ -476,11 +471,11 @@ namespace ts.formatting { return indentation; default: // if token line equals to the line of containing node (this is a first token in the node) - use node indentation - return nodeStartLine !== line ? indentation + delta : indentation; + return nodeStartLine !== line ? indentation + getEffectiveDelta(delta, container) : indentation; } }, getIndentation: () => indentation, - getDelta: (child) => (delta && SmartIndenter.shouldInheritParentIndentation(node, child)) ? 0 : delta, + getDelta: (child) => getEffectiveDelta(delta, child), recomputeIndentation: lineAdded => { if (node.parent && SmartIndenter.shouldIndentChildNode(node.parent, node)) { if (lineAdded) { @@ -497,15 +492,12 @@ namespace ts.formatting { delta = 0; } } - }, - getCopyForSpecificChild(child) { - if (!delta) { - // delta value is already 0, so do not copy - return this; - } - return getDynamicIndentation(node, nodeStartLine, indentation, (this).getDelta(child)); } } + + function getEffectiveDelta(delta: number, child: TextRangeWithKind) { + return SmartIndenter.shouldInheritParentIndentation(node, child) ? 0 : delta; + } } function processNode(node: Node, contextNode: Node, nodeStartLine: number, undecoratedNodeStartLine: number, indentation: number, delta: number) { @@ -580,7 +572,7 @@ namespace ts.formatting { if (!rangeOverlapsWithStartEnd(originalRange, child.pos, child.end)) { return inheritedIndentation; } - + if (child.getFullWidth() === 0) { return inheritedIndentation; } @@ -604,7 +596,7 @@ namespace ts.formatting { // if child node is a token, it does not impact indentation, proceed it using parent indentation scope rules let tokenInfo = formattingScanner.readTokenInfo(child); Debug.assert(tokenInfo.token.end === child.end); - consumeTokenAndAdvanceScanner(tokenInfo, node, parentDynamicIndentation.getCopyForSpecificChild(child)); + consumeTokenAndAdvanceScanner(tokenInfo, node, parentDynamicIndentation, child); return inheritedIndentation; } @@ -618,8 +610,8 @@ namespace ts.formatting { return inheritedIndentation; } - function processChildNodes(nodes: NodeArray, - parent: Node, + function processChildNodes(nodes: NodeArray, + parent: Node, parentStartLine: number, parentDynamicIndentation: DynamicIndentation): void { @@ -673,7 +665,7 @@ namespace ts.formatting { } } - function consumeTokenAndAdvanceScanner(currentTokenInfo: TokenInfo, parent: Node, dynamicIndentation: DynamicIndentation): void { + function consumeTokenAndAdvanceScanner(currentTokenInfo: TokenInfo, parent: Node, dynamicIndentation: DynamicIndentation, container?: Node): void { Debug.assert(rangeContainsRange(parent, currentTokenInfo.token)); let lastTriviaWasNewLine = formattingScanner.lastTrailingTriviaWasNewLine(); @@ -712,11 +704,11 @@ namespace ts.formatting { if (indentToken) { let tokenIndentation = (isTokenInRange && !rangeContainsError(currentTokenInfo.token)) ? - dynamicIndentation.getIndentationForToken(tokenStart.line, currentTokenInfo.token.kind) : + dynamicIndentation.getIndentationForToken(tokenStart.line, currentTokenInfo.token.kind, container) : Constants.Unknown; if (currentTokenInfo.leadingTrivia) { - let commentIndentation = dynamicIndentation.getIndentationForComment(currentTokenInfo.token.kind, tokenIndentation); + let commentIndentation = dynamicIndentation.getIndentationForComment(currentTokenInfo.token.kind, tokenIndentation, container); let indentNextTokenOrTrivia = true; for (let triviaItem of currentTokenInfo.leadingTrivia) { @@ -745,7 +737,7 @@ namespace ts.formatting { // indent token only if is it is in target range and does not overlap with any error ranges if (tokenIndentation !== Constants.Unknown) { insertIndentation(currentTokenInfo.token.pos, tokenIndentation, lineAdded); - + lastIndentedLine = tokenStart.line; indentationOnLastIndentedLine = tokenIndentation; } @@ -766,12 +758,12 @@ namespace ts.formatting { } } - function processRange(range: TextRangeWithKind, - rangeStart: LineAndCharacter, - parent: Node, - contextNode: Node, + function processRange(range: TextRangeWithKind, + rangeStart: LineAndCharacter, + parent: Node, + contextNode: Node, dynamicIndentation: DynamicIndentation): boolean { - + let rangeHasError = rangeContainsError(range); let lineAdded: boolean; if (!rangeHasError && !previousRangeHasError) { @@ -781,7 +773,7 @@ namespace ts.formatting { trimTrailingWhitespacesForLines(originalStart.line, rangeStart.line); } else { - lineAdded = + lineAdded = processPair(range, rangeStart.line, parent, previousRange, previousRangeStartLine, previousParent, contextNode, dynamicIndentation) } } From 9eb85e21731e5516f45b4e00e0fc0127002ad2c6 Mon Sep 17 00:00:00 2001 From: SaschaNaz Date: Tue, 29 Sep 2015 19:50:42 +0900 Subject: [PATCH 010/177] remove parens --- src/services/formatting/formatting.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/services/formatting/formatting.ts b/src/services/formatting/formatting.ts index 0bd2a47bb1e..7d559f99464 100644 --- a/src/services/formatting/formatting.ts +++ b/src/services/formatting/formatting.ts @@ -475,7 +475,7 @@ namespace ts.formatting { } }, getIndentation: () => indentation, - getDelta: (child) => getEffectiveDelta(delta, child), + getDelta: child => getEffectiveDelta(delta, child), recomputeIndentation: lineAdded => { if (node.parent && SmartIndenter.shouldIndentChildNode(node.parent, node)) { if (lineAdded) { From 32b1ad36ecd2018c61fc42d133e1235517543d61 Mon Sep 17 00:00:00 2001 From: Vladimir Matveev Date: Sun, 4 Oct 2015 22:00:57 -0700 Subject: [PATCH 011/177] do not emit exportsStar function if module does not expose any values --- src/compiler/checker.ts | 30 ++++++++++- src/compiler/emitter.ts | 38 +++++++------ src/compiler/types.ts | 2 + .../reference/es6ExportEqualsInterop.js | 1 - .../exportDeclarationInInternalModule.js | 2 +- .../reference/exportStarForValues.js | 17 ++++++ .../reference/exportStarForValues.symbols | 11 ++++ .../reference/exportStarForValues.types | 11 ++++ .../reference/exportStarForValues10.js | 52 ++++++++++++++++++ .../reference/exportStarForValues10.symbols | 16 ++++++ .../reference/exportStarForValues10.types | 18 +++++++ .../reference/exportStarForValues2.js | 25 +++++++++ .../reference/exportStarForValues2.symbols | 16 ++++++ .../reference/exportStarForValues2.types | 18 +++++++ .../reference/exportStarForValues3.js | 45 ++++++++++++++++ .../reference/exportStarForValues3.symbols | 39 ++++++++++++++ .../reference/exportStarForValues3.types | 43 +++++++++++++++ .../reference/exportStarForValues4.js | 29 ++++++++++ .../reference/exportStarForValues4.symbols | 25 +++++++++ .../reference/exportStarForValues4.types | 27 ++++++++++ .../reference/exportStarForValues5.js | 16 ++++++ .../reference/exportStarForValues5.symbols | 11 ++++ .../reference/exportStarForValues5.types | 11 ++++ .../reference/exportStarForValues6.js | 28 ++++++++++ .../reference/exportStarForValues6.symbols | 11 ++++ .../reference/exportStarForValues6.types | 12 +++++ .../reference/exportStarForValues7.js | 29 ++++++++++ .../reference/exportStarForValues7.symbols | 16 ++++++ .../reference/exportStarForValues7.types | 18 +++++++ .../reference/exportStarForValues8.js | 54 +++++++++++++++++++ .../reference/exportStarForValues8.symbols | 39 ++++++++++++++ .../reference/exportStarForValues8.types | 43 +++++++++++++++ .../reference/exportStarForValues9.js | 37 +++++++++++++ .../reference/exportStarForValues9.symbols | 25 +++++++++ .../reference/exportStarForValues9.types | 27 ++++++++++ .../reference/exportStarForValuesInSystem.js | 28 ++++++++++ .../exportStarForValuesInSystem.symbols | 11 ++++ .../exportStarForValuesInSystem.types | 12 +++++ .../reference/moduleElementsInWrongContext.js | 1 - .../moduleElementsInWrongContext2.js | 1 - .../moduleElementsInWrongContext3.js | 1 - tests/cases/compiler/exportStarForValues.ts | 8 +++ tests/cases/compiler/exportStarForValues10.ts | 12 +++++ tests/cases/compiler/exportStarForValues2.ts | 12 +++++ tests/cases/compiler/exportStarForValues3.ts | 24 +++++++++ tests/cases/compiler/exportStarForValues4.ts | 15 ++++++ tests/cases/compiler/exportStarForValues5.ts | 8 +++ tests/cases/compiler/exportStarForValues6.ts | 8 +++ tests/cases/compiler/exportStarForValues7.ts | 12 +++++ tests/cases/compiler/exportStarForValues8.ts | 24 +++++++++ tests/cases/compiler/exportStarForValues9.ts | 15 ++++++ .../compiler/exportStarForValuesInSystem.ts | 8 +++ 52 files changed, 1020 insertions(+), 22 deletions(-) create mode 100644 tests/baselines/reference/exportStarForValues.js create mode 100644 tests/baselines/reference/exportStarForValues.symbols create mode 100644 tests/baselines/reference/exportStarForValues.types create mode 100644 tests/baselines/reference/exportStarForValues10.js create mode 100644 tests/baselines/reference/exportStarForValues10.symbols create mode 100644 tests/baselines/reference/exportStarForValues10.types create mode 100644 tests/baselines/reference/exportStarForValues2.js create mode 100644 tests/baselines/reference/exportStarForValues2.symbols create mode 100644 tests/baselines/reference/exportStarForValues2.types create mode 100644 tests/baselines/reference/exportStarForValues3.js create mode 100644 tests/baselines/reference/exportStarForValues3.symbols create mode 100644 tests/baselines/reference/exportStarForValues3.types create mode 100644 tests/baselines/reference/exportStarForValues4.js create mode 100644 tests/baselines/reference/exportStarForValues4.symbols create mode 100644 tests/baselines/reference/exportStarForValues4.types create mode 100644 tests/baselines/reference/exportStarForValues5.js create mode 100644 tests/baselines/reference/exportStarForValues5.symbols create mode 100644 tests/baselines/reference/exportStarForValues5.types create mode 100644 tests/baselines/reference/exportStarForValues6.js create mode 100644 tests/baselines/reference/exportStarForValues6.symbols create mode 100644 tests/baselines/reference/exportStarForValues6.types create mode 100644 tests/baselines/reference/exportStarForValues7.js create mode 100644 tests/baselines/reference/exportStarForValues7.symbols create mode 100644 tests/baselines/reference/exportStarForValues7.types create mode 100644 tests/baselines/reference/exportStarForValues8.js create mode 100644 tests/baselines/reference/exportStarForValues8.symbols create mode 100644 tests/baselines/reference/exportStarForValues8.types create mode 100644 tests/baselines/reference/exportStarForValues9.js create mode 100644 tests/baselines/reference/exportStarForValues9.symbols create mode 100644 tests/baselines/reference/exportStarForValues9.types create mode 100644 tests/baselines/reference/exportStarForValuesInSystem.js create mode 100644 tests/baselines/reference/exportStarForValuesInSystem.symbols create mode 100644 tests/baselines/reference/exportStarForValuesInSystem.types create mode 100644 tests/cases/compiler/exportStarForValues.ts create mode 100644 tests/cases/compiler/exportStarForValues10.ts create mode 100644 tests/cases/compiler/exportStarForValues2.ts create mode 100644 tests/cases/compiler/exportStarForValues3.ts create mode 100644 tests/cases/compiler/exportStarForValues4.ts create mode 100644 tests/cases/compiler/exportStarForValues5.ts create mode 100644 tests/cases/compiler/exportStarForValues6.ts create mode 100644 tests/cases/compiler/exportStarForValues7.ts create mode 100644 tests/cases/compiler/exportStarForValues8.ts create mode 100644 tests/cases/compiler/exportStarForValues9.ts create mode 100644 tests/cases/compiler/exportStarForValuesInSystem.ts diff --git a/src/compiler/checker.ts b/src/compiler/checker.ts index 663825f1e84..18e76f46d72 100644 --- a/src/compiler/checker.ts +++ b/src/compiler/checker.ts @@ -14493,6 +14493,33 @@ namespace ts { // Emitter support + function moduleExportsSomeValue(moduleReferenceExpression: Expression): boolean { + let moduleSymbol = resolveExternalModuleName(moduleReferenceExpression.parent, moduleReferenceExpression); + if (!moduleSymbol) { + // module not found - be conservative + return true; + } + + const hasExportAssignment = getExportAssignmentSymbol(moduleSymbol) !== undefined; + moduleSymbol = resolveExternalModuleSymbol(moduleSymbol); + + const symbolLinks = getSymbolLinks(moduleSymbol); + if (symbolLinks.exportsSomeValue == undefined) { + // for export assignments - check if resolved symbol for RHS is itself a value + // otherwise - check if at least one export is value + symbolLinks.exportsSomeValue = hasExportAssignment + ? !!(moduleSymbol.flags & SymbolFlags.Value) + : forEachValue(getExportsOfModule(moduleSymbol), isValue); + } + + return symbolLinks.exportsSomeValue; + + function isValue(s: Symbol): boolean { + s = resolveSymbol(s); + return s && !!(s.flags & SymbolFlags.Value); + } + } + // When resolved as an expression identifier, if the given node references an exported entity, return the declaration // node of the exported entity's container. Otherwise, return undefined. function getReferencedExportContainer(node: Identifier): SourceFile | ModuleDeclaration | EnumDeclaration { @@ -14823,7 +14850,8 @@ namespace ts { getBlockScopedVariableId, getReferencedValueDeclaration, getTypeReferenceSerializationKind, - isOptionalParameter + isOptionalParameter, + moduleExportsSomeValue }; } diff --git a/src/compiler/emitter.ts b/src/compiler/emitter.ts index 11942562dcb..bf670bd2c42 100644 --- a/src/compiler/emitter.ts +++ b/src/compiler/emitter.ts @@ -406,7 +406,7 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, Promi let externalImports: (ImportDeclaration | ImportEqualsDeclaration | ExportDeclaration)[]; let exportSpecifiers: Map; let exportEquals: ExportAssignment; - let hasExportStars: boolean; + let hasExportStarsToExportValues: boolean; /** Write emitted output to disk */ let writeEmittedFiles = writeJavaScriptFile; @@ -5892,15 +5892,17 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, Promi } else { // export * from "foo" - writeLine(); - write("__export("); - if (modulekind !== ModuleKind.AMD) { - emitRequire(getExternalModuleName(node)); + if (hasExportStarsToExportValues && resolver.moduleExportsSomeValue(node.moduleSpecifier)) { + writeLine(); + write("__export("); + if (modulekind !== ModuleKind.AMD) { + emitRequire(getExternalModuleName(node)); + } + else { + write(generatedName); + } + write(");"); } - else { - write(generatedName); - } - write(");"); } emitEnd(node); } @@ -5988,7 +5990,7 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, Promi externalImports = []; exportSpecifiers = {}; exportEquals = undefined; - hasExportStars = false; + hasExportStarsToExportValues = false; for (let node of sourceFile.statements) { switch (node.kind) { case SyntaxKind.ImportDeclaration: @@ -6011,8 +6013,10 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, Promi if ((node).moduleSpecifier) { if (!(node).exportClause) { // export * from "mod" - externalImports.push(node); - hasExportStars = true; + if (resolver.moduleExportsSomeValue((node).moduleSpecifier)) { + externalImports.push(node); + hasExportStarsToExportValues = true; + } } else if (resolver.isValueAliasDeclaration(node)) { // export { x, y } from "mod" where at least one export is a value symbol @@ -6038,7 +6042,7 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, Promi } function emitExportStarHelper() { - if (hasExportStars) { + if (hasExportStarsToExportValues) { writeLine(); write("function __export(m) {"); increaseIndent(); @@ -6110,7 +6114,7 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, Promi // should always win over entries with similar names that were added via star exports // to support this we store names of local/indirect exported entries in a set. // this set is used to filter names brought by star expors. - if (!hasExportStars) { + if (!hasExportStarsToExportValues) { // local names set is needed only in presence of star exports return undefined; } @@ -6535,6 +6539,8 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, Promi write("});"); } else { + // collectExternalModuleInfo prefilters star exports to keep only ones that export values + // this means that check 'resolver.moduleExportsSomeValue' is redundant and can be omitted here writeLine(); // export * from 'foo' // emit as: @@ -6796,7 +6802,7 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, Promi externalImports = undefined; exportSpecifiers = undefined; exportEquals = undefined; - hasExportStars = false; + hasExportStarsToExportValues = false; emitEmitHelpers(node); emitCaptureThisForNodeIfNecessary(node); emitLinesStartingAt(node.statements, startIndex); @@ -6996,7 +7002,7 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, Promi externalImports = undefined; exportSpecifiers = undefined; exportEquals = undefined; - hasExportStars = false; + hasExportStarsToExportValues = false; emitEmitHelpers(node); emitCaptureThisForNodeIfNecessary(node); emitLinesStartingAt(node.statements, startIndex); diff --git a/src/compiler/types.ts b/src/compiler/types.ts index 5979c4246b1..08dbd22ff7c 100644 --- a/src/compiler/types.ts +++ b/src/compiler/types.ts @@ -1602,6 +1602,7 @@ namespace ts { getReferencedValueDeclaration(reference: Identifier): Declaration; getTypeReferenceSerializationKind(typeName: EntityName): TypeReferenceSerializationKind; isOptionalParameter(node: ParameterDeclaration): boolean; + moduleExportsSomeValue(moduleReferenceExpression: Expression): boolean; } export const enum SymbolFlags { @@ -1718,6 +1719,7 @@ namespace ts { exportsChecked?: boolean; // True if exports of external module have been checked isNestedRedeclaration?: boolean; // True if symbol is block scoped redeclaration bindingElement?: BindingElement; // Binding element associated with property symbol + exportsSomeValue?: boolean; // true if module exports some value (not just types) } /* @internal */ diff --git a/tests/baselines/reference/es6ExportEqualsInterop.js b/tests/baselines/reference/es6ExportEqualsInterop.js index 747b0b2beb8..3429b71b93c 100644 --- a/tests/baselines/reference/es6ExportEqualsInterop.js +++ b/tests/baselines/reference/es6ExportEqualsInterop.js @@ -289,7 +289,6 @@ exports.a8 = function_module_2.a; var class_module_2 = require("class-module"); exports.a0 = class_module_2.a; // export-star -__export(require("interface")); __export(require("variable")); __export(require("interface-variable")); __export(require("module")); diff --git a/tests/baselines/reference/exportDeclarationInInternalModule.js b/tests/baselines/reference/exportDeclarationInInternalModule.js index 4a1ee9b739f..39c8123a1e7 100644 --- a/tests/baselines/reference/exportDeclarationInInternalModule.js +++ b/tests/baselines/reference/exportDeclarationInInternalModule.js @@ -53,7 +53,7 @@ var Bbb; return SomeType; })(); Bbb.SomeType = SomeType; - __export(require()); // this line causes the nullref + // this line causes the nullref })(Bbb || (Bbb = {})); var a; diff --git a/tests/baselines/reference/exportStarForValues.js b/tests/baselines/reference/exportStarForValues.js new file mode 100644 index 00000000000..bd82373d52a --- /dev/null +++ b/tests/baselines/reference/exportStarForValues.js @@ -0,0 +1,17 @@ +//// [tests/cases/compiler/exportStarForValues.ts] //// + +//// [file1.ts] + +export interface Foo { x } + +//// [file2.ts] +export * from "file1" +var x; + +//// [file1.js] +define(["require", "exports"], function (require, exports) { +}); +//// [file2.js] +define(["require", "exports"], function (require, exports) { + var x; +}); diff --git a/tests/baselines/reference/exportStarForValues.symbols b/tests/baselines/reference/exportStarForValues.symbols new file mode 100644 index 00000000000..6694afecdc6 --- /dev/null +++ b/tests/baselines/reference/exportStarForValues.symbols @@ -0,0 +1,11 @@ +=== tests/cases/compiler/file1.ts === + +export interface Foo { x } +>Foo : Symbol(Foo, Decl(file1.ts, 0, 0)) +>x : Symbol(x, Decl(file1.ts, 1, 22)) + +=== tests/cases/compiler/file2.ts === +export * from "file1" +var x; +>x : Symbol(x, Decl(file2.ts, 1, 3)) + diff --git a/tests/baselines/reference/exportStarForValues.types b/tests/baselines/reference/exportStarForValues.types new file mode 100644 index 00000000000..b326a7e7ff6 --- /dev/null +++ b/tests/baselines/reference/exportStarForValues.types @@ -0,0 +1,11 @@ +=== tests/cases/compiler/file1.ts === + +export interface Foo { x } +>Foo : Foo +>x : any + +=== tests/cases/compiler/file2.ts === +export * from "file1" +var x; +>x : any + diff --git a/tests/baselines/reference/exportStarForValues10.js b/tests/baselines/reference/exportStarForValues10.js new file mode 100644 index 00000000000..781316cb8f9 --- /dev/null +++ b/tests/baselines/reference/exportStarForValues10.js @@ -0,0 +1,52 @@ +//// [tests/cases/compiler/exportStarForValues10.ts] //// + +//// [file0.ts] + +export var v = 1; + +//// [file1.ts] +export interface Foo { x } + +//// [file2.ts] +export * from "file0"; +export * from "file1"; +var x = 1; + +//// [file0.js] +System.register([], function(exports_1) { + var v; + return { + setters:[], + execute: function() { + exports_1("v", v = 1); + } + } +}); +//// [file1.js] +System.register([], function(exports_1) { + return { + setters:[], + execute: function() { + } + } +}); +//// [file2.js] +System.register(["file0"], function(exports_1) { + var x; + function exportStar_1(m) { + var exports = {}; + for(var n in m) { + if (n !== "default") exports[n] = m[n]; + } + exports_1(exports); + } + return { + setters:[ + function (file0_1_1) { + exportStar_1(file0_1_1); + }], + execute: function() { + x = 1; + } + } +}); diff --git a/tests/baselines/reference/exportStarForValues10.symbols b/tests/baselines/reference/exportStarForValues10.symbols new file mode 100644 index 00000000000..2de35864d27 --- /dev/null +++ b/tests/baselines/reference/exportStarForValues10.symbols @@ -0,0 +1,16 @@ +=== tests/cases/compiler/file0.ts === + +export var v = 1; +>v : Symbol(v, Decl(file0.ts, 1, 10)) + +=== tests/cases/compiler/file1.ts === +export interface Foo { x } +>Foo : Symbol(Foo, Decl(file1.ts, 0, 0)) +>x : Symbol(x, Decl(file1.ts, 0, 22)) + +=== tests/cases/compiler/file2.ts === +export * from "file0"; +export * from "file1"; +var x = 1; +>x : Symbol(x, Decl(file2.ts, 2, 3)) + diff --git a/tests/baselines/reference/exportStarForValues10.types b/tests/baselines/reference/exportStarForValues10.types new file mode 100644 index 00000000000..370f02318c1 --- /dev/null +++ b/tests/baselines/reference/exportStarForValues10.types @@ -0,0 +1,18 @@ +=== tests/cases/compiler/file0.ts === + +export var v = 1; +>v : number +>1 : number + +=== tests/cases/compiler/file1.ts === +export interface Foo { x } +>Foo : Foo +>x : any + +=== tests/cases/compiler/file2.ts === +export * from "file0"; +export * from "file1"; +var x = 1; +>x : number +>1 : number + diff --git a/tests/baselines/reference/exportStarForValues2.js b/tests/baselines/reference/exportStarForValues2.js new file mode 100644 index 00000000000..3d6b24ae433 --- /dev/null +++ b/tests/baselines/reference/exportStarForValues2.js @@ -0,0 +1,25 @@ +//// [tests/cases/compiler/exportStarForValues2.ts] //// + +//// [file1.ts] + +export interface Foo { x } + +//// [file2.ts] +export * from "file1" +var x = 1; + +//// [file3.ts] +export * from "file2" +var x = 1; + +//// [file1.js] +define(["require", "exports"], function (require, exports) { +}); +//// [file2.js] +define(["require", "exports"], function (require, exports) { + var x = 1; +}); +//// [file3.js] +define(["require", "exports"], function (require, exports) { + var x = 1; +}); diff --git a/tests/baselines/reference/exportStarForValues2.symbols b/tests/baselines/reference/exportStarForValues2.symbols new file mode 100644 index 00000000000..0fa739f5431 --- /dev/null +++ b/tests/baselines/reference/exportStarForValues2.symbols @@ -0,0 +1,16 @@ +=== tests/cases/compiler/file1.ts === + +export interface Foo { x } +>Foo : Symbol(Foo, Decl(file1.ts, 0, 0)) +>x : Symbol(x, Decl(file1.ts, 1, 22)) + +=== tests/cases/compiler/file2.ts === +export * from "file1" +var x = 1; +>x : Symbol(x, Decl(file2.ts, 1, 3)) + +=== tests/cases/compiler/file3.ts === +export * from "file2" +var x = 1; +>x : Symbol(x, Decl(file3.ts, 1, 3)) + diff --git a/tests/baselines/reference/exportStarForValues2.types b/tests/baselines/reference/exportStarForValues2.types new file mode 100644 index 00000000000..f1de53bd7cf --- /dev/null +++ b/tests/baselines/reference/exportStarForValues2.types @@ -0,0 +1,18 @@ +=== tests/cases/compiler/file1.ts === + +export interface Foo { x } +>Foo : Foo +>x : any + +=== tests/cases/compiler/file2.ts === +export * from "file1" +var x = 1; +>x : number +>1 : number + +=== tests/cases/compiler/file3.ts === +export * from "file2" +var x = 1; +>x : number +>1 : number + diff --git a/tests/baselines/reference/exportStarForValues3.js b/tests/baselines/reference/exportStarForValues3.js new file mode 100644 index 00000000000..c5136e57eef --- /dev/null +++ b/tests/baselines/reference/exportStarForValues3.js @@ -0,0 +1,45 @@ +//// [tests/cases/compiler/exportStarForValues3.ts] //// + +//// [file1.ts] + +export interface Foo { x } + +//// [file2.ts] +export interface A { x } +export * from "file1" +var x = 1; + +//// [file3.ts] +export interface B { x } +export * from "file1" +var x = 1; + +//// [file4.ts] +export interface C { x } +export * from "file2" +export * from "file3" +var x = 1; + +//// [file5.ts] +export * from "file4" +var x = 1; + +//// [file1.js] +define(["require", "exports"], function (require, exports) { +}); +//// [file2.js] +define(["require", "exports"], function (require, exports) { + var x = 1; +}); +//// [file3.js] +define(["require", "exports"], function (require, exports) { + var x = 1; +}); +//// [file4.js] +define(["require", "exports"], function (require, exports) { + var x = 1; +}); +//// [file5.js] +define(["require", "exports"], function (require, exports) { + var x = 1; +}); diff --git a/tests/baselines/reference/exportStarForValues3.symbols b/tests/baselines/reference/exportStarForValues3.symbols new file mode 100644 index 00000000000..a79aeb36588 --- /dev/null +++ b/tests/baselines/reference/exportStarForValues3.symbols @@ -0,0 +1,39 @@ +=== tests/cases/compiler/file1.ts === + +export interface Foo { x } +>Foo : Symbol(Foo, Decl(file1.ts, 0, 0)) +>x : Symbol(x, Decl(file1.ts, 1, 22)) + +=== tests/cases/compiler/file2.ts === +export interface A { x } +>A : Symbol(A, Decl(file2.ts, 0, 0)) +>x : Symbol(x, Decl(file2.ts, 0, 20)) + +export * from "file1" +var x = 1; +>x : Symbol(x, Decl(file2.ts, 2, 3)) + +=== tests/cases/compiler/file3.ts === +export interface B { x } +>B : Symbol(B, Decl(file3.ts, 0, 0)) +>x : Symbol(x, Decl(file3.ts, 0, 20)) + +export * from "file1" +var x = 1; +>x : Symbol(x, Decl(file3.ts, 2, 3)) + +=== tests/cases/compiler/file4.ts === +export interface C { x } +>C : Symbol(C, Decl(file4.ts, 0, 0)) +>x : Symbol(x, Decl(file4.ts, 0, 20)) + +export * from "file2" +export * from "file3" +var x = 1; +>x : Symbol(x, Decl(file4.ts, 3, 3)) + +=== tests/cases/compiler/file5.ts === +export * from "file4" +var x = 1; +>x : Symbol(x, Decl(file5.ts, 1, 3)) + diff --git a/tests/baselines/reference/exportStarForValues3.types b/tests/baselines/reference/exportStarForValues3.types new file mode 100644 index 00000000000..d2ee5ebb1d4 --- /dev/null +++ b/tests/baselines/reference/exportStarForValues3.types @@ -0,0 +1,43 @@ +=== tests/cases/compiler/file1.ts === + +export interface Foo { x } +>Foo : Foo +>x : any + +=== tests/cases/compiler/file2.ts === +export interface A { x } +>A : A +>x : any + +export * from "file1" +var x = 1; +>x : number +>1 : number + +=== tests/cases/compiler/file3.ts === +export interface B { x } +>B : B +>x : any + +export * from "file1" +var x = 1; +>x : number +>1 : number + +=== tests/cases/compiler/file4.ts === +export interface C { x } +>C : C +>x : any + +export * from "file2" +export * from "file3" +var x = 1; +>x : number +>1 : number + +=== tests/cases/compiler/file5.ts === +export * from "file4" +var x = 1; +>x : number +>1 : number + diff --git a/tests/baselines/reference/exportStarForValues4.js b/tests/baselines/reference/exportStarForValues4.js new file mode 100644 index 00000000000..2e7b84a6c2f --- /dev/null +++ b/tests/baselines/reference/exportStarForValues4.js @@ -0,0 +1,29 @@ +//// [tests/cases/compiler/exportStarForValues4.ts] //// + +//// [file1.ts] + +export interface Foo { x } + +//// [file2.ts] +export interface A { x } +export * from "file1" +export * from "file3" +var x = 1; + +//// [file3.ts] +export interface B { x } +export * from "file2" +var x = 1; + + +//// [file1.js] +define(["require", "exports"], function (require, exports) { +}); +//// [file3.js] +define(["require", "exports"], function (require, exports) { + var x = 1; +}); +//// [file2.js] +define(["require", "exports"], function (require, exports) { + var x = 1; +}); diff --git a/tests/baselines/reference/exportStarForValues4.symbols b/tests/baselines/reference/exportStarForValues4.symbols new file mode 100644 index 00000000000..465d6ed3237 --- /dev/null +++ b/tests/baselines/reference/exportStarForValues4.symbols @@ -0,0 +1,25 @@ +=== tests/cases/compiler/file1.ts === + +export interface Foo { x } +>Foo : Symbol(Foo, Decl(file1.ts, 0, 0)) +>x : Symbol(x, Decl(file1.ts, 1, 22)) + +=== tests/cases/compiler/file2.ts === +export interface A { x } +>A : Symbol(A, Decl(file2.ts, 0, 0)) +>x : Symbol(x, Decl(file2.ts, 0, 20)) + +export * from "file1" +export * from "file3" +var x = 1; +>x : Symbol(x, Decl(file2.ts, 3, 3)) + +=== tests/cases/compiler/file3.ts === +export interface B { x } +>B : Symbol(B, Decl(file3.ts, 0, 0)) +>x : Symbol(x, Decl(file3.ts, 0, 20)) + +export * from "file2" +var x = 1; +>x : Symbol(x, Decl(file3.ts, 2, 3)) + diff --git a/tests/baselines/reference/exportStarForValues4.types b/tests/baselines/reference/exportStarForValues4.types new file mode 100644 index 00000000000..b381f9461e8 --- /dev/null +++ b/tests/baselines/reference/exportStarForValues4.types @@ -0,0 +1,27 @@ +=== tests/cases/compiler/file1.ts === + +export interface Foo { x } +>Foo : Foo +>x : any + +=== tests/cases/compiler/file2.ts === +export interface A { x } +>A : A +>x : any + +export * from "file1" +export * from "file3" +var x = 1; +>x : number +>1 : number + +=== tests/cases/compiler/file3.ts === +export interface B { x } +>B : B +>x : any + +export * from "file2" +var x = 1; +>x : number +>1 : number + diff --git a/tests/baselines/reference/exportStarForValues5.js b/tests/baselines/reference/exportStarForValues5.js new file mode 100644 index 00000000000..48caf8bdb85 --- /dev/null +++ b/tests/baselines/reference/exportStarForValues5.js @@ -0,0 +1,16 @@ +//// [tests/cases/compiler/exportStarForValues5.ts] //// + +//// [file1.ts] + +export interface Foo { x } + +//// [file2.ts] +export * from "file1" +export var x; + +//// [file1.js] +define(["require", "exports"], function (require, exports) { +}); +//// [file2.js] +define(["require", "exports"], function (require, exports) { +}); diff --git a/tests/baselines/reference/exportStarForValues5.symbols b/tests/baselines/reference/exportStarForValues5.symbols new file mode 100644 index 00000000000..a2950afa73f --- /dev/null +++ b/tests/baselines/reference/exportStarForValues5.symbols @@ -0,0 +1,11 @@ +=== tests/cases/compiler/file1.ts === + +export interface Foo { x } +>Foo : Symbol(Foo, Decl(file1.ts, 0, 0)) +>x : Symbol(x, Decl(file1.ts, 1, 22)) + +=== tests/cases/compiler/file2.ts === +export * from "file1" +export var x; +>x : Symbol(x, Decl(file2.ts, 1, 10)) + diff --git a/tests/baselines/reference/exportStarForValues5.types b/tests/baselines/reference/exportStarForValues5.types new file mode 100644 index 00000000000..9edfc88289a --- /dev/null +++ b/tests/baselines/reference/exportStarForValues5.types @@ -0,0 +1,11 @@ +=== tests/cases/compiler/file1.ts === + +export interface Foo { x } +>Foo : Foo +>x : any + +=== tests/cases/compiler/file2.ts === +export * from "file1" +export var x; +>x : any + diff --git a/tests/baselines/reference/exportStarForValues6.js b/tests/baselines/reference/exportStarForValues6.js new file mode 100644 index 00000000000..e393ad3fe7e --- /dev/null +++ b/tests/baselines/reference/exportStarForValues6.js @@ -0,0 +1,28 @@ +//// [tests/cases/compiler/exportStarForValues6.ts] //// + +//// [file1.ts] + +export interface Foo { x } + +//// [file2.ts] +export * from "file1" +export var x = 1; + +//// [file1.js] +System.register([], function(exports_1) { + return { + setters:[], + execute: function() { + } + } +}); +//// [file2.js] +System.register([], function(exports_1) { + var x; + return { + setters:[], + execute: function() { + exports_1("x", x = 1); + } + } +}); diff --git a/tests/baselines/reference/exportStarForValues6.symbols b/tests/baselines/reference/exportStarForValues6.symbols new file mode 100644 index 00000000000..c57baf301dd --- /dev/null +++ b/tests/baselines/reference/exportStarForValues6.symbols @@ -0,0 +1,11 @@ +=== tests/cases/compiler/file1.ts === + +export interface Foo { x } +>Foo : Symbol(Foo, Decl(file1.ts, 0, 0)) +>x : Symbol(x, Decl(file1.ts, 1, 22)) + +=== tests/cases/compiler/file2.ts === +export * from "file1" +export var x = 1; +>x : Symbol(x, Decl(file2.ts, 1, 10)) + diff --git a/tests/baselines/reference/exportStarForValues6.types b/tests/baselines/reference/exportStarForValues6.types new file mode 100644 index 00000000000..4fe38a45d02 --- /dev/null +++ b/tests/baselines/reference/exportStarForValues6.types @@ -0,0 +1,12 @@ +=== tests/cases/compiler/file1.ts === + +export interface Foo { x } +>Foo : Foo +>x : any + +=== tests/cases/compiler/file2.ts === +export * from "file1" +export var x = 1; +>x : number +>1 : number + diff --git a/tests/baselines/reference/exportStarForValues7.js b/tests/baselines/reference/exportStarForValues7.js new file mode 100644 index 00000000000..1e249f45906 --- /dev/null +++ b/tests/baselines/reference/exportStarForValues7.js @@ -0,0 +1,29 @@ +//// [tests/cases/compiler/exportStarForValues7.ts] //// + +//// [file1.ts] + +export interface Foo { x } + +//// [file2.ts] +export * from "file1" +export var x = 1; + +//// [file3.ts] +export * from "file2" +export var x = 1; + +//// [file1.js] +define(["require", "exports"], function (require, exports) { +}); +//// [file2.js] +define(["require", "exports"], function (require, exports) { + exports.x = 1; +}); +//// [file3.js] +define(["require", "exports", "file2"], function (require, exports, file2_1) { + function __export(m) { + for (var p in m) if (!exports.hasOwnProperty(p)) exports[p] = m[p]; + } + __export(file2_1); + exports.x = 1; +}); diff --git a/tests/baselines/reference/exportStarForValues7.symbols b/tests/baselines/reference/exportStarForValues7.symbols new file mode 100644 index 00000000000..b59f2890047 --- /dev/null +++ b/tests/baselines/reference/exportStarForValues7.symbols @@ -0,0 +1,16 @@ +=== tests/cases/compiler/file1.ts === + +export interface Foo { x } +>Foo : Symbol(Foo, Decl(file1.ts, 0, 0)) +>x : Symbol(x, Decl(file1.ts, 1, 22)) + +=== tests/cases/compiler/file2.ts === +export * from "file1" +export var x = 1; +>x : Symbol(x, Decl(file2.ts, 1, 10)) + +=== tests/cases/compiler/file3.ts === +export * from "file2" +export var x = 1; +>x : Symbol(x, Decl(file3.ts, 1, 10)) + diff --git a/tests/baselines/reference/exportStarForValues7.types b/tests/baselines/reference/exportStarForValues7.types new file mode 100644 index 00000000000..d37661320d6 --- /dev/null +++ b/tests/baselines/reference/exportStarForValues7.types @@ -0,0 +1,18 @@ +=== tests/cases/compiler/file1.ts === + +export interface Foo { x } +>Foo : Foo +>x : any + +=== tests/cases/compiler/file2.ts === +export * from "file1" +export var x = 1; +>x : number +>1 : number + +=== tests/cases/compiler/file3.ts === +export * from "file2" +export var x = 1; +>x : number +>1 : number + diff --git a/tests/baselines/reference/exportStarForValues8.js b/tests/baselines/reference/exportStarForValues8.js new file mode 100644 index 00000000000..aca678ddd17 --- /dev/null +++ b/tests/baselines/reference/exportStarForValues8.js @@ -0,0 +1,54 @@ +//// [tests/cases/compiler/exportStarForValues8.ts] //// + +//// [file1.ts] + +export interface Foo { x } + +//// [file2.ts] +export interface A { x } +export * from "file1" +export var x = 1; + +//// [file3.ts] +export interface B { x } +export * from "file1" +export var x = 1; + +//// [file4.ts] +export interface C { x } +export * from "file2" +export * from "file3" +export var x = 1; + +//// [file5.ts] +export * from "file4" +export var x = 1; + +//// [file1.js] +define(["require", "exports"], function (require, exports) { +}); +//// [file2.js] +define(["require", "exports"], function (require, exports) { + exports.x = 1; +}); +//// [file3.js] +define(["require", "exports"], function (require, exports) { + exports.x = 1; +}); +//// [file4.js] +define(["require", "exports", "file2", "file3"], function (require, exports, file2_1, file3_1) { + function __export(m) { + for (var p in m) if (!exports.hasOwnProperty(p)) exports[p] = m[p]; + } + __export(file2_1); + __export(file3_1); + exports.x = 1; +}); +//// [file5.js] +define(["require", "exports", "file4"], function (require, exports, file4_1) { + function __export(m) { + for (var p in m) if (!exports.hasOwnProperty(p)) exports[p] = m[p]; + } + __export(file4_1); + exports.x = 1; +}); diff --git a/tests/baselines/reference/exportStarForValues8.symbols b/tests/baselines/reference/exportStarForValues8.symbols new file mode 100644 index 00000000000..be958ecabe8 --- /dev/null +++ b/tests/baselines/reference/exportStarForValues8.symbols @@ -0,0 +1,39 @@ +=== tests/cases/compiler/file1.ts === + +export interface Foo { x } +>Foo : Symbol(Foo, Decl(file1.ts, 0, 0)) +>x : Symbol(x, Decl(file1.ts, 1, 22)) + +=== tests/cases/compiler/file2.ts === +export interface A { x } +>A : Symbol(A, Decl(file2.ts, 0, 0)) +>x : Symbol(x, Decl(file2.ts, 0, 20)) + +export * from "file1" +export var x = 1; +>x : Symbol(x, Decl(file2.ts, 2, 10)) + +=== tests/cases/compiler/file3.ts === +export interface B { x } +>B : Symbol(B, Decl(file3.ts, 0, 0)) +>x : Symbol(x, Decl(file3.ts, 0, 20)) + +export * from "file1" +export var x = 1; +>x : Symbol(x, Decl(file3.ts, 2, 10)) + +=== tests/cases/compiler/file4.ts === +export interface C { x } +>C : Symbol(C, Decl(file4.ts, 0, 0)) +>x : Symbol(x, Decl(file4.ts, 0, 20)) + +export * from "file2" +export * from "file3" +export var x = 1; +>x : Symbol(x, Decl(file4.ts, 3, 10)) + +=== tests/cases/compiler/file5.ts === +export * from "file4" +export var x = 1; +>x : Symbol(x, Decl(file5.ts, 1, 10)) + diff --git a/tests/baselines/reference/exportStarForValues8.types b/tests/baselines/reference/exportStarForValues8.types new file mode 100644 index 00000000000..9cc1484eecb --- /dev/null +++ b/tests/baselines/reference/exportStarForValues8.types @@ -0,0 +1,43 @@ +=== tests/cases/compiler/file1.ts === + +export interface Foo { x } +>Foo : Foo +>x : any + +=== tests/cases/compiler/file2.ts === +export interface A { x } +>A : A +>x : any + +export * from "file1" +export var x = 1; +>x : number +>1 : number + +=== tests/cases/compiler/file3.ts === +export interface B { x } +>B : B +>x : any + +export * from "file1" +export var x = 1; +>x : number +>1 : number + +=== tests/cases/compiler/file4.ts === +export interface C { x } +>C : C +>x : any + +export * from "file2" +export * from "file3" +export var x = 1; +>x : number +>1 : number + +=== tests/cases/compiler/file5.ts === +export * from "file4" +export var x = 1; +>x : number +>1 : number + diff --git a/tests/baselines/reference/exportStarForValues9.js b/tests/baselines/reference/exportStarForValues9.js new file mode 100644 index 00000000000..76758d8a2a0 --- /dev/null +++ b/tests/baselines/reference/exportStarForValues9.js @@ -0,0 +1,37 @@ +//// [tests/cases/compiler/exportStarForValues9.ts] //// + +//// [file1.ts] + +export interface Foo { x } + +//// [file2.ts] +export interface A { x } +export * from "file1" +export * from "file3" +export var x = 1; + +//// [file3.ts] +export interface B { x } +export * from "file2" +export var x = 1; + + +//// [file1.js] +define(["require", "exports"], function (require, exports) { +}); +//// [file3.js] +define(["require", "exports", "file2"], function (require, exports, file2_1) { + function __export(m) { + for (var p in m) if (!exports.hasOwnProperty(p)) exports[p] = m[p]; + } + __export(file2_1); + exports.x = 1; +}); +//// [file2.js] +define(["require", "exports", "file3"], function (require, exports, file3_1) { + function __export(m) { + for (var p in m) if (!exports.hasOwnProperty(p)) exports[p] = m[p]; + } + __export(file3_1); + exports.x = 1; +}); diff --git a/tests/baselines/reference/exportStarForValues9.symbols b/tests/baselines/reference/exportStarForValues9.symbols new file mode 100644 index 00000000000..0684c9e7b7c --- /dev/null +++ b/tests/baselines/reference/exportStarForValues9.symbols @@ -0,0 +1,25 @@ +=== tests/cases/compiler/file1.ts === + +export interface Foo { x } +>Foo : Symbol(Foo, Decl(file1.ts, 0, 0)) +>x : Symbol(x, Decl(file1.ts, 1, 22)) + +=== tests/cases/compiler/file2.ts === +export interface A { x } +>A : Symbol(A, Decl(file2.ts, 0, 0)) +>x : Symbol(x, Decl(file2.ts, 0, 20)) + +export * from "file1" +export * from "file3" +export var x = 1; +>x : Symbol(x, Decl(file2.ts, 3, 10)) + +=== tests/cases/compiler/file3.ts === +export interface B { x } +>B : Symbol(B, Decl(file3.ts, 0, 0)) +>x : Symbol(x, Decl(file3.ts, 0, 20)) + +export * from "file2" +export var x = 1; +>x : Symbol(x, Decl(file3.ts, 2, 10)) + diff --git a/tests/baselines/reference/exportStarForValues9.types b/tests/baselines/reference/exportStarForValues9.types new file mode 100644 index 00000000000..3cf250ec50b --- /dev/null +++ b/tests/baselines/reference/exportStarForValues9.types @@ -0,0 +1,27 @@ +=== tests/cases/compiler/file1.ts === + +export interface Foo { x } +>Foo : Foo +>x : any + +=== tests/cases/compiler/file2.ts === +export interface A { x } +>A : A +>x : any + +export * from "file1" +export * from "file3" +export var x = 1; +>x : number +>1 : number + +=== tests/cases/compiler/file3.ts === +export interface B { x } +>B : B +>x : any + +export * from "file2" +export var x = 1; +>x : number +>1 : number + diff --git a/tests/baselines/reference/exportStarForValuesInSystem.js b/tests/baselines/reference/exportStarForValuesInSystem.js new file mode 100644 index 00000000000..29b839731a8 --- /dev/null +++ b/tests/baselines/reference/exportStarForValuesInSystem.js @@ -0,0 +1,28 @@ +//// [tests/cases/compiler/exportStarForValuesInSystem.ts] //// + +//// [file1.ts] + +export interface Foo { x } + +//// [file2.ts] +export * from "file1" +var x = 1; + +//// [file1.js] +System.register([], function(exports_1) { + return { + setters:[], + execute: function() { + } + } +}); +//// [file2.js] +System.register([], function(exports_1) { + var x; + return { + setters:[], + execute: function() { + x = 1; + } + } +}); diff --git a/tests/baselines/reference/exportStarForValuesInSystem.symbols b/tests/baselines/reference/exportStarForValuesInSystem.symbols new file mode 100644 index 00000000000..c9ef9830c60 --- /dev/null +++ b/tests/baselines/reference/exportStarForValuesInSystem.symbols @@ -0,0 +1,11 @@ +=== tests/cases/compiler/file1.ts === + +export interface Foo { x } +>Foo : Symbol(Foo, Decl(file1.ts, 0, 0)) +>x : Symbol(x, Decl(file1.ts, 1, 22)) + +=== tests/cases/compiler/file2.ts === +export * from "file1" +var x = 1; +>x : Symbol(x, Decl(file2.ts, 1, 3)) + diff --git a/tests/baselines/reference/exportStarForValuesInSystem.types b/tests/baselines/reference/exportStarForValuesInSystem.types new file mode 100644 index 00000000000..36d07741e10 --- /dev/null +++ b/tests/baselines/reference/exportStarForValuesInSystem.types @@ -0,0 +1,12 @@ +=== tests/cases/compiler/file1.ts === + +export interface Foo { x } +>Foo : Foo +>x : any + +=== tests/cases/compiler/file2.ts === +export * from "file1" +var x = 1; +>x : number +>1 : number + diff --git a/tests/baselines/reference/moduleElementsInWrongContext.js b/tests/baselines/reference/moduleElementsInWrongContext.js index 635da02bdf2..df4935f9e19 100644 --- a/tests/baselines/reference/moduleElementsInWrongContext.js +++ b/tests/baselines/reference/moduleElementsInWrongContext.js @@ -34,7 +34,6 @@ { var v; function foo() { } - __export(require("ambient")); exports["default"] = v; var C = (function () { function C() { diff --git a/tests/baselines/reference/moduleElementsInWrongContext2.js b/tests/baselines/reference/moduleElementsInWrongContext2.js index fdf1222e549..b923bc7861e 100644 --- a/tests/baselines/reference/moduleElementsInWrongContext2.js +++ b/tests/baselines/reference/moduleElementsInWrongContext2.js @@ -34,7 +34,6 @@ function blah () { function blah() { var v; function foo() { } - __export(require("ambient")); exports["default"] = v; var C = (function () { function C() { diff --git a/tests/baselines/reference/moduleElementsInWrongContext3.js b/tests/baselines/reference/moduleElementsInWrongContext3.js index d464d9d31b1..2fa0b60dce4 100644 --- a/tests/baselines/reference/moduleElementsInWrongContext3.js +++ b/tests/baselines/reference/moduleElementsInWrongContext3.js @@ -37,7 +37,6 @@ var P; { var v; function foo() { } - __export(require("ambient")); P["default"] = v; var C = (function () { function C() { diff --git a/tests/cases/compiler/exportStarForValues.ts b/tests/cases/compiler/exportStarForValues.ts new file mode 100644 index 00000000000..3432548c528 --- /dev/null +++ b/tests/cases/compiler/exportStarForValues.ts @@ -0,0 +1,8 @@ +// @module: amd + +// @filename: file1.ts +export interface Foo { x } + +// @filename: file2.ts +export * from "file1" +var x; \ No newline at end of file diff --git a/tests/cases/compiler/exportStarForValues10.ts b/tests/cases/compiler/exportStarForValues10.ts new file mode 100644 index 00000000000..82cee772b18 --- /dev/null +++ b/tests/cases/compiler/exportStarForValues10.ts @@ -0,0 +1,12 @@ +// @module: system + +// @filename: file0.ts +export var v = 1; + +// @filename: file1.ts +export interface Foo { x } + +// @filename: file2.ts +export * from "file0"; +export * from "file1"; +var x = 1; \ No newline at end of file diff --git a/tests/cases/compiler/exportStarForValues2.ts b/tests/cases/compiler/exportStarForValues2.ts new file mode 100644 index 00000000000..63a880cce0a --- /dev/null +++ b/tests/cases/compiler/exportStarForValues2.ts @@ -0,0 +1,12 @@ +// @module: amd + +// @filename: file1.ts +export interface Foo { x } + +// @filename: file2.ts +export * from "file1" +var x = 1; + +// @filename: file3.ts +export * from "file2" +var x = 1; \ No newline at end of file diff --git a/tests/cases/compiler/exportStarForValues3.ts b/tests/cases/compiler/exportStarForValues3.ts new file mode 100644 index 00000000000..f0c36db0bda --- /dev/null +++ b/tests/cases/compiler/exportStarForValues3.ts @@ -0,0 +1,24 @@ +// @module: amd + +// @filename: file1.ts +export interface Foo { x } + +// @filename: file2.ts +export interface A { x } +export * from "file1" +var x = 1; + +// @filename: file3.ts +export interface B { x } +export * from "file1" +var x = 1; + +// @filename: file4.ts +export interface C { x } +export * from "file2" +export * from "file3" +var x = 1; + +// @filename: file5.ts +export * from "file4" +var x = 1; \ No newline at end of file diff --git a/tests/cases/compiler/exportStarForValues4.ts b/tests/cases/compiler/exportStarForValues4.ts new file mode 100644 index 00000000000..d685ba1c8a3 --- /dev/null +++ b/tests/cases/compiler/exportStarForValues4.ts @@ -0,0 +1,15 @@ +// @module: amd + +// @filename: file1.ts +export interface Foo { x } + +// @filename: file2.ts +export interface A { x } +export * from "file1" +export * from "file3" +var x = 1; + +// @filename: file3.ts +export interface B { x } +export * from "file2" +var x = 1; diff --git a/tests/cases/compiler/exportStarForValues5.ts b/tests/cases/compiler/exportStarForValues5.ts new file mode 100644 index 00000000000..cb716c72002 --- /dev/null +++ b/tests/cases/compiler/exportStarForValues5.ts @@ -0,0 +1,8 @@ +// @module: amd + +// @filename: file1.ts +export interface Foo { x } + +// @filename: file2.ts +export * from "file1" +export var x; \ No newline at end of file diff --git a/tests/cases/compiler/exportStarForValues6.ts b/tests/cases/compiler/exportStarForValues6.ts new file mode 100644 index 00000000000..a623e31f178 --- /dev/null +++ b/tests/cases/compiler/exportStarForValues6.ts @@ -0,0 +1,8 @@ +// @module: system + +// @filename: file1.ts +export interface Foo { x } + +// @filename: file2.ts +export * from "file1" +export var x = 1; \ No newline at end of file diff --git a/tests/cases/compiler/exportStarForValues7.ts b/tests/cases/compiler/exportStarForValues7.ts new file mode 100644 index 00000000000..c1343a44119 --- /dev/null +++ b/tests/cases/compiler/exportStarForValues7.ts @@ -0,0 +1,12 @@ +// @module: amd + +// @filename: file1.ts +export interface Foo { x } + +// @filename: file2.ts +export * from "file1" +export var x = 1; + +// @filename: file3.ts +export * from "file2" +export var x = 1; \ No newline at end of file diff --git a/tests/cases/compiler/exportStarForValues8.ts b/tests/cases/compiler/exportStarForValues8.ts new file mode 100644 index 00000000000..0594f8b0877 --- /dev/null +++ b/tests/cases/compiler/exportStarForValues8.ts @@ -0,0 +1,24 @@ +// @module: amd + +// @filename: file1.ts +export interface Foo { x } + +// @filename: file2.ts +export interface A { x } +export * from "file1" +export var x = 1; + +// @filename: file3.ts +export interface B { x } +export * from "file1" +export var x = 1; + +// @filename: file4.ts +export interface C { x } +export * from "file2" +export * from "file3" +export var x = 1; + +// @filename: file5.ts +export * from "file4" +export var x = 1; \ No newline at end of file diff --git a/tests/cases/compiler/exportStarForValues9.ts b/tests/cases/compiler/exportStarForValues9.ts new file mode 100644 index 00000000000..53ffb1b7954 --- /dev/null +++ b/tests/cases/compiler/exportStarForValues9.ts @@ -0,0 +1,15 @@ +// @module: amd + +// @filename: file1.ts +export interface Foo { x } + +// @filename: file2.ts +export interface A { x } +export * from "file1" +export * from "file3" +export var x = 1; + +// @filename: file3.ts +export interface B { x } +export * from "file2" +export var x = 1; diff --git a/tests/cases/compiler/exportStarForValuesInSystem.ts b/tests/cases/compiler/exportStarForValuesInSystem.ts new file mode 100644 index 00000000000..1f60e8dec6f --- /dev/null +++ b/tests/cases/compiler/exportStarForValuesInSystem.ts @@ -0,0 +1,8 @@ +// @module: system + +// @filename: file1.ts +export interface Foo { x } + +// @filename: file2.ts +export * from "file1" +var x = 1; \ No newline at end of file From 6120f1f3da5ad35973f4d60e0e4c86eb9496d7b0 Mon Sep 17 00:00:00 2001 From: Vladimir Matveev Date: Sun, 4 Oct 2015 22:45:08 -0700 Subject: [PATCH 012/177] fix linter issues --- src/compiler/checker.ts | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/compiler/checker.ts b/src/compiler/checker.ts index 18e76f46d72..1cabea864dc 100644 --- a/src/compiler/checker.ts +++ b/src/compiler/checker.ts @@ -14507,8 +14507,8 @@ namespace ts { if (symbolLinks.exportsSomeValue == undefined) { // for export assignments - check if resolved symbol for RHS is itself a value // otherwise - check if at least one export is value - symbolLinks.exportsSomeValue = hasExportAssignment - ? !!(moduleSymbol.flags & SymbolFlags.Value) + symbolLinks.exportsSomeValue = hasExportAssignment + ? !!(moduleSymbol.flags & SymbolFlags.Value) : forEachValue(getExportsOfModule(moduleSymbol), isValue); } @@ -14519,7 +14519,7 @@ namespace ts { return s && !!(s.flags & SymbolFlags.Value); } } - + // When resolved as an expression identifier, if the given node references an exported entity, return the declaration // node of the exported entity's container. Otherwise, return undefined. function getReferencedExportContainer(node: Identifier): SourceFile | ModuleDeclaration | EnumDeclaration { From b31b45f584282175281a04c4e465115e4dde6c6a Mon Sep 17 00:00:00 2001 From: Ryan Cavanaugh Date: Mon, 26 Oct 2015 15:42:25 -0700 Subject: [PATCH 013/177] JavaScript class inference from prototype property assignment --- src/compiler/binder.ts | 32 ++++++++++++++ src/compiler/checker.ts | 43 +++++++++++++------ src/compiler/types.ts | 2 + src/compiler/utilities.ts | 29 +++++++++++++ src/services/services.ts | 1 + tests/cases/fourslash/javaScriptPrototype1.ts | 36 ++++++++++++++++ 6 files changed, 129 insertions(+), 14 deletions(-) create mode 100644 tests/cases/fourslash/javaScriptPrototype1.ts diff --git a/src/compiler/binder.ts b/src/compiler/binder.ts index d5ab7dd11ca..bfef27a9102 100644 --- a/src/compiler/binder.ts +++ b/src/compiler/binder.ts @@ -622,6 +622,7 @@ namespace ts { function bindAnonymousDeclaration(node: Declaration, symbolFlags: SymbolFlags, name: string) { let symbol = createSymbol(symbolFlags, name); addDeclarationToSymbol(symbol, node, symbolFlags); + return symbol; } function bindBlockScopedDeclaration(node: Declaration, symbolFlags: SymbolFlags, symbolExcludes: SymbolFlags) { @@ -867,6 +868,9 @@ namespace ts { else if (isModuleExportsAssignment(node)) { bindModuleExportsAssignment(node); } + else if (isPrototypePropertyAssignment(node)) { + bindPrototypePropertyAssignment(node); + } } return checkStrictModeBinaryExpression(node); case SyntaxKind.CatchClause: @@ -1034,6 +1038,34 @@ namespace ts { bindExportAssignment(node); } + function bindPrototypePropertyAssignment(node: BinaryExpression) { + // We saw a node of the form 'x.prototype.y = z'. + // This does two things: turns 'x' into a constructor function, and + // adds a member 'y' to the result of that constructor function + // Get 'x', the class + let classId = ((node.left).expression).expression; + + // Look up the function in the local scope, since prototype assignments should immediately + // follow the function declaration + let funcSymbol = container.locals[classId.text]; + if (!funcSymbol) { + return; + } + + // The function is now a constructor rather than a normal function + if (!funcSymbol.inferredConstructor) { + funcSymbol.flags = (funcSymbol.flags | SymbolFlags.Class) & ~SymbolFlags.Function; + funcSymbol.members = funcSymbol.members || {}; + funcSymbol.members["__constructor"] = funcSymbol; + funcSymbol.inferredConstructor = true; + } + + // Get 'y', the property name, and add it to the type of the class + let propertyName = (node.left).name; + let prototypeSymbol = declareSymbol(funcSymbol.members, funcSymbol, (node.left).expression, SymbolFlags.HasMembers, SymbolFlags.None); + declareSymbol(prototypeSymbol.members, prototypeSymbol, node.left, SymbolFlags.Method | SymbolFlags.Property, SymbolFlags.None); + } + function bindCallExpression(node: CallExpression) { // We're only inspecting call expressions to detect CommonJS modules, so we can skip // this check if we've already seen the module indicator diff --git a/src/compiler/checker.ts b/src/compiler/checker.ts index ac5056bf769..24da884a330 100644 --- a/src/compiler/checker.ts +++ b/src/compiler/checker.ts @@ -122,8 +122,8 @@ namespace ts { let noConstraintType = createAnonymousType(undefined, emptySymbols, emptyArray, emptyArray, undefined, undefined); - let anySignature = createSignature(undefined, undefined, emptyArray, anyType, undefined, 0, false, false); - let unknownSignature = createSignature(undefined, undefined, emptyArray, unknownType, undefined, 0, false, false); + let anySignature = createSignature(undefined, undefined, emptyArray, undefined, anyType, undefined, 0, false, false); + let unknownSignature = createSignature(undefined, undefined, emptyArray, undefined, unknownType, undefined, 0, false, false); let globals: SymbolTable = {}; @@ -3247,12 +3247,13 @@ namespace ts { resolveObjectTypeMembers(type, source, typeParameters, typeArguments); } - function createSignature(declaration: SignatureDeclaration, typeParameters: TypeParameter[], parameters: Symbol[], + function createSignature(declaration: SignatureDeclaration, typeParameters: TypeParameter[], parameters: Symbol[], kind: SignatureKind, resolvedReturnType: Type, typePredicate: TypePredicate, minArgumentCount: number, hasRestParameter: boolean, hasStringLiterals: boolean): Signature { let sig = new Signature(checker); sig.declaration = declaration; sig.typeParameters = typeParameters; sig.parameters = parameters; + sig.kind = kind; sig.resolvedReturnType = resolvedReturnType; sig.typePredicate = typePredicate; sig.minArgumentCount = minArgumentCount; @@ -3262,13 +3263,13 @@ namespace ts { } function cloneSignature(sig: Signature): Signature { - return createSignature(sig.declaration, sig.typeParameters, sig.parameters, sig.resolvedReturnType, sig.typePredicate, + return createSignature(sig.declaration, sig.typeParameters, sig.parameters, sig.kind, sig.resolvedReturnType, sig.typePredicate, sig.minArgumentCount, sig.hasRestParameter, sig.hasStringLiterals); } function getDefaultConstructSignatures(classType: InterfaceType): Signature[] { if (!getBaseTypes(classType).length) { - return [createSignature(undefined, classType.localTypeParameters, emptyArray, classType, undefined, 0, false, false)]; + return [createSignature(undefined, classType.localTypeParameters, emptyArray, SignatureKind.Construct, classType, undefined, 0, false, false)]; } let baseConstructorType = getBaseConstructorTypeOfClass(classType); let baseSignatures = getSignaturesOfType(baseConstructorType, SignatureKind.Construct); @@ -3788,7 +3789,26 @@ namespace ts { } } - links.resolvedSignature = createSignature(declaration, typeParameters, parameters, returnType, typePredicate, + let kind: SignatureKind; + switch (declaration.kind) { + case SyntaxKind.Constructor: + case SyntaxKind.ConstructSignature: + case SyntaxKind.ConstructorType: + kind = SignatureKind.Construct; + break; + default: + if (declaration.symbol.inferredConstructor) { + kind = SignatureKind.Construct; + let proto = declaration.symbol.members["prototype"]; + returnType = createAnonymousType(createSymbol(SymbolFlags.None, "__jsClass"), proto.members, emptyArray, emptyArray, undefined, undefined); + } + else { + kind = SignatureKind.Call; + } + break; + } + + links.resolvedSignature = createSignature(declaration, typeParameters, parameters, kind, returnType, typePredicate, minArgumentCount, hasRestParameter(declaration), hasStringLiterals); } return links.resolvedSignature; @@ -3905,7 +3925,7 @@ namespace ts { // object type literal or interface (using the new keyword). Each way of declaring a constructor // will result in a different declaration kind. if (!signature.isolatedSignatureType) { - let isConstructor = signature.declaration.kind === SyntaxKind.Constructor || signature.declaration.kind === SyntaxKind.ConstructSignature; + let isConstructor = signature.kind === SignatureKind.Construct; let type = createObjectType(TypeFlags.Anonymous | TypeFlags.FromSignature); type.members = emptySymbols; type.properties = emptyArray; @@ -4611,6 +4631,7 @@ namespace ts { } let result = createSignature(signature.declaration, freshTypeParameters, instantiateList(signature.parameters, mapper, instantiateSymbol), + signature.kind, instantiateType(signature.resolvedReturnType, mapper), freshTypePredicate, signature.minArgumentCount, signature.hasRestParameter, signature.hasStringLiterals); @@ -9359,13 +9380,7 @@ namespace ts { return voidType; } if (node.kind === SyntaxKind.NewExpression) { - let declaration = signature.declaration; - - if (declaration && - declaration.kind !== SyntaxKind.Constructor && - declaration.kind !== SyntaxKind.ConstructSignature && - declaration.kind !== SyntaxKind.ConstructorType) { - + if (signature.kind === SignatureKind.Call) { // When resolved signature is a call signature (and not a construct signature) the result type is any if (compilerOptions.noImplicitAny) { error(node, Diagnostics.new_expression_whose_target_lacks_a_construct_signature_implicitly_has_an_any_type); diff --git a/src/compiler/types.ts b/src/compiler/types.ts index 5e8de9a3fb4..5232209e7d1 100644 --- a/src/compiler/types.ts +++ b/src/compiler/types.ts @@ -1714,6 +1714,7 @@ namespace ts { /* @internal */ parent?: Symbol; // Parent symbol /* @internal */ exportSymbol?: Symbol; // Exported symbol associated with this symbol /* @internal */ constEnumOnlyModule?: boolean; // True if module contains only const enums or other modules with only const enums + /* @internal */ inferredConstructor?: boolean; // A function promoted to constructor as the result of a prototype property assignment } /* @internal */ @@ -1958,6 +1959,7 @@ namespace ts { declaration: SignatureDeclaration; // Originating declaration typeParameters: TypeParameter[]; // Type parameters (undefined if non-generic) parameters: Symbol[]; // Parameters + kind: SignatureKind; // Call or Construct typePredicate?: TypePredicate; // Type predicate /* @internal */ resolvedReturnType: Type; // Resolved return type diff --git a/src/compiler/utilities.ts b/src/compiler/utilities.ts index 9eff4370ec2..05184e29f58 100644 --- a/src/compiler/utilities.ts +++ b/src/compiler/utilities.ts @@ -1086,6 +1086,35 @@ namespace ts { (((expression).left).name.text === "exports"); } + /** + * Returns true if this expression is an assignment to the given named property + */ + function isAssignmentToProperty(expression: Node, name?: string): expression is BinaryExpression { + return (expression.kind === SyntaxKind.BinaryExpression) && + ((expression).operatorToken.kind === SyntaxKind.EqualsToken) && + isNamedPropertyAccess((expression).left, name); + } + + /** + * Returns true if this expression is a PropertyAccessExpression where the property name is the provided name + */ + function isNamedPropertyAccess(expression: Node, name?: string): expression is PropertyAccessExpression { + return expression.kind === SyntaxKind.PropertyAccessExpression && + (!name || (expression).name.text === name); + } + + /** + * Returns true if the node is an assignment in the form 'id1.prototype.id2 = expr' where id1 and id2 + * are any identifier. + * This function does not test if the node is in a JavaScript file or not. + */ + export function isPrototypePropertyAssignment(expression: Node): expression is BinaryExpression { + return isAssignmentToProperty(expression) && + isNamedPropertyAccess(expression.left) && + isNamedPropertyAccess((expression.left).expression, "prototype") && + ((expression.left).expression).expression.kind === SyntaxKind.Identifier; + } + export function getExternalModuleName(node: Node): Expression { if (node.kind === SyntaxKind.ImportDeclaration) { return (node).moduleSpecifier; diff --git a/src/services/services.ts b/src/services/services.ts index 30d993cb6b6..2c2bbb8e73e 100644 --- a/src/services/services.ts +++ b/src/services/services.ts @@ -735,6 +735,7 @@ namespace ts { declaration: SignatureDeclaration; typeParameters: TypeParameter[]; parameters: Symbol[]; + kind: SignatureKind; resolvedReturnType: Type; minArgumentCount: number; hasRestParameter: boolean; diff --git a/tests/cases/fourslash/javaScriptPrototype1.ts b/tests/cases/fourslash/javaScriptPrototype1.ts new file mode 100644 index 00000000000..0dec8d721d6 --- /dev/null +++ b/tests/cases/fourslash/javaScriptPrototype1.ts @@ -0,0 +1,36 @@ +/// + +// Assignments to the 'prototype' property of a function create a class + +// @allowNonTsExtensions: true +// @Filename: myMod.js +//// function myCtor(x) { +//// } +//// myCtor.prototype.foo = function() { return 32 }; +//// myCtor.prototype.bar = function() { return '' }; +//// +//// var m = new myCtor(10); +//// m/*1*/ +//// var x = m.foo(); +//// x/*2*/ +//// var y = m.bar(); +//// y/*3*/ + +goTo.marker('1'); +edit.insert('.'); +verify.memberListContains('foo', undefined, undefined, 'method'); +edit.insert('foo'); + +edit.backspace(); +edit.backspace(); + +goTo.marker('2'); +edit.insert('.'); +verify.memberListContains('toFixed', undefined, undefined, 'method'); +verify.not.memberListContains('substr', undefined, undefined, 'method'); +edit.backspace(); + +goTo.marker('3'); +edit.insert('.'); +verify.memberListContains('substr', undefined, undefined, 'method'); +verify.not.memberListContains('toFixed', undefined, undefined, 'method'); From bc3d95c0a41c833802d0939ecda081a167565b02 Mon Sep 17 00:00:00 2001 From: Ryan Cavanaugh Date: Tue, 27 Oct 2015 17:17:31 -0700 Subject: [PATCH 014/177] JS class members as methods --- src/compiler/binder.ts | 2 +- src/compiler/checker.ts | 5 +++++ 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/src/compiler/binder.ts b/src/compiler/binder.ts index bfef27a9102..85882c495b6 100644 --- a/src/compiler/binder.ts +++ b/src/compiler/binder.ts @@ -1063,7 +1063,7 @@ namespace ts { // Get 'y', the property name, and add it to the type of the class let propertyName = (node.left).name; let prototypeSymbol = declareSymbol(funcSymbol.members, funcSymbol, (node.left).expression, SymbolFlags.HasMembers, SymbolFlags.None); - declareSymbol(prototypeSymbol.members, prototypeSymbol, node.left, SymbolFlags.Method | SymbolFlags.Property, SymbolFlags.None); + declareSymbol(prototypeSymbol.members, prototypeSymbol, node.left, SymbolFlags.Method, SymbolFlags.None); } function bindCallExpression(node: CallExpression) { diff --git a/src/compiler/checker.ts b/src/compiler/checker.ts index 24da884a330..f0bdd48afa7 100644 --- a/src/compiler/checker.ts +++ b/src/compiler/checker.ts @@ -3843,6 +3843,11 @@ namespace ts { } } result.push(getSignatureFromDeclaration(node)); + break; + + case SyntaxKind.PropertyAccessExpression: + // Class inference from ClassName.prototype.methodName = expr + return getSignaturesOfType(checkExpressionCached((node.parent).right), SignatureKind.Call); } } return result; From 3b7213116d324585dc73548dc2289f8513b1884c Mon Sep 17 00:00:00 2001 From: Ryan Cavanaugh Date: Fri, 30 Oct 2015 12:34:56 -0700 Subject: [PATCH 015/177] Inference from JavaScript `prototype` property assignments --- src/compiler/binder.ts | 58 ++++++++++++++----- src/compiler/checker.ts | 31 +++++++--- src/compiler/types.ts | 13 +++++ src/compiler/utilities.ts | 36 ++++++++++++ tests/cases/fourslash/javaScriptPrototype1.ts | 26 ++++++--- tests/cases/fourslash/javaScriptPrototype2.ts | 36 ++++++++++++ tests/cases/fourslash/javaScriptPrototype3.ts | 40 +++++++++++++ tests/cases/fourslash/javaScriptPrototype4.ts | 36 ++++++++++++ 8 files changed, 247 insertions(+), 29 deletions(-) create mode 100644 tests/cases/fourslash/javaScriptPrototype2.ts create mode 100644 tests/cases/fourslash/javaScriptPrototype3.ts create mode 100644 tests/cases/fourslash/javaScriptPrototype4.ts diff --git a/src/compiler/binder.ts b/src/compiler/binder.ts index 85882c495b6..9bd51f0c763 100644 --- a/src/compiler/binder.ts +++ b/src/compiler/binder.ts @@ -167,8 +167,21 @@ namespace ts { case SyntaxKind.ExportAssignment: return (node).isExportEquals ? "export=" : "default"; case SyntaxKind.BinaryExpression: - // Binary expression case is for JS module 'module.exports = expr' - return "export="; + switch (getSpecialPropertyAssignmentKind(node)) { + case SpecialPropertyAssignmentKind.ModuleExports: + // module.exports = ... + return "export="; + case SpecialPropertyAssignmentKind.ExportsProperty: + case SpecialPropertyAssignmentKind.ThisProperty: + // exports.x = ... or this.y = ... + return ((node as BinaryExpression).left as PropertyAccessExpression).name.text; + case SpecialPropertyAssignmentKind.PrototypeProperty: + // className.prototype.methodName = ... + return (((node as BinaryExpression).left as PropertyAccessExpression).expression as PropertyAccessExpression).name.text; + } + Debug.fail("Unknown binary declaration kind"); + break; + case SyntaxKind.FunctionDeclaration: case SyntaxKind.ClassDeclaration: return node.flags & NodeFlags.Default ? "default" : undefined; @@ -862,14 +875,20 @@ namespace ts { return checkStrictModeIdentifier(node); case SyntaxKind.BinaryExpression: if (isJavaScriptFile) { - if (isExportsPropertyAssignment(node)) { - bindExportsPropertyAssignment(node); - } - else if (isModuleExportsAssignment(node)) { - bindModuleExportsAssignment(node); - } - else if (isPrototypePropertyAssignment(node)) { - bindPrototypePropertyAssignment(node); + let specialKind = getSpecialPropertyAssignmentKind(node); + switch (specialKind) { + case SpecialPropertyAssignmentKind.ExportsProperty: + bindExportsPropertyAssignment(node); + break; + case SpecialPropertyAssignmentKind.ModuleExports: + bindModuleExportsAssignment(node); + break; + case SpecialPropertyAssignmentKind.PrototypeProperty: + bindPrototypePropertyAssignment(node); + break; + case SpecialPropertyAssignmentKind.ThisProperty: + bindThisPropertyAssignment(node); + break; } } return checkStrictModeBinaryExpression(node); @@ -1038,6 +1057,13 @@ namespace ts { bindExportAssignment(node); } + function bindThisPropertyAssignment(node: BinaryExpression) { + if (container.kind === SyntaxKind.FunctionExpression || container.kind === SyntaxKind.FunctionDeclaration) { + container.symbol.members = container.symbol.members || {}; + declareClassMember(node, SymbolFlags.Property, SymbolFlags.PropertyExcludes); + } + } + function bindPrototypePropertyAssignment(node: BinaryExpression) { // We saw a node of the form 'x.prototype.y = z'. // This does two things: turns 'x' into a constructor function, and @@ -1054,16 +1080,20 @@ namespace ts { // The function is now a constructor rather than a normal function if (!funcSymbol.inferredConstructor) { - funcSymbol.flags = (funcSymbol.flags | SymbolFlags.Class) & ~SymbolFlags.Function; + declareSymbol(container.locals, funcSymbol, funcSymbol.valueDeclaration, SymbolFlags.Class, SymbolFlags.None); + // funcSymbol.flags = (funcSymbol.flags | SymbolFlags.Class) & ~SymbolFlags.Function; funcSymbol.members = funcSymbol.members || {}; funcSymbol.members["__constructor"] = funcSymbol; funcSymbol.inferredConstructor = true; } - // Get 'y', the property name, and add it to the type of the class - let propertyName = (node.left).name; - let prototypeSymbol = declareSymbol(funcSymbol.members, funcSymbol, (node.left).expression, SymbolFlags.HasMembers, SymbolFlags.None); + // Declare the 'prototype' member of the function + let prototypeSymbol = declareSymbol(funcSymbol.exports, funcSymbol, (node.left).expression, SymbolFlags.ObjectLiteral | SymbolFlags.Property, SymbolFlags.None); + + // Declare the property on the prototype symbol declareSymbol(prototypeSymbol.members, prototypeSymbol, node.left, SymbolFlags.Method, SymbolFlags.None); + // and on the class type + declareSymbol(funcSymbol.members, funcSymbol, node.left, SymbolFlags.Method, SymbolFlags.PropertyExcludes); } function bindCallExpression(node: CallExpression) { diff --git a/src/compiler/checker.ts b/src/compiler/checker.ts index f0bdd48afa7..fb7040a96ab 100644 --- a/src/compiler/checker.ts +++ b/src/compiler/checker.ts @@ -2576,9 +2576,16 @@ namespace ts { if (declaration.kind === SyntaxKind.BinaryExpression) { return links.type = checkExpression((declaration).right); } - // Handle exports.p = expr if (declaration.kind === SyntaxKind.PropertyAccessExpression) { - return checkExpressionCached((declaration.parent).right); + if (declaration.parent.kind === SyntaxKind.BinaryExpression) { + // Handle exports.p = expr or this.p = expr or className.prototype.method = expr + return links.type = checkExpression((declaration.parent).right); + } + else { + // Declaration for className.prototype in inferred JS class + let type = createAnonymousType(symbol, symbol.members, emptyArray, emptyArray, undefined, undefined); + return links.type = type; + } } // Handle variable, parameter or property if (!pushTypeResolution(symbol, TypeSystemPropertyName.Type)) { @@ -3799,8 +3806,15 @@ namespace ts { default: if (declaration.symbol.inferredConstructor) { kind = SignatureKind.Construct; - let proto = declaration.symbol.members["prototype"]; - returnType = createAnonymousType(createSymbol(SymbolFlags.None, "__jsClass"), proto.members, emptyArray, emptyArray, undefined, undefined); + let members = createSymbolTable(emptyArray); + // Collect methods declared with className.protoype.methodName = ... + let proto = declaration.symbol.exports["prototype"]; + if (proto) { + mergeSymbolTable(members, proto.members); + } + // Collect properties defined in the constructor by this.propName = ... + mergeSymbolTable(members, declaration.symbol.members); + returnType = createAnonymousType(declaration.symbol, members, emptyArray, emptyArray, undefined, undefined); } else { kind = SignatureKind.Call; @@ -3846,8 +3860,8 @@ namespace ts { break; case SyntaxKind.PropertyAccessExpression: - // Class inference from ClassName.prototype.methodName = expr - return getSignaturesOfType(checkExpressionCached((node.parent).right), SignatureKind.Call); + result = getSignaturesOfType(checkExpressionCached((node.parent).right), SignatureKind.Call); + break; } } return result; @@ -6957,7 +6971,10 @@ namespace ts { let operator = binaryExpression.operatorToken.kind; if (operator >= SyntaxKind.FirstAssignment && operator <= SyntaxKind.LastAssignment) { // In an assignment expression, the right operand is contextually typed by the type of the left operand. - if (node === binaryExpression.right) { + // In JS files where a special assignment is taking place, don't contextually type the RHS to avoid + // incorrectly assuming a circular 'any' (the type of the LHS is determined by the RHS) + if (node === binaryExpression.right && + !(node.parserContextFlags & ParserContextFlags.JavaScriptFile && getSpecialPropertyAssignmentKind(binaryExpression))) { return checkExpression(binaryExpression.left); } } diff --git a/src/compiler/types.ts b/src/compiler/types.ts index 5232209e7d1..00375f8a574 100644 --- a/src/compiler/types.ts +++ b/src/compiler/types.ts @@ -2013,6 +2013,19 @@ namespace ts { // It is optional because in contextual signature instantiation, nothing fails } + /* @internal */ + export const enum SpecialPropertyAssignmentKind { + None, + /// exports.name = expr + ExportsProperty, + /// module.exports = expr + ModuleExports, + /// className.prototype.name = expr + PrototypeProperty, + /// this.name = expr + ThisProperty + } + export interface DiagnosticMessage { key: string; category: DiagnosticCategory; diff --git a/src/compiler/utilities.ts b/src/compiler/utilities.ts index 05184e29f58..cb72e87bb94 100644 --- a/src/compiler/utilities.ts +++ b/src/compiler/utilities.ts @@ -1057,6 +1057,42 @@ namespace ts { (expression).arguments[0].kind === SyntaxKind.StringLiteral; } + /// Given a BinaryExpression, returns SpecialPropertyAssignmentKind for the various kinds of property + /// assignments we treat as special in the binder + export function getSpecialPropertyAssignmentKind(expression: Node): SpecialPropertyAssignmentKind { + if (expression.kind !== SyntaxKind.BinaryExpression) { + return SpecialPropertyAssignmentKind.None; + } + const expr = expression; + if (expr.operatorToken.kind !== SyntaxKind.EqualsToken || expr.left.kind !== SyntaxKind.PropertyAccessExpression) { + return SpecialPropertyAssignmentKind.None; + } + const lhs = expr.left; + if (lhs.expression.kind === SyntaxKind.Identifier) { + const lhsId = lhs.expression; + if (lhsId.text === "exports") { + // exports.name = expr + return SpecialPropertyAssignmentKind.ExportsProperty; + } + else if (lhsId.text === "module" && lhs.name.text === "exports") { + // module.exports = expr + return SpecialPropertyAssignmentKind.ModuleExports; + } + } + else if (lhs.expression.kind === SyntaxKind.ThisKeyword) { + return SpecialPropertyAssignmentKind.ThisProperty; + } + else if (lhs.expression.kind === SyntaxKind.PropertyAccessExpression) { + // chained dot, e.g. x.y.z = expr; this var is the 'x.y' part + let innerPropertyAccess = lhs.expression; + if (innerPropertyAccess.expression.kind === SyntaxKind.Identifier && innerPropertyAccess.name.text === "prototype") { + return SpecialPropertyAssignmentKind.PrototypeProperty; + } + } + + return SpecialPropertyAssignmentKind.None; + } + /** * Returns true if the node is an assignment to a property on the identifier 'exports'. * This function does not test if the node is in a JavaScript file or not. diff --git a/tests/cases/fourslash/javaScriptPrototype1.ts b/tests/cases/fourslash/javaScriptPrototype1.ts index 0dec8d721d6..0473d18aae8 100644 --- a/tests/cases/fourslash/javaScriptPrototype1.ts +++ b/tests/cases/fourslash/javaScriptPrototype1.ts @@ -11,26 +11,36 @@ //// //// var m = new myCtor(10); //// m/*1*/ -//// var x = m.foo(); -//// x/*2*/ -//// var y = m.bar(); -//// y/*3*/ +//// var a = m.foo; +//// a/*2*/ +//// var b = a(); +//// b/*3*/ +//// var c = m.bar(); +//// c/*4*/ + +// Members of the class instance goTo.marker('1'); edit.insert('.'); verify.memberListContains('foo', undefined, undefined, 'method'); -edit.insert('foo'); - -edit.backspace(); +verify.memberListContains('bar', undefined, undefined, 'method'); edit.backspace(); +// Members of a class method (1) goTo.marker('2'); edit.insert('.'); +verify.memberListContains('length', undefined, undefined, 'property'); +edit.backspace(); + +// Members of the invocation of a class method (1) +goTo.marker('3'); +edit.insert('.'); verify.memberListContains('toFixed', undefined, undefined, 'method'); verify.not.memberListContains('substr', undefined, undefined, 'method'); edit.backspace(); -goTo.marker('3'); +// Members of the invocation of a class method (2) +goTo.marker('4'); edit.insert('.'); verify.memberListContains('substr', undefined, undefined, 'method'); verify.not.memberListContains('toFixed', undefined, undefined, 'method'); diff --git a/tests/cases/fourslash/javaScriptPrototype2.ts b/tests/cases/fourslash/javaScriptPrototype2.ts new file mode 100644 index 00000000000..ab6afff3d2c --- /dev/null +++ b/tests/cases/fourslash/javaScriptPrototype2.ts @@ -0,0 +1,36 @@ +/// + +// Assignments to 'this' in the constructorish body create +// properties with those names + +// @allowNonTsExtensions: true +// @Filename: myMod.js +//// function myCtor(x) { +//// this.qua = 10; +//// } +//// myCtor.prototype.foo = function() { return 32 }; +//// myCtor.prototype.bar = function() { return '' }; +//// +//// var m = new myCtor(10); +//// m/*1*/ +//// var x = m.qua; +//// x/*2*/ +//// myCtor/*3*/ + +// Verify the instance property exists +goTo.marker('1'); +edit.insert('.'); +verify.completionListContains('qua', undefined, undefined, 'property'); +edit.backspace(); + +// Verify the type of the instance property +goTo.marker('2'); +edit.insert('.'); +verify.completionListContains('toFixed', undefined, undefined, 'method'); + +goTo.marker('3'); +edit.insert('.'); +// Make sure symbols don't leak out into the constructor +verify.completionListContains('qua', undefined, undefined, 'warning'); +verify.completionListContains('foo', undefined, undefined, 'warning'); +verify.completionListContains('bar', undefined, undefined, 'warning'); diff --git a/tests/cases/fourslash/javaScriptPrototype3.ts b/tests/cases/fourslash/javaScriptPrototype3.ts new file mode 100644 index 00000000000..900a39ddce9 --- /dev/null +++ b/tests/cases/fourslash/javaScriptPrototype3.ts @@ -0,0 +1,40 @@ +/// + +// ES6 classes can extend from JS classes + +// @allowNonTsExtensions: true +// @Filename: myMod.js +//// function myCtor(x) { +//// this.qua = 10; +//// } +//// myCtor.prototype.foo = function() { return 32 }; +//// myCtor.prototype.bar = function() { return '' }; +//// +//// class MyClass extends myCtor { +//// fn() { +//// this/*1*/ +//// let y = super.foo(); +//// y; +//// } +//// } +//// var n = new MyClass(3); +//// n/*2*/; + +goTo.marker('1'); +edit.insert('.'); +// Current class method +verify.completionListContains('fn', undefined, undefined, 'method'); +// Base class method +verify.completionListContains('foo', undefined, undefined, 'method'); +// Base class instance property +verify.completionListContains('qua', undefined, undefined, 'property'); +edit.backspace(); + +// Derived class instance from outside the class +goTo.marker('2'); +edit.insert('.'); +verify.completionListContains('fn', undefined, undefined, 'method'); +// Base class method +verify.completionListContains('foo', undefined, undefined, 'method'); +// Base class instance property +verify.completionListContains('qua', undefined, undefined, 'property'); diff --git a/tests/cases/fourslash/javaScriptPrototype4.ts b/tests/cases/fourslash/javaScriptPrototype4.ts new file mode 100644 index 00000000000..78eab19733a --- /dev/null +++ b/tests/cases/fourslash/javaScriptPrototype4.ts @@ -0,0 +1,36 @@ +/// + +// Check for any odd symbol leakage + +// @allowNonTsExtensions: true +// @Filename: myMod.js +//// function myCtor(x) { +//// this.qua = 10; +//// } +//// myCtor.prototype.foo = function() { return 32 }; +//// myCtor.prototype.bar = function() { return '' }; +//// +//// myCtor/*1*/ + +goTo.marker('1'); +edit.insert('.'); + +// Check members of the function +verify.completionListContains('prototype', undefined, undefined, 'property'); +verify.completionListContains('foo', undefined, undefined, 'warning'); +verify.completionListContains('bar', undefined, undefined, 'warning'); +verify.completionListContains('qua', undefined, undefined, 'warning'); + +// Check members of function.prototype +edit.insert('prototype.'); +debugger; +debug.printMemberListMembers(); +verify.completionListContains('foo', undefined, undefined, 'method'); +verify.completionListContains('bar', undefined, undefined, 'method'); +verify.completionListContains('qua', undefined, undefined, 'warning'); +verify.completionListContains('prototype', undefined, undefined, 'warning'); + +// debug.printErrorList(); +// debug.printCurrentQuickInfo(); +// edit.insert('.'); +// verify.completionListContains('toFixed', undefined, undefined, 'method'); From a3a5c1619d6371cd9b093f71ab83abc1d485d856 Mon Sep 17 00:00:00 2001 From: Ryan Cavanaugh Date: Fri, 30 Oct 2015 12:35:20 -0700 Subject: [PATCH 016/177] Human-readable fourslash debug output for completion lists / quickinfo --- src/harness/fourslash.ts | 20 +++++++++++++++++--- 1 file changed, 17 insertions(+), 3 deletions(-) diff --git a/src/harness/fourslash.ts b/src/harness/fourslash.ts index dd2dde6989c..8564714801a 100644 --- a/src/harness/fourslash.ts +++ b/src/harness/fourslash.ts @@ -1265,7 +1265,7 @@ namespace FourSlash { public printCurrentQuickInfo() { let quickInfo = this.languageService.getQuickInfoAtPosition(this.activeFile.fileName, this.currentCaretPosition); - Harness.IO.log(JSON.stringify(quickInfo)); + Harness.IO.log("Quick Info: " + quickInfo.displayParts.map(part => part.text).join("")); } public printErrorList() { @@ -1307,12 +1307,26 @@ namespace FourSlash { public printMemberListMembers() { let members = this.getMemberListAtCaret(); - Harness.IO.log(JSON.stringify(members)); + this.printMembersOrCompletions(members); } public printCompletionListMembers() { let completions = this.getCompletionListAtCaret(); - Harness.IO.log(JSON.stringify(completions)); + this.printMembersOrCompletions(completions); + } + + private printMembersOrCompletions(info: ts.CompletionInfo) { + function pad(s: string, length: number) { + return s + new Array(length - s.length + 1).join(" "); + } + function max(arr: T[], selector: (x: T) => number): number { + return arr.reduce((prev, x) => Math.max(prev, selector(x)), 0); + } + let longestNameLength = max(info.entries, m => m.name.length); + let longestKindLength = max(info.entries, m => m.kind.length); + info.entries.sort((m, n) => m.sortText > n.sortText ? 1 : m.sortText < n.sortText ? -1 : m.name > n.name ? 1 : m.name < n.name ? -1 : 0); + let membersString = info.entries.map(m => `${pad(m.name, longestNameLength)} ${pad(m.kind, longestKindLength)} ${m.kindModifiers}`).join("\n"); + Harness.IO.log(membersString); } public printReferences() { From a531610eb91d6497a26919e8629ac19796b36a72 Mon Sep 17 00:00:00 2001 From: Vladimir Matveev Date: Mon, 9 Nov 2015 10:46:50 -0800 Subject: [PATCH 017/177] fix merge issue --- src/compiler/emitter.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/compiler/emitter.ts b/src/compiler/emitter.ts index 4c594da1fa5..49d6236805f 100644 --- a/src/compiler/emitter.ts +++ b/src/compiler/emitter.ts @@ -580,7 +580,7 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, Promi externalImports = undefined; exportSpecifiers = undefined; exportEquals = undefined; - hasExportStars = undefined; + hasExportStarsToExportValues = undefined; detachedCommentsInfo = undefined; sourceMapData = undefined; isEs6Module = false; From eaeeb1f7624f9be5287544659debdbda40df8824 Mon Sep 17 00:00:00 2001 From: Ryan Cavanaugh Date: Mon, 9 Nov 2015 15:19:41 -0800 Subject: [PATCH 018/177] Fix TC --- tests/cases/fourslash/javaScriptPrototype4.ts | 5 ----- 1 file changed, 5 deletions(-) diff --git a/tests/cases/fourslash/javaScriptPrototype4.ts b/tests/cases/fourslash/javaScriptPrototype4.ts index 78eab19733a..f78bf52438b 100644 --- a/tests/cases/fourslash/javaScriptPrototype4.ts +++ b/tests/cases/fourslash/javaScriptPrototype4.ts @@ -23,14 +23,9 @@ verify.completionListContains('qua', undefined, undefined, 'warning'); // Check members of function.prototype edit.insert('prototype.'); -debugger; debug.printMemberListMembers(); verify.completionListContains('foo', undefined, undefined, 'method'); verify.completionListContains('bar', undefined, undefined, 'method'); verify.completionListContains('qua', undefined, undefined, 'warning'); verify.completionListContains('prototype', undefined, undefined, 'warning'); -// debug.printErrorList(); -// debug.printCurrentQuickInfo(); -// edit.insert('.'); -// verify.completionListContains('toFixed', undefined, undefined, 'method'); From fb83ee0a3036687115f505d621a8022eaca95e07 Mon Sep 17 00:00:00 2001 From: Ryan Cavanaugh Date: Fri, 20 Nov 2015 10:59:13 -0800 Subject: [PATCH 019/177] WIP --- src/compiler/binder.ts | 20 ++++--- src/compiler/checker.ts | 5 +- src/compiler/utilities.ts | 58 ------------------- tests/cases/fourslash/javaScriptPrototype4.ts | 1 - 4 files changed, 16 insertions(+), 68 deletions(-) diff --git a/src/compiler/binder.ts b/src/compiler/binder.ts index 9bd51f0c763..f91cf107749 100644 --- a/src/compiler/binder.ts +++ b/src/compiler/binder.ts @@ -635,7 +635,6 @@ namespace ts { function bindAnonymousDeclaration(node: Declaration, symbolFlags: SymbolFlags, name: string) { let symbol = createSymbol(symbolFlags, name); addDeclarationToSymbol(symbol, node, symbolFlags); - return symbol; } function bindBlockScopedDeclaration(node: Declaration, symbolFlags: SymbolFlags, symbolExcludes: SymbolFlags) { @@ -889,6 +888,11 @@ namespace ts { case SpecialPropertyAssignmentKind.ThisProperty: bindThisPropertyAssignment(node); break; + case SpecialPropertyAssignmentKind.None: + // Nothing to do + break; + default: + Debug.fail("Unknown special property assignment kind"); } } return checkStrictModeBinaryExpression(node); @@ -1080,19 +1084,19 @@ namespace ts { // The function is now a constructor rather than a normal function if (!funcSymbol.inferredConstructor) { + // Have the binder set up all the related class symbols for us declareSymbol(container.locals, funcSymbol, funcSymbol.valueDeclaration, SymbolFlags.Class, SymbolFlags.None); - // funcSymbol.flags = (funcSymbol.flags | SymbolFlags.Class) & ~SymbolFlags.Function; - funcSymbol.members = funcSymbol.members || {}; + // funcSymbol.members = funcSymbol.members || {}; funcSymbol.members["__constructor"] = funcSymbol; funcSymbol.inferredConstructor = true; } - // Declare the 'prototype' member of the function - let prototypeSymbol = declareSymbol(funcSymbol.exports, funcSymbol, (node.left).expression, SymbolFlags.ObjectLiteral | SymbolFlags.Property, SymbolFlags.None); + // Get the exports of the class so we can add the method to it + let funcExports = declareSymbol(funcSymbol.exports, funcSymbol, (node.left).expression, SymbolFlags.ObjectLiteral | SymbolFlags.Property, SymbolFlags.None); - // Declare the property on the prototype symbol - declareSymbol(prototypeSymbol.members, prototypeSymbol, node.left, SymbolFlags.Method, SymbolFlags.None); - // and on the class type + // Declare the method + declareSymbol(funcExports.members, funcExports, node.left, SymbolFlags.Method, SymbolFlags.None); + // and on the members of the function so it appears in 'prototype' declareSymbol(funcSymbol.members, funcSymbol, node.left, SymbolFlags.Method, SymbolFlags.PropertyExcludes); } diff --git a/src/compiler/checker.ts b/src/compiler/checker.ts index fb7040a96ab..18a878ae91b 100644 --- a/src/compiler/checker.ts +++ b/src/compiler/checker.ts @@ -2577,9 +2577,11 @@ namespace ts { return links.type = checkExpression((declaration).right); } if (declaration.kind === SyntaxKind.PropertyAccessExpression) { + // Declarations only exist for property access expressions for certain + // special assignment kinds if (declaration.parent.kind === SyntaxKind.BinaryExpression) { // Handle exports.p = expr or this.p = expr or className.prototype.method = expr - return links.type = checkExpression((declaration.parent).right); + return links.type = checkExpressionCached((declaration.parent).right); } else { // Declaration for className.prototype in inferred JS class @@ -3860,6 +3862,7 @@ namespace ts { break; case SyntaxKind.PropertyAccessExpression: + // Inferred class method result = getSignaturesOfType(checkExpressionCached((node.parent).right), SignatureKind.Call); break; } diff --git a/src/compiler/utilities.ts b/src/compiler/utilities.ts index cb72e87bb94..603f5a3d93c 100644 --- a/src/compiler/utilities.ts +++ b/src/compiler/utilities.ts @@ -1093,64 +1093,6 @@ namespace ts { return SpecialPropertyAssignmentKind.None; } - /** - * Returns true if the node is an assignment to a property on the identifier 'exports'. - * This function does not test if the node is in a JavaScript file or not. - */ - export function isExportsPropertyAssignment(expression: Node): boolean { - // of the form 'exports.name = expr' where 'name' and 'expr' are arbitrary - return isInJavaScriptFile(expression) && - (expression.kind === SyntaxKind.BinaryExpression) && - ((expression).operatorToken.kind === SyntaxKind.EqualsToken) && - ((expression).left.kind === SyntaxKind.PropertyAccessExpression) && - (((expression).left).expression.kind === SyntaxKind.Identifier) && - (((((expression).left).expression)).text === "exports"); - } - - /** - * Returns true if the node is an assignment to the property access expression 'module.exports'. - * This function does not test if the node is in a JavaScript file or not. - */ - export function isModuleExportsAssignment(expression: Node): boolean { - // of the form 'module.exports = expr' where 'expr' is arbitrary - return isInJavaScriptFile(expression) && - (expression.kind === SyntaxKind.BinaryExpression) && - ((expression).operatorToken.kind === SyntaxKind.EqualsToken) && - ((expression).left.kind === SyntaxKind.PropertyAccessExpression) && - (((expression).left).expression.kind === SyntaxKind.Identifier) && - (((((expression).left).expression)).text === "module") && - (((expression).left).name.text === "exports"); - } - - /** - * Returns true if this expression is an assignment to the given named property - */ - function isAssignmentToProperty(expression: Node, name?: string): expression is BinaryExpression { - return (expression.kind === SyntaxKind.BinaryExpression) && - ((expression).operatorToken.kind === SyntaxKind.EqualsToken) && - isNamedPropertyAccess((expression).left, name); - } - - /** - * Returns true if this expression is a PropertyAccessExpression where the property name is the provided name - */ - function isNamedPropertyAccess(expression: Node, name?: string): expression is PropertyAccessExpression { - return expression.kind === SyntaxKind.PropertyAccessExpression && - (!name || (expression).name.text === name); - } - - /** - * Returns true if the node is an assignment in the form 'id1.prototype.id2 = expr' where id1 and id2 - * are any identifier. - * This function does not test if the node is in a JavaScript file or not. - */ - export function isPrototypePropertyAssignment(expression: Node): expression is BinaryExpression { - return isAssignmentToProperty(expression) && - isNamedPropertyAccess(expression.left) && - isNamedPropertyAccess((expression.left).expression, "prototype") && - ((expression.left).expression).expression.kind === SyntaxKind.Identifier; - } - export function getExternalModuleName(node: Node): Expression { if (node.kind === SyntaxKind.ImportDeclaration) { return (node).moduleSpecifier; diff --git a/tests/cases/fourslash/javaScriptPrototype4.ts b/tests/cases/fourslash/javaScriptPrototype4.ts index f78bf52438b..3ed723740b4 100644 --- a/tests/cases/fourslash/javaScriptPrototype4.ts +++ b/tests/cases/fourslash/javaScriptPrototype4.ts @@ -23,7 +23,6 @@ verify.completionListContains('qua', undefined, undefined, 'warning'); // Check members of function.prototype edit.insert('prototype.'); -debug.printMemberListMembers(); verify.completionListContains('foo', undefined, undefined, 'method'); verify.completionListContains('bar', undefined, undefined, 'method'); verify.completionListContains('qua', undefined, undefined, 'warning'); From c7a65b558ec853cf065e1127c6bf24d84ae0f051 Mon Sep 17 00:00:00 2001 From: Vladimir Matveev Date: Tue, 1 Dec 2015 10:00:00 -0800 Subject: [PATCH 020/177] do not error on 'super' property access in ES6 --- src/compiler/checker.ts | 2 +- .../superPropertyAccess_ES5.errors.txt | 38 ++++++++ .../reference/superPropertyAccess_ES5.js | 84 +++++++++++++++++ .../reference/superPropertyAccess_ES6.js | 54 +++++++++++ .../reference/superPropertyAccess_ES6.symbols | 80 +++++++++++++++++ .../reference/superPropertyAccess_ES6.types | 89 +++++++++++++++++++ .../cases/compiler/superPropertyAccess_ES5.ts | 30 +++++++ .../cases/compiler/superPropertyAccess_ES6.ts | 30 +++++++ 8 files changed, 406 insertions(+), 1 deletion(-) create mode 100644 tests/baselines/reference/superPropertyAccess_ES5.errors.txt create mode 100644 tests/baselines/reference/superPropertyAccess_ES5.js create mode 100644 tests/baselines/reference/superPropertyAccess_ES6.js create mode 100644 tests/baselines/reference/superPropertyAccess_ES6.symbols create mode 100644 tests/baselines/reference/superPropertyAccess_ES6.types create mode 100644 tests/cases/compiler/superPropertyAccess_ES5.ts create mode 100644 tests/cases/compiler/superPropertyAccess_ES6.ts diff --git a/src/compiler/checker.ts b/src/compiler/checker.ts index 9ed3ca55e19..a76e7233c9b 100644 --- a/src/compiler/checker.ts +++ b/src/compiler/checker.ts @@ -8219,7 +8219,7 @@ namespace ts { // - In a static member function or static member accessor // where this references the constructor function object of a derived class, // a super property access is permitted and must specify a public static member function of the base class. - if (getDeclarationKindFromSymbol(prop) !== SyntaxKind.MethodDeclaration) { + if (languageVersion < ScriptTarget.ES6 && getDeclarationKindFromSymbol(prop) !== SyntaxKind.MethodDeclaration) { // `prop` refers to a *property* declared in the super class // rather than a *method*, so it does not satisfy the above criteria. diff --git a/tests/baselines/reference/superPropertyAccess_ES5.errors.txt b/tests/baselines/reference/superPropertyAccess_ES5.errors.txt new file mode 100644 index 00000000000..08adcd36e68 --- /dev/null +++ b/tests/baselines/reference/superPropertyAccess_ES5.errors.txt @@ -0,0 +1,38 @@ +tests/cases/compiler/superPropertyAccess_ES5.ts(12,22): error TS2340: Only public and protected methods of the base class are accessible via the 'super' keyword. +tests/cases/compiler/superPropertyAccess_ES5.ts(27,15): error TS2340: Only public and protected methods of the base class are accessible via the 'super' keyword. + + +==== tests/cases/compiler/superPropertyAccess_ES5.ts (2 errors) ==== + + class MyBase { + getValue(): number { return 1; } + get value(): number { return 1; } + } + + class MyDerived extends MyBase { + constructor() { + super(); + + const f1 = super.getValue(); + const f2 = super.value; + ~~~~~ +!!! error TS2340: Only public and protected methods of the base class are accessible via the 'super' keyword. + } + } + + var d = new MyDerived(); + var f3 = d.value; + + class A { + private _property: string; + get property() { return this._property; } + set property(value: string) { this._property = value } + } + + class B extends A { + set property(value: string) { + super.property = value + " addition"; + ~~~~~~~~ +!!! error TS2340: Only public and protected methods of the base class are accessible via the 'super' keyword. + } + } \ No newline at end of file diff --git a/tests/baselines/reference/superPropertyAccess_ES5.js b/tests/baselines/reference/superPropertyAccess_ES5.js new file mode 100644 index 00000000000..a31c1dfdcba --- /dev/null +++ b/tests/baselines/reference/superPropertyAccess_ES5.js @@ -0,0 +1,84 @@ +//// [superPropertyAccess_ES5.ts] + +class MyBase { + getValue(): number { return 1; } + get value(): number { return 1; } +} + +class MyDerived extends MyBase { + constructor() { + super(); + + const f1 = super.getValue(); + const f2 = super.value; + } +} + +var d = new MyDerived(); +var f3 = d.value; + +class A { + private _property: string; + get property() { return this._property; } + set property(value: string) { this._property = value } +} + +class B extends A { + set property(value: string) { + super.property = value + " addition"; + } +} + +//// [superPropertyAccess_ES5.js] +var __extends = (this && this.__extends) || function (d, b) { + for (var p in b) if (b.hasOwnProperty(p)) d[p] = b[p]; + function __() { this.constructor = d; } + d.prototype = b === null ? Object.create(b) : (__.prototype = b.prototype, new __()); +}; +var MyBase = (function () { + function MyBase() { + } + MyBase.prototype.getValue = function () { return 1; }; + Object.defineProperty(MyBase.prototype, "value", { + get: function () { return 1; }, + enumerable: true, + configurable: true + }); + return MyBase; +})(); +var MyDerived = (function (_super) { + __extends(MyDerived, _super); + function MyDerived() { + _super.call(this); + var f1 = _super.prototype.getValue.call(this); + var f2 = _super.prototype.value; + } + return MyDerived; +})(MyBase); +var d = new MyDerived(); +var f3 = d.value; +var A = (function () { + function A() { + } + Object.defineProperty(A.prototype, "property", { + get: function () { return this._property; }, + set: function (value) { this._property = value; }, + enumerable: true, + configurable: true + }); + return A; +})(); +var B = (function (_super) { + __extends(B, _super); + function B() { + _super.apply(this, arguments); + } + Object.defineProperty(B.prototype, "property", { + set: function (value) { + _super.prototype.property = value + " addition"; + }, + enumerable: true, + configurable: true + }); + return B; +})(A); diff --git a/tests/baselines/reference/superPropertyAccess_ES6.js b/tests/baselines/reference/superPropertyAccess_ES6.js new file mode 100644 index 00000000000..1b23c6ca0d8 --- /dev/null +++ b/tests/baselines/reference/superPropertyAccess_ES6.js @@ -0,0 +1,54 @@ +//// [superPropertyAccess_ES6.ts] + +class MyBase { + getValue(): number { return 1; } + get value(): number { return 1; } +} + +class MyDerived extends MyBase { + constructor() { + super(); + + const f1 = super.getValue(); + const f2 = super.value; + } +} + +var d = new MyDerived(); +var f3 = d.value; + +class A { + private _property: string; + get property() { return this._property; } + set property(value: string) { this._property = value } +} + +class B extends A { + set property(value: string) { + super.property = value + " addition"; + } +} + +//// [superPropertyAccess_ES6.js] +class MyBase { + getValue() { return 1; } + get value() { return 1; } +} +class MyDerived extends MyBase { + constructor() { + super(); + const f1 = super.getValue(); + const f2 = super.value; + } +} +var d = new MyDerived(); +var f3 = d.value; +class A { + get property() { return this._property; } + set property(value) { this._property = value; } +} +class B extends A { + set property(value) { + super.property = value + " addition"; + } +} diff --git a/tests/baselines/reference/superPropertyAccess_ES6.symbols b/tests/baselines/reference/superPropertyAccess_ES6.symbols new file mode 100644 index 00000000000..ada6c5b8057 --- /dev/null +++ b/tests/baselines/reference/superPropertyAccess_ES6.symbols @@ -0,0 +1,80 @@ +=== tests/cases/compiler/superPropertyAccess_ES6.ts === + +class MyBase { +>MyBase : Symbol(MyBase, Decl(superPropertyAccess_ES6.ts, 0, 0)) + + getValue(): number { return 1; } +>getValue : Symbol(getValue, Decl(superPropertyAccess_ES6.ts, 1, 14)) + + get value(): number { return 1; } +>value : Symbol(value, Decl(superPropertyAccess_ES6.ts, 2, 34)) +} + +class MyDerived extends MyBase { +>MyDerived : Symbol(MyDerived, Decl(superPropertyAccess_ES6.ts, 4, 1)) +>MyBase : Symbol(MyBase, Decl(superPropertyAccess_ES6.ts, 0, 0)) + + constructor() { + super(); +>super : Symbol(MyBase, Decl(superPropertyAccess_ES6.ts, 0, 0)) + + const f1 = super.getValue(); +>f1 : Symbol(f1, Decl(superPropertyAccess_ES6.ts, 10, 9)) +>super.getValue : Symbol(MyBase.getValue, Decl(superPropertyAccess_ES6.ts, 1, 14)) +>super : Symbol(MyBase, Decl(superPropertyAccess_ES6.ts, 0, 0)) +>getValue : Symbol(MyBase.getValue, Decl(superPropertyAccess_ES6.ts, 1, 14)) + + const f2 = super.value; +>f2 : Symbol(f2, Decl(superPropertyAccess_ES6.ts, 11, 9)) +>super.value : Symbol(MyBase.value, Decl(superPropertyAccess_ES6.ts, 2, 34)) +>super : Symbol(MyBase, Decl(superPropertyAccess_ES6.ts, 0, 0)) +>value : Symbol(MyBase.value, Decl(superPropertyAccess_ES6.ts, 2, 34)) + } +} + +var d = new MyDerived(); +>d : Symbol(d, Decl(superPropertyAccess_ES6.ts, 15, 3)) +>MyDerived : Symbol(MyDerived, Decl(superPropertyAccess_ES6.ts, 4, 1)) + +var f3 = d.value; +>f3 : Symbol(f3, Decl(superPropertyAccess_ES6.ts, 16, 3)) +>d.value : Symbol(MyBase.value, Decl(superPropertyAccess_ES6.ts, 2, 34)) +>d : Symbol(d, Decl(superPropertyAccess_ES6.ts, 15, 3)) +>value : Symbol(MyBase.value, Decl(superPropertyAccess_ES6.ts, 2, 34)) + +class A { +>A : Symbol(A, Decl(superPropertyAccess_ES6.ts, 16, 17)) + + private _property: string; +>_property : Symbol(_property, Decl(superPropertyAccess_ES6.ts, 18, 9)) + + get property() { return this._property; } +>property : Symbol(property, Decl(superPropertyAccess_ES6.ts, 19, 30), Decl(superPropertyAccess_ES6.ts, 20, 45)) +>this._property : Symbol(_property, Decl(superPropertyAccess_ES6.ts, 18, 9)) +>this : Symbol(A, Decl(superPropertyAccess_ES6.ts, 16, 17)) +>_property : Symbol(_property, Decl(superPropertyAccess_ES6.ts, 18, 9)) + + set property(value: string) { this._property = value } +>property : Symbol(property, Decl(superPropertyAccess_ES6.ts, 19, 30), Decl(superPropertyAccess_ES6.ts, 20, 45)) +>value : Symbol(value, Decl(superPropertyAccess_ES6.ts, 21, 17)) +>this._property : Symbol(_property, Decl(superPropertyAccess_ES6.ts, 18, 9)) +>this : Symbol(A, Decl(superPropertyAccess_ES6.ts, 16, 17)) +>_property : Symbol(_property, Decl(superPropertyAccess_ES6.ts, 18, 9)) +>value : Symbol(value, Decl(superPropertyAccess_ES6.ts, 21, 17)) +} + +class B extends A { +>B : Symbol(B, Decl(superPropertyAccess_ES6.ts, 22, 1)) +>A : Symbol(A, Decl(superPropertyAccess_ES6.ts, 16, 17)) + + set property(value: string) { +>property : Symbol(property, Decl(superPropertyAccess_ES6.ts, 24, 19)) +>value : Symbol(value, Decl(superPropertyAccess_ES6.ts, 25, 17)) + + super.property = value + " addition"; +>super.property : Symbol(A.property, Decl(superPropertyAccess_ES6.ts, 19, 30), Decl(superPropertyAccess_ES6.ts, 20, 45)) +>super : Symbol(A, Decl(superPropertyAccess_ES6.ts, 16, 17)) +>property : Symbol(A.property, Decl(superPropertyAccess_ES6.ts, 19, 30), Decl(superPropertyAccess_ES6.ts, 20, 45)) +>value : Symbol(value, Decl(superPropertyAccess_ES6.ts, 25, 17)) + } +} diff --git a/tests/baselines/reference/superPropertyAccess_ES6.types b/tests/baselines/reference/superPropertyAccess_ES6.types new file mode 100644 index 00000000000..b10b1944a44 --- /dev/null +++ b/tests/baselines/reference/superPropertyAccess_ES6.types @@ -0,0 +1,89 @@ +=== tests/cases/compiler/superPropertyAccess_ES6.ts === + +class MyBase { +>MyBase : MyBase + + getValue(): number { return 1; } +>getValue : () => number +>1 : number + + get value(): number { return 1; } +>value : number +>1 : number +} + +class MyDerived extends MyBase { +>MyDerived : MyDerived +>MyBase : MyBase + + constructor() { + super(); +>super() : void +>super : typeof MyBase + + const f1 = super.getValue(); +>f1 : number +>super.getValue() : number +>super.getValue : () => number +>super : MyBase +>getValue : () => number + + const f2 = super.value; +>f2 : number +>super.value : number +>super : MyBase +>value : number + } +} + +var d = new MyDerived(); +>d : MyDerived +>new MyDerived() : MyDerived +>MyDerived : typeof MyDerived + +var f3 = d.value; +>f3 : number +>d.value : number +>d : MyDerived +>value : number + +class A { +>A : A + + private _property: string; +>_property : string + + get property() { return this._property; } +>property : string +>this._property : string +>this : this +>_property : string + + set property(value: string) { this._property = value } +>property : string +>value : string +>this._property = value : string +>this._property : string +>this : this +>_property : string +>value : string +} + +class B extends A { +>B : B +>A : A + + set property(value: string) { +>property : string +>value : string + + super.property = value + " addition"; +>super.property = value + " addition" : string +>super.property : string +>super : A +>property : string +>value + " addition" : string +>value : string +>" addition" : string + } +} diff --git a/tests/cases/compiler/superPropertyAccess_ES5.ts b/tests/cases/compiler/superPropertyAccess_ES5.ts new file mode 100644 index 00000000000..37897b9e549 --- /dev/null +++ b/tests/cases/compiler/superPropertyAccess_ES5.ts @@ -0,0 +1,30 @@ +// @target: ES5 + +class MyBase { + getValue(): number { return 1; } + get value(): number { return 1; } +} + +class MyDerived extends MyBase { + constructor() { + super(); + + const f1 = super.getValue(); + const f2 = super.value; + } +} + +var d = new MyDerived(); +var f3 = d.value; + +class A { + private _property: string; + get property() { return this._property; } + set property(value: string) { this._property = value } +} + +class B extends A { + set property(value: string) { + super.property = value + " addition"; + } +} \ No newline at end of file diff --git a/tests/cases/compiler/superPropertyAccess_ES6.ts b/tests/cases/compiler/superPropertyAccess_ES6.ts new file mode 100644 index 00000000000..ed082b19032 --- /dev/null +++ b/tests/cases/compiler/superPropertyAccess_ES6.ts @@ -0,0 +1,30 @@ +// @target: ES6 + +class MyBase { + getValue(): number { return 1; } + get value(): number { return 1; } +} + +class MyDerived extends MyBase { + constructor() { + super(); + + const f1 = super.getValue(); + const f2 = super.value; + } +} + +var d = new MyDerived(); +var f3 = d.value; + +class A { + private _property: string; + get property() { return this._property; } + set property(value: string) { this._property = value } +} + +class B extends A { + set property(value: string) { + super.property = value + " addition"; + } +} \ No newline at end of file From c4b0b62bfc694928ed79858d8e9bcb8f2790bb05 Mon Sep 17 00:00:00 2001 From: Ryan Cavanaugh Date: Tue, 1 Dec 2015 15:06:53 -0800 Subject: [PATCH 021/177] Merge fixup --- src/compiler/binder.ts | 10 +++++----- src/compiler/checker.ts | 21 ++++++++++++++------- src/compiler/utilities.ts | 2 +- 3 files changed, 20 insertions(+), 13 deletions(-) diff --git a/src/compiler/binder.ts b/src/compiler/binder.ts index 7f0fd2fb3fa..86fcc809d58 100644 --- a/src/compiler/binder.ts +++ b/src/compiler/binder.ts @@ -1178,8 +1178,8 @@ namespace ts { case SyntaxKind.Identifier: return checkStrictModeIdentifier(node); case SyntaxKind.BinaryExpression: - if (isJavaScriptFile) { - let specialKind = getSpecialPropertyAssignmentKind(node); + if (isInJavaScriptFile(node)) { + const specialKind = getSpecialPropertyAssignmentKind(node); switch (specialKind) { case SpecialPropertyAssignmentKind.ExportsProperty: bindExportsPropertyAssignment(node); @@ -1378,11 +1378,11 @@ namespace ts { // This does two things: turns 'x' into a constructor function, and // adds a member 'y' to the result of that constructor function // Get 'x', the class - let classId = ((node.left).expression).expression; + const classId = ((node.left).expression).expression; // Look up the function in the local scope, since prototype assignments should immediately // follow the function declaration - let funcSymbol = container.locals[classId.text]; + const funcSymbol = container.locals[classId.text]; if (!funcSymbol) { return; } @@ -1397,7 +1397,7 @@ namespace ts { } // Get the exports of the class so we can add the method to it - let funcExports = declareSymbol(funcSymbol.exports, funcSymbol, (node.left).expression, SymbolFlags.ObjectLiteral | SymbolFlags.Property, SymbolFlags.None); + const funcExports = declareSymbol(funcSymbol.exports, funcSymbol, (node.left).expression, SymbolFlags.ObjectLiteral | SymbolFlags.Property, SymbolFlags.None); // Declare the method declareSymbol(funcExports.members, funcExports, node.left, SymbolFlags.Method, SymbolFlags.None); diff --git a/src/compiler/checker.ts b/src/compiler/checker.ts index 29e31a84a23..94c13fd1f3f 100644 --- a/src/compiler/checker.ts +++ b/src/compiler/checker.ts @@ -123,8 +123,8 @@ namespace ts { const noConstraintType = createAnonymousType(undefined, emptySymbols, emptyArray, emptyArray, undefined, undefined); - const anySignature = createSignature(undefined, undefined, emptyArray, undefined, anyType, undefined, 0, false, false); - const unknownSignature = createSignature(undefined, undefined, emptyArray, undefined, unknownType, undefined, 0, false, false); + const anySignature = createSignature(undefined, undefined, emptyArray, undefined, anyType, undefined, 0, /*hasRestParameter*/ false, /*hasStringLiterals*/ false); + const unknownSignature = createSignature(undefined, undefined, emptyArray, undefined, unknownType, undefined, 0, /*hasRestParameter*/ false, /*hasStringLiterals*/ false); const globals: SymbolTable = {}; @@ -2661,7 +2661,7 @@ namespace ts { } else { // Declaration for className.prototype in inferred JS class - let type = createAnonymousType(symbol, symbol.members, emptyArray, emptyArray, undefined, undefined); + const type = createAnonymousType(symbol, symbol.members, emptyArray, emptyArray, undefined, undefined); return links.type = type; } } @@ -3930,9 +3930,9 @@ namespace ts { default: if (declaration.symbol.inferredConstructor) { kind = SignatureKind.Construct; - let members = createSymbolTable(emptyArray); + const members = createSymbolTable(emptyArray); // Collect methods declared with className.protoype.methodName = ... - let proto = declaration.symbol.exports["prototype"]; + const proto = declaration.symbol.exports["prototype"]; if (proto) { mergeSymbolTable(members, proto.members); } @@ -3954,7 +3954,7 @@ namespace ts { function getSignaturesOfSymbol(symbol: Symbol): Signature[] { if (!symbol) return emptyArray; - const result: Signature[] = []; + let result: Signature[] = []; for (let i = 0, len = symbol.declarations.length; i < len; i++) { const node = symbol.declarations[i]; switch (node.kind) { @@ -6841,7 +6841,14 @@ namespace ts { let container: Node; if (symbol.flags & SymbolFlags.Class) { // get parent of class declaration - container = getClassLikeDeclarationOfSymbol(symbol).parent; + const classDeclaration = getClassLikeDeclarationOfSymbol(symbol); + if (classDeclaration) { + container = classDeclaration.parent; + } + else { + // JS-inferred class; do nothing + return; + } } else { // nesting structure: diff --git a/src/compiler/utilities.ts b/src/compiler/utilities.ts index 553c5bbeff0..cffc1e90a06 100644 --- a/src/compiler/utilities.ts +++ b/src/compiler/utilities.ts @@ -1090,7 +1090,7 @@ namespace ts { } else if (lhs.expression.kind === SyntaxKind.PropertyAccessExpression) { // chained dot, e.g. x.y.z = expr; this var is the 'x.y' part - let innerPropertyAccess = lhs.expression; + const innerPropertyAccess = lhs.expression; if (innerPropertyAccess.expression.kind === SyntaxKind.Identifier && innerPropertyAccess.name.text === "prototype") { return SpecialPropertyAssignmentKind.PrototypeProperty; } From 973ba4b50ea7de646bf8cd9e9da92c2d65f9ffa6 Mon Sep 17 00:00:00 2001 From: Anders Hejlsberg Date: Tue, 1 Dec 2015 15:51:43 -0800 Subject: [PATCH 022/177] Allow type parameters in constraints --- src/compiler/checker.ts | 208 +++++++++++---------------- src/compiler/diagnosticMessages.json | 2 +- src/compiler/types.ts | 2 +- 3 files changed, 83 insertions(+), 129 deletions(-) diff --git a/src/compiler/checker.ts b/src/compiler/checker.ts index d4cdd50180d..dfd108cf713 100644 --- a/src/compiler/checker.ts +++ b/src/compiler/checker.ts @@ -4068,6 +4068,23 @@ namespace ts { : undefined; } + function getConstraintDeclaration(type: TypeParameter) { + return (getDeclarationOfKind(type.symbol, SyntaxKind.TypeParameter)).constraint; + } + + function hasConstraintReferenceTo(type: Type, target: TypeParameter): boolean { + let checked: Type[]; + while (type && type.flags & TypeFlags.TypeParameter && !contains(checked, type)) { + if (type === target) { + return true; + } + (checked || (checked = [])).push(type); + let constraintDeclaration = getConstraintDeclaration(type); + type = constraintDeclaration && getTypeFromTypeNode(constraintDeclaration); + } + return false; + } + function getConstraintOfTypeParameter(type: TypeParameter): Type { if (!type.constraint) { if (type.target) { @@ -4075,7 +4092,13 @@ namespace ts { type.constraint = targetConstraint ? instantiateType(targetConstraint, type.mapper) : noConstraintType; } else { - type.constraint = getTypeFromTypeNode((getDeclarationOfKind(type.symbol, SyntaxKind.TypeParameter)).constraint); + let constraintDeclaration = getConstraintDeclaration(type); + let constraint = getTypeFromTypeNode(constraintDeclaration); + if (hasConstraintReferenceTo(constraint, type)) { + error(constraintDeclaration, Diagnostics.Type_parameter_0_has_a_circular_constraint, typeToString(type)); + constraint = unknownType; + } + type.constraint = constraint; } } return type.constraint === noConstraintType ? undefined : type.constraint; @@ -4130,55 +4153,6 @@ namespace ts { return type; } - function isTypeParameterReferenceIllegalInConstraint(typeReferenceNode: TypeReferenceNode | ExpressionWithTypeArguments, typeParameterSymbol: Symbol): boolean { - const links = getNodeLinks(typeReferenceNode); - if (links.isIllegalTypeReferenceInConstraint !== undefined) { - return links.isIllegalTypeReferenceInConstraint; - } - - // bubble up to the declaration - let currentNode: Node = typeReferenceNode; - // forEach === exists - while (!forEach(typeParameterSymbol.declarations, d => d.parent === currentNode.parent)) { - currentNode = currentNode.parent; - } - // if last step was made from the type parameter this means that path has started somewhere in constraint which is illegal - links.isIllegalTypeReferenceInConstraint = currentNode.kind === SyntaxKind.TypeParameter; - return links.isIllegalTypeReferenceInConstraint; - } - - function checkTypeParameterHasIllegalReferencesInConstraint(typeParameter: TypeParameterDeclaration): void { - let typeParameterSymbol: Symbol; - function check(n: Node): void { - if (n.kind === SyntaxKind.TypeReference && (n).typeName.kind === SyntaxKind.Identifier) { - const links = getNodeLinks(n); - if (links.isIllegalTypeReferenceInConstraint === undefined) { - const symbol = resolveName(typeParameter, ((n).typeName).text, SymbolFlags.Type, /*nameNotFoundMessage*/ undefined, /*nameArg*/ undefined); - if (symbol && (symbol.flags & SymbolFlags.TypeParameter)) { - // TypeScript 1.0 spec (April 2014): 3.4.1 - // Type parameters declared in a particular type parameter list - // may not be referenced in constraints in that type parameter list - - // symbol.declaration.parent === typeParameter.parent - // -> typeParameter and symbol.declaration originate from the same type parameter list - // -> illegal for all declarations in symbol - // forEach === exists - links.isIllegalTypeReferenceInConstraint = forEach(symbol.declarations, d => d.parent === typeParameter.parent); - } - } - if (links.isIllegalTypeReferenceInConstraint) { - error(typeParameter, Diagnostics.Constraint_of_a_type_parameter_cannot_reference_any_type_parameter_from_the_same_type_parameter_list); - } - } - forEachChild(n, check); - } - - if (typeParameter.constraint) { - typeParameterSymbol = getSymbolOfNode(typeParameter); - check(typeParameter.constraint); - } - } - // Get type from reference to class or interface function getTypeFromClassOrInterfaceReference(node: TypeReferenceNode | ExpressionWithTypeArguments, symbol: Symbol): Type { const type = getDeclaredTypeOfSymbol(symbol); @@ -4225,13 +4199,6 @@ namespace ts { // Get type from reference to named type that cannot be generic (enum or type parameter) function getTypeFromNonGenericTypeReference(node: TypeReferenceNode | ExpressionWithTypeArguments, symbol: Symbol): Type { - if (symbol.flags & SymbolFlags.TypeParameter && isTypeParameterReferenceIllegalInConstraint(node, symbol)) { - // TypeScript 1.0 spec (April 2014): 3.4.1 - // Type parameters declared in a particular type parameter list - // may not be referenced in constraints in that type parameter list - // Implementation: such type references are resolved to 'unknown' type that usually denotes error - return unknownType; - } if (node.typeArguments) { error(node, Diagnostics.Type_0_is_not_generic, symbolToString(symbol)); return unknownType; @@ -4678,19 +4645,21 @@ namespace ts { }; } - function createInferenceMapper(context: InferenceContext): TypeMapper { - const mapper: TypeMapper = t => { - for (let i = 0; i < context.typeParameters.length; i++) { - if (t === context.typeParameters[i]) { - context.inferences[i].isFixed = true; - return getInferredType(context, i); + function getInferenceMapper(context: InferenceContext): TypeMapper { + if (!context.mapper) { + const mapper: TypeMapper = t => { + for (let i = 0; i < context.typeParameters.length; i++) { + if (t === context.typeParameters[i]) { + context.inferences[i].isFixed = true; + return getInferredType(context, i); + } } - } - return t; - }; - - mapper.context = context; - return mapper; + return t; + }; + mapper.context = context; + context.mapper = mapper; + } + return context.mapper; } function identityMapper(type: Type): Type { @@ -5071,9 +5040,6 @@ namespace ts { } return objectTypeRelatedTo(source, source, target, /*reportErrors*/ false); } - if (source.flags & TypeFlags.TypeParameter && target.flags & TypeFlags.TypeParameter) { - return typeParameterIdenticalTo(source, target); - } if (source.flags & TypeFlags.Union && target.flags & TypeFlags.Union || source.flags & TypeFlags.Intersection && target.flags & TypeFlags.Intersection) { if (result = eachTypeRelatedToSomeType(source, target)) { @@ -5204,27 +5170,16 @@ namespace ts { return result; } - function typeParameterIdenticalTo(source: TypeParameter, target: TypeParameter): Ternary { - // covers case when both type parameters does not have constraint (both equal to noConstraintType) - if (source.constraint === target.constraint) { - return Ternary.True; - } - if (source.constraint === noConstraintType || target.constraint === noConstraintType) { - return Ternary.False; - } - return isIdenticalTo(source.constraint, target.constraint); - } - // Determine if two object types are related by structure. First, check if the result is already available in the global cache. // Second, check if we have already started a comparison of the given two types in which case we assume the result to be true. // Third, check if both types are part of deeply nested chains of generic type instantiations and if so assume the types are // equal and infinitely expanding. Fourth, if we have reached a depth of 100 nested comparisons, assume we have runaway recursion // and issue an error. Otherwise, actually compare the structure of the two types. - function objectTypeRelatedTo(apparentSource: Type, originalSource: Type, target: Type, reportErrors: boolean): Ternary { + function objectTypeRelatedTo(source: Type, originalSource: Type, target: Type, reportErrors: boolean): Ternary { if (overflow) { return Ternary.False; } - const id = relation !== identityRelation || apparentSource.id < target.id ? apparentSource.id + "," + target.id : target.id + "," + apparentSource.id; + const id = relation !== identityRelation || source.id < target.id ? source.id + "," + target.id : target.id + "," + source.id; const related = relation[id]; if (related !== undefined) { if (elaborateErrors && related === RelationComparisonResult.Failed) { @@ -5254,28 +5209,28 @@ namespace ts { maybeStack = []; expandingFlags = 0; } - sourceStack[depth] = apparentSource; + sourceStack[depth] = source; targetStack[depth] = target; maybeStack[depth] = {}; maybeStack[depth][id] = RelationComparisonResult.Succeeded; depth++; const saveExpandingFlags = expandingFlags; - if (!(expandingFlags & 1) && isDeeplyNestedGeneric(apparentSource, sourceStack, depth)) expandingFlags |= 1; + if (!(expandingFlags & 1) && isDeeplyNestedGeneric(source, sourceStack, depth)) expandingFlags |= 1; if (!(expandingFlags & 2) && isDeeplyNestedGeneric(target, targetStack, depth)) expandingFlags |= 2; let result: Ternary; if (expandingFlags === 3) { result = Ternary.Maybe; } else { - result = propertiesRelatedTo(apparentSource, target, reportErrors); + result = propertiesRelatedTo(source, target, reportErrors); if (result) { - result &= signaturesRelatedTo(apparentSource, target, SignatureKind.Call, reportErrors); + result &= signaturesRelatedTo(source, target, SignatureKind.Call, reportErrors); if (result) { - result &= signaturesRelatedTo(apparentSource, target, SignatureKind.Construct, reportErrors); + result &= signaturesRelatedTo(source, target, SignatureKind.Construct, reportErrors); if (result) { - result &= stringIndexTypesRelatedTo(apparentSource, originalSource, target, reportErrors); + result &= stringIndexTypesRelatedTo(source, originalSource, target, reportErrors); if (result) { - result &= numberIndexTypesRelatedTo(apparentSource, originalSource, target, reportErrors); + result &= numberIndexTypesRelatedTo(source, originalSource, target, reportErrors); } } } @@ -5763,26 +5718,19 @@ namespace ts { if (!(isMatchingSignature(source, target, partialMatch))) { return Ternary.False; } - let result = Ternary.True; - if (source.typeParameters && target.typeParameters) { - if (source.typeParameters.length !== target.typeParameters.length) { - return Ternary.False; - } - for (let i = 0, len = source.typeParameters.length; i < len; ++i) { - const related = compareTypes(source.typeParameters[i], target.typeParameters[i]); - if (!related) { - return Ternary.False; - } - result &= related; - } - } - else if (source.typeParameters || target.typeParameters) { + // Check that the two signatures have the same number of type parameters. We might consider + // also checking that any type parameter constraints match, but that would require instantiating + // the constraints with a common set of type arguments to get relatable entities in places where + // type parameters occur in the constraints. The complexity of doing that doesn't seem worthwhile, + // particularly as we're comparing erased versions of the signatures below. + if ((source.typeParameters ? source.typeParameters.length : 0) !== (target.typeParameters ? target.typeParameters.length : 0)) { return Ternary.False; } // Spec 1.0 Section 3.8.3 & 3.8.4: // M and N (the signatures) are instantiated using type Any as the type argument for all type parameters declared by M and N source = getErasedSignature(source); target = getErasedSignature(target); + let result = Ternary.True; const targetLen = target.parameters.length; for (let i = 0; i < targetLen; i++) { const s = isRestParameterIndex(source, i) ? getRestTypeOfSignature(source) : getTypeOfSymbol(source.parameters[i]); @@ -6315,11 +6263,18 @@ namespace ts { inferredType = emptyObjectType; inferenceSucceeded = true; } + context.inferredTypes[index] = inferredType; // Only do the constraint check if inference succeeded (to prevent cascading errors) if (inferenceSucceeded) { const constraint = getConstraintOfTypeParameter(context.typeParameters[index]); - inferredType = constraint && !isTypeAssignableTo(inferredType, constraint) ? constraint : inferredType; + if (constraint) { + const instantiatedConstraint = instantiateType(constraint, getInferenceMapper(context)); + if (!isTypeAssignableTo(inferredType, instantiatedConstraint)) { + inferredType = instantiateType(constraint, createTypeEraser(context.typeParameters)); + context.inferredTypes[index] = inferredType; + } + } } else if (context.failedTypeParameterIndex === undefined || context.failedTypeParameterIndex > index) { // If inference failed, it is necessary to record the index of the failed type parameter (the one we are on). @@ -6327,7 +6282,6 @@ namespace ts { // So if this failure is on preceding type parameter, this type parameter is the new failure index. context.failedTypeParameterIndex = index; } - context.inferredTypes[index] = inferredType; } return inferredType; } @@ -6336,7 +6290,6 @@ namespace ts { for (let i = 0; i < context.inferredTypes.length; i++) { getInferredType(context, i); } - return context.inferredTypes; } @@ -8683,7 +8636,7 @@ namespace ts { function inferTypeArguments(node: CallLikeExpression, signature: Signature, args: Expression[], excludeArgument: boolean[], context: InferenceContext): void { const typeParameters = signature.typeParameters; - const inferenceMapper = createInferenceMapper(context); + const inferenceMapper = getInferenceMapper(context); // Clear out all the inference results from the last time inferTypeArguments was called on this context for (let i = 0; i < typeParameters.length; i++) { @@ -8749,14 +8702,11 @@ namespace ts { getInferredTypes(context); } - function checkTypeArguments(signature: Signature, typeArguments: TypeNode[], typeArgumentResultTypes: Type[], reportErrors: boolean, headMessage?: DiagnosticMessage): boolean { + function checkTypeArguments(signature: Signature, typeArgumentNodes: TypeNode[], typeArgumentTypes: Type[], reportErrors: boolean, headMessage?: DiagnosticMessage): boolean { const typeParameters = signature.typeParameters; let typeArgumentsAreAssignable = true; + let mapper: TypeMapper; for (let i = 0; i < typeParameters.length; i++) { - const typeArgNode = typeArguments[i]; - const typeArgument = getTypeFromTypeNode(typeArgNode); - // Do not push on this array! It has a preallocated length - typeArgumentResultTypes[i] = typeArgument; if (typeArgumentsAreAssignable /* so far */) { const constraint = getConstraintOfTypeParameter(typeParameters[i]); if (constraint) { @@ -8766,17 +8716,15 @@ namespace ts { errorInfo = chainDiagnosticMessages(errorInfo, typeArgumentHeadMessage); typeArgumentHeadMessage = headMessage; } - typeArgumentsAreAssignable = checkTypeAssignableTo( - typeArgument, - constraint, - reportErrors ? typeArgNode : undefined, + typeArgumentTypes[i], + instantiateType(constraint, mapper || (mapper = createTypeMapper(typeParameters, typeArgumentTypes))), + reportErrors ? typeArgumentNodes[i] : undefined, typeArgumentHeadMessage, errorInfo); } } } - return typeArgumentsAreAssignable; } @@ -9232,7 +9180,8 @@ namespace ts { } else if (candidateForTypeArgumentError) { if (!isTaggedTemplate && !isDecorator && typeArguments) { - checkTypeArguments(candidateForTypeArgumentError, (node).typeArguments, [], /*reportErrors*/ true, headMessage); + const typeArguments = (node).typeArguments; + checkTypeArguments(candidateForTypeArgumentError, typeArguments, map(typeArguments, getTypeFromTypeNode), /*reportErrors*/ true, headMessage); } else { Debug.assert(resultOfFailedInference.failedTypeParameterIndex >= 0); @@ -9299,7 +9248,7 @@ namespace ts { if (candidate.typeParameters) { let typeArgumentTypes: Type[]; if (typeArguments) { - typeArgumentTypes = new Array(candidate.typeParameters.length); + typeArgumentTypes = map(typeArguments, getTypeFromTypeNode); typeArgumentsAreValid = checkTypeArguments(candidate, typeArguments, typeArgumentTypes, /*reportErrors*/ false); } else { @@ -10823,11 +10772,10 @@ namespace ts { } checkSourceElement(node.constraint); + getConstraintOfTypeParameter(getDeclaredTypeOfTypeParameter(getSymbolOfNode(node))); if (produceDiagnostics) { - checkTypeParameterHasIllegalReferencesInConstraint(node); checkTypeNameIsReserved(node.name, Diagnostics.Type_parameter_name_cannot_be_0); } - // TODO: Check multiple declarations are identical } function checkParameter(node: ParameterDeclaration) { @@ -11238,13 +11186,19 @@ namespace ts { checkDecorators(node); } - function checkTypeArgumentConstraints(typeParameters: TypeParameter[], typeArguments: TypeNode[]): boolean { + function checkTypeArgumentConstraints(typeParameters: TypeParameter[], typeArgumentNodes: TypeNode[]): boolean { + let typeArguments: Type[]; + let mapper: TypeMapper; let result = true; for (let i = 0; i < typeParameters.length; i++) { const constraint = getConstraintOfTypeParameter(typeParameters[i]); if (constraint) { - const typeArgument = typeArguments[i]; - result = result && checkTypeAssignableTo(getTypeFromTypeNode(typeArgument), constraint, typeArgument, Diagnostics.Type_0_does_not_satisfy_the_constraint_1); + if (!typeArguments) { + typeArguments = map(typeArgumentNodes, getTypeFromTypeNode); + mapper = createTypeMapper(typeParameters, typeArguments); + } + result = result && checkTypeAssignableTo(typeArguments[i], instantiateType(constraint, mapper), + typeArgumentNodes[i], Diagnostics.Type_0_does_not_satisfy_the_constraint_1); } } return result; diff --git a/src/compiler/diagnosticMessages.json b/src/compiler/diagnosticMessages.json index 62661706373..5b626122951 100644 --- a/src/compiler/diagnosticMessages.json +++ b/src/compiler/diagnosticMessages.json @@ -852,7 +852,7 @@ "category": "Error", "code": 2312 }, - "Constraint of a type parameter cannot reference any type parameter from the same type parameter list.": { + "Type parameter '{0}' has a circular constraint.": { "category": "Error", "code": 2313 }, diff --git a/src/compiler/types.ts b/src/compiler/types.ts index f8b26ddaa6d..8fd1e335db3 100644 --- a/src/compiler/types.ts +++ b/src/compiler/types.ts @@ -2040,7 +2040,6 @@ namespace ts { resolvedSymbol?: Symbol; // Cached name resolution result flags?: NodeCheckFlags; // Set of flags specific to Node enumMemberValue?: number; // Constant value of enum member - isIllegalTypeReferenceInConstraint?: boolean; // Is type reference in constraint refers to the type parameter from the same list isVisible?: boolean; // Is this node visible generatedName?: string; // Generated name for module, enum, or import declaration generatedNames?: Map; // Generated names table for source file @@ -2281,6 +2280,7 @@ namespace ts { inferUnionTypes: boolean; // Infer union types for disjoint candidates (otherwise undefinedType) inferences: TypeInferences[]; // Inferences made for each type parameter inferredTypes: Type[]; // Inferred type for each type parameter + mapper?: TypeMapper; // Type mapper for this inference context failedTypeParameterIndex?: number; // Index of type parameter for which inference failed // It is optional because in contextual signature instantiation, nothing fails } From 3750748a277e4fd6116f9fec069131bc6b704cb3 Mon Sep 17 00:00:00 2001 From: Anders Hejlsberg Date: Tue, 1 Dec 2015 15:52:32 -0800 Subject: [PATCH 023/177] Accepting new baselines --- .../anyAssignableToEveryType2.errors.txt | 136 ---- .../anyAssignableToEveryType2.symbols | 274 +++++++ .../reference/anyAssignableToEveryType2.types | 276 +++++++ .../assertInWrapSomeTypeParameter.errors.txt | 5 +- ...ompatWithGenericCallSignatures4.errors.txt | 22 - ...ntCompatWithGenericCallSignatures4.symbols | 38 + ...mentCompatWithGenericCallSignatures4.types | 40 + .../assignmentStricterConstraints.errors.txt | 18 - .../assignmentStricterConstraints.symbols | 32 + .../assignmentStricterConstraints.types | 39 + ...onTypeOfConditionalExpressions2.errors.txt | 36 - ...ommonTypeOfConditionalExpressions2.symbols | 83 +++ ...tCommonTypeOfConditionalExpressions2.types | 95 +++ ...ectsOnInstantiatedCallSignature.errors.txt | 155 ---- ...ObjectsOnInstantiatedCallSignature.symbols | 599 +++++++++++++++ ...ipObjectsOnInstantiatedCallSignature.types | 695 ++++++++++++++++++ ...nstantiatedConstructorSignature.errors.txt | 155 ---- ...OnInstantiatedConstructorSignature.symbols | 587 +++++++++++++++ ...tsOnInstantiatedConstructorSignature.types | 683 +++++++++++++++++ ...ameterFromSameTypeParameterList.errors.txt | 45 -- ...ParameterFromSameTypeParameterList.symbols | 60 ++ ...peParameterFromSameTypeParameterList.types | 60 ++ .../constraintSatisfactionWithAny2.errors.txt | 14 - .../constraintSatisfactionWithAny2.symbols | 27 + .../constraintSatisfactionWithAny2.types | 29 + ...ThatReferenceOtherContstraints1.errors.txt | 18 - ...ntsThatReferenceOtherContstraints1.symbols | 31 + ...aintsThatReferenceOtherContstraints1.types | 31 + .../contextuallyTypingOrOperator3.errors.txt | 9 - .../contextuallyTypingOrOperator3.symbols | 15 + .../contextuallyTypingOrOperator3.types | 16 + .../reference/enumAssignability.errors.txt | 5 +- ...sNotASubtypeOfAnythingButNumber.errors.txt | 5 +- ...functionConstraintSatisfaction2.errors.txt | 9 +- ...ionWithMultipleReturnStatements.errors.txt | 11 +- ...mentCompatOfFunctionSignatures1.errors.txt | 14 - ...ignmentCompatOfFunctionSignatures1.symbols | 35 + ...ssignmentCompatOfFunctionSignatures1.types | 39 + ...nstraintsTypeArgumentInference2.errors.txt | 5 +- ...thObjectTypeArgsAndConstraints3.errors.txt | 5 +- ...thObjectTypeArgsAndConstraints4.errors.txt | 8 +- ...thObjectTypeArgsAndConstraints5.errors.txt | 8 +- ...ObjectTypeArgsAndIndexersErrors.errors.txt | 33 - ...ithObjectTypeArgsAndIndexersErrors.symbols | 76 ++ ...lWithObjectTypeArgsAndIndexersErrors.types | 84 +++ ...thObjectTypeArgsAndInitializers.errors.txt | 30 +- .../reference/genericConstraint2.errors.txt | 9 +- .../reference/genericConstraint3.errors.txt | 9 - .../reference/genericConstraint3.symbols | 21 + .../reference/genericConstraint3.types | 21 + .../genericMemberFunction.errors.txt | 17 +- ...edDeclarationUsingTypeParameter.errors.txt | 5 +- ...eExpansionThroughInstantiation2.errors.txt | 17 - ...niteExpansionThroughInstantiation2.symbols | 22 + ...finiteExpansionThroughInstantiation2.types | 22 + ...iateConstraintsToTypeArguments2.errors.txt | 17 - ...antiateConstraintsToTypeArguments2.symbols | 30 + ...stantiateConstraintsToTypeArguments2.types | 30 + ...instantiatedBaseTypeConstraints.errors.txt | 17 - .../instantiatedBaseTypeConstraints.symbols | 28 + .../instantiatedBaseTypeConstraints.types | 28 + ...nstantiatedBaseTypeConstraints2.errors.txt | 11 - .../instantiatedBaseTypeConstraints2.symbols | 21 + .../instantiatedBaseTypeConstraints2.types | 21 + ...terfaceWithMultipleDeclarations.errors.txt | 14 +- .../reference/invalidConstraint1.errors.txt | 10 +- ...chingOfObjectLiteralConstraints.errors.txt | 10 - ...matchingOfObjectLiteralConstraints.symbols | 17 + .../matchingOfObjectLiteralConstraints.types | 21 + .../reference/maxConstraints.errors.txt | 5 +- ...WrappedPropertyCheckedNominally.errors.txt | 14 +- ...sIdentityWithComplexConstraints.errors.txt | 22 - ...ypesIdentityWithComplexConstraints.symbols | 49 ++ ...tTypesIdentityWithComplexConstraints.types | 49 ++ ...gnaturesDifferingByConstraints2.errors.txt | 141 ---- ...lSignaturesDifferingByConstraints2.symbols | 462 ++++++++++++ ...allSignaturesDifferingByConstraints2.types | 468 ++++++++++++ ...gnaturesDifferingByConstraints3.errors.txt | 150 ---- ...lSignaturesDifferingByConstraints3.symbols | 497 +++++++++++++ ...allSignaturesDifferingByConstraints3.types | 503 +++++++++++++ ...gnaturesDifferingByConstraints2.errors.txt | 110 --- ...tSignaturesDifferingByConstraints2.symbols | 349 +++++++++ ...uctSignaturesDifferingByConstraints2.types | 354 +++++++++ ...gnaturesDifferingByConstraints3.errors.txt | 119 --- ...tSignaturesDifferingByConstraints3.symbols | 384 ++++++++++ ...uctSignaturesDifferingByConstraints3.types | 389 ++++++++++ .../parserGenericConstraint2.errors.txt | 5 +- .../parserGenericConstraint3.errors.txt | 5 +- .../parserGenericConstraint4.errors.txt | 5 +- .../parserGenericConstraint5.errors.txt | 5 +- .../parserGenericConstraint6.errors.txt | 5 +- .../parserGenericConstraint7.errors.txt | 5 +- .../primitiveConstraints1.errors.txt | 12 +- ...OnTypeParameterWithConstraints3.errors.txt | 77 -- ...essOnTypeParameterWithConstraints3.symbols | 190 +++++ ...ccessOnTypeParameterWithConstraints3.types | 233 ++++++ ...OnTypeParameterWithConstraints5.errors.txt | 26 +- .../recursiveGenericTypeHierarchy.errors.txt | 18 - .../recursiveGenericTypeHierarchy.symbols | 31 + .../recursiveGenericTypeHierarchy.types | 31 + .../recursiveIdenticalAssignment.errors.txt | 17 - .../recursiveIdenticalAssignment.symbols | 35 + .../recursiveIdenticalAssignment.types | 35 + ...ecursiveTypeInGenericConstraint.errors.txt | 19 - .../recursiveTypeInGenericConstraint.symbols | 39 + .../recursiveTypeInGenericConstraint.types | 40 + .../reference/recursiveTypes1.errors.txt | 22 - .../reference/recursiveTypes1.symbols | 37 + .../baselines/reference/recursiveTypes1.types | 37 + ...veTypesUsedAsFunctionParameters.errors.txt | 49 -- ...rsiveTypesUsedAsFunctionParameters.symbols | 154 ++++ ...cursiveTypesUsedAsFunctionParameters.types | 157 ++++ ...ingLiteralTypeIsSubtypeOfString.errors.txt | 22 +- .../subtypesOfTypeParameter.errors.txt | 5 +- ...sOfTypeParameterWithConstraints.errors.txt | 270 +------ ...OfTypeParameterWithConstraints2.errors.txt | 175 ----- ...pesOfTypeParameterWithConstraints2.symbols | 548 ++++++++++++++ ...typesOfTypeParameterWithConstraints2.types | 690 +++++++++++++++++ ...OfTypeParameterWithConstraints3.errors.txt | 21 - ...pesOfTypeParameterWithConstraints3.symbols | 49 ++ ...typesOfTypeParameterWithConstraints3.types | 61 ++ ...rameterWithRecursiveConstraints.errors.txt | 275 +++---- .../reference/testTypings.errors.txt | 19 - tests/baselines/reference/testTypings.symbols | 27 + tests/baselines/reference/testTypings.types | 27 + ...tInferenceTransitiveConstraints.errors.txt | 17 - ...mentInferenceTransitiveConstraints.symbols | 34 + ...gumentInferenceTransitiveConstraints.types | 39 + ...rgumentInferenceWithConstraints.errors.txt | 12 +- .../typeParamExtendsOtherTypeParam.errors.txt | 50 +- ...ameterAsTypeParameterConstraint.errors.txt | 35 - ...ParameterAsTypeParameterConstraint.symbols | 88 +++ ...peParameterAsTypeParameterConstraint.types | 120 +++ ...meterAsTypeParameterConstraint2.errors.txt | 27 - ...arameterAsTypeParameterConstraint2.symbols | 61 ++ ...eParameterAsTypeParameterConstraint2.types | 81 ++ .../typeParameterAssignability2.errors.txt | 89 +-- ...ameterAssignmentWithConstraints.errors.txt | 14 - ...ParameterAssignmentWithConstraints.symbols | 19 + ...peParameterAssignmentWithConstraints.types | 20 + ...eterDirectlyConstrainedToItself.errors.txt | 60 +- ...ypeParameterHasSelfAsConstraint.errors.txt | 6 +- .../typeParameterInConstraint1.errors.txt | 8 - .../typeParameterInConstraint1.symbols | 7 + .../typeParameterInConstraint1.types | 7 + ...erIndirectlyConstrainedToItself.errors.txt | 167 +++-- .../typeParameterOrderReversal.errors.txt | 22 - .../typeParameterOrderReversal.symbols | 42 ++ .../typeParameterOrderReversal.types | 45 ++ .../typeParameterUsedAsConstraint.errors.txt | 158 ---- .../typeParameterUsedAsConstraint.symbols | 211 ++++++ .../typeParameterUsedAsConstraint.types | 217 ++++++ ...erUsedAsTypeParameterConstraint.errors.txt | 88 --- ...meterUsedAsTypeParameterConstraint.symbols | 116 +++ ...rameterUsedAsTypeParameterConstraint.types | 126 ++++ ...rUsedAsTypeParameterConstraint2.errors.txt | 113 --- ...eterUsedAsTypeParameterConstraint2.symbols | 238 ++++++ ...ameterUsedAsTypeParameterConstraint2.types | 252 +++++++ ...rUsedAsTypeParameterConstraint4.errors.txt | 49 +- ...ameterWithInvalidConstraintType.errors.txt | 6 +- .../unspecializedConstraints.errors.txt | 11 +- ...wrappedAndRecursiveConstraints2.errors.txt | 12 - .../wrappedAndRecursiveConstraints2.symbols | 21 + .../wrappedAndRecursiveConstraints2.types | 26 + 164 files changed, 12258 insertions(+), 3107 deletions(-) delete mode 100644 tests/baselines/reference/anyAssignableToEveryType2.errors.txt create mode 100644 tests/baselines/reference/anyAssignableToEveryType2.symbols create mode 100644 tests/baselines/reference/anyAssignableToEveryType2.types delete mode 100644 tests/baselines/reference/assignmentCompatWithGenericCallSignatures4.errors.txt create mode 100644 tests/baselines/reference/assignmentCompatWithGenericCallSignatures4.symbols create mode 100644 tests/baselines/reference/assignmentCompatWithGenericCallSignatures4.types delete mode 100644 tests/baselines/reference/assignmentStricterConstraints.errors.txt create mode 100644 tests/baselines/reference/assignmentStricterConstraints.symbols create mode 100644 tests/baselines/reference/assignmentStricterConstraints.types delete mode 100644 tests/baselines/reference/bestCommonTypeOfConditionalExpressions2.errors.txt create mode 100644 tests/baselines/reference/bestCommonTypeOfConditionalExpressions2.symbols create mode 100644 tests/baselines/reference/bestCommonTypeOfConditionalExpressions2.types delete mode 100644 tests/baselines/reference/comparisonOperatorWithNoRelationshipObjectsOnInstantiatedCallSignature.errors.txt create mode 100644 tests/baselines/reference/comparisonOperatorWithNoRelationshipObjectsOnInstantiatedCallSignature.symbols create mode 100644 tests/baselines/reference/comparisonOperatorWithNoRelationshipObjectsOnInstantiatedCallSignature.types delete mode 100644 tests/baselines/reference/comparisonOperatorWithNoRelationshipObjectsOnInstantiatedConstructorSignature.errors.txt create mode 100644 tests/baselines/reference/comparisonOperatorWithNoRelationshipObjectsOnInstantiatedConstructorSignature.symbols create mode 100644 tests/baselines/reference/comparisonOperatorWithNoRelationshipObjectsOnInstantiatedConstructorSignature.types delete mode 100644 tests/baselines/reference/constraintReferencingTypeParameterFromSameTypeParameterList.errors.txt create mode 100644 tests/baselines/reference/constraintReferencingTypeParameterFromSameTypeParameterList.symbols create mode 100644 tests/baselines/reference/constraintReferencingTypeParameterFromSameTypeParameterList.types delete mode 100644 tests/baselines/reference/constraintSatisfactionWithAny2.errors.txt create mode 100644 tests/baselines/reference/constraintSatisfactionWithAny2.symbols create mode 100644 tests/baselines/reference/constraintSatisfactionWithAny2.types delete mode 100644 tests/baselines/reference/constraintsThatReferenceOtherContstraints1.errors.txt create mode 100644 tests/baselines/reference/constraintsThatReferenceOtherContstraints1.symbols create mode 100644 tests/baselines/reference/constraintsThatReferenceOtherContstraints1.types delete mode 100644 tests/baselines/reference/contextuallyTypingOrOperator3.errors.txt create mode 100644 tests/baselines/reference/contextuallyTypingOrOperator3.symbols create mode 100644 tests/baselines/reference/contextuallyTypingOrOperator3.types delete mode 100644 tests/baselines/reference/genericAssignmentCompatOfFunctionSignatures1.errors.txt create mode 100644 tests/baselines/reference/genericAssignmentCompatOfFunctionSignatures1.symbols create mode 100644 tests/baselines/reference/genericAssignmentCompatOfFunctionSignatures1.types delete mode 100644 tests/baselines/reference/genericCallWithObjectTypeArgsAndIndexersErrors.errors.txt create mode 100644 tests/baselines/reference/genericCallWithObjectTypeArgsAndIndexersErrors.symbols create mode 100644 tests/baselines/reference/genericCallWithObjectTypeArgsAndIndexersErrors.types delete mode 100644 tests/baselines/reference/genericConstraint3.errors.txt create mode 100644 tests/baselines/reference/genericConstraint3.symbols create mode 100644 tests/baselines/reference/genericConstraint3.types delete mode 100644 tests/baselines/reference/infiniteExpansionThroughInstantiation2.errors.txt create mode 100644 tests/baselines/reference/infiniteExpansionThroughInstantiation2.symbols create mode 100644 tests/baselines/reference/infiniteExpansionThroughInstantiation2.types delete mode 100644 tests/baselines/reference/instantiateConstraintsToTypeArguments2.errors.txt create mode 100644 tests/baselines/reference/instantiateConstraintsToTypeArguments2.symbols create mode 100644 tests/baselines/reference/instantiateConstraintsToTypeArguments2.types delete mode 100644 tests/baselines/reference/instantiatedBaseTypeConstraints.errors.txt create mode 100644 tests/baselines/reference/instantiatedBaseTypeConstraints.symbols create mode 100644 tests/baselines/reference/instantiatedBaseTypeConstraints.types delete mode 100644 tests/baselines/reference/instantiatedBaseTypeConstraints2.errors.txt create mode 100644 tests/baselines/reference/instantiatedBaseTypeConstraints2.symbols create mode 100644 tests/baselines/reference/instantiatedBaseTypeConstraints2.types delete mode 100644 tests/baselines/reference/matchingOfObjectLiteralConstraints.errors.txt create mode 100644 tests/baselines/reference/matchingOfObjectLiteralConstraints.symbols create mode 100644 tests/baselines/reference/matchingOfObjectLiteralConstraints.types delete mode 100644 tests/baselines/reference/objectTypesIdentityWithComplexConstraints.errors.txt create mode 100644 tests/baselines/reference/objectTypesIdentityWithComplexConstraints.symbols create mode 100644 tests/baselines/reference/objectTypesIdentityWithComplexConstraints.types delete mode 100644 tests/baselines/reference/objectTypesIdentityWithGenericCallSignaturesDifferingByConstraints2.errors.txt create mode 100644 tests/baselines/reference/objectTypesIdentityWithGenericCallSignaturesDifferingByConstraints2.symbols create mode 100644 tests/baselines/reference/objectTypesIdentityWithGenericCallSignaturesDifferingByConstraints2.types delete mode 100644 tests/baselines/reference/objectTypesIdentityWithGenericCallSignaturesDifferingByConstraints3.errors.txt create mode 100644 tests/baselines/reference/objectTypesIdentityWithGenericCallSignaturesDifferingByConstraints3.symbols create mode 100644 tests/baselines/reference/objectTypesIdentityWithGenericCallSignaturesDifferingByConstraints3.types delete mode 100644 tests/baselines/reference/objectTypesIdentityWithGenericConstructSignaturesDifferingByConstraints2.errors.txt create mode 100644 tests/baselines/reference/objectTypesIdentityWithGenericConstructSignaturesDifferingByConstraints2.symbols create mode 100644 tests/baselines/reference/objectTypesIdentityWithGenericConstructSignaturesDifferingByConstraints2.types delete mode 100644 tests/baselines/reference/objectTypesIdentityWithGenericConstructSignaturesDifferingByConstraints3.errors.txt create mode 100644 tests/baselines/reference/objectTypesIdentityWithGenericConstructSignaturesDifferingByConstraints3.symbols create mode 100644 tests/baselines/reference/objectTypesIdentityWithGenericConstructSignaturesDifferingByConstraints3.types delete mode 100644 tests/baselines/reference/propertyAccessOnTypeParameterWithConstraints3.errors.txt create mode 100644 tests/baselines/reference/propertyAccessOnTypeParameterWithConstraints3.symbols create mode 100644 tests/baselines/reference/propertyAccessOnTypeParameterWithConstraints3.types delete mode 100644 tests/baselines/reference/recursiveGenericTypeHierarchy.errors.txt create mode 100644 tests/baselines/reference/recursiveGenericTypeHierarchy.symbols create mode 100644 tests/baselines/reference/recursiveGenericTypeHierarchy.types delete mode 100644 tests/baselines/reference/recursiveIdenticalAssignment.errors.txt create mode 100644 tests/baselines/reference/recursiveIdenticalAssignment.symbols create mode 100644 tests/baselines/reference/recursiveIdenticalAssignment.types delete mode 100644 tests/baselines/reference/recursiveTypeInGenericConstraint.errors.txt create mode 100644 tests/baselines/reference/recursiveTypeInGenericConstraint.symbols create mode 100644 tests/baselines/reference/recursiveTypeInGenericConstraint.types delete mode 100644 tests/baselines/reference/recursiveTypes1.errors.txt create mode 100644 tests/baselines/reference/recursiveTypes1.symbols create mode 100644 tests/baselines/reference/recursiveTypes1.types delete mode 100644 tests/baselines/reference/recursiveTypesUsedAsFunctionParameters.errors.txt create mode 100644 tests/baselines/reference/recursiveTypesUsedAsFunctionParameters.symbols create mode 100644 tests/baselines/reference/recursiveTypesUsedAsFunctionParameters.types delete mode 100644 tests/baselines/reference/subtypesOfTypeParameterWithConstraints2.errors.txt create mode 100644 tests/baselines/reference/subtypesOfTypeParameterWithConstraints2.symbols create mode 100644 tests/baselines/reference/subtypesOfTypeParameterWithConstraints2.types delete mode 100644 tests/baselines/reference/subtypesOfTypeParameterWithConstraints3.errors.txt create mode 100644 tests/baselines/reference/subtypesOfTypeParameterWithConstraints3.symbols create mode 100644 tests/baselines/reference/subtypesOfTypeParameterWithConstraints3.types delete mode 100644 tests/baselines/reference/testTypings.errors.txt create mode 100644 tests/baselines/reference/testTypings.symbols create mode 100644 tests/baselines/reference/testTypings.types delete mode 100644 tests/baselines/reference/typeArgumentInferenceTransitiveConstraints.errors.txt create mode 100644 tests/baselines/reference/typeArgumentInferenceTransitiveConstraints.symbols create mode 100644 tests/baselines/reference/typeArgumentInferenceTransitiveConstraints.types delete mode 100644 tests/baselines/reference/typeParameterAsTypeParameterConstraint.errors.txt create mode 100644 tests/baselines/reference/typeParameterAsTypeParameterConstraint.symbols create mode 100644 tests/baselines/reference/typeParameterAsTypeParameterConstraint.types delete mode 100644 tests/baselines/reference/typeParameterAsTypeParameterConstraint2.errors.txt create mode 100644 tests/baselines/reference/typeParameterAsTypeParameterConstraint2.symbols create mode 100644 tests/baselines/reference/typeParameterAsTypeParameterConstraint2.types delete mode 100644 tests/baselines/reference/typeParameterAssignmentWithConstraints.errors.txt create mode 100644 tests/baselines/reference/typeParameterAssignmentWithConstraints.symbols create mode 100644 tests/baselines/reference/typeParameterAssignmentWithConstraints.types delete mode 100644 tests/baselines/reference/typeParameterInConstraint1.errors.txt create mode 100644 tests/baselines/reference/typeParameterInConstraint1.symbols create mode 100644 tests/baselines/reference/typeParameterInConstraint1.types delete mode 100644 tests/baselines/reference/typeParameterOrderReversal.errors.txt create mode 100644 tests/baselines/reference/typeParameterOrderReversal.symbols create mode 100644 tests/baselines/reference/typeParameterOrderReversal.types delete mode 100644 tests/baselines/reference/typeParameterUsedAsConstraint.errors.txt create mode 100644 tests/baselines/reference/typeParameterUsedAsConstraint.symbols create mode 100644 tests/baselines/reference/typeParameterUsedAsConstraint.types delete mode 100644 tests/baselines/reference/typeParameterUsedAsTypeParameterConstraint.errors.txt create mode 100644 tests/baselines/reference/typeParameterUsedAsTypeParameterConstraint.symbols create mode 100644 tests/baselines/reference/typeParameterUsedAsTypeParameterConstraint.types delete mode 100644 tests/baselines/reference/typeParameterUsedAsTypeParameterConstraint2.errors.txt create mode 100644 tests/baselines/reference/typeParameterUsedAsTypeParameterConstraint2.symbols create mode 100644 tests/baselines/reference/typeParameterUsedAsTypeParameterConstraint2.types delete mode 100644 tests/baselines/reference/wrappedAndRecursiveConstraints2.errors.txt create mode 100644 tests/baselines/reference/wrappedAndRecursiveConstraints2.symbols create mode 100644 tests/baselines/reference/wrappedAndRecursiveConstraints2.types diff --git a/tests/baselines/reference/anyAssignableToEveryType2.errors.txt b/tests/baselines/reference/anyAssignableToEveryType2.errors.txt deleted file mode 100644 index e5f9a07476e..00000000000 --- a/tests/baselines/reference/anyAssignableToEveryType2.errors.txt +++ /dev/null @@ -1,136 +0,0 @@ -tests/cases/conformance/types/typeRelationships/assignmentCompatibility/anyAssignableToEveryType2.ts(114,18): error TS2313: Constraint of a type parameter cannot reference any type parameter from the same type parameter list. - - -==== tests/cases/conformance/types/typeRelationships/assignmentCompatibility/anyAssignableToEveryType2.ts (1 errors) ==== - // any is not a subtype of any other types, but is assignable, all the below should work - - interface I { - [x: string]: any; - foo: any; // ok, any identical to itself - } - - - interface I2 { - [x: string]: number; - foo: any; - } - - - interface I3 { - [x: string]: string; - foo: any; - } - - - interface I4 { - [x: string]: boolean; - foo: any; - } - - - interface I5 { - [x: string]: Date; - foo: any; - } - - - interface I6 { - [x: string]: RegExp; - foo: any; - } - - - interface I7 { - [x: string]: { bar: number }; - foo: any; - } - - - interface I8 { - [x: string]: number[]; - foo: any; - } - - - interface I9 { - [x: string]: I8; - foo: any; - } - - class A { foo: number; } - interface I10 { - [x: string]: A; - foo: any; - } - - class A2 { foo: T; } - interface I11 { - [x: string]: A2; - foo: any; - } - - - interface I12 { - [x: string]: (x) => number; - foo: any; - } - - - interface I13 { - [x: string]: (x: T) => T; - foo: any; - } - - - enum E { A } - interface I14 { - [x: string]: E; - foo: any; - } - - - function f() { } - module f { - export var bar = 1; - } - interface I15 { - [x: string]: typeof f; - foo: any; - } - - - class c { baz: string } - module c { - export var bar = 1; - } - interface I16 { - [x: string]: typeof c; - foo: any; - } - - - interface I17 { - [x: string]: T; - foo: any; - } - - - interface I18 { - ~~~~~~~~~~~ -!!! error TS2313: Constraint of a type parameter cannot reference any type parameter from the same type parameter list. - [x: string]: U; - foo: any; - } - - - interface I19 { - [x: string]: Object; - foo: any; - } - - - interface I20 { - [x: string]: {}; - foo: any; - } - \ No newline at end of file diff --git a/tests/baselines/reference/anyAssignableToEveryType2.symbols b/tests/baselines/reference/anyAssignableToEveryType2.symbols new file mode 100644 index 00000000000..9984a3f2fb8 --- /dev/null +++ b/tests/baselines/reference/anyAssignableToEveryType2.symbols @@ -0,0 +1,274 @@ +=== tests/cases/conformance/types/typeRelationships/assignmentCompatibility/anyAssignableToEveryType2.ts === +// any is not a subtype of any other types, but is assignable, all the below should work + +interface I { +>I : Symbol(I, Decl(anyAssignableToEveryType2.ts, 0, 0)) + + [x: string]: any; +>x : Symbol(x, Decl(anyAssignableToEveryType2.ts, 3, 5)) + + foo: any; // ok, any identical to itself +>foo : Symbol(foo, Decl(anyAssignableToEveryType2.ts, 3, 21)) +} + + +interface I2 { +>I2 : Symbol(I2, Decl(anyAssignableToEveryType2.ts, 5, 1)) + + [x: string]: number; +>x : Symbol(x, Decl(anyAssignableToEveryType2.ts, 9, 5)) + + foo: any; +>foo : Symbol(foo, Decl(anyAssignableToEveryType2.ts, 9, 24)) +} + + +interface I3 { +>I3 : Symbol(I3, Decl(anyAssignableToEveryType2.ts, 11, 1)) + + [x: string]: string; +>x : Symbol(x, Decl(anyAssignableToEveryType2.ts, 15, 5)) + + foo: any; +>foo : Symbol(foo, Decl(anyAssignableToEveryType2.ts, 15, 24)) +} + + +interface I4 { +>I4 : Symbol(I4, Decl(anyAssignableToEveryType2.ts, 17, 1)) + + [x: string]: boolean; +>x : Symbol(x, Decl(anyAssignableToEveryType2.ts, 21, 5)) + + foo: any; +>foo : Symbol(foo, Decl(anyAssignableToEveryType2.ts, 21, 25)) +} + + +interface I5 { +>I5 : Symbol(I5, Decl(anyAssignableToEveryType2.ts, 23, 1)) + + [x: string]: Date; +>x : Symbol(x, Decl(anyAssignableToEveryType2.ts, 27, 5)) +>Date : Symbol(Date, Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --)) + + foo: any; +>foo : Symbol(foo, Decl(anyAssignableToEveryType2.ts, 27, 22)) +} + + +interface I6 { +>I6 : Symbol(I6, Decl(anyAssignableToEveryType2.ts, 29, 1)) + + [x: string]: RegExp; +>x : Symbol(x, Decl(anyAssignableToEveryType2.ts, 33, 5)) +>RegExp : Symbol(RegExp, Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --)) + + foo: any; +>foo : Symbol(foo, Decl(anyAssignableToEveryType2.ts, 33, 24)) +} + + +interface I7 { +>I7 : Symbol(I7, Decl(anyAssignableToEveryType2.ts, 35, 1)) + + [x: string]: { bar: number }; +>x : Symbol(x, Decl(anyAssignableToEveryType2.ts, 39, 5)) +>bar : Symbol(bar, Decl(anyAssignableToEveryType2.ts, 39, 18)) + + foo: any; +>foo : Symbol(foo, Decl(anyAssignableToEveryType2.ts, 39, 33)) +} + + +interface I8 { +>I8 : Symbol(I8, Decl(anyAssignableToEveryType2.ts, 41, 1)) + + [x: string]: number[]; +>x : Symbol(x, Decl(anyAssignableToEveryType2.ts, 45, 5)) + + foo: any; +>foo : Symbol(foo, Decl(anyAssignableToEveryType2.ts, 45, 26)) +} + + +interface I9 { +>I9 : Symbol(I9, Decl(anyAssignableToEveryType2.ts, 47, 1)) + + [x: string]: I8; +>x : Symbol(x, Decl(anyAssignableToEveryType2.ts, 51, 5)) +>I8 : Symbol(I8, Decl(anyAssignableToEveryType2.ts, 41, 1)) + + foo: any; +>foo : Symbol(foo, Decl(anyAssignableToEveryType2.ts, 51, 20)) +} + +class A { foo: number; } +>A : Symbol(A, Decl(anyAssignableToEveryType2.ts, 53, 1)) +>foo : Symbol(foo, Decl(anyAssignableToEveryType2.ts, 55, 9)) + +interface I10 { +>I10 : Symbol(I10, Decl(anyAssignableToEveryType2.ts, 55, 24)) + + [x: string]: A; +>x : Symbol(x, Decl(anyAssignableToEveryType2.ts, 57, 5)) +>A : Symbol(A, Decl(anyAssignableToEveryType2.ts, 53, 1)) + + foo: any; +>foo : Symbol(foo, Decl(anyAssignableToEveryType2.ts, 57, 19)) +} + +class A2 { foo: T; } +>A2 : Symbol(A2, Decl(anyAssignableToEveryType2.ts, 59, 1)) +>T : Symbol(T, Decl(anyAssignableToEveryType2.ts, 61, 9)) +>foo : Symbol(foo, Decl(anyAssignableToEveryType2.ts, 61, 13)) +>T : Symbol(T, Decl(anyAssignableToEveryType2.ts, 61, 9)) + +interface I11 { +>I11 : Symbol(I11, Decl(anyAssignableToEveryType2.ts, 61, 23)) + + [x: string]: A2; +>x : Symbol(x, Decl(anyAssignableToEveryType2.ts, 63, 5)) +>A2 : Symbol(A2, Decl(anyAssignableToEveryType2.ts, 59, 1)) + + foo: any; +>foo : Symbol(foo, Decl(anyAssignableToEveryType2.ts, 63, 28)) +} + + +interface I12 { +>I12 : Symbol(I12, Decl(anyAssignableToEveryType2.ts, 65, 1)) + + [x: string]: (x) => number; +>x : Symbol(x, Decl(anyAssignableToEveryType2.ts, 69, 5)) +>x : Symbol(x, Decl(anyAssignableToEveryType2.ts, 69, 18)) + + foo: any; +>foo : Symbol(foo, Decl(anyAssignableToEveryType2.ts, 69, 31)) +} + + +interface I13 { +>I13 : Symbol(I13, Decl(anyAssignableToEveryType2.ts, 71, 1)) + + [x: string]: (x: T) => T; +>x : Symbol(x, Decl(anyAssignableToEveryType2.ts, 75, 5)) +>T : Symbol(T, Decl(anyAssignableToEveryType2.ts, 75, 18)) +>x : Symbol(x, Decl(anyAssignableToEveryType2.ts, 75, 21)) +>T : Symbol(T, Decl(anyAssignableToEveryType2.ts, 75, 18)) +>T : Symbol(T, Decl(anyAssignableToEveryType2.ts, 75, 18)) + + foo: any; +>foo : Symbol(foo, Decl(anyAssignableToEveryType2.ts, 75, 32)) +} + + +enum E { A } +>E : Symbol(E, Decl(anyAssignableToEveryType2.ts, 77, 1)) +>A : Symbol(E.A, Decl(anyAssignableToEveryType2.ts, 80, 8)) + +interface I14 { +>I14 : Symbol(I14, Decl(anyAssignableToEveryType2.ts, 80, 12)) + + [x: string]: E; +>x : Symbol(x, Decl(anyAssignableToEveryType2.ts, 82, 5)) +>E : Symbol(E, Decl(anyAssignableToEveryType2.ts, 77, 1)) + + foo: any; +>foo : Symbol(foo, Decl(anyAssignableToEveryType2.ts, 82, 19)) +} + + +function f() { } +>f : Symbol(f, Decl(anyAssignableToEveryType2.ts, 84, 1), Decl(anyAssignableToEveryType2.ts, 87, 16)) + +module f { +>f : Symbol(f, Decl(anyAssignableToEveryType2.ts, 84, 1), Decl(anyAssignableToEveryType2.ts, 87, 16)) + + export var bar = 1; +>bar : Symbol(bar, Decl(anyAssignableToEveryType2.ts, 89, 14)) +} +interface I15 { +>I15 : Symbol(I15, Decl(anyAssignableToEveryType2.ts, 90, 1)) + + [x: string]: typeof f; +>x : Symbol(x, Decl(anyAssignableToEveryType2.ts, 92, 5)) +>f : Symbol(f, Decl(anyAssignableToEveryType2.ts, 84, 1), Decl(anyAssignableToEveryType2.ts, 87, 16)) + + foo: any; +>foo : Symbol(foo, Decl(anyAssignableToEveryType2.ts, 92, 26)) +} + + +class c { baz: string } +>c : Symbol(c, Decl(anyAssignableToEveryType2.ts, 94, 1), Decl(anyAssignableToEveryType2.ts, 97, 23)) +>baz : Symbol(baz, Decl(anyAssignableToEveryType2.ts, 97, 9)) + +module c { +>c : Symbol(c, Decl(anyAssignableToEveryType2.ts, 94, 1), Decl(anyAssignableToEveryType2.ts, 97, 23)) + + export var bar = 1; +>bar : Symbol(bar, Decl(anyAssignableToEveryType2.ts, 99, 14)) +} +interface I16 { +>I16 : Symbol(I16, Decl(anyAssignableToEveryType2.ts, 100, 1)) + + [x: string]: typeof c; +>x : Symbol(x, Decl(anyAssignableToEveryType2.ts, 102, 5)) +>c : Symbol(c, Decl(anyAssignableToEveryType2.ts, 94, 1), Decl(anyAssignableToEveryType2.ts, 97, 23)) + + foo: any; +>foo : Symbol(foo, Decl(anyAssignableToEveryType2.ts, 102, 26)) +} + + +interface I17 { +>I17 : Symbol(I17, Decl(anyAssignableToEveryType2.ts, 104, 1)) +>T : Symbol(T, Decl(anyAssignableToEveryType2.ts, 107, 14)) + + [x: string]: T; +>x : Symbol(x, Decl(anyAssignableToEveryType2.ts, 108, 5)) +>T : Symbol(T, Decl(anyAssignableToEveryType2.ts, 107, 14)) + + foo: any; +>foo : Symbol(foo, Decl(anyAssignableToEveryType2.ts, 108, 19)) +} + + +interface I18 { +>I18 : Symbol(I18, Decl(anyAssignableToEveryType2.ts, 110, 1)) +>T : Symbol(T, Decl(anyAssignableToEveryType2.ts, 113, 14)) +>U : Symbol(U, Decl(anyAssignableToEveryType2.ts, 113, 16)) +>T : Symbol(T, Decl(anyAssignableToEveryType2.ts, 113, 14)) + + [x: string]: U; +>x : Symbol(x, Decl(anyAssignableToEveryType2.ts, 114, 5)) +>U : Symbol(U, Decl(anyAssignableToEveryType2.ts, 113, 16)) + + foo: any; +>foo : Symbol(foo, Decl(anyAssignableToEveryType2.ts, 114, 19)) +} + + +interface I19 { +>I19 : Symbol(I19, Decl(anyAssignableToEveryType2.ts, 116, 1)) + + [x: string]: Object; +>x : Symbol(x, Decl(anyAssignableToEveryType2.ts, 120, 5)) +>Object : Symbol(Object, Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --)) + + foo: any; +>foo : Symbol(foo, Decl(anyAssignableToEveryType2.ts, 120, 24)) +} + + +interface I20 { +>I20 : Symbol(I20, Decl(anyAssignableToEveryType2.ts, 122, 1)) + + [x: string]: {}; +>x : Symbol(x, Decl(anyAssignableToEveryType2.ts, 126, 5)) + + foo: any; +>foo : Symbol(foo, Decl(anyAssignableToEveryType2.ts, 126, 20)) +} + diff --git a/tests/baselines/reference/anyAssignableToEveryType2.types b/tests/baselines/reference/anyAssignableToEveryType2.types new file mode 100644 index 00000000000..b3f54211601 --- /dev/null +++ b/tests/baselines/reference/anyAssignableToEveryType2.types @@ -0,0 +1,276 @@ +=== tests/cases/conformance/types/typeRelationships/assignmentCompatibility/anyAssignableToEveryType2.ts === +// any is not a subtype of any other types, but is assignable, all the below should work + +interface I { +>I : I + + [x: string]: any; +>x : string + + foo: any; // ok, any identical to itself +>foo : any +} + + +interface I2 { +>I2 : I2 + + [x: string]: number; +>x : string + + foo: any; +>foo : any +} + + +interface I3 { +>I3 : I3 + + [x: string]: string; +>x : string + + foo: any; +>foo : any +} + + +interface I4 { +>I4 : I4 + + [x: string]: boolean; +>x : string + + foo: any; +>foo : any +} + + +interface I5 { +>I5 : I5 + + [x: string]: Date; +>x : string +>Date : Date + + foo: any; +>foo : any +} + + +interface I6 { +>I6 : I6 + + [x: string]: RegExp; +>x : string +>RegExp : RegExp + + foo: any; +>foo : any +} + + +interface I7 { +>I7 : I7 + + [x: string]: { bar: number }; +>x : string +>bar : number + + foo: any; +>foo : any +} + + +interface I8 { +>I8 : I8 + + [x: string]: number[]; +>x : string + + foo: any; +>foo : any +} + + +interface I9 { +>I9 : I9 + + [x: string]: I8; +>x : string +>I8 : I8 + + foo: any; +>foo : any +} + +class A { foo: number; } +>A : A +>foo : number + +interface I10 { +>I10 : I10 + + [x: string]: A; +>x : string +>A : A + + foo: any; +>foo : any +} + +class A2 { foo: T; } +>A2 : A2 +>T : T +>foo : T +>T : T + +interface I11 { +>I11 : I11 + + [x: string]: A2; +>x : string +>A2 : A2 + + foo: any; +>foo : any +} + + +interface I12 { +>I12 : I12 + + [x: string]: (x) => number; +>x : string +>x : any + + foo: any; +>foo : any +} + + +interface I13 { +>I13 : I13 + + [x: string]: (x: T) => T; +>x : string +>T : T +>x : T +>T : T +>T : T + + foo: any; +>foo : any +} + + +enum E { A } +>E : E +>A : E + +interface I14 { +>I14 : I14 + + [x: string]: E; +>x : string +>E : E + + foo: any; +>foo : any +} + + +function f() { } +>f : typeof f + +module f { +>f : typeof f + + export var bar = 1; +>bar : number +>1 : number +} +interface I15 { +>I15 : I15 + + [x: string]: typeof f; +>x : string +>f : typeof f + + foo: any; +>foo : any +} + + +class c { baz: string } +>c : c +>baz : string + +module c { +>c : typeof c + + export var bar = 1; +>bar : number +>1 : number +} +interface I16 { +>I16 : I16 + + [x: string]: typeof c; +>x : string +>c : typeof c + + foo: any; +>foo : any +} + + +interface I17 { +>I17 : I17 +>T : T + + [x: string]: T; +>x : string +>T : T + + foo: any; +>foo : any +} + + +interface I18 { +>I18 : I18 +>T : T +>U : U +>T : T + + [x: string]: U; +>x : string +>U : U + + foo: any; +>foo : any +} + + +interface I19 { +>I19 : I19 + + [x: string]: Object; +>x : string +>Object : Object + + foo: any; +>foo : any +} + + +interface I20 { +>I20 : I20 + + [x: string]: {}; +>x : string + + foo: any; +>foo : any +} + diff --git a/tests/baselines/reference/assertInWrapSomeTypeParameter.errors.txt b/tests/baselines/reference/assertInWrapSomeTypeParameter.errors.txt index c5492e42e42..a7d1630c50e 100644 --- a/tests/baselines/reference/assertInWrapSomeTypeParameter.errors.txt +++ b/tests/baselines/reference/assertInWrapSomeTypeParameter.errors.txt @@ -1,11 +1,8 @@ -tests/cases/compiler/assertInWrapSomeTypeParameter.ts(1,9): error TS2313: Constraint of a type parameter cannot reference any type parameter from the same type parameter list. tests/cases/compiler/assertInWrapSomeTypeParameter.ts(2,26): error TS1005: '>' expected. -==== tests/cases/compiler/assertInWrapSomeTypeParameter.ts (2 errors) ==== +==== tests/cases/compiler/assertInWrapSomeTypeParameter.ts (1 errors) ==== class C> { - ~~~~~~~~~~~~~~ -!!! error TS2313: Constraint of a type parameter cannot reference any type parameter from the same type parameter list. foo>(x: U) { ~ !!! error TS1005: '>' expected. diff --git a/tests/baselines/reference/assignmentCompatWithGenericCallSignatures4.errors.txt b/tests/baselines/reference/assignmentCompatWithGenericCallSignatures4.errors.txt deleted file mode 100644 index bc82b0fa69c..00000000000 --- a/tests/baselines/reference/assignmentCompatWithGenericCallSignatures4.errors.txt +++ /dev/null @@ -1,22 +0,0 @@ -tests/cases/conformance/types/typeRelationships/assignmentCompatibility/assignmentCompatWithGenericCallSignatures4.ts(7,9): error TS2313: Constraint of a type parameter cannot reference any type parameter from the same type parameter list. -tests/cases/conformance/types/typeRelationships/assignmentCompatibility/assignmentCompatWithGenericCallSignatures4.ts(8,9): error TS2313: Constraint of a type parameter cannot reference any type parameter from the same type parameter list. - - -==== tests/cases/conformance/types/typeRelationships/assignmentCompatibility/assignmentCompatWithGenericCallSignatures4.ts (2 errors) ==== - // some complex cases of assignment compat of generic signatures. - - interface I2 { - p: T - } - - var x: >(z: T) => void - ~~~~~~~~~~~~~~~ -!!! error TS2313: Constraint of a type parameter cannot reference any type parameter from the same type parameter list. - var y: >>(z: T) => void - ~~~~~~~~~~~~~~~~~~~ -!!! error TS2313: Constraint of a type parameter cannot reference any type parameter from the same type parameter list. - - // These both do not make sense as we would eventually be comparing I2 to I2>, and they are self referencing anyway - x = y - y = x - \ No newline at end of file diff --git a/tests/baselines/reference/assignmentCompatWithGenericCallSignatures4.symbols b/tests/baselines/reference/assignmentCompatWithGenericCallSignatures4.symbols new file mode 100644 index 00000000000..bcea8fbbb27 --- /dev/null +++ b/tests/baselines/reference/assignmentCompatWithGenericCallSignatures4.symbols @@ -0,0 +1,38 @@ +=== tests/cases/conformance/types/typeRelationships/assignmentCompatibility/assignmentCompatWithGenericCallSignatures4.ts === +// some complex cases of assignment compat of generic signatures. + +interface I2 { +>I2 : Symbol(I2, Decl(assignmentCompatWithGenericCallSignatures4.ts, 0, 0)) +>T : Symbol(T, Decl(assignmentCompatWithGenericCallSignatures4.ts, 2, 13)) + + p: T +>p : Symbol(p, Decl(assignmentCompatWithGenericCallSignatures4.ts, 2, 17)) +>T : Symbol(T, Decl(assignmentCompatWithGenericCallSignatures4.ts, 2, 13)) +} + +var x: >(z: T) => void +>x : Symbol(x, Decl(assignmentCompatWithGenericCallSignatures4.ts, 6, 3)) +>T : Symbol(T, Decl(assignmentCompatWithGenericCallSignatures4.ts, 6, 8)) +>I2 : Symbol(I2, Decl(assignmentCompatWithGenericCallSignatures4.ts, 0, 0)) +>T : Symbol(T, Decl(assignmentCompatWithGenericCallSignatures4.ts, 6, 8)) +>z : Symbol(z, Decl(assignmentCompatWithGenericCallSignatures4.ts, 6, 25)) +>T : Symbol(T, Decl(assignmentCompatWithGenericCallSignatures4.ts, 6, 8)) + +var y: >>(z: T) => void +>y : Symbol(y, Decl(assignmentCompatWithGenericCallSignatures4.ts, 7, 3)) +>T : Symbol(T, Decl(assignmentCompatWithGenericCallSignatures4.ts, 7, 8)) +>I2 : Symbol(I2, Decl(assignmentCompatWithGenericCallSignatures4.ts, 0, 0)) +>I2 : Symbol(I2, Decl(assignmentCompatWithGenericCallSignatures4.ts, 0, 0)) +>T : Symbol(T, Decl(assignmentCompatWithGenericCallSignatures4.ts, 7, 8)) +>z : Symbol(z, Decl(assignmentCompatWithGenericCallSignatures4.ts, 7, 29)) +>T : Symbol(T, Decl(assignmentCompatWithGenericCallSignatures4.ts, 7, 8)) + +// These both do not make sense as we would eventually be comparing I2 to I2>, and they are self referencing anyway +x = y +>x : Symbol(x, Decl(assignmentCompatWithGenericCallSignatures4.ts, 6, 3)) +>y : Symbol(y, Decl(assignmentCompatWithGenericCallSignatures4.ts, 7, 3)) + +y = x +>y : Symbol(y, Decl(assignmentCompatWithGenericCallSignatures4.ts, 7, 3)) +>x : Symbol(x, Decl(assignmentCompatWithGenericCallSignatures4.ts, 6, 3)) + diff --git a/tests/baselines/reference/assignmentCompatWithGenericCallSignatures4.types b/tests/baselines/reference/assignmentCompatWithGenericCallSignatures4.types new file mode 100644 index 00000000000..38485a78463 --- /dev/null +++ b/tests/baselines/reference/assignmentCompatWithGenericCallSignatures4.types @@ -0,0 +1,40 @@ +=== tests/cases/conformance/types/typeRelationships/assignmentCompatibility/assignmentCompatWithGenericCallSignatures4.ts === +// some complex cases of assignment compat of generic signatures. + +interface I2 { +>I2 : I2 +>T : T + + p: T +>p : T +>T : T +} + +var x: >(z: T) => void +>x : >(z: T) => void +>T : T +>I2 : I2 +>T : T +>z : T +>T : T + +var y: >>(z: T) => void +>y : >>(z: T) => void +>T : T +>I2 : I2 +>I2 : I2 +>T : T +>z : T +>T : T + +// These both do not make sense as we would eventually be comparing I2 to I2>, and they are self referencing anyway +x = y +>x = y : >>(z: T) => void +>x : >(z: T) => void +>y : >>(z: T) => void + +y = x +>y = x : >(z: T) => void +>y : >>(z: T) => void +>x : >(z: T) => void + diff --git a/tests/baselines/reference/assignmentStricterConstraints.errors.txt b/tests/baselines/reference/assignmentStricterConstraints.errors.txt deleted file mode 100644 index bf3751dda74..00000000000 --- a/tests/baselines/reference/assignmentStricterConstraints.errors.txt +++ /dev/null @@ -1,18 +0,0 @@ -tests/cases/compiler/assignmentStricterConstraints.ts(1,22): error TS2313: Constraint of a type parameter cannot reference any type parameter from the same type parameter list. -tests/cases/compiler/assignmentStricterConstraints.ts(2,5): error TS2322: Type 'S' is not assignable to type 'T'. - - -==== tests/cases/compiler/assignmentStricterConstraints.ts (2 errors) ==== - var f = function (x: T, y: S): void { - ~~~~~~~~~~~ -!!! error TS2313: Constraint of a type parameter cannot reference any type parameter from the same type parameter list. - x = y - ~ -!!! error TS2322: Type 'S' is not assignable to type 'T'. - } - - var g = function (x: T, y: S): void { } - - g = f - g(1, "") - \ No newline at end of file diff --git a/tests/baselines/reference/assignmentStricterConstraints.symbols b/tests/baselines/reference/assignmentStricterConstraints.symbols new file mode 100644 index 00000000000..aba29bf3e5b --- /dev/null +++ b/tests/baselines/reference/assignmentStricterConstraints.symbols @@ -0,0 +1,32 @@ +=== tests/cases/compiler/assignmentStricterConstraints.ts === +var f = function (x: T, y: S): void { +>f : Symbol(f, Decl(assignmentStricterConstraints.ts, 0, 3)) +>T : Symbol(T, Decl(assignmentStricterConstraints.ts, 0, 18)) +>S : Symbol(S, Decl(assignmentStricterConstraints.ts, 0, 20)) +>T : Symbol(T, Decl(assignmentStricterConstraints.ts, 0, 18)) +>x : Symbol(x, Decl(assignmentStricterConstraints.ts, 0, 34)) +>T : Symbol(T, Decl(assignmentStricterConstraints.ts, 0, 18)) +>y : Symbol(y, Decl(assignmentStricterConstraints.ts, 0, 39)) +>S : Symbol(S, Decl(assignmentStricterConstraints.ts, 0, 20)) + + x = y +>x : Symbol(x, Decl(assignmentStricterConstraints.ts, 0, 34)) +>y : Symbol(y, Decl(assignmentStricterConstraints.ts, 0, 39)) +} + +var g = function (x: T, y: S): void { } +>g : Symbol(g, Decl(assignmentStricterConstraints.ts, 4, 3)) +>T : Symbol(T, Decl(assignmentStricterConstraints.ts, 4, 18)) +>S : Symbol(S, Decl(assignmentStricterConstraints.ts, 4, 20)) +>x : Symbol(x, Decl(assignmentStricterConstraints.ts, 4, 24)) +>T : Symbol(T, Decl(assignmentStricterConstraints.ts, 4, 18)) +>y : Symbol(y, Decl(assignmentStricterConstraints.ts, 4, 29)) +>S : Symbol(S, Decl(assignmentStricterConstraints.ts, 4, 20)) + +g = f +>g : Symbol(g, Decl(assignmentStricterConstraints.ts, 4, 3)) +>f : Symbol(f, Decl(assignmentStricterConstraints.ts, 0, 3)) + +g(1, "") +>g : Symbol(g, Decl(assignmentStricterConstraints.ts, 4, 3)) + diff --git a/tests/baselines/reference/assignmentStricterConstraints.types b/tests/baselines/reference/assignmentStricterConstraints.types new file mode 100644 index 00000000000..3a72d92f51c --- /dev/null +++ b/tests/baselines/reference/assignmentStricterConstraints.types @@ -0,0 +1,39 @@ +=== tests/cases/compiler/assignmentStricterConstraints.ts === +var f = function (x: T, y: S): void { +>f : (x: T, y: S) => void +>function (x: T, y: S): void { x = y} : (x: T, y: S) => void +>T : T +>S : S +>T : T +>x : T +>T : T +>y : S +>S : S + + x = y +>x = y : S +>x : T +>y : S +} + +var g = function (x: T, y: S): void { } +>g : (x: T, y: S) => void +>function (x: T, y: S): void { } : (x: T, y: S) => void +>T : T +>S : S +>x : T +>T : T +>y : S +>S : S + +g = f +>g = f : (x: T, y: S) => void +>g : (x: T, y: S) => void +>f : (x: T, y: S) => void + +g(1, "") +>g(1, "") : void +>g : (x: T, y: S) => void +>1 : number +>"" : string + diff --git a/tests/baselines/reference/bestCommonTypeOfConditionalExpressions2.errors.txt b/tests/baselines/reference/bestCommonTypeOfConditionalExpressions2.errors.txt deleted file mode 100644 index 83f4678c8f3..00000000000 --- a/tests/baselines/reference/bestCommonTypeOfConditionalExpressions2.errors.txt +++ /dev/null @@ -1,36 +0,0 @@ -tests/cases/conformance/types/typeRelationships/bestCommonType/bestCommonTypeOfConditionalExpressions2.ts(18,15): error TS2313: Constraint of a type parameter cannot reference any type parameter from the same type parameter list. -tests/cases/conformance/types/typeRelationships/bestCommonType/bestCommonTypeOfConditionalExpressions2.ts(22,15): error TS2313: Constraint of a type parameter cannot reference any type parameter from the same type parameter list. -tests/cases/conformance/types/typeRelationships/bestCommonType/bestCommonTypeOfConditionalExpressions2.ts(22,28): error TS2313: Constraint of a type parameter cannot reference any type parameter from the same type parameter list. - - -==== tests/cases/conformance/types/typeRelationships/bestCommonType/bestCommonTypeOfConditionalExpressions2.ts (3 errors) ==== - // conditional expressions return the best common type of the branches plus contextual type (using the first candidate if multiple BCTs exist) - // these are errors - - class Base { foo: string; } - class Derived extends Base { bar: string; } - class Derived2 extends Base { baz: string; } - var base: Base; - var derived: Derived; - var derived2: Derived2; - - var r2 = true ? 1 : ''; - var r9 = true ? derived : derived2; - - function foo(t: T, u: U) { - return true ? t : u; - } - - function foo2(t: T, u: U) { // Error for referencing own type parameter - ~~~~~~~~~~~ -!!! error TS2313: Constraint of a type parameter cannot reference any type parameter from the same type parameter list. - return true ? t : u; // Ok because BCT(T, U) = U - } - - function foo3(t: T, u: U) { - ~~~~~~~~~~~ -!!! error TS2313: Constraint of a type parameter cannot reference any type parameter from the same type parameter list. - ~~~~~~~~~~~ -!!! error TS2313: Constraint of a type parameter cannot reference any type parameter from the same type parameter list. - return true ? t : u; - } \ No newline at end of file diff --git a/tests/baselines/reference/bestCommonTypeOfConditionalExpressions2.symbols b/tests/baselines/reference/bestCommonTypeOfConditionalExpressions2.symbols new file mode 100644 index 00000000000..68103761051 --- /dev/null +++ b/tests/baselines/reference/bestCommonTypeOfConditionalExpressions2.symbols @@ -0,0 +1,83 @@ +=== tests/cases/conformance/types/typeRelationships/bestCommonType/bestCommonTypeOfConditionalExpressions2.ts === +// conditional expressions return the best common type of the branches plus contextual type (using the first candidate if multiple BCTs exist) +// these are errors + +class Base { foo: string; } +>Base : Symbol(Base, Decl(bestCommonTypeOfConditionalExpressions2.ts, 0, 0)) +>foo : Symbol(foo, Decl(bestCommonTypeOfConditionalExpressions2.ts, 3, 12)) + +class Derived extends Base { bar: string; } +>Derived : Symbol(Derived, Decl(bestCommonTypeOfConditionalExpressions2.ts, 3, 27)) +>Base : Symbol(Base, Decl(bestCommonTypeOfConditionalExpressions2.ts, 0, 0)) +>bar : Symbol(bar, Decl(bestCommonTypeOfConditionalExpressions2.ts, 4, 28)) + +class Derived2 extends Base { baz: string; } +>Derived2 : Symbol(Derived2, Decl(bestCommonTypeOfConditionalExpressions2.ts, 4, 43)) +>Base : Symbol(Base, Decl(bestCommonTypeOfConditionalExpressions2.ts, 0, 0)) +>baz : Symbol(baz, Decl(bestCommonTypeOfConditionalExpressions2.ts, 5, 29)) + +var base: Base; +>base : Symbol(base, Decl(bestCommonTypeOfConditionalExpressions2.ts, 6, 3)) +>Base : Symbol(Base, Decl(bestCommonTypeOfConditionalExpressions2.ts, 0, 0)) + +var derived: Derived; +>derived : Symbol(derived, Decl(bestCommonTypeOfConditionalExpressions2.ts, 7, 3)) +>Derived : Symbol(Derived, Decl(bestCommonTypeOfConditionalExpressions2.ts, 3, 27)) + +var derived2: Derived2; +>derived2 : Symbol(derived2, Decl(bestCommonTypeOfConditionalExpressions2.ts, 8, 3)) +>Derived2 : Symbol(Derived2, Decl(bestCommonTypeOfConditionalExpressions2.ts, 4, 43)) + +var r2 = true ? 1 : ''; +>r2 : Symbol(r2, Decl(bestCommonTypeOfConditionalExpressions2.ts, 10, 3)) + +var r9 = true ? derived : derived2; +>r9 : Symbol(r9, Decl(bestCommonTypeOfConditionalExpressions2.ts, 11, 3)) +>derived : Symbol(derived, Decl(bestCommonTypeOfConditionalExpressions2.ts, 7, 3)) +>derived2 : Symbol(derived2, Decl(bestCommonTypeOfConditionalExpressions2.ts, 8, 3)) + +function foo(t: T, u: U) { +>foo : Symbol(foo, Decl(bestCommonTypeOfConditionalExpressions2.ts, 11, 35)) +>T : Symbol(T, Decl(bestCommonTypeOfConditionalExpressions2.ts, 13, 13)) +>U : Symbol(U, Decl(bestCommonTypeOfConditionalExpressions2.ts, 13, 15)) +>t : Symbol(t, Decl(bestCommonTypeOfConditionalExpressions2.ts, 13, 19)) +>T : Symbol(T, Decl(bestCommonTypeOfConditionalExpressions2.ts, 13, 13)) +>u : Symbol(u, Decl(bestCommonTypeOfConditionalExpressions2.ts, 13, 24)) +>U : Symbol(U, Decl(bestCommonTypeOfConditionalExpressions2.ts, 13, 15)) + + return true ? t : u; +>t : Symbol(t, Decl(bestCommonTypeOfConditionalExpressions2.ts, 13, 19)) +>u : Symbol(u, Decl(bestCommonTypeOfConditionalExpressions2.ts, 13, 24)) +} + +function foo2(t: T, u: U) { // Error for referencing own type parameter +>foo2 : Symbol(foo2, Decl(bestCommonTypeOfConditionalExpressions2.ts, 15, 1)) +>T : Symbol(T, Decl(bestCommonTypeOfConditionalExpressions2.ts, 17, 14)) +>U : Symbol(U, Decl(bestCommonTypeOfConditionalExpressions2.ts, 17, 26)) +>U : Symbol(U, Decl(bestCommonTypeOfConditionalExpressions2.ts, 17, 26)) +>t : Symbol(t, Decl(bestCommonTypeOfConditionalExpressions2.ts, 17, 30)) +>T : Symbol(T, Decl(bestCommonTypeOfConditionalExpressions2.ts, 17, 14)) +>u : Symbol(u, Decl(bestCommonTypeOfConditionalExpressions2.ts, 17, 35)) +>U : Symbol(U, Decl(bestCommonTypeOfConditionalExpressions2.ts, 17, 26)) + + return true ? t : u; // Ok because BCT(T, U) = U +>t : Symbol(t, Decl(bestCommonTypeOfConditionalExpressions2.ts, 17, 30)) +>u : Symbol(u, Decl(bestCommonTypeOfConditionalExpressions2.ts, 17, 35)) +} + +function foo3(t: T, u: U) { +>foo3 : Symbol(foo3, Decl(bestCommonTypeOfConditionalExpressions2.ts, 19, 1)) +>T : Symbol(T, Decl(bestCommonTypeOfConditionalExpressions2.ts, 21, 14)) +>U : Symbol(U, Decl(bestCommonTypeOfConditionalExpressions2.ts, 21, 26)) +>U : Symbol(U, Decl(bestCommonTypeOfConditionalExpressions2.ts, 21, 26)) +>V : Symbol(V, Decl(bestCommonTypeOfConditionalExpressions2.ts, 21, 39)) +>V : Symbol(V, Decl(bestCommonTypeOfConditionalExpressions2.ts, 21, 39)) +>t : Symbol(t, Decl(bestCommonTypeOfConditionalExpressions2.ts, 21, 43)) +>T : Symbol(T, Decl(bestCommonTypeOfConditionalExpressions2.ts, 21, 14)) +>u : Symbol(u, Decl(bestCommonTypeOfConditionalExpressions2.ts, 21, 48)) +>U : Symbol(U, Decl(bestCommonTypeOfConditionalExpressions2.ts, 21, 26)) + + return true ? t : u; +>t : Symbol(t, Decl(bestCommonTypeOfConditionalExpressions2.ts, 21, 43)) +>u : Symbol(u, Decl(bestCommonTypeOfConditionalExpressions2.ts, 21, 48)) +} diff --git a/tests/baselines/reference/bestCommonTypeOfConditionalExpressions2.types b/tests/baselines/reference/bestCommonTypeOfConditionalExpressions2.types new file mode 100644 index 00000000000..ef9ecfb2a11 --- /dev/null +++ b/tests/baselines/reference/bestCommonTypeOfConditionalExpressions2.types @@ -0,0 +1,95 @@ +=== tests/cases/conformance/types/typeRelationships/bestCommonType/bestCommonTypeOfConditionalExpressions2.ts === +// conditional expressions return the best common type of the branches plus contextual type (using the first candidate if multiple BCTs exist) +// these are errors + +class Base { foo: string; } +>Base : Base +>foo : string + +class Derived extends Base { bar: string; } +>Derived : Derived +>Base : Base +>bar : string + +class Derived2 extends Base { baz: string; } +>Derived2 : Derived2 +>Base : Base +>baz : string + +var base: Base; +>base : Base +>Base : Base + +var derived: Derived; +>derived : Derived +>Derived : Derived + +var derived2: Derived2; +>derived2 : Derived2 +>Derived2 : Derived2 + +var r2 = true ? 1 : ''; +>r2 : number | string +>true ? 1 : '' : number | string +>true : boolean +>1 : number +>'' : string + +var r9 = true ? derived : derived2; +>r9 : Derived | Derived2 +>true ? derived : derived2 : Derived | Derived2 +>true : boolean +>derived : Derived +>derived2 : Derived2 + +function foo(t: T, u: U) { +>foo : (t: T, u: U) => T | U +>T : T +>U : U +>t : T +>T : T +>u : U +>U : U + + return true ? t : u; +>true ? t : u : T | U +>true : boolean +>t : T +>u : U +} + +function foo2(t: T, u: U) { // Error for referencing own type parameter +>foo2 : (t: T, u: U) => U +>T : T +>U : U +>U : U +>t : T +>T : T +>u : U +>U : U + + return true ? t : u; // Ok because BCT(T, U) = U +>true ? t : u : U +>true : boolean +>t : T +>u : U +} + +function foo3(t: T, u: U) { +>foo3 : (t: T, u: U) => U +>T : T +>U : U +>U : U +>V : V +>V : V +>t : T +>T : T +>u : U +>U : U + + return true ? t : u; +>true ? t : u : U +>true : boolean +>t : T +>u : U +} diff --git a/tests/baselines/reference/comparisonOperatorWithNoRelationshipObjectsOnInstantiatedCallSignature.errors.txt b/tests/baselines/reference/comparisonOperatorWithNoRelationshipObjectsOnInstantiatedCallSignature.errors.txt deleted file mode 100644 index 908f97345a1..00000000000 --- a/tests/baselines/reference/comparisonOperatorWithNoRelationshipObjectsOnInstantiatedCallSignature.errors.txt +++ /dev/null @@ -1,155 +0,0 @@ -tests/cases/conformance/expressions/binaryOperators/comparisonOperator/comparisonOperatorWithNoRelationshipObjectsOnInstantiatedCallSignature.ts(28,17): error TS2313: Constraint of a type parameter cannot reference any type parameter from the same type parameter list. - - -==== tests/cases/conformance/expressions/binaryOperators/comparisonOperator/comparisonOperatorWithNoRelationshipObjectsOnInstantiatedCallSignature.ts (1 errors) ==== - class Base { - public a: string; - } - - class Derived extends Base { - public b: string; - } - - class C { - public c: string; - } - - var a1: { fn(x: T): T }; - var b1: { fn(): string }; - - var a2: { fn(x: T): T }; - var b2: { fn(x: string): number }; - - var a3: { fn(x?: T): T }; - var b3: { fn(x?: string): number }; - - var a4: { fn(...x: T[]): T }; - var b4: { fn(...x: string[]): number }; - - var a5: { fn(x: T, y: T): T }; - var b5: { fn(x: string, y: number): string }; - - var a6: { fn(x: T, y: U): T }; - ~~~~~~~~~~~ -!!! error TS2313: Constraint of a type parameter cannot reference any type parameter from the same type parameter list. - var b6: { fn(x: Base, y: C): Base }; - - // operator < - var r1a1 = a1 < b1; - var r1a2 = a2 < b2; - var r1a3 = a3 < b3; - var r1a4 = a4 < b4; - var r1a5 = a5 < b5; - var r1a6 = a6 < b6; - - var r1b1 = b1 < a1; - var r1b2 = b2 < a2; - var r1b3 = b3 < a3; - var r1b4 = b4 < a4; - var r1b5 = b5 < a5; - var r1b6 = b6 < a6; - - // operator > - var r2a1 = a1 > b1; - var r2a2 = a2 > b2; - var r2a3 = a3 > b3; - var r2a4 = a4 > b4; - var r2a5 = a5 > b5; - var r2a6 = a6 > b6; - - var r2b1 = b1 > a1; - var r2b2 = b2 > a2; - var r2b3 = b3 > a3; - var r2b4 = b4 > a4; - var r2b5 = b5 > a5; - var r2b6 = b6 > a6; - - // operator <= - var r3a1 = a1 <= b1; - var r3a2 = a2 <= b2; - var r3a3 = a3 <= b3; - var r3a4 = a4 <= b4; - var r3a5 = a5 <= b5; - var r3a6 = a6 <= b6; - - var r3b1 = b1 <= a1; - var r3b2 = b2 <= a2; - var r3b3 = b3 <= a3; - var r3b4 = b4 <= a4; - var r3b5 = b5 <= a5; - var r3b6 = b6 <= a6; - - // operator >= - var r4a1 = a1 >= b1; - var r4a2 = a2 >= b2; - var r4a3 = a3 >= b3; - var r4a4 = a4 >= b4; - var r4a5 = a5 >= b5; - var r4a6 = a6 >= b6; - - var r4b1 = b1 >= a1; - var r4b2 = b2 >= a2; - var r4b3 = b3 >= a3; - var r4b4 = b4 >= a4; - var r4b5 = b5 >= a5; - var r4b6 = b6 >= a6; - - // operator == - var r5a1 = a1 == b1; - var r5a2 = a2 == b2; - var r5a3 = a3 == b3; - var r5a4 = a4 == b4; - var r5a5 = a5 == b5; - var r5a6 = a6 == b6; - - var r5b1 = b1 == a1; - var r5b2 = b2 == a2; - var r5b3 = b3 == a3; - var r5b4 = b4 == a4; - var r5b5 = b5 == a5; - var r5b6 = b6 == a6; - - // operator != - var r6a1 = a1 != b1; - var r6a2 = a2 != b2; - var r6a3 = a3 != b3; - var r6a4 = a4 != b4; - var r6a5 = a5 != b5; - var r6a6 = a6 != b6; - - var r6b1 = b1 != a1; - var r6b2 = b2 != a2; - var r6b3 = b3 != a3; - var r6b4 = b4 != a4; - var r6b5 = b5 != a5; - var r6b6 = b6 != a6; - - // operator === - var r7a1 = a1 === b1; - var r7a2 = a2 === b2; - var r7a3 = a3 === b3; - var r7a4 = a4 === b4; - var r7a5 = a5 === b5; - var r7a6 = a6 === b6; - - var r7b1 = b1 === a1; - var r7b2 = b2 === a2; - var r7b3 = b3 === a3; - var r7b4 = b4 === a4; - var r7b5 = b5 === a5; - var r7b6 = b6 === a6; - - // operator !== - var r8a1 = a1 !== b1; - var r8a2 = a2 !== b2; - var r8a3 = a3 !== b3; - var r8a4 = a4 !== b4; - var r8a5 = a5 !== b5; - var r8a6 = a6 !== b6; - - var r8b1 = b1 !== a1; - var r8b2 = b2 !== a2; - var r8b3 = b3 !== a3; - var r8b4 = b4 !== a4; - var r8b5 = b5 !== a5; - var r8b6 = b6 !== a6; \ No newline at end of file diff --git a/tests/baselines/reference/comparisonOperatorWithNoRelationshipObjectsOnInstantiatedCallSignature.symbols b/tests/baselines/reference/comparisonOperatorWithNoRelationshipObjectsOnInstantiatedCallSignature.symbols new file mode 100644 index 00000000000..ef92cdd676a --- /dev/null +++ b/tests/baselines/reference/comparisonOperatorWithNoRelationshipObjectsOnInstantiatedCallSignature.symbols @@ -0,0 +1,599 @@ +=== tests/cases/conformance/expressions/binaryOperators/comparisonOperator/comparisonOperatorWithNoRelationshipObjectsOnInstantiatedCallSignature.ts === +class Base { +>Base : Symbol(Base, Decl(comparisonOperatorWithNoRelationshipObjectsOnInstantiatedCallSignature.ts, 0, 0)) + + public a: string; +>a : Symbol(a, Decl(comparisonOperatorWithNoRelationshipObjectsOnInstantiatedCallSignature.ts, 0, 12)) +} + +class Derived extends Base { +>Derived : Symbol(Derived, Decl(comparisonOperatorWithNoRelationshipObjectsOnInstantiatedCallSignature.ts, 2, 1)) +>Base : Symbol(Base, Decl(comparisonOperatorWithNoRelationshipObjectsOnInstantiatedCallSignature.ts, 0, 0)) + + public b: string; +>b : Symbol(b, Decl(comparisonOperatorWithNoRelationshipObjectsOnInstantiatedCallSignature.ts, 4, 28)) +} + +class C { +>C : Symbol(C, Decl(comparisonOperatorWithNoRelationshipObjectsOnInstantiatedCallSignature.ts, 6, 1)) + + public c: string; +>c : Symbol(c, Decl(comparisonOperatorWithNoRelationshipObjectsOnInstantiatedCallSignature.ts, 8, 9)) +} + +var a1: { fn(x: T): T }; +>a1 : Symbol(a1, Decl(comparisonOperatorWithNoRelationshipObjectsOnInstantiatedCallSignature.ts, 12, 3)) +>fn : Symbol(fn, Decl(comparisonOperatorWithNoRelationshipObjectsOnInstantiatedCallSignature.ts, 12, 9)) +>T : Symbol(T, Decl(comparisonOperatorWithNoRelationshipObjectsOnInstantiatedCallSignature.ts, 12, 13)) +>x : Symbol(x, Decl(comparisonOperatorWithNoRelationshipObjectsOnInstantiatedCallSignature.ts, 12, 16)) +>T : Symbol(T, Decl(comparisonOperatorWithNoRelationshipObjectsOnInstantiatedCallSignature.ts, 12, 13)) +>T : Symbol(T, Decl(comparisonOperatorWithNoRelationshipObjectsOnInstantiatedCallSignature.ts, 12, 13)) + +var b1: { fn(): string }; +>b1 : Symbol(b1, Decl(comparisonOperatorWithNoRelationshipObjectsOnInstantiatedCallSignature.ts, 13, 3)) +>fn : Symbol(fn, Decl(comparisonOperatorWithNoRelationshipObjectsOnInstantiatedCallSignature.ts, 13, 9)) + +var a2: { fn(x: T): T }; +>a2 : Symbol(a2, Decl(comparisonOperatorWithNoRelationshipObjectsOnInstantiatedCallSignature.ts, 15, 3)) +>fn : Symbol(fn, Decl(comparisonOperatorWithNoRelationshipObjectsOnInstantiatedCallSignature.ts, 15, 9)) +>T : Symbol(T, Decl(comparisonOperatorWithNoRelationshipObjectsOnInstantiatedCallSignature.ts, 15, 13)) +>x : Symbol(x, Decl(comparisonOperatorWithNoRelationshipObjectsOnInstantiatedCallSignature.ts, 15, 16)) +>T : Symbol(T, Decl(comparisonOperatorWithNoRelationshipObjectsOnInstantiatedCallSignature.ts, 15, 13)) +>T : Symbol(T, Decl(comparisonOperatorWithNoRelationshipObjectsOnInstantiatedCallSignature.ts, 15, 13)) + +var b2: { fn(x: string): number }; +>b2 : Symbol(b2, Decl(comparisonOperatorWithNoRelationshipObjectsOnInstantiatedCallSignature.ts, 16, 3)) +>fn : Symbol(fn, Decl(comparisonOperatorWithNoRelationshipObjectsOnInstantiatedCallSignature.ts, 16, 9)) +>x : Symbol(x, Decl(comparisonOperatorWithNoRelationshipObjectsOnInstantiatedCallSignature.ts, 16, 13)) + +var a3: { fn(x?: T): T }; +>a3 : Symbol(a3, Decl(comparisonOperatorWithNoRelationshipObjectsOnInstantiatedCallSignature.ts, 18, 3)) +>fn : Symbol(fn, Decl(comparisonOperatorWithNoRelationshipObjectsOnInstantiatedCallSignature.ts, 18, 9)) +>T : Symbol(T, Decl(comparisonOperatorWithNoRelationshipObjectsOnInstantiatedCallSignature.ts, 18, 13)) +>x : Symbol(x, Decl(comparisonOperatorWithNoRelationshipObjectsOnInstantiatedCallSignature.ts, 18, 16)) +>T : Symbol(T, Decl(comparisonOperatorWithNoRelationshipObjectsOnInstantiatedCallSignature.ts, 18, 13)) +>T : Symbol(T, Decl(comparisonOperatorWithNoRelationshipObjectsOnInstantiatedCallSignature.ts, 18, 13)) + +var b3: { fn(x?: string): number }; +>b3 : Symbol(b3, Decl(comparisonOperatorWithNoRelationshipObjectsOnInstantiatedCallSignature.ts, 19, 3)) +>fn : Symbol(fn, Decl(comparisonOperatorWithNoRelationshipObjectsOnInstantiatedCallSignature.ts, 19, 9)) +>x : Symbol(x, Decl(comparisonOperatorWithNoRelationshipObjectsOnInstantiatedCallSignature.ts, 19, 13)) + +var a4: { fn(...x: T[]): T }; +>a4 : Symbol(a4, Decl(comparisonOperatorWithNoRelationshipObjectsOnInstantiatedCallSignature.ts, 21, 3)) +>fn : Symbol(fn, Decl(comparisonOperatorWithNoRelationshipObjectsOnInstantiatedCallSignature.ts, 21, 9)) +>T : Symbol(T, Decl(comparisonOperatorWithNoRelationshipObjectsOnInstantiatedCallSignature.ts, 21, 13)) +>x : Symbol(x, Decl(comparisonOperatorWithNoRelationshipObjectsOnInstantiatedCallSignature.ts, 21, 16)) +>T : Symbol(T, Decl(comparisonOperatorWithNoRelationshipObjectsOnInstantiatedCallSignature.ts, 21, 13)) +>T : Symbol(T, Decl(comparisonOperatorWithNoRelationshipObjectsOnInstantiatedCallSignature.ts, 21, 13)) + +var b4: { fn(...x: string[]): number }; +>b4 : Symbol(b4, Decl(comparisonOperatorWithNoRelationshipObjectsOnInstantiatedCallSignature.ts, 22, 3)) +>fn : Symbol(fn, Decl(comparisonOperatorWithNoRelationshipObjectsOnInstantiatedCallSignature.ts, 22, 9)) +>x : Symbol(x, Decl(comparisonOperatorWithNoRelationshipObjectsOnInstantiatedCallSignature.ts, 22, 13)) + +var a5: { fn(x: T, y: T): T }; +>a5 : Symbol(a5, Decl(comparisonOperatorWithNoRelationshipObjectsOnInstantiatedCallSignature.ts, 24, 3)) +>fn : Symbol(fn, Decl(comparisonOperatorWithNoRelationshipObjectsOnInstantiatedCallSignature.ts, 24, 9)) +>T : Symbol(T, Decl(comparisonOperatorWithNoRelationshipObjectsOnInstantiatedCallSignature.ts, 24, 13)) +>x : Symbol(x, Decl(comparisonOperatorWithNoRelationshipObjectsOnInstantiatedCallSignature.ts, 24, 16)) +>T : Symbol(T, Decl(comparisonOperatorWithNoRelationshipObjectsOnInstantiatedCallSignature.ts, 24, 13)) +>y : Symbol(y, Decl(comparisonOperatorWithNoRelationshipObjectsOnInstantiatedCallSignature.ts, 24, 21)) +>T : Symbol(T, Decl(comparisonOperatorWithNoRelationshipObjectsOnInstantiatedCallSignature.ts, 24, 13)) +>T : Symbol(T, Decl(comparisonOperatorWithNoRelationshipObjectsOnInstantiatedCallSignature.ts, 24, 13)) + +var b5: { fn(x: string, y: number): string }; +>b5 : Symbol(b5, Decl(comparisonOperatorWithNoRelationshipObjectsOnInstantiatedCallSignature.ts, 25, 3)) +>fn : Symbol(fn, Decl(comparisonOperatorWithNoRelationshipObjectsOnInstantiatedCallSignature.ts, 25, 9)) +>x : Symbol(x, Decl(comparisonOperatorWithNoRelationshipObjectsOnInstantiatedCallSignature.ts, 25, 13)) +>y : Symbol(y, Decl(comparisonOperatorWithNoRelationshipObjectsOnInstantiatedCallSignature.ts, 25, 23)) + +var a6: { fn(x: T, y: U): T }; +>a6 : Symbol(a6, Decl(comparisonOperatorWithNoRelationshipObjectsOnInstantiatedCallSignature.ts, 27, 3)) +>fn : Symbol(fn, Decl(comparisonOperatorWithNoRelationshipObjectsOnInstantiatedCallSignature.ts, 27, 9)) +>T : Symbol(T, Decl(comparisonOperatorWithNoRelationshipObjectsOnInstantiatedCallSignature.ts, 27, 13)) +>U : Symbol(U, Decl(comparisonOperatorWithNoRelationshipObjectsOnInstantiatedCallSignature.ts, 27, 15)) +>T : Symbol(T, Decl(comparisonOperatorWithNoRelationshipObjectsOnInstantiatedCallSignature.ts, 27, 13)) +>x : Symbol(x, Decl(comparisonOperatorWithNoRelationshipObjectsOnInstantiatedCallSignature.ts, 27, 29)) +>T : Symbol(T, Decl(comparisonOperatorWithNoRelationshipObjectsOnInstantiatedCallSignature.ts, 27, 13)) +>y : Symbol(y, Decl(comparisonOperatorWithNoRelationshipObjectsOnInstantiatedCallSignature.ts, 27, 34)) +>U : Symbol(U, Decl(comparisonOperatorWithNoRelationshipObjectsOnInstantiatedCallSignature.ts, 27, 15)) +>T : Symbol(T, Decl(comparisonOperatorWithNoRelationshipObjectsOnInstantiatedCallSignature.ts, 27, 13)) + +var b6: { fn(x: Base, y: C): Base }; +>b6 : Symbol(b6, Decl(comparisonOperatorWithNoRelationshipObjectsOnInstantiatedCallSignature.ts, 28, 3)) +>fn : Symbol(fn, Decl(comparisonOperatorWithNoRelationshipObjectsOnInstantiatedCallSignature.ts, 28, 9)) +>x : Symbol(x, Decl(comparisonOperatorWithNoRelationshipObjectsOnInstantiatedCallSignature.ts, 28, 13)) +>Base : Symbol(Base, Decl(comparisonOperatorWithNoRelationshipObjectsOnInstantiatedCallSignature.ts, 0, 0)) +>y : Symbol(y, Decl(comparisonOperatorWithNoRelationshipObjectsOnInstantiatedCallSignature.ts, 28, 21)) +>C : Symbol(C, Decl(comparisonOperatorWithNoRelationshipObjectsOnInstantiatedCallSignature.ts, 6, 1)) +>Base : Symbol(Base, Decl(comparisonOperatorWithNoRelationshipObjectsOnInstantiatedCallSignature.ts, 0, 0)) + +// operator < +var r1a1 = a1 < b1; +>r1a1 : Symbol(r1a1, Decl(comparisonOperatorWithNoRelationshipObjectsOnInstantiatedCallSignature.ts, 31, 3)) +>a1 : Symbol(a1, Decl(comparisonOperatorWithNoRelationshipObjectsOnInstantiatedCallSignature.ts, 12, 3)) +>b1 : Symbol(b1, Decl(comparisonOperatorWithNoRelationshipObjectsOnInstantiatedCallSignature.ts, 13, 3)) + +var r1a2 = a2 < b2; +>r1a2 : Symbol(r1a2, Decl(comparisonOperatorWithNoRelationshipObjectsOnInstantiatedCallSignature.ts, 32, 3)) +>a2 : Symbol(a2, Decl(comparisonOperatorWithNoRelationshipObjectsOnInstantiatedCallSignature.ts, 15, 3)) +>b2 : Symbol(b2, Decl(comparisonOperatorWithNoRelationshipObjectsOnInstantiatedCallSignature.ts, 16, 3)) + +var r1a3 = a3 < b3; +>r1a3 : Symbol(r1a3, Decl(comparisonOperatorWithNoRelationshipObjectsOnInstantiatedCallSignature.ts, 33, 3)) +>a3 : Symbol(a3, Decl(comparisonOperatorWithNoRelationshipObjectsOnInstantiatedCallSignature.ts, 18, 3)) +>b3 : Symbol(b3, Decl(comparisonOperatorWithNoRelationshipObjectsOnInstantiatedCallSignature.ts, 19, 3)) + +var r1a4 = a4 < b4; +>r1a4 : Symbol(r1a4, Decl(comparisonOperatorWithNoRelationshipObjectsOnInstantiatedCallSignature.ts, 34, 3)) +>a4 : Symbol(a4, Decl(comparisonOperatorWithNoRelationshipObjectsOnInstantiatedCallSignature.ts, 21, 3)) +>b4 : Symbol(b4, Decl(comparisonOperatorWithNoRelationshipObjectsOnInstantiatedCallSignature.ts, 22, 3)) + +var r1a5 = a5 < b5; +>r1a5 : Symbol(r1a5, Decl(comparisonOperatorWithNoRelationshipObjectsOnInstantiatedCallSignature.ts, 35, 3)) +>a5 : Symbol(a5, Decl(comparisonOperatorWithNoRelationshipObjectsOnInstantiatedCallSignature.ts, 24, 3)) +>b5 : Symbol(b5, Decl(comparisonOperatorWithNoRelationshipObjectsOnInstantiatedCallSignature.ts, 25, 3)) + +var r1a6 = a6 < b6; +>r1a6 : Symbol(r1a6, Decl(comparisonOperatorWithNoRelationshipObjectsOnInstantiatedCallSignature.ts, 36, 3)) +>a6 : Symbol(a6, Decl(comparisonOperatorWithNoRelationshipObjectsOnInstantiatedCallSignature.ts, 27, 3)) +>b6 : Symbol(b6, Decl(comparisonOperatorWithNoRelationshipObjectsOnInstantiatedCallSignature.ts, 28, 3)) + +var r1b1 = b1 < a1; +>r1b1 : Symbol(r1b1, Decl(comparisonOperatorWithNoRelationshipObjectsOnInstantiatedCallSignature.ts, 38, 3)) +>b1 : Symbol(b1, Decl(comparisonOperatorWithNoRelationshipObjectsOnInstantiatedCallSignature.ts, 13, 3)) +>a1 : Symbol(a1, Decl(comparisonOperatorWithNoRelationshipObjectsOnInstantiatedCallSignature.ts, 12, 3)) + +var r1b2 = b2 < a2; +>r1b2 : Symbol(r1b2, Decl(comparisonOperatorWithNoRelationshipObjectsOnInstantiatedCallSignature.ts, 39, 3)) +>b2 : Symbol(b2, Decl(comparisonOperatorWithNoRelationshipObjectsOnInstantiatedCallSignature.ts, 16, 3)) +>a2 : Symbol(a2, Decl(comparisonOperatorWithNoRelationshipObjectsOnInstantiatedCallSignature.ts, 15, 3)) + +var r1b3 = b3 < a3; +>r1b3 : Symbol(r1b3, Decl(comparisonOperatorWithNoRelationshipObjectsOnInstantiatedCallSignature.ts, 40, 3)) +>b3 : Symbol(b3, Decl(comparisonOperatorWithNoRelationshipObjectsOnInstantiatedCallSignature.ts, 19, 3)) +>a3 : Symbol(a3, Decl(comparisonOperatorWithNoRelationshipObjectsOnInstantiatedCallSignature.ts, 18, 3)) + +var r1b4 = b4 < a4; +>r1b4 : Symbol(r1b4, Decl(comparisonOperatorWithNoRelationshipObjectsOnInstantiatedCallSignature.ts, 41, 3)) +>b4 : Symbol(b4, Decl(comparisonOperatorWithNoRelationshipObjectsOnInstantiatedCallSignature.ts, 22, 3)) +>a4 : Symbol(a4, Decl(comparisonOperatorWithNoRelationshipObjectsOnInstantiatedCallSignature.ts, 21, 3)) + +var r1b5 = b5 < a5; +>r1b5 : Symbol(r1b5, Decl(comparisonOperatorWithNoRelationshipObjectsOnInstantiatedCallSignature.ts, 42, 3)) +>b5 : Symbol(b5, Decl(comparisonOperatorWithNoRelationshipObjectsOnInstantiatedCallSignature.ts, 25, 3)) +>a5 : Symbol(a5, Decl(comparisonOperatorWithNoRelationshipObjectsOnInstantiatedCallSignature.ts, 24, 3)) + +var r1b6 = b6 < a6; +>r1b6 : Symbol(r1b6, Decl(comparisonOperatorWithNoRelationshipObjectsOnInstantiatedCallSignature.ts, 43, 3)) +>b6 : Symbol(b6, Decl(comparisonOperatorWithNoRelationshipObjectsOnInstantiatedCallSignature.ts, 28, 3)) +>a6 : Symbol(a6, Decl(comparisonOperatorWithNoRelationshipObjectsOnInstantiatedCallSignature.ts, 27, 3)) + +// operator > +var r2a1 = a1 > b1; +>r2a1 : Symbol(r2a1, Decl(comparisonOperatorWithNoRelationshipObjectsOnInstantiatedCallSignature.ts, 46, 3)) +>a1 : Symbol(a1, Decl(comparisonOperatorWithNoRelationshipObjectsOnInstantiatedCallSignature.ts, 12, 3)) +>b1 : Symbol(b1, Decl(comparisonOperatorWithNoRelationshipObjectsOnInstantiatedCallSignature.ts, 13, 3)) + +var r2a2 = a2 > b2; +>r2a2 : Symbol(r2a2, Decl(comparisonOperatorWithNoRelationshipObjectsOnInstantiatedCallSignature.ts, 47, 3)) +>a2 : Symbol(a2, Decl(comparisonOperatorWithNoRelationshipObjectsOnInstantiatedCallSignature.ts, 15, 3)) +>b2 : Symbol(b2, Decl(comparisonOperatorWithNoRelationshipObjectsOnInstantiatedCallSignature.ts, 16, 3)) + +var r2a3 = a3 > b3; +>r2a3 : Symbol(r2a3, Decl(comparisonOperatorWithNoRelationshipObjectsOnInstantiatedCallSignature.ts, 48, 3)) +>a3 : Symbol(a3, Decl(comparisonOperatorWithNoRelationshipObjectsOnInstantiatedCallSignature.ts, 18, 3)) +>b3 : Symbol(b3, Decl(comparisonOperatorWithNoRelationshipObjectsOnInstantiatedCallSignature.ts, 19, 3)) + +var r2a4 = a4 > b4; +>r2a4 : Symbol(r2a4, Decl(comparisonOperatorWithNoRelationshipObjectsOnInstantiatedCallSignature.ts, 49, 3)) +>a4 : Symbol(a4, Decl(comparisonOperatorWithNoRelationshipObjectsOnInstantiatedCallSignature.ts, 21, 3)) +>b4 : Symbol(b4, Decl(comparisonOperatorWithNoRelationshipObjectsOnInstantiatedCallSignature.ts, 22, 3)) + +var r2a5 = a5 > b5; +>r2a5 : Symbol(r2a5, Decl(comparisonOperatorWithNoRelationshipObjectsOnInstantiatedCallSignature.ts, 50, 3)) +>a5 : Symbol(a5, Decl(comparisonOperatorWithNoRelationshipObjectsOnInstantiatedCallSignature.ts, 24, 3)) +>b5 : Symbol(b5, Decl(comparisonOperatorWithNoRelationshipObjectsOnInstantiatedCallSignature.ts, 25, 3)) + +var r2a6 = a6 > b6; +>r2a6 : Symbol(r2a6, Decl(comparisonOperatorWithNoRelationshipObjectsOnInstantiatedCallSignature.ts, 51, 3)) +>a6 : Symbol(a6, Decl(comparisonOperatorWithNoRelationshipObjectsOnInstantiatedCallSignature.ts, 27, 3)) +>b6 : Symbol(b6, Decl(comparisonOperatorWithNoRelationshipObjectsOnInstantiatedCallSignature.ts, 28, 3)) + +var r2b1 = b1 > a1; +>r2b1 : Symbol(r2b1, Decl(comparisonOperatorWithNoRelationshipObjectsOnInstantiatedCallSignature.ts, 53, 3)) +>b1 : Symbol(b1, Decl(comparisonOperatorWithNoRelationshipObjectsOnInstantiatedCallSignature.ts, 13, 3)) +>a1 : Symbol(a1, Decl(comparisonOperatorWithNoRelationshipObjectsOnInstantiatedCallSignature.ts, 12, 3)) + +var r2b2 = b2 > a2; +>r2b2 : Symbol(r2b2, Decl(comparisonOperatorWithNoRelationshipObjectsOnInstantiatedCallSignature.ts, 54, 3)) +>b2 : Symbol(b2, Decl(comparisonOperatorWithNoRelationshipObjectsOnInstantiatedCallSignature.ts, 16, 3)) +>a2 : Symbol(a2, Decl(comparisonOperatorWithNoRelationshipObjectsOnInstantiatedCallSignature.ts, 15, 3)) + +var r2b3 = b3 > a3; +>r2b3 : Symbol(r2b3, Decl(comparisonOperatorWithNoRelationshipObjectsOnInstantiatedCallSignature.ts, 55, 3)) +>b3 : Symbol(b3, Decl(comparisonOperatorWithNoRelationshipObjectsOnInstantiatedCallSignature.ts, 19, 3)) +>a3 : Symbol(a3, Decl(comparisonOperatorWithNoRelationshipObjectsOnInstantiatedCallSignature.ts, 18, 3)) + +var r2b4 = b4 > a4; +>r2b4 : Symbol(r2b4, Decl(comparisonOperatorWithNoRelationshipObjectsOnInstantiatedCallSignature.ts, 56, 3)) +>b4 : Symbol(b4, Decl(comparisonOperatorWithNoRelationshipObjectsOnInstantiatedCallSignature.ts, 22, 3)) +>a4 : Symbol(a4, Decl(comparisonOperatorWithNoRelationshipObjectsOnInstantiatedCallSignature.ts, 21, 3)) + +var r2b5 = b5 > a5; +>r2b5 : Symbol(r2b5, Decl(comparisonOperatorWithNoRelationshipObjectsOnInstantiatedCallSignature.ts, 57, 3)) +>b5 : Symbol(b5, Decl(comparisonOperatorWithNoRelationshipObjectsOnInstantiatedCallSignature.ts, 25, 3)) +>a5 : Symbol(a5, Decl(comparisonOperatorWithNoRelationshipObjectsOnInstantiatedCallSignature.ts, 24, 3)) + +var r2b6 = b6 > a6; +>r2b6 : Symbol(r2b6, Decl(comparisonOperatorWithNoRelationshipObjectsOnInstantiatedCallSignature.ts, 58, 3)) +>b6 : Symbol(b6, Decl(comparisonOperatorWithNoRelationshipObjectsOnInstantiatedCallSignature.ts, 28, 3)) +>a6 : Symbol(a6, Decl(comparisonOperatorWithNoRelationshipObjectsOnInstantiatedCallSignature.ts, 27, 3)) + +// operator <= +var r3a1 = a1 <= b1; +>r3a1 : Symbol(r3a1, Decl(comparisonOperatorWithNoRelationshipObjectsOnInstantiatedCallSignature.ts, 61, 3)) +>a1 : Symbol(a1, Decl(comparisonOperatorWithNoRelationshipObjectsOnInstantiatedCallSignature.ts, 12, 3)) +>b1 : Symbol(b1, Decl(comparisonOperatorWithNoRelationshipObjectsOnInstantiatedCallSignature.ts, 13, 3)) + +var r3a2 = a2 <= b2; +>r3a2 : Symbol(r3a2, Decl(comparisonOperatorWithNoRelationshipObjectsOnInstantiatedCallSignature.ts, 62, 3)) +>a2 : Symbol(a2, Decl(comparisonOperatorWithNoRelationshipObjectsOnInstantiatedCallSignature.ts, 15, 3)) +>b2 : Symbol(b2, Decl(comparisonOperatorWithNoRelationshipObjectsOnInstantiatedCallSignature.ts, 16, 3)) + +var r3a3 = a3 <= b3; +>r3a3 : Symbol(r3a3, Decl(comparisonOperatorWithNoRelationshipObjectsOnInstantiatedCallSignature.ts, 63, 3)) +>a3 : Symbol(a3, Decl(comparisonOperatorWithNoRelationshipObjectsOnInstantiatedCallSignature.ts, 18, 3)) +>b3 : Symbol(b3, Decl(comparisonOperatorWithNoRelationshipObjectsOnInstantiatedCallSignature.ts, 19, 3)) + +var r3a4 = a4 <= b4; +>r3a4 : Symbol(r3a4, Decl(comparisonOperatorWithNoRelationshipObjectsOnInstantiatedCallSignature.ts, 64, 3)) +>a4 : Symbol(a4, Decl(comparisonOperatorWithNoRelationshipObjectsOnInstantiatedCallSignature.ts, 21, 3)) +>b4 : Symbol(b4, Decl(comparisonOperatorWithNoRelationshipObjectsOnInstantiatedCallSignature.ts, 22, 3)) + +var r3a5 = a5 <= b5; +>r3a5 : Symbol(r3a5, Decl(comparisonOperatorWithNoRelationshipObjectsOnInstantiatedCallSignature.ts, 65, 3)) +>a5 : Symbol(a5, Decl(comparisonOperatorWithNoRelationshipObjectsOnInstantiatedCallSignature.ts, 24, 3)) +>b5 : Symbol(b5, Decl(comparisonOperatorWithNoRelationshipObjectsOnInstantiatedCallSignature.ts, 25, 3)) + +var r3a6 = a6 <= b6; +>r3a6 : Symbol(r3a6, Decl(comparisonOperatorWithNoRelationshipObjectsOnInstantiatedCallSignature.ts, 66, 3)) +>a6 : Symbol(a6, Decl(comparisonOperatorWithNoRelationshipObjectsOnInstantiatedCallSignature.ts, 27, 3)) +>b6 : Symbol(b6, Decl(comparisonOperatorWithNoRelationshipObjectsOnInstantiatedCallSignature.ts, 28, 3)) + +var r3b1 = b1 <= a1; +>r3b1 : Symbol(r3b1, Decl(comparisonOperatorWithNoRelationshipObjectsOnInstantiatedCallSignature.ts, 68, 3)) +>b1 : Symbol(b1, Decl(comparisonOperatorWithNoRelationshipObjectsOnInstantiatedCallSignature.ts, 13, 3)) +>a1 : Symbol(a1, Decl(comparisonOperatorWithNoRelationshipObjectsOnInstantiatedCallSignature.ts, 12, 3)) + +var r3b2 = b2 <= a2; +>r3b2 : Symbol(r3b2, Decl(comparisonOperatorWithNoRelationshipObjectsOnInstantiatedCallSignature.ts, 69, 3)) +>b2 : Symbol(b2, Decl(comparisonOperatorWithNoRelationshipObjectsOnInstantiatedCallSignature.ts, 16, 3)) +>a2 : Symbol(a2, Decl(comparisonOperatorWithNoRelationshipObjectsOnInstantiatedCallSignature.ts, 15, 3)) + +var r3b3 = b3 <= a3; +>r3b3 : Symbol(r3b3, Decl(comparisonOperatorWithNoRelationshipObjectsOnInstantiatedCallSignature.ts, 70, 3)) +>b3 : Symbol(b3, Decl(comparisonOperatorWithNoRelationshipObjectsOnInstantiatedCallSignature.ts, 19, 3)) +>a3 : Symbol(a3, Decl(comparisonOperatorWithNoRelationshipObjectsOnInstantiatedCallSignature.ts, 18, 3)) + +var r3b4 = b4 <= a4; +>r3b4 : Symbol(r3b4, Decl(comparisonOperatorWithNoRelationshipObjectsOnInstantiatedCallSignature.ts, 71, 3)) +>b4 : Symbol(b4, Decl(comparisonOperatorWithNoRelationshipObjectsOnInstantiatedCallSignature.ts, 22, 3)) +>a4 : Symbol(a4, Decl(comparisonOperatorWithNoRelationshipObjectsOnInstantiatedCallSignature.ts, 21, 3)) + +var r3b5 = b5 <= a5; +>r3b5 : Symbol(r3b5, Decl(comparisonOperatorWithNoRelationshipObjectsOnInstantiatedCallSignature.ts, 72, 3)) +>b5 : Symbol(b5, Decl(comparisonOperatorWithNoRelationshipObjectsOnInstantiatedCallSignature.ts, 25, 3)) +>a5 : Symbol(a5, Decl(comparisonOperatorWithNoRelationshipObjectsOnInstantiatedCallSignature.ts, 24, 3)) + +var r3b6 = b6 <= a6; +>r3b6 : Symbol(r3b6, Decl(comparisonOperatorWithNoRelationshipObjectsOnInstantiatedCallSignature.ts, 73, 3)) +>b6 : Symbol(b6, Decl(comparisonOperatorWithNoRelationshipObjectsOnInstantiatedCallSignature.ts, 28, 3)) +>a6 : Symbol(a6, Decl(comparisonOperatorWithNoRelationshipObjectsOnInstantiatedCallSignature.ts, 27, 3)) + +// operator >= +var r4a1 = a1 >= b1; +>r4a1 : Symbol(r4a1, Decl(comparisonOperatorWithNoRelationshipObjectsOnInstantiatedCallSignature.ts, 76, 3)) +>a1 : Symbol(a1, Decl(comparisonOperatorWithNoRelationshipObjectsOnInstantiatedCallSignature.ts, 12, 3)) +>b1 : Symbol(b1, Decl(comparisonOperatorWithNoRelationshipObjectsOnInstantiatedCallSignature.ts, 13, 3)) + +var r4a2 = a2 >= b2; +>r4a2 : Symbol(r4a2, Decl(comparisonOperatorWithNoRelationshipObjectsOnInstantiatedCallSignature.ts, 77, 3)) +>a2 : Symbol(a2, Decl(comparisonOperatorWithNoRelationshipObjectsOnInstantiatedCallSignature.ts, 15, 3)) +>b2 : Symbol(b2, Decl(comparisonOperatorWithNoRelationshipObjectsOnInstantiatedCallSignature.ts, 16, 3)) + +var r4a3 = a3 >= b3; +>r4a3 : Symbol(r4a3, Decl(comparisonOperatorWithNoRelationshipObjectsOnInstantiatedCallSignature.ts, 78, 3)) +>a3 : Symbol(a3, Decl(comparisonOperatorWithNoRelationshipObjectsOnInstantiatedCallSignature.ts, 18, 3)) +>b3 : Symbol(b3, Decl(comparisonOperatorWithNoRelationshipObjectsOnInstantiatedCallSignature.ts, 19, 3)) + +var r4a4 = a4 >= b4; +>r4a4 : Symbol(r4a4, Decl(comparisonOperatorWithNoRelationshipObjectsOnInstantiatedCallSignature.ts, 79, 3)) +>a4 : Symbol(a4, Decl(comparisonOperatorWithNoRelationshipObjectsOnInstantiatedCallSignature.ts, 21, 3)) +>b4 : Symbol(b4, Decl(comparisonOperatorWithNoRelationshipObjectsOnInstantiatedCallSignature.ts, 22, 3)) + +var r4a5 = a5 >= b5; +>r4a5 : Symbol(r4a5, Decl(comparisonOperatorWithNoRelationshipObjectsOnInstantiatedCallSignature.ts, 80, 3)) +>a5 : Symbol(a5, Decl(comparisonOperatorWithNoRelationshipObjectsOnInstantiatedCallSignature.ts, 24, 3)) +>b5 : Symbol(b5, Decl(comparisonOperatorWithNoRelationshipObjectsOnInstantiatedCallSignature.ts, 25, 3)) + +var r4a6 = a6 >= b6; +>r4a6 : Symbol(r4a6, Decl(comparisonOperatorWithNoRelationshipObjectsOnInstantiatedCallSignature.ts, 81, 3)) +>a6 : Symbol(a6, Decl(comparisonOperatorWithNoRelationshipObjectsOnInstantiatedCallSignature.ts, 27, 3)) +>b6 : Symbol(b6, Decl(comparisonOperatorWithNoRelationshipObjectsOnInstantiatedCallSignature.ts, 28, 3)) + +var r4b1 = b1 >= a1; +>r4b1 : Symbol(r4b1, Decl(comparisonOperatorWithNoRelationshipObjectsOnInstantiatedCallSignature.ts, 83, 3)) +>b1 : Symbol(b1, Decl(comparisonOperatorWithNoRelationshipObjectsOnInstantiatedCallSignature.ts, 13, 3)) +>a1 : Symbol(a1, Decl(comparisonOperatorWithNoRelationshipObjectsOnInstantiatedCallSignature.ts, 12, 3)) + +var r4b2 = b2 >= a2; +>r4b2 : Symbol(r4b2, Decl(comparisonOperatorWithNoRelationshipObjectsOnInstantiatedCallSignature.ts, 84, 3)) +>b2 : Symbol(b2, Decl(comparisonOperatorWithNoRelationshipObjectsOnInstantiatedCallSignature.ts, 16, 3)) +>a2 : Symbol(a2, Decl(comparisonOperatorWithNoRelationshipObjectsOnInstantiatedCallSignature.ts, 15, 3)) + +var r4b3 = b3 >= a3; +>r4b3 : Symbol(r4b3, Decl(comparisonOperatorWithNoRelationshipObjectsOnInstantiatedCallSignature.ts, 85, 3)) +>b3 : Symbol(b3, Decl(comparisonOperatorWithNoRelationshipObjectsOnInstantiatedCallSignature.ts, 19, 3)) +>a3 : Symbol(a3, Decl(comparisonOperatorWithNoRelationshipObjectsOnInstantiatedCallSignature.ts, 18, 3)) + +var r4b4 = b4 >= a4; +>r4b4 : Symbol(r4b4, Decl(comparisonOperatorWithNoRelationshipObjectsOnInstantiatedCallSignature.ts, 86, 3)) +>b4 : Symbol(b4, Decl(comparisonOperatorWithNoRelationshipObjectsOnInstantiatedCallSignature.ts, 22, 3)) +>a4 : Symbol(a4, Decl(comparisonOperatorWithNoRelationshipObjectsOnInstantiatedCallSignature.ts, 21, 3)) + +var r4b5 = b5 >= a5; +>r4b5 : Symbol(r4b5, Decl(comparisonOperatorWithNoRelationshipObjectsOnInstantiatedCallSignature.ts, 87, 3)) +>b5 : Symbol(b5, Decl(comparisonOperatorWithNoRelationshipObjectsOnInstantiatedCallSignature.ts, 25, 3)) +>a5 : Symbol(a5, Decl(comparisonOperatorWithNoRelationshipObjectsOnInstantiatedCallSignature.ts, 24, 3)) + +var r4b6 = b6 >= a6; +>r4b6 : Symbol(r4b6, Decl(comparisonOperatorWithNoRelationshipObjectsOnInstantiatedCallSignature.ts, 88, 3)) +>b6 : Symbol(b6, Decl(comparisonOperatorWithNoRelationshipObjectsOnInstantiatedCallSignature.ts, 28, 3)) +>a6 : Symbol(a6, Decl(comparisonOperatorWithNoRelationshipObjectsOnInstantiatedCallSignature.ts, 27, 3)) + +// operator == +var r5a1 = a1 == b1; +>r5a1 : Symbol(r5a1, Decl(comparisonOperatorWithNoRelationshipObjectsOnInstantiatedCallSignature.ts, 91, 3)) +>a1 : Symbol(a1, Decl(comparisonOperatorWithNoRelationshipObjectsOnInstantiatedCallSignature.ts, 12, 3)) +>b1 : Symbol(b1, Decl(comparisonOperatorWithNoRelationshipObjectsOnInstantiatedCallSignature.ts, 13, 3)) + +var r5a2 = a2 == b2; +>r5a2 : Symbol(r5a2, Decl(comparisonOperatorWithNoRelationshipObjectsOnInstantiatedCallSignature.ts, 92, 3)) +>a2 : Symbol(a2, Decl(comparisonOperatorWithNoRelationshipObjectsOnInstantiatedCallSignature.ts, 15, 3)) +>b2 : Symbol(b2, Decl(comparisonOperatorWithNoRelationshipObjectsOnInstantiatedCallSignature.ts, 16, 3)) + +var r5a3 = a3 == b3; +>r5a3 : Symbol(r5a3, Decl(comparisonOperatorWithNoRelationshipObjectsOnInstantiatedCallSignature.ts, 93, 3)) +>a3 : Symbol(a3, Decl(comparisonOperatorWithNoRelationshipObjectsOnInstantiatedCallSignature.ts, 18, 3)) +>b3 : Symbol(b3, Decl(comparisonOperatorWithNoRelationshipObjectsOnInstantiatedCallSignature.ts, 19, 3)) + +var r5a4 = a4 == b4; +>r5a4 : Symbol(r5a4, Decl(comparisonOperatorWithNoRelationshipObjectsOnInstantiatedCallSignature.ts, 94, 3)) +>a4 : Symbol(a4, Decl(comparisonOperatorWithNoRelationshipObjectsOnInstantiatedCallSignature.ts, 21, 3)) +>b4 : Symbol(b4, Decl(comparisonOperatorWithNoRelationshipObjectsOnInstantiatedCallSignature.ts, 22, 3)) + +var r5a5 = a5 == b5; +>r5a5 : Symbol(r5a5, Decl(comparisonOperatorWithNoRelationshipObjectsOnInstantiatedCallSignature.ts, 95, 3)) +>a5 : Symbol(a5, Decl(comparisonOperatorWithNoRelationshipObjectsOnInstantiatedCallSignature.ts, 24, 3)) +>b5 : Symbol(b5, Decl(comparisonOperatorWithNoRelationshipObjectsOnInstantiatedCallSignature.ts, 25, 3)) + +var r5a6 = a6 == b6; +>r5a6 : Symbol(r5a6, Decl(comparisonOperatorWithNoRelationshipObjectsOnInstantiatedCallSignature.ts, 96, 3)) +>a6 : Symbol(a6, Decl(comparisonOperatorWithNoRelationshipObjectsOnInstantiatedCallSignature.ts, 27, 3)) +>b6 : Symbol(b6, Decl(comparisonOperatorWithNoRelationshipObjectsOnInstantiatedCallSignature.ts, 28, 3)) + +var r5b1 = b1 == a1; +>r5b1 : Symbol(r5b1, Decl(comparisonOperatorWithNoRelationshipObjectsOnInstantiatedCallSignature.ts, 98, 3)) +>b1 : Symbol(b1, Decl(comparisonOperatorWithNoRelationshipObjectsOnInstantiatedCallSignature.ts, 13, 3)) +>a1 : Symbol(a1, Decl(comparisonOperatorWithNoRelationshipObjectsOnInstantiatedCallSignature.ts, 12, 3)) + +var r5b2 = b2 == a2; +>r5b2 : Symbol(r5b2, Decl(comparisonOperatorWithNoRelationshipObjectsOnInstantiatedCallSignature.ts, 99, 3)) +>b2 : Symbol(b2, Decl(comparisonOperatorWithNoRelationshipObjectsOnInstantiatedCallSignature.ts, 16, 3)) +>a2 : Symbol(a2, Decl(comparisonOperatorWithNoRelationshipObjectsOnInstantiatedCallSignature.ts, 15, 3)) + +var r5b3 = b3 == a3; +>r5b3 : Symbol(r5b3, Decl(comparisonOperatorWithNoRelationshipObjectsOnInstantiatedCallSignature.ts, 100, 3)) +>b3 : Symbol(b3, Decl(comparisonOperatorWithNoRelationshipObjectsOnInstantiatedCallSignature.ts, 19, 3)) +>a3 : Symbol(a3, Decl(comparisonOperatorWithNoRelationshipObjectsOnInstantiatedCallSignature.ts, 18, 3)) + +var r5b4 = b4 == a4; +>r5b4 : Symbol(r5b4, Decl(comparisonOperatorWithNoRelationshipObjectsOnInstantiatedCallSignature.ts, 101, 3)) +>b4 : Symbol(b4, Decl(comparisonOperatorWithNoRelationshipObjectsOnInstantiatedCallSignature.ts, 22, 3)) +>a4 : Symbol(a4, Decl(comparisonOperatorWithNoRelationshipObjectsOnInstantiatedCallSignature.ts, 21, 3)) + +var r5b5 = b5 == a5; +>r5b5 : Symbol(r5b5, Decl(comparisonOperatorWithNoRelationshipObjectsOnInstantiatedCallSignature.ts, 102, 3)) +>b5 : Symbol(b5, Decl(comparisonOperatorWithNoRelationshipObjectsOnInstantiatedCallSignature.ts, 25, 3)) +>a5 : Symbol(a5, Decl(comparisonOperatorWithNoRelationshipObjectsOnInstantiatedCallSignature.ts, 24, 3)) + +var r5b6 = b6 == a6; +>r5b6 : Symbol(r5b6, Decl(comparisonOperatorWithNoRelationshipObjectsOnInstantiatedCallSignature.ts, 103, 3)) +>b6 : Symbol(b6, Decl(comparisonOperatorWithNoRelationshipObjectsOnInstantiatedCallSignature.ts, 28, 3)) +>a6 : Symbol(a6, Decl(comparisonOperatorWithNoRelationshipObjectsOnInstantiatedCallSignature.ts, 27, 3)) + +// operator != +var r6a1 = a1 != b1; +>r6a1 : Symbol(r6a1, Decl(comparisonOperatorWithNoRelationshipObjectsOnInstantiatedCallSignature.ts, 106, 3)) +>a1 : Symbol(a1, Decl(comparisonOperatorWithNoRelationshipObjectsOnInstantiatedCallSignature.ts, 12, 3)) +>b1 : Symbol(b1, Decl(comparisonOperatorWithNoRelationshipObjectsOnInstantiatedCallSignature.ts, 13, 3)) + +var r6a2 = a2 != b2; +>r6a2 : Symbol(r6a2, Decl(comparisonOperatorWithNoRelationshipObjectsOnInstantiatedCallSignature.ts, 107, 3)) +>a2 : Symbol(a2, Decl(comparisonOperatorWithNoRelationshipObjectsOnInstantiatedCallSignature.ts, 15, 3)) +>b2 : Symbol(b2, Decl(comparisonOperatorWithNoRelationshipObjectsOnInstantiatedCallSignature.ts, 16, 3)) + +var r6a3 = a3 != b3; +>r6a3 : Symbol(r6a3, Decl(comparisonOperatorWithNoRelationshipObjectsOnInstantiatedCallSignature.ts, 108, 3)) +>a3 : Symbol(a3, Decl(comparisonOperatorWithNoRelationshipObjectsOnInstantiatedCallSignature.ts, 18, 3)) +>b3 : Symbol(b3, Decl(comparisonOperatorWithNoRelationshipObjectsOnInstantiatedCallSignature.ts, 19, 3)) + +var r6a4 = a4 != b4; +>r6a4 : Symbol(r6a4, Decl(comparisonOperatorWithNoRelationshipObjectsOnInstantiatedCallSignature.ts, 109, 3)) +>a4 : Symbol(a4, Decl(comparisonOperatorWithNoRelationshipObjectsOnInstantiatedCallSignature.ts, 21, 3)) +>b4 : Symbol(b4, Decl(comparisonOperatorWithNoRelationshipObjectsOnInstantiatedCallSignature.ts, 22, 3)) + +var r6a5 = a5 != b5; +>r6a5 : Symbol(r6a5, Decl(comparisonOperatorWithNoRelationshipObjectsOnInstantiatedCallSignature.ts, 110, 3)) +>a5 : Symbol(a5, Decl(comparisonOperatorWithNoRelationshipObjectsOnInstantiatedCallSignature.ts, 24, 3)) +>b5 : Symbol(b5, Decl(comparisonOperatorWithNoRelationshipObjectsOnInstantiatedCallSignature.ts, 25, 3)) + +var r6a6 = a6 != b6; +>r6a6 : Symbol(r6a6, Decl(comparisonOperatorWithNoRelationshipObjectsOnInstantiatedCallSignature.ts, 111, 3)) +>a6 : Symbol(a6, Decl(comparisonOperatorWithNoRelationshipObjectsOnInstantiatedCallSignature.ts, 27, 3)) +>b6 : Symbol(b6, Decl(comparisonOperatorWithNoRelationshipObjectsOnInstantiatedCallSignature.ts, 28, 3)) + +var r6b1 = b1 != a1; +>r6b1 : Symbol(r6b1, Decl(comparisonOperatorWithNoRelationshipObjectsOnInstantiatedCallSignature.ts, 113, 3)) +>b1 : Symbol(b1, Decl(comparisonOperatorWithNoRelationshipObjectsOnInstantiatedCallSignature.ts, 13, 3)) +>a1 : Symbol(a1, Decl(comparisonOperatorWithNoRelationshipObjectsOnInstantiatedCallSignature.ts, 12, 3)) + +var r6b2 = b2 != a2; +>r6b2 : Symbol(r6b2, Decl(comparisonOperatorWithNoRelationshipObjectsOnInstantiatedCallSignature.ts, 114, 3)) +>b2 : Symbol(b2, Decl(comparisonOperatorWithNoRelationshipObjectsOnInstantiatedCallSignature.ts, 16, 3)) +>a2 : Symbol(a2, Decl(comparisonOperatorWithNoRelationshipObjectsOnInstantiatedCallSignature.ts, 15, 3)) + +var r6b3 = b3 != a3; +>r6b3 : Symbol(r6b3, Decl(comparisonOperatorWithNoRelationshipObjectsOnInstantiatedCallSignature.ts, 115, 3)) +>b3 : Symbol(b3, Decl(comparisonOperatorWithNoRelationshipObjectsOnInstantiatedCallSignature.ts, 19, 3)) +>a3 : Symbol(a3, Decl(comparisonOperatorWithNoRelationshipObjectsOnInstantiatedCallSignature.ts, 18, 3)) + +var r6b4 = b4 != a4; +>r6b4 : Symbol(r6b4, Decl(comparisonOperatorWithNoRelationshipObjectsOnInstantiatedCallSignature.ts, 116, 3)) +>b4 : Symbol(b4, Decl(comparisonOperatorWithNoRelationshipObjectsOnInstantiatedCallSignature.ts, 22, 3)) +>a4 : Symbol(a4, Decl(comparisonOperatorWithNoRelationshipObjectsOnInstantiatedCallSignature.ts, 21, 3)) + +var r6b5 = b5 != a5; +>r6b5 : Symbol(r6b5, Decl(comparisonOperatorWithNoRelationshipObjectsOnInstantiatedCallSignature.ts, 117, 3)) +>b5 : Symbol(b5, Decl(comparisonOperatorWithNoRelationshipObjectsOnInstantiatedCallSignature.ts, 25, 3)) +>a5 : Symbol(a5, Decl(comparisonOperatorWithNoRelationshipObjectsOnInstantiatedCallSignature.ts, 24, 3)) + +var r6b6 = b6 != a6; +>r6b6 : Symbol(r6b6, Decl(comparisonOperatorWithNoRelationshipObjectsOnInstantiatedCallSignature.ts, 118, 3)) +>b6 : Symbol(b6, Decl(comparisonOperatorWithNoRelationshipObjectsOnInstantiatedCallSignature.ts, 28, 3)) +>a6 : Symbol(a6, Decl(comparisonOperatorWithNoRelationshipObjectsOnInstantiatedCallSignature.ts, 27, 3)) + +// operator === +var r7a1 = a1 === b1; +>r7a1 : Symbol(r7a1, Decl(comparisonOperatorWithNoRelationshipObjectsOnInstantiatedCallSignature.ts, 121, 3)) +>a1 : Symbol(a1, Decl(comparisonOperatorWithNoRelationshipObjectsOnInstantiatedCallSignature.ts, 12, 3)) +>b1 : Symbol(b1, Decl(comparisonOperatorWithNoRelationshipObjectsOnInstantiatedCallSignature.ts, 13, 3)) + +var r7a2 = a2 === b2; +>r7a2 : Symbol(r7a2, Decl(comparisonOperatorWithNoRelationshipObjectsOnInstantiatedCallSignature.ts, 122, 3)) +>a2 : Symbol(a2, Decl(comparisonOperatorWithNoRelationshipObjectsOnInstantiatedCallSignature.ts, 15, 3)) +>b2 : Symbol(b2, Decl(comparisonOperatorWithNoRelationshipObjectsOnInstantiatedCallSignature.ts, 16, 3)) + +var r7a3 = a3 === b3; +>r7a3 : Symbol(r7a3, Decl(comparisonOperatorWithNoRelationshipObjectsOnInstantiatedCallSignature.ts, 123, 3)) +>a3 : Symbol(a3, Decl(comparisonOperatorWithNoRelationshipObjectsOnInstantiatedCallSignature.ts, 18, 3)) +>b3 : Symbol(b3, Decl(comparisonOperatorWithNoRelationshipObjectsOnInstantiatedCallSignature.ts, 19, 3)) + +var r7a4 = a4 === b4; +>r7a4 : Symbol(r7a4, Decl(comparisonOperatorWithNoRelationshipObjectsOnInstantiatedCallSignature.ts, 124, 3)) +>a4 : Symbol(a4, Decl(comparisonOperatorWithNoRelationshipObjectsOnInstantiatedCallSignature.ts, 21, 3)) +>b4 : Symbol(b4, Decl(comparisonOperatorWithNoRelationshipObjectsOnInstantiatedCallSignature.ts, 22, 3)) + +var r7a5 = a5 === b5; +>r7a5 : Symbol(r7a5, Decl(comparisonOperatorWithNoRelationshipObjectsOnInstantiatedCallSignature.ts, 125, 3)) +>a5 : Symbol(a5, Decl(comparisonOperatorWithNoRelationshipObjectsOnInstantiatedCallSignature.ts, 24, 3)) +>b5 : Symbol(b5, Decl(comparisonOperatorWithNoRelationshipObjectsOnInstantiatedCallSignature.ts, 25, 3)) + +var r7a6 = a6 === b6; +>r7a6 : Symbol(r7a6, Decl(comparisonOperatorWithNoRelationshipObjectsOnInstantiatedCallSignature.ts, 126, 3)) +>a6 : Symbol(a6, Decl(comparisonOperatorWithNoRelationshipObjectsOnInstantiatedCallSignature.ts, 27, 3)) +>b6 : Symbol(b6, Decl(comparisonOperatorWithNoRelationshipObjectsOnInstantiatedCallSignature.ts, 28, 3)) + +var r7b1 = b1 === a1; +>r7b1 : Symbol(r7b1, Decl(comparisonOperatorWithNoRelationshipObjectsOnInstantiatedCallSignature.ts, 128, 3)) +>b1 : Symbol(b1, Decl(comparisonOperatorWithNoRelationshipObjectsOnInstantiatedCallSignature.ts, 13, 3)) +>a1 : Symbol(a1, Decl(comparisonOperatorWithNoRelationshipObjectsOnInstantiatedCallSignature.ts, 12, 3)) + +var r7b2 = b2 === a2; +>r7b2 : Symbol(r7b2, Decl(comparisonOperatorWithNoRelationshipObjectsOnInstantiatedCallSignature.ts, 129, 3)) +>b2 : Symbol(b2, Decl(comparisonOperatorWithNoRelationshipObjectsOnInstantiatedCallSignature.ts, 16, 3)) +>a2 : Symbol(a2, Decl(comparisonOperatorWithNoRelationshipObjectsOnInstantiatedCallSignature.ts, 15, 3)) + +var r7b3 = b3 === a3; +>r7b3 : Symbol(r7b3, Decl(comparisonOperatorWithNoRelationshipObjectsOnInstantiatedCallSignature.ts, 130, 3)) +>b3 : Symbol(b3, Decl(comparisonOperatorWithNoRelationshipObjectsOnInstantiatedCallSignature.ts, 19, 3)) +>a3 : Symbol(a3, Decl(comparisonOperatorWithNoRelationshipObjectsOnInstantiatedCallSignature.ts, 18, 3)) + +var r7b4 = b4 === a4; +>r7b4 : Symbol(r7b4, Decl(comparisonOperatorWithNoRelationshipObjectsOnInstantiatedCallSignature.ts, 131, 3)) +>b4 : Symbol(b4, Decl(comparisonOperatorWithNoRelationshipObjectsOnInstantiatedCallSignature.ts, 22, 3)) +>a4 : Symbol(a4, Decl(comparisonOperatorWithNoRelationshipObjectsOnInstantiatedCallSignature.ts, 21, 3)) + +var r7b5 = b5 === a5; +>r7b5 : Symbol(r7b5, Decl(comparisonOperatorWithNoRelationshipObjectsOnInstantiatedCallSignature.ts, 132, 3)) +>b5 : Symbol(b5, Decl(comparisonOperatorWithNoRelationshipObjectsOnInstantiatedCallSignature.ts, 25, 3)) +>a5 : Symbol(a5, Decl(comparisonOperatorWithNoRelationshipObjectsOnInstantiatedCallSignature.ts, 24, 3)) + +var r7b6 = b6 === a6; +>r7b6 : Symbol(r7b6, Decl(comparisonOperatorWithNoRelationshipObjectsOnInstantiatedCallSignature.ts, 133, 3)) +>b6 : Symbol(b6, Decl(comparisonOperatorWithNoRelationshipObjectsOnInstantiatedCallSignature.ts, 28, 3)) +>a6 : Symbol(a6, Decl(comparisonOperatorWithNoRelationshipObjectsOnInstantiatedCallSignature.ts, 27, 3)) + +// operator !== +var r8a1 = a1 !== b1; +>r8a1 : Symbol(r8a1, Decl(comparisonOperatorWithNoRelationshipObjectsOnInstantiatedCallSignature.ts, 136, 3)) +>a1 : Symbol(a1, Decl(comparisonOperatorWithNoRelationshipObjectsOnInstantiatedCallSignature.ts, 12, 3)) +>b1 : Symbol(b1, Decl(comparisonOperatorWithNoRelationshipObjectsOnInstantiatedCallSignature.ts, 13, 3)) + +var r8a2 = a2 !== b2; +>r8a2 : Symbol(r8a2, Decl(comparisonOperatorWithNoRelationshipObjectsOnInstantiatedCallSignature.ts, 137, 3)) +>a2 : Symbol(a2, Decl(comparisonOperatorWithNoRelationshipObjectsOnInstantiatedCallSignature.ts, 15, 3)) +>b2 : Symbol(b2, Decl(comparisonOperatorWithNoRelationshipObjectsOnInstantiatedCallSignature.ts, 16, 3)) + +var r8a3 = a3 !== b3; +>r8a3 : Symbol(r8a3, Decl(comparisonOperatorWithNoRelationshipObjectsOnInstantiatedCallSignature.ts, 138, 3)) +>a3 : Symbol(a3, Decl(comparisonOperatorWithNoRelationshipObjectsOnInstantiatedCallSignature.ts, 18, 3)) +>b3 : Symbol(b3, Decl(comparisonOperatorWithNoRelationshipObjectsOnInstantiatedCallSignature.ts, 19, 3)) + +var r8a4 = a4 !== b4; +>r8a4 : Symbol(r8a4, Decl(comparisonOperatorWithNoRelationshipObjectsOnInstantiatedCallSignature.ts, 139, 3)) +>a4 : Symbol(a4, Decl(comparisonOperatorWithNoRelationshipObjectsOnInstantiatedCallSignature.ts, 21, 3)) +>b4 : Symbol(b4, Decl(comparisonOperatorWithNoRelationshipObjectsOnInstantiatedCallSignature.ts, 22, 3)) + +var r8a5 = a5 !== b5; +>r8a5 : Symbol(r8a5, Decl(comparisonOperatorWithNoRelationshipObjectsOnInstantiatedCallSignature.ts, 140, 3)) +>a5 : Symbol(a5, Decl(comparisonOperatorWithNoRelationshipObjectsOnInstantiatedCallSignature.ts, 24, 3)) +>b5 : Symbol(b5, Decl(comparisonOperatorWithNoRelationshipObjectsOnInstantiatedCallSignature.ts, 25, 3)) + +var r8a6 = a6 !== b6; +>r8a6 : Symbol(r8a6, Decl(comparisonOperatorWithNoRelationshipObjectsOnInstantiatedCallSignature.ts, 141, 3)) +>a6 : Symbol(a6, Decl(comparisonOperatorWithNoRelationshipObjectsOnInstantiatedCallSignature.ts, 27, 3)) +>b6 : Symbol(b6, Decl(comparisonOperatorWithNoRelationshipObjectsOnInstantiatedCallSignature.ts, 28, 3)) + +var r8b1 = b1 !== a1; +>r8b1 : Symbol(r8b1, Decl(comparisonOperatorWithNoRelationshipObjectsOnInstantiatedCallSignature.ts, 143, 3)) +>b1 : Symbol(b1, Decl(comparisonOperatorWithNoRelationshipObjectsOnInstantiatedCallSignature.ts, 13, 3)) +>a1 : Symbol(a1, Decl(comparisonOperatorWithNoRelationshipObjectsOnInstantiatedCallSignature.ts, 12, 3)) + +var r8b2 = b2 !== a2; +>r8b2 : Symbol(r8b2, Decl(comparisonOperatorWithNoRelationshipObjectsOnInstantiatedCallSignature.ts, 144, 3)) +>b2 : Symbol(b2, Decl(comparisonOperatorWithNoRelationshipObjectsOnInstantiatedCallSignature.ts, 16, 3)) +>a2 : Symbol(a2, Decl(comparisonOperatorWithNoRelationshipObjectsOnInstantiatedCallSignature.ts, 15, 3)) + +var r8b3 = b3 !== a3; +>r8b3 : Symbol(r8b3, Decl(comparisonOperatorWithNoRelationshipObjectsOnInstantiatedCallSignature.ts, 145, 3)) +>b3 : Symbol(b3, Decl(comparisonOperatorWithNoRelationshipObjectsOnInstantiatedCallSignature.ts, 19, 3)) +>a3 : Symbol(a3, Decl(comparisonOperatorWithNoRelationshipObjectsOnInstantiatedCallSignature.ts, 18, 3)) + +var r8b4 = b4 !== a4; +>r8b4 : Symbol(r8b4, Decl(comparisonOperatorWithNoRelationshipObjectsOnInstantiatedCallSignature.ts, 146, 3)) +>b4 : Symbol(b4, Decl(comparisonOperatorWithNoRelationshipObjectsOnInstantiatedCallSignature.ts, 22, 3)) +>a4 : Symbol(a4, Decl(comparisonOperatorWithNoRelationshipObjectsOnInstantiatedCallSignature.ts, 21, 3)) + +var r8b5 = b5 !== a5; +>r8b5 : Symbol(r8b5, Decl(comparisonOperatorWithNoRelationshipObjectsOnInstantiatedCallSignature.ts, 147, 3)) +>b5 : Symbol(b5, Decl(comparisonOperatorWithNoRelationshipObjectsOnInstantiatedCallSignature.ts, 25, 3)) +>a5 : Symbol(a5, Decl(comparisonOperatorWithNoRelationshipObjectsOnInstantiatedCallSignature.ts, 24, 3)) + +var r8b6 = b6 !== a6; +>r8b6 : Symbol(r8b6, Decl(comparisonOperatorWithNoRelationshipObjectsOnInstantiatedCallSignature.ts, 148, 3)) +>b6 : Symbol(b6, Decl(comparisonOperatorWithNoRelationshipObjectsOnInstantiatedCallSignature.ts, 28, 3)) +>a6 : Symbol(a6, Decl(comparisonOperatorWithNoRelationshipObjectsOnInstantiatedCallSignature.ts, 27, 3)) + diff --git a/tests/baselines/reference/comparisonOperatorWithNoRelationshipObjectsOnInstantiatedCallSignature.types b/tests/baselines/reference/comparisonOperatorWithNoRelationshipObjectsOnInstantiatedCallSignature.types new file mode 100644 index 00000000000..d1e7b6c78da --- /dev/null +++ b/tests/baselines/reference/comparisonOperatorWithNoRelationshipObjectsOnInstantiatedCallSignature.types @@ -0,0 +1,695 @@ +=== tests/cases/conformance/expressions/binaryOperators/comparisonOperator/comparisonOperatorWithNoRelationshipObjectsOnInstantiatedCallSignature.ts === +class Base { +>Base : Base + + public a: string; +>a : string +} + +class Derived extends Base { +>Derived : Derived +>Base : Base + + public b: string; +>b : string +} + +class C { +>C : C + + public c: string; +>c : string +} + +var a1: { fn(x: T): T }; +>a1 : { fn(x: T): T; } +>fn : (x: T) => T +>T : T +>x : T +>T : T +>T : T + +var b1: { fn(): string }; +>b1 : { fn(): string; } +>fn : () => string + +var a2: { fn(x: T): T }; +>a2 : { fn(x: T): T; } +>fn : (x: T) => T +>T : T +>x : T +>T : T +>T : T + +var b2: { fn(x: string): number }; +>b2 : { fn(x: string): number; } +>fn : (x: string) => number +>x : string + +var a3: { fn(x?: T): T }; +>a3 : { fn(x?: T): T; } +>fn : (x?: T) => T +>T : T +>x : T +>T : T +>T : T + +var b3: { fn(x?: string): number }; +>b3 : { fn(x?: string): number; } +>fn : (x?: string) => number +>x : string + +var a4: { fn(...x: T[]): T }; +>a4 : { fn(...x: T[]): T; } +>fn : (...x: T[]) => T +>T : T +>x : T[] +>T : T +>T : T + +var b4: { fn(...x: string[]): number }; +>b4 : { fn(...x: string[]): number; } +>fn : (...x: string[]) => number +>x : string[] + +var a5: { fn(x: T, y: T): T }; +>a5 : { fn(x: T, y: T): T; } +>fn : (x: T, y: T) => T +>T : T +>x : T +>T : T +>y : T +>T : T +>T : T + +var b5: { fn(x: string, y: number): string }; +>b5 : { fn(x: string, y: number): string; } +>fn : (x: string, y: number) => string +>x : string +>y : number + +var a6: { fn(x: T, y: U): T }; +>a6 : { fn(x: T, y: U): T; } +>fn : (x: T, y: U) => T +>T : T +>U : U +>T : T +>x : T +>T : T +>y : U +>U : U +>T : T + +var b6: { fn(x: Base, y: C): Base }; +>b6 : { fn(x: Base, y: C): Base; } +>fn : (x: Base, y: C) => Base +>x : Base +>Base : Base +>y : C +>C : C +>Base : Base + +// operator < +var r1a1 = a1 < b1; +>r1a1 : boolean +>a1 < b1 : boolean +>a1 : { fn(x: T): T; } +>b1 : { fn(): string; } + +var r1a2 = a2 < b2; +>r1a2 : boolean +>a2 < b2 : boolean +>a2 : { fn(x: T): T; } +>b2 : { fn(x: string): number; } + +var r1a3 = a3 < b3; +>r1a3 : boolean +>a3 < b3 : boolean +>a3 : { fn(x?: T): T; } +>b3 : { fn(x?: string): number; } + +var r1a4 = a4 < b4; +>r1a4 : boolean +>a4 < b4 : boolean +>a4 : { fn(...x: T[]): T; } +>b4 : { fn(...x: string[]): number; } + +var r1a5 = a5 < b5; +>r1a5 : boolean +>a5 < b5 : boolean +>a5 : { fn(x: T, y: T): T; } +>b5 : { fn(x: string, y: number): string; } + +var r1a6 = a6 < b6; +>r1a6 : boolean +>a6 < b6 : boolean +>a6 : { fn(x: T, y: U): T; } +>b6 : { fn(x: Base, y: C): Base; } + +var r1b1 = b1 < a1; +>r1b1 : boolean +>b1 < a1 : boolean +>b1 : { fn(): string; } +>a1 : { fn(x: T): T; } + +var r1b2 = b2 < a2; +>r1b2 : boolean +>b2 < a2 : boolean +>b2 : { fn(x: string): number; } +>a2 : { fn(x: T): T; } + +var r1b3 = b3 < a3; +>r1b3 : boolean +>b3 < a3 : boolean +>b3 : { fn(x?: string): number; } +>a3 : { fn(x?: T): T; } + +var r1b4 = b4 < a4; +>r1b4 : boolean +>b4 < a4 : boolean +>b4 : { fn(...x: string[]): number; } +>a4 : { fn(...x: T[]): T; } + +var r1b5 = b5 < a5; +>r1b5 : boolean +>b5 < a5 : boolean +>b5 : { fn(x: string, y: number): string; } +>a5 : { fn(x: T, y: T): T; } + +var r1b6 = b6 < a6; +>r1b6 : boolean +>b6 < a6 : boolean +>b6 : { fn(x: Base, y: C): Base; } +>a6 : { fn(x: T, y: U): T; } + +// operator > +var r2a1 = a1 > b1; +>r2a1 : boolean +>a1 > b1 : boolean +>a1 : { fn(x: T): T; } +>b1 : { fn(): string; } + +var r2a2 = a2 > b2; +>r2a2 : boolean +>a2 > b2 : boolean +>a2 : { fn(x: T): T; } +>b2 : { fn(x: string): number; } + +var r2a3 = a3 > b3; +>r2a3 : boolean +>a3 > b3 : boolean +>a3 : { fn(x?: T): T; } +>b3 : { fn(x?: string): number; } + +var r2a4 = a4 > b4; +>r2a4 : boolean +>a4 > b4 : boolean +>a4 : { fn(...x: T[]): T; } +>b4 : { fn(...x: string[]): number; } + +var r2a5 = a5 > b5; +>r2a5 : boolean +>a5 > b5 : boolean +>a5 : { fn(x: T, y: T): T; } +>b5 : { fn(x: string, y: number): string; } + +var r2a6 = a6 > b6; +>r2a6 : boolean +>a6 > b6 : boolean +>a6 : { fn(x: T, y: U): T; } +>b6 : { fn(x: Base, y: C): Base; } + +var r2b1 = b1 > a1; +>r2b1 : boolean +>b1 > a1 : boolean +>b1 : { fn(): string; } +>a1 : { fn(x: T): T; } + +var r2b2 = b2 > a2; +>r2b2 : boolean +>b2 > a2 : boolean +>b2 : { fn(x: string): number; } +>a2 : { fn(x: T): T; } + +var r2b3 = b3 > a3; +>r2b3 : boolean +>b3 > a3 : boolean +>b3 : { fn(x?: string): number; } +>a3 : { fn(x?: T): T; } + +var r2b4 = b4 > a4; +>r2b4 : boolean +>b4 > a4 : boolean +>b4 : { fn(...x: string[]): number; } +>a4 : { fn(...x: T[]): T; } + +var r2b5 = b5 > a5; +>r2b5 : boolean +>b5 > a5 : boolean +>b5 : { fn(x: string, y: number): string; } +>a5 : { fn(x: T, y: T): T; } + +var r2b6 = b6 > a6; +>r2b6 : boolean +>b6 > a6 : boolean +>b6 : { fn(x: Base, y: C): Base; } +>a6 : { fn(x: T, y: U): T; } + +// operator <= +var r3a1 = a1 <= b1; +>r3a1 : boolean +>a1 <= b1 : boolean +>a1 : { fn(x: T): T; } +>b1 : { fn(): string; } + +var r3a2 = a2 <= b2; +>r3a2 : boolean +>a2 <= b2 : boolean +>a2 : { fn(x: T): T; } +>b2 : { fn(x: string): number; } + +var r3a3 = a3 <= b3; +>r3a3 : boolean +>a3 <= b3 : boolean +>a3 : { fn(x?: T): T; } +>b3 : { fn(x?: string): number; } + +var r3a4 = a4 <= b4; +>r3a4 : boolean +>a4 <= b4 : boolean +>a4 : { fn(...x: T[]): T; } +>b4 : { fn(...x: string[]): number; } + +var r3a5 = a5 <= b5; +>r3a5 : boolean +>a5 <= b5 : boolean +>a5 : { fn(x: T, y: T): T; } +>b5 : { fn(x: string, y: number): string; } + +var r3a6 = a6 <= b6; +>r3a6 : boolean +>a6 <= b6 : boolean +>a6 : { fn(x: T, y: U): T; } +>b6 : { fn(x: Base, y: C): Base; } + +var r3b1 = b1 <= a1; +>r3b1 : boolean +>b1 <= a1 : boolean +>b1 : { fn(): string; } +>a1 : { fn(x: T): T; } + +var r3b2 = b2 <= a2; +>r3b2 : boolean +>b2 <= a2 : boolean +>b2 : { fn(x: string): number; } +>a2 : { fn(x: T): T; } + +var r3b3 = b3 <= a3; +>r3b3 : boolean +>b3 <= a3 : boolean +>b3 : { fn(x?: string): number; } +>a3 : { fn(x?: T): T; } + +var r3b4 = b4 <= a4; +>r3b4 : boolean +>b4 <= a4 : boolean +>b4 : { fn(...x: string[]): number; } +>a4 : { fn(...x: T[]): T; } + +var r3b5 = b5 <= a5; +>r3b5 : boolean +>b5 <= a5 : boolean +>b5 : { fn(x: string, y: number): string; } +>a5 : { fn(x: T, y: T): T; } + +var r3b6 = b6 <= a6; +>r3b6 : boolean +>b6 <= a6 : boolean +>b6 : { fn(x: Base, y: C): Base; } +>a6 : { fn(x: T, y: U): T; } + +// operator >= +var r4a1 = a1 >= b1; +>r4a1 : boolean +>a1 >= b1 : boolean +>a1 : { fn(x: T): T; } +>b1 : { fn(): string; } + +var r4a2 = a2 >= b2; +>r4a2 : boolean +>a2 >= b2 : boolean +>a2 : { fn(x: T): T; } +>b2 : { fn(x: string): number; } + +var r4a3 = a3 >= b3; +>r4a3 : boolean +>a3 >= b3 : boolean +>a3 : { fn(x?: T): T; } +>b3 : { fn(x?: string): number; } + +var r4a4 = a4 >= b4; +>r4a4 : boolean +>a4 >= b4 : boolean +>a4 : { fn(...x: T[]): T; } +>b4 : { fn(...x: string[]): number; } + +var r4a5 = a5 >= b5; +>r4a5 : boolean +>a5 >= b5 : boolean +>a5 : { fn(x: T, y: T): T; } +>b5 : { fn(x: string, y: number): string; } + +var r4a6 = a6 >= b6; +>r4a6 : boolean +>a6 >= b6 : boolean +>a6 : { fn(x: T, y: U): T; } +>b6 : { fn(x: Base, y: C): Base; } + +var r4b1 = b1 >= a1; +>r4b1 : boolean +>b1 >= a1 : boolean +>b1 : { fn(): string; } +>a1 : { fn(x: T): T; } + +var r4b2 = b2 >= a2; +>r4b2 : boolean +>b2 >= a2 : boolean +>b2 : { fn(x: string): number; } +>a2 : { fn(x: T): T; } + +var r4b3 = b3 >= a3; +>r4b3 : boolean +>b3 >= a3 : boolean +>b3 : { fn(x?: string): number; } +>a3 : { fn(x?: T): T; } + +var r4b4 = b4 >= a4; +>r4b4 : boolean +>b4 >= a4 : boolean +>b4 : { fn(...x: string[]): number; } +>a4 : { fn(...x: T[]): T; } + +var r4b5 = b5 >= a5; +>r4b5 : boolean +>b5 >= a5 : boolean +>b5 : { fn(x: string, y: number): string; } +>a5 : { fn(x: T, y: T): T; } + +var r4b6 = b6 >= a6; +>r4b6 : boolean +>b6 >= a6 : boolean +>b6 : { fn(x: Base, y: C): Base; } +>a6 : { fn(x: T, y: U): T; } + +// operator == +var r5a1 = a1 == b1; +>r5a1 : boolean +>a1 == b1 : boolean +>a1 : { fn(x: T): T; } +>b1 : { fn(): string; } + +var r5a2 = a2 == b2; +>r5a2 : boolean +>a2 == b2 : boolean +>a2 : { fn(x: T): T; } +>b2 : { fn(x: string): number; } + +var r5a3 = a3 == b3; +>r5a3 : boolean +>a3 == b3 : boolean +>a3 : { fn(x?: T): T; } +>b3 : { fn(x?: string): number; } + +var r5a4 = a4 == b4; +>r5a4 : boolean +>a4 == b4 : boolean +>a4 : { fn(...x: T[]): T; } +>b4 : { fn(...x: string[]): number; } + +var r5a5 = a5 == b5; +>r5a5 : boolean +>a5 == b5 : boolean +>a5 : { fn(x: T, y: T): T; } +>b5 : { fn(x: string, y: number): string; } + +var r5a6 = a6 == b6; +>r5a6 : boolean +>a6 == b6 : boolean +>a6 : { fn(x: T, y: U): T; } +>b6 : { fn(x: Base, y: C): Base; } + +var r5b1 = b1 == a1; +>r5b1 : boolean +>b1 == a1 : boolean +>b1 : { fn(): string; } +>a1 : { fn(x: T): T; } + +var r5b2 = b2 == a2; +>r5b2 : boolean +>b2 == a2 : boolean +>b2 : { fn(x: string): number; } +>a2 : { fn(x: T): T; } + +var r5b3 = b3 == a3; +>r5b3 : boolean +>b3 == a3 : boolean +>b3 : { fn(x?: string): number; } +>a3 : { fn(x?: T): T; } + +var r5b4 = b4 == a4; +>r5b4 : boolean +>b4 == a4 : boolean +>b4 : { fn(...x: string[]): number; } +>a4 : { fn(...x: T[]): T; } + +var r5b5 = b5 == a5; +>r5b5 : boolean +>b5 == a5 : boolean +>b5 : { fn(x: string, y: number): string; } +>a5 : { fn(x: T, y: T): T; } + +var r5b6 = b6 == a6; +>r5b6 : boolean +>b6 == a6 : boolean +>b6 : { fn(x: Base, y: C): Base; } +>a6 : { fn(x: T, y: U): T; } + +// operator != +var r6a1 = a1 != b1; +>r6a1 : boolean +>a1 != b1 : boolean +>a1 : { fn(x: T): T; } +>b1 : { fn(): string; } + +var r6a2 = a2 != b2; +>r6a2 : boolean +>a2 != b2 : boolean +>a2 : { fn(x: T): T; } +>b2 : { fn(x: string): number; } + +var r6a3 = a3 != b3; +>r6a3 : boolean +>a3 != b3 : boolean +>a3 : { fn(x?: T): T; } +>b3 : { fn(x?: string): number; } + +var r6a4 = a4 != b4; +>r6a4 : boolean +>a4 != b4 : boolean +>a4 : { fn(...x: T[]): T; } +>b4 : { fn(...x: string[]): number; } + +var r6a5 = a5 != b5; +>r6a5 : boolean +>a5 != b5 : boolean +>a5 : { fn(x: T, y: T): T; } +>b5 : { fn(x: string, y: number): string; } + +var r6a6 = a6 != b6; +>r6a6 : boolean +>a6 != b6 : boolean +>a6 : { fn(x: T, y: U): T; } +>b6 : { fn(x: Base, y: C): Base; } + +var r6b1 = b1 != a1; +>r6b1 : boolean +>b1 != a1 : boolean +>b1 : { fn(): string; } +>a1 : { fn(x: T): T; } + +var r6b2 = b2 != a2; +>r6b2 : boolean +>b2 != a2 : boolean +>b2 : { fn(x: string): number; } +>a2 : { fn(x: T): T; } + +var r6b3 = b3 != a3; +>r6b3 : boolean +>b3 != a3 : boolean +>b3 : { fn(x?: string): number; } +>a3 : { fn(x?: T): T; } + +var r6b4 = b4 != a4; +>r6b4 : boolean +>b4 != a4 : boolean +>b4 : { fn(...x: string[]): number; } +>a4 : { fn(...x: T[]): T; } + +var r6b5 = b5 != a5; +>r6b5 : boolean +>b5 != a5 : boolean +>b5 : { fn(x: string, y: number): string; } +>a5 : { fn(x: T, y: T): T; } + +var r6b6 = b6 != a6; +>r6b6 : boolean +>b6 != a6 : boolean +>b6 : { fn(x: Base, y: C): Base; } +>a6 : { fn(x: T, y: U): T; } + +// operator === +var r7a1 = a1 === b1; +>r7a1 : boolean +>a1 === b1 : boolean +>a1 : { fn(x: T): T; } +>b1 : { fn(): string; } + +var r7a2 = a2 === b2; +>r7a2 : boolean +>a2 === b2 : boolean +>a2 : { fn(x: T): T; } +>b2 : { fn(x: string): number; } + +var r7a3 = a3 === b3; +>r7a3 : boolean +>a3 === b3 : boolean +>a3 : { fn(x?: T): T; } +>b3 : { fn(x?: string): number; } + +var r7a4 = a4 === b4; +>r7a4 : boolean +>a4 === b4 : boolean +>a4 : { fn(...x: T[]): T; } +>b4 : { fn(...x: string[]): number; } + +var r7a5 = a5 === b5; +>r7a5 : boolean +>a5 === b5 : boolean +>a5 : { fn(x: T, y: T): T; } +>b5 : { fn(x: string, y: number): string; } + +var r7a6 = a6 === b6; +>r7a6 : boolean +>a6 === b6 : boolean +>a6 : { fn(x: T, y: U): T; } +>b6 : { fn(x: Base, y: C): Base; } + +var r7b1 = b1 === a1; +>r7b1 : boolean +>b1 === a1 : boolean +>b1 : { fn(): string; } +>a1 : { fn(x: T): T; } + +var r7b2 = b2 === a2; +>r7b2 : boolean +>b2 === a2 : boolean +>b2 : { fn(x: string): number; } +>a2 : { fn(x: T): T; } + +var r7b3 = b3 === a3; +>r7b3 : boolean +>b3 === a3 : boolean +>b3 : { fn(x?: string): number; } +>a3 : { fn(x?: T): T; } + +var r7b4 = b4 === a4; +>r7b4 : boolean +>b4 === a4 : boolean +>b4 : { fn(...x: string[]): number; } +>a4 : { fn(...x: T[]): T; } + +var r7b5 = b5 === a5; +>r7b5 : boolean +>b5 === a5 : boolean +>b5 : { fn(x: string, y: number): string; } +>a5 : { fn(x: T, y: T): T; } + +var r7b6 = b6 === a6; +>r7b6 : boolean +>b6 === a6 : boolean +>b6 : { fn(x: Base, y: C): Base; } +>a6 : { fn(x: T, y: U): T; } + +// operator !== +var r8a1 = a1 !== b1; +>r8a1 : boolean +>a1 !== b1 : boolean +>a1 : { fn(x: T): T; } +>b1 : { fn(): string; } + +var r8a2 = a2 !== b2; +>r8a2 : boolean +>a2 !== b2 : boolean +>a2 : { fn(x: T): T; } +>b2 : { fn(x: string): number; } + +var r8a3 = a3 !== b3; +>r8a3 : boolean +>a3 !== b3 : boolean +>a3 : { fn(x?: T): T; } +>b3 : { fn(x?: string): number; } + +var r8a4 = a4 !== b4; +>r8a4 : boolean +>a4 !== b4 : boolean +>a4 : { fn(...x: T[]): T; } +>b4 : { fn(...x: string[]): number; } + +var r8a5 = a5 !== b5; +>r8a5 : boolean +>a5 !== b5 : boolean +>a5 : { fn(x: T, y: T): T; } +>b5 : { fn(x: string, y: number): string; } + +var r8a6 = a6 !== b6; +>r8a6 : boolean +>a6 !== b6 : boolean +>a6 : { fn(x: T, y: U): T; } +>b6 : { fn(x: Base, y: C): Base; } + +var r8b1 = b1 !== a1; +>r8b1 : boolean +>b1 !== a1 : boolean +>b1 : { fn(): string; } +>a1 : { fn(x: T): T; } + +var r8b2 = b2 !== a2; +>r8b2 : boolean +>b2 !== a2 : boolean +>b2 : { fn(x: string): number; } +>a2 : { fn(x: T): T; } + +var r8b3 = b3 !== a3; +>r8b3 : boolean +>b3 !== a3 : boolean +>b3 : { fn(x?: string): number; } +>a3 : { fn(x?: T): T; } + +var r8b4 = b4 !== a4; +>r8b4 : boolean +>b4 !== a4 : boolean +>b4 : { fn(...x: string[]): number; } +>a4 : { fn(...x: T[]): T; } + +var r8b5 = b5 !== a5; +>r8b5 : boolean +>b5 !== a5 : boolean +>b5 : { fn(x: string, y: number): string; } +>a5 : { fn(x: T, y: T): T; } + +var r8b6 = b6 !== a6; +>r8b6 : boolean +>b6 !== a6 : boolean +>b6 : { fn(x: Base, y: C): Base; } +>a6 : { fn(x: T, y: U): T; } + diff --git a/tests/baselines/reference/comparisonOperatorWithNoRelationshipObjectsOnInstantiatedConstructorSignature.errors.txt b/tests/baselines/reference/comparisonOperatorWithNoRelationshipObjectsOnInstantiatedConstructorSignature.errors.txt deleted file mode 100644 index 5364fea089c..00000000000 --- a/tests/baselines/reference/comparisonOperatorWithNoRelationshipObjectsOnInstantiatedConstructorSignature.errors.txt +++ /dev/null @@ -1,155 +0,0 @@ -tests/cases/conformance/expressions/binaryOperators/comparisonOperator/comparisonOperatorWithNoRelationshipObjectsOnInstantiatedConstructorSignature.ts(28,19): error TS2313: Constraint of a type parameter cannot reference any type parameter from the same type parameter list. - - -==== tests/cases/conformance/expressions/binaryOperators/comparisonOperator/comparisonOperatorWithNoRelationshipObjectsOnInstantiatedConstructorSignature.ts (1 errors) ==== - class Base { - public a: string; - } - - class Derived extends Base { - public b: string; - } - - class C { - public c: string; - } - - var a1: { new (x: T): T }; - var b1: { new (): string }; - - var a2: { new (x: T): T }; - var b2: { new (x: string): number }; - - var a3: { new (x?: T): T }; - var b3: { new (x?: string): number }; - - var a4: { new (...x: T[]): T }; - var b4: { new (...x: string[]): number }; - - var a5: { new (x: T, y: T): T }; - var b5: { new (x: string, y: number): string }; - - var a6: { new (x: T, y: U): T }; - ~~~~~~~~~~~ -!!! error TS2313: Constraint of a type parameter cannot reference any type parameter from the same type parameter list. - var b6: { new (x: Base, y: C): Base }; - - // operator < - var r1a1 = a1 < b1; - var r1a2 = a2 < b2; - var r1a3 = a3 < b3; - var r1a4 = a4 < b4; - var r1a5 = a5 < b5; - var r1a6 = a6 < b6; - - var r1b1 = b1 < a1; - var r1b2 = b2 < a2; - var r1b3 = b3 < a3; - var r1b4 = b4 < a4; - var r1b5 = b5 < a5; - var r1b6 = b6 < a6; - - // operator > - var r2a1 = a1 > b1; - var r2a2 = a2 > b2; - var r2a3 = a3 > b3; - var r2a4 = a4 > b4; - var r2a5 = a5 > b5; - var r2a6 = a6 > b6; - - var r2b1 = b1 > a1; - var r2b2 = b2 > a2; - var r2b3 = b3 > a3; - var r2b4 = b4 > a4; - var r2b5 = b5 > a5; - var r2b6 = b6 > a6; - - // operator <= - var r3a1 = a1 <= b1; - var r3a2 = a2 <= b2; - var r3a3 = a3 <= b3; - var r3a4 = a4 <= b4; - var r3a5 = a5 <= b5; - var r3a6 = a6 <= b6; - - var r3b1 = b1 <= a1; - var r3b2 = b2 <= a2; - var r3b3 = b3 <= a3; - var r3b4 = b4 <= a4; - var r3b5 = b5 <= a5; - var r3b6 = b6 <= a6; - - // operator >= - var r4a1 = a1 >= b1; - var r4a2 = a2 >= b2; - var r4a3 = a3 >= b3; - var r4a4 = a4 >= b4; - var r4a5 = a5 >= b5; - var r4a6 = a6 >= b6; - - var r4b1 = b1 >= a1; - var r4b2 = b2 >= a2; - var r4b3 = b3 >= a3; - var r4b4 = b4 >= a4; - var r4b5 = b5 >= a5; - var r4b6 = b6 >= a6; - - // operator == - var r5a1 = a1 == b1; - var r5a2 = a2 == b2; - var r5a3 = a3 == b3; - var r5a4 = a4 == b4; - var r5a5 = a5 == b5; - var r5a6 = a6 == b6; - - var r5b1 = b1 == a1; - var r5b2 = b2 == a2; - var r5b3 = b3 == a3; - var r5b4 = b4 == a4; - var r5b5 = b5 == a5; - var r5b6 = b6 == a6; - - // operator != - var r6a1 = a1 != b1; - var r6a2 = a2 != b2; - var r6a3 = a3 != b3; - var r6a4 = a4 != b4; - var r6a5 = a5 != b5; - var r6a6 = a6 != b6; - - var r6b1 = b1 != a1; - var r6b2 = b2 != a2; - var r6b3 = b3 != a3; - var r6b4 = b4 != a4; - var r6b5 = b5 != a5; - var r6b6 = b6 != a6; - - // operator === - var r7a1 = a1 === b1; - var r7a2 = a2 === b2; - var r7a3 = a3 === b3; - var r7a4 = a4 === b4; - var r7a5 = a5 === b5; - var r7a6 = a6 === b6; - - var r7b1 = b1 === a1; - var r7b2 = b2 === a2; - var r7b3 = b3 === a3; - var r7b4 = b4 === a4; - var r7b5 = b5 === a5; - var r7b6 = b6 === a6; - - // operator !== - var r8a1 = a1 !== b1; - var r8a2 = a2 !== b2; - var r8a3 = a3 !== b3; - var r8a4 = a4 !== b4; - var r8a5 = a5 !== b5; - var r8a6 = a6 !== b6; - - var r8b1 = b1 !== a1; - var r8b2 = b2 !== a2; - var r8b3 = b3 !== a3; - var r8b4 = b4 !== a4; - var r8b5 = b5 !== a5; - var r8b6 = b6 !== a6; \ No newline at end of file diff --git a/tests/baselines/reference/comparisonOperatorWithNoRelationshipObjectsOnInstantiatedConstructorSignature.symbols b/tests/baselines/reference/comparisonOperatorWithNoRelationshipObjectsOnInstantiatedConstructorSignature.symbols new file mode 100644 index 00000000000..08b23dac50a --- /dev/null +++ b/tests/baselines/reference/comparisonOperatorWithNoRelationshipObjectsOnInstantiatedConstructorSignature.symbols @@ -0,0 +1,587 @@ +=== tests/cases/conformance/expressions/binaryOperators/comparisonOperator/comparisonOperatorWithNoRelationshipObjectsOnInstantiatedConstructorSignature.ts === +class Base { +>Base : Symbol(Base, Decl(comparisonOperatorWithNoRelationshipObjectsOnInstantiatedConstructorSignature.ts, 0, 0)) + + public a: string; +>a : Symbol(a, Decl(comparisonOperatorWithNoRelationshipObjectsOnInstantiatedConstructorSignature.ts, 0, 12)) +} + +class Derived extends Base { +>Derived : Symbol(Derived, Decl(comparisonOperatorWithNoRelationshipObjectsOnInstantiatedConstructorSignature.ts, 2, 1)) +>Base : Symbol(Base, Decl(comparisonOperatorWithNoRelationshipObjectsOnInstantiatedConstructorSignature.ts, 0, 0)) + + public b: string; +>b : Symbol(b, Decl(comparisonOperatorWithNoRelationshipObjectsOnInstantiatedConstructorSignature.ts, 4, 28)) +} + +class C { +>C : Symbol(C, Decl(comparisonOperatorWithNoRelationshipObjectsOnInstantiatedConstructorSignature.ts, 6, 1)) + + public c: string; +>c : Symbol(c, Decl(comparisonOperatorWithNoRelationshipObjectsOnInstantiatedConstructorSignature.ts, 8, 9)) +} + +var a1: { new (x: T): T }; +>a1 : Symbol(a1, Decl(comparisonOperatorWithNoRelationshipObjectsOnInstantiatedConstructorSignature.ts, 12, 3)) +>T : Symbol(T, Decl(comparisonOperatorWithNoRelationshipObjectsOnInstantiatedConstructorSignature.ts, 12, 15)) +>x : Symbol(x, Decl(comparisonOperatorWithNoRelationshipObjectsOnInstantiatedConstructorSignature.ts, 12, 18)) +>T : Symbol(T, Decl(comparisonOperatorWithNoRelationshipObjectsOnInstantiatedConstructorSignature.ts, 12, 15)) +>T : Symbol(T, Decl(comparisonOperatorWithNoRelationshipObjectsOnInstantiatedConstructorSignature.ts, 12, 15)) + +var b1: { new (): string }; +>b1 : Symbol(b1, Decl(comparisonOperatorWithNoRelationshipObjectsOnInstantiatedConstructorSignature.ts, 13, 3)) + +var a2: { new (x: T): T }; +>a2 : Symbol(a2, Decl(comparisonOperatorWithNoRelationshipObjectsOnInstantiatedConstructorSignature.ts, 15, 3)) +>T : Symbol(T, Decl(comparisonOperatorWithNoRelationshipObjectsOnInstantiatedConstructorSignature.ts, 15, 15)) +>x : Symbol(x, Decl(comparisonOperatorWithNoRelationshipObjectsOnInstantiatedConstructorSignature.ts, 15, 18)) +>T : Symbol(T, Decl(comparisonOperatorWithNoRelationshipObjectsOnInstantiatedConstructorSignature.ts, 15, 15)) +>T : Symbol(T, Decl(comparisonOperatorWithNoRelationshipObjectsOnInstantiatedConstructorSignature.ts, 15, 15)) + +var b2: { new (x: string): number }; +>b2 : Symbol(b2, Decl(comparisonOperatorWithNoRelationshipObjectsOnInstantiatedConstructorSignature.ts, 16, 3)) +>x : Symbol(x, Decl(comparisonOperatorWithNoRelationshipObjectsOnInstantiatedConstructorSignature.ts, 16, 15)) + +var a3: { new (x?: T): T }; +>a3 : Symbol(a3, Decl(comparisonOperatorWithNoRelationshipObjectsOnInstantiatedConstructorSignature.ts, 18, 3)) +>T : Symbol(T, Decl(comparisonOperatorWithNoRelationshipObjectsOnInstantiatedConstructorSignature.ts, 18, 15)) +>x : Symbol(x, Decl(comparisonOperatorWithNoRelationshipObjectsOnInstantiatedConstructorSignature.ts, 18, 18)) +>T : Symbol(T, Decl(comparisonOperatorWithNoRelationshipObjectsOnInstantiatedConstructorSignature.ts, 18, 15)) +>T : Symbol(T, Decl(comparisonOperatorWithNoRelationshipObjectsOnInstantiatedConstructorSignature.ts, 18, 15)) + +var b3: { new (x?: string): number }; +>b3 : Symbol(b3, Decl(comparisonOperatorWithNoRelationshipObjectsOnInstantiatedConstructorSignature.ts, 19, 3)) +>x : Symbol(x, Decl(comparisonOperatorWithNoRelationshipObjectsOnInstantiatedConstructorSignature.ts, 19, 15)) + +var a4: { new (...x: T[]): T }; +>a4 : Symbol(a4, Decl(comparisonOperatorWithNoRelationshipObjectsOnInstantiatedConstructorSignature.ts, 21, 3)) +>T : Symbol(T, Decl(comparisonOperatorWithNoRelationshipObjectsOnInstantiatedConstructorSignature.ts, 21, 15)) +>x : Symbol(x, Decl(comparisonOperatorWithNoRelationshipObjectsOnInstantiatedConstructorSignature.ts, 21, 18)) +>T : Symbol(T, Decl(comparisonOperatorWithNoRelationshipObjectsOnInstantiatedConstructorSignature.ts, 21, 15)) +>T : Symbol(T, Decl(comparisonOperatorWithNoRelationshipObjectsOnInstantiatedConstructorSignature.ts, 21, 15)) + +var b4: { new (...x: string[]): number }; +>b4 : Symbol(b4, Decl(comparisonOperatorWithNoRelationshipObjectsOnInstantiatedConstructorSignature.ts, 22, 3)) +>x : Symbol(x, Decl(comparisonOperatorWithNoRelationshipObjectsOnInstantiatedConstructorSignature.ts, 22, 15)) + +var a5: { new (x: T, y: T): T }; +>a5 : Symbol(a5, Decl(comparisonOperatorWithNoRelationshipObjectsOnInstantiatedConstructorSignature.ts, 24, 3)) +>T : Symbol(T, Decl(comparisonOperatorWithNoRelationshipObjectsOnInstantiatedConstructorSignature.ts, 24, 15)) +>x : Symbol(x, Decl(comparisonOperatorWithNoRelationshipObjectsOnInstantiatedConstructorSignature.ts, 24, 18)) +>T : Symbol(T, Decl(comparisonOperatorWithNoRelationshipObjectsOnInstantiatedConstructorSignature.ts, 24, 15)) +>y : Symbol(y, Decl(comparisonOperatorWithNoRelationshipObjectsOnInstantiatedConstructorSignature.ts, 24, 23)) +>T : Symbol(T, Decl(comparisonOperatorWithNoRelationshipObjectsOnInstantiatedConstructorSignature.ts, 24, 15)) +>T : Symbol(T, Decl(comparisonOperatorWithNoRelationshipObjectsOnInstantiatedConstructorSignature.ts, 24, 15)) + +var b5: { new (x: string, y: number): string }; +>b5 : Symbol(b5, Decl(comparisonOperatorWithNoRelationshipObjectsOnInstantiatedConstructorSignature.ts, 25, 3)) +>x : Symbol(x, Decl(comparisonOperatorWithNoRelationshipObjectsOnInstantiatedConstructorSignature.ts, 25, 15)) +>y : Symbol(y, Decl(comparisonOperatorWithNoRelationshipObjectsOnInstantiatedConstructorSignature.ts, 25, 25)) + +var a6: { new (x: T, y: U): T }; +>a6 : Symbol(a6, Decl(comparisonOperatorWithNoRelationshipObjectsOnInstantiatedConstructorSignature.ts, 27, 3)) +>T : Symbol(T, Decl(comparisonOperatorWithNoRelationshipObjectsOnInstantiatedConstructorSignature.ts, 27, 15)) +>U : Symbol(U, Decl(comparisonOperatorWithNoRelationshipObjectsOnInstantiatedConstructorSignature.ts, 27, 17)) +>T : Symbol(T, Decl(comparisonOperatorWithNoRelationshipObjectsOnInstantiatedConstructorSignature.ts, 27, 15)) +>x : Symbol(x, Decl(comparisonOperatorWithNoRelationshipObjectsOnInstantiatedConstructorSignature.ts, 27, 31)) +>T : Symbol(T, Decl(comparisonOperatorWithNoRelationshipObjectsOnInstantiatedConstructorSignature.ts, 27, 15)) +>y : Symbol(y, Decl(comparisonOperatorWithNoRelationshipObjectsOnInstantiatedConstructorSignature.ts, 27, 36)) +>U : Symbol(U, Decl(comparisonOperatorWithNoRelationshipObjectsOnInstantiatedConstructorSignature.ts, 27, 17)) +>T : Symbol(T, Decl(comparisonOperatorWithNoRelationshipObjectsOnInstantiatedConstructorSignature.ts, 27, 15)) + +var b6: { new (x: Base, y: C): Base }; +>b6 : Symbol(b6, Decl(comparisonOperatorWithNoRelationshipObjectsOnInstantiatedConstructorSignature.ts, 28, 3)) +>x : Symbol(x, Decl(comparisonOperatorWithNoRelationshipObjectsOnInstantiatedConstructorSignature.ts, 28, 15)) +>Base : Symbol(Base, Decl(comparisonOperatorWithNoRelationshipObjectsOnInstantiatedConstructorSignature.ts, 0, 0)) +>y : Symbol(y, Decl(comparisonOperatorWithNoRelationshipObjectsOnInstantiatedConstructorSignature.ts, 28, 23)) +>C : Symbol(C, Decl(comparisonOperatorWithNoRelationshipObjectsOnInstantiatedConstructorSignature.ts, 6, 1)) +>Base : Symbol(Base, Decl(comparisonOperatorWithNoRelationshipObjectsOnInstantiatedConstructorSignature.ts, 0, 0)) + +// operator < +var r1a1 = a1 < b1; +>r1a1 : Symbol(r1a1, Decl(comparisonOperatorWithNoRelationshipObjectsOnInstantiatedConstructorSignature.ts, 31, 3)) +>a1 : Symbol(a1, Decl(comparisonOperatorWithNoRelationshipObjectsOnInstantiatedConstructorSignature.ts, 12, 3)) +>b1 : Symbol(b1, Decl(comparisonOperatorWithNoRelationshipObjectsOnInstantiatedConstructorSignature.ts, 13, 3)) + +var r1a2 = a2 < b2; +>r1a2 : Symbol(r1a2, Decl(comparisonOperatorWithNoRelationshipObjectsOnInstantiatedConstructorSignature.ts, 32, 3)) +>a2 : Symbol(a2, Decl(comparisonOperatorWithNoRelationshipObjectsOnInstantiatedConstructorSignature.ts, 15, 3)) +>b2 : Symbol(b2, Decl(comparisonOperatorWithNoRelationshipObjectsOnInstantiatedConstructorSignature.ts, 16, 3)) + +var r1a3 = a3 < b3; +>r1a3 : Symbol(r1a3, Decl(comparisonOperatorWithNoRelationshipObjectsOnInstantiatedConstructorSignature.ts, 33, 3)) +>a3 : Symbol(a3, Decl(comparisonOperatorWithNoRelationshipObjectsOnInstantiatedConstructorSignature.ts, 18, 3)) +>b3 : Symbol(b3, Decl(comparisonOperatorWithNoRelationshipObjectsOnInstantiatedConstructorSignature.ts, 19, 3)) + +var r1a4 = a4 < b4; +>r1a4 : Symbol(r1a4, Decl(comparisonOperatorWithNoRelationshipObjectsOnInstantiatedConstructorSignature.ts, 34, 3)) +>a4 : Symbol(a4, Decl(comparisonOperatorWithNoRelationshipObjectsOnInstantiatedConstructorSignature.ts, 21, 3)) +>b4 : Symbol(b4, Decl(comparisonOperatorWithNoRelationshipObjectsOnInstantiatedConstructorSignature.ts, 22, 3)) + +var r1a5 = a5 < b5; +>r1a5 : Symbol(r1a5, Decl(comparisonOperatorWithNoRelationshipObjectsOnInstantiatedConstructorSignature.ts, 35, 3)) +>a5 : Symbol(a5, Decl(comparisonOperatorWithNoRelationshipObjectsOnInstantiatedConstructorSignature.ts, 24, 3)) +>b5 : Symbol(b5, Decl(comparisonOperatorWithNoRelationshipObjectsOnInstantiatedConstructorSignature.ts, 25, 3)) + +var r1a6 = a6 < b6; +>r1a6 : Symbol(r1a6, Decl(comparisonOperatorWithNoRelationshipObjectsOnInstantiatedConstructorSignature.ts, 36, 3)) +>a6 : Symbol(a6, Decl(comparisonOperatorWithNoRelationshipObjectsOnInstantiatedConstructorSignature.ts, 27, 3)) +>b6 : Symbol(b6, Decl(comparisonOperatorWithNoRelationshipObjectsOnInstantiatedConstructorSignature.ts, 28, 3)) + +var r1b1 = b1 < a1; +>r1b1 : Symbol(r1b1, Decl(comparisonOperatorWithNoRelationshipObjectsOnInstantiatedConstructorSignature.ts, 38, 3)) +>b1 : Symbol(b1, Decl(comparisonOperatorWithNoRelationshipObjectsOnInstantiatedConstructorSignature.ts, 13, 3)) +>a1 : Symbol(a1, Decl(comparisonOperatorWithNoRelationshipObjectsOnInstantiatedConstructorSignature.ts, 12, 3)) + +var r1b2 = b2 < a2; +>r1b2 : Symbol(r1b2, Decl(comparisonOperatorWithNoRelationshipObjectsOnInstantiatedConstructorSignature.ts, 39, 3)) +>b2 : Symbol(b2, Decl(comparisonOperatorWithNoRelationshipObjectsOnInstantiatedConstructorSignature.ts, 16, 3)) +>a2 : Symbol(a2, Decl(comparisonOperatorWithNoRelationshipObjectsOnInstantiatedConstructorSignature.ts, 15, 3)) + +var r1b3 = b3 < a3; +>r1b3 : Symbol(r1b3, Decl(comparisonOperatorWithNoRelationshipObjectsOnInstantiatedConstructorSignature.ts, 40, 3)) +>b3 : Symbol(b3, Decl(comparisonOperatorWithNoRelationshipObjectsOnInstantiatedConstructorSignature.ts, 19, 3)) +>a3 : Symbol(a3, Decl(comparisonOperatorWithNoRelationshipObjectsOnInstantiatedConstructorSignature.ts, 18, 3)) + +var r1b4 = b4 < a4; +>r1b4 : Symbol(r1b4, Decl(comparisonOperatorWithNoRelationshipObjectsOnInstantiatedConstructorSignature.ts, 41, 3)) +>b4 : Symbol(b4, Decl(comparisonOperatorWithNoRelationshipObjectsOnInstantiatedConstructorSignature.ts, 22, 3)) +>a4 : Symbol(a4, Decl(comparisonOperatorWithNoRelationshipObjectsOnInstantiatedConstructorSignature.ts, 21, 3)) + +var r1b5 = b5 < a5; +>r1b5 : Symbol(r1b5, Decl(comparisonOperatorWithNoRelationshipObjectsOnInstantiatedConstructorSignature.ts, 42, 3)) +>b5 : Symbol(b5, Decl(comparisonOperatorWithNoRelationshipObjectsOnInstantiatedConstructorSignature.ts, 25, 3)) +>a5 : Symbol(a5, Decl(comparisonOperatorWithNoRelationshipObjectsOnInstantiatedConstructorSignature.ts, 24, 3)) + +var r1b6 = b6 < a6; +>r1b6 : Symbol(r1b6, Decl(comparisonOperatorWithNoRelationshipObjectsOnInstantiatedConstructorSignature.ts, 43, 3)) +>b6 : Symbol(b6, Decl(comparisonOperatorWithNoRelationshipObjectsOnInstantiatedConstructorSignature.ts, 28, 3)) +>a6 : Symbol(a6, Decl(comparisonOperatorWithNoRelationshipObjectsOnInstantiatedConstructorSignature.ts, 27, 3)) + +// operator > +var r2a1 = a1 > b1; +>r2a1 : Symbol(r2a1, Decl(comparisonOperatorWithNoRelationshipObjectsOnInstantiatedConstructorSignature.ts, 46, 3)) +>a1 : Symbol(a1, Decl(comparisonOperatorWithNoRelationshipObjectsOnInstantiatedConstructorSignature.ts, 12, 3)) +>b1 : Symbol(b1, Decl(comparisonOperatorWithNoRelationshipObjectsOnInstantiatedConstructorSignature.ts, 13, 3)) + +var r2a2 = a2 > b2; +>r2a2 : Symbol(r2a2, Decl(comparisonOperatorWithNoRelationshipObjectsOnInstantiatedConstructorSignature.ts, 47, 3)) +>a2 : Symbol(a2, Decl(comparisonOperatorWithNoRelationshipObjectsOnInstantiatedConstructorSignature.ts, 15, 3)) +>b2 : Symbol(b2, Decl(comparisonOperatorWithNoRelationshipObjectsOnInstantiatedConstructorSignature.ts, 16, 3)) + +var r2a3 = a3 > b3; +>r2a3 : Symbol(r2a3, Decl(comparisonOperatorWithNoRelationshipObjectsOnInstantiatedConstructorSignature.ts, 48, 3)) +>a3 : Symbol(a3, Decl(comparisonOperatorWithNoRelationshipObjectsOnInstantiatedConstructorSignature.ts, 18, 3)) +>b3 : Symbol(b3, Decl(comparisonOperatorWithNoRelationshipObjectsOnInstantiatedConstructorSignature.ts, 19, 3)) + +var r2a4 = a4 > b4; +>r2a4 : Symbol(r2a4, Decl(comparisonOperatorWithNoRelationshipObjectsOnInstantiatedConstructorSignature.ts, 49, 3)) +>a4 : Symbol(a4, Decl(comparisonOperatorWithNoRelationshipObjectsOnInstantiatedConstructorSignature.ts, 21, 3)) +>b4 : Symbol(b4, Decl(comparisonOperatorWithNoRelationshipObjectsOnInstantiatedConstructorSignature.ts, 22, 3)) + +var r2a5 = a5 > b5; +>r2a5 : Symbol(r2a5, Decl(comparisonOperatorWithNoRelationshipObjectsOnInstantiatedConstructorSignature.ts, 50, 3)) +>a5 : Symbol(a5, Decl(comparisonOperatorWithNoRelationshipObjectsOnInstantiatedConstructorSignature.ts, 24, 3)) +>b5 : Symbol(b5, Decl(comparisonOperatorWithNoRelationshipObjectsOnInstantiatedConstructorSignature.ts, 25, 3)) + +var r2a6 = a6 > b6; +>r2a6 : Symbol(r2a6, Decl(comparisonOperatorWithNoRelationshipObjectsOnInstantiatedConstructorSignature.ts, 51, 3)) +>a6 : Symbol(a6, Decl(comparisonOperatorWithNoRelationshipObjectsOnInstantiatedConstructorSignature.ts, 27, 3)) +>b6 : Symbol(b6, Decl(comparisonOperatorWithNoRelationshipObjectsOnInstantiatedConstructorSignature.ts, 28, 3)) + +var r2b1 = b1 > a1; +>r2b1 : Symbol(r2b1, Decl(comparisonOperatorWithNoRelationshipObjectsOnInstantiatedConstructorSignature.ts, 53, 3)) +>b1 : Symbol(b1, Decl(comparisonOperatorWithNoRelationshipObjectsOnInstantiatedConstructorSignature.ts, 13, 3)) +>a1 : Symbol(a1, Decl(comparisonOperatorWithNoRelationshipObjectsOnInstantiatedConstructorSignature.ts, 12, 3)) + +var r2b2 = b2 > a2; +>r2b2 : Symbol(r2b2, Decl(comparisonOperatorWithNoRelationshipObjectsOnInstantiatedConstructorSignature.ts, 54, 3)) +>b2 : Symbol(b2, Decl(comparisonOperatorWithNoRelationshipObjectsOnInstantiatedConstructorSignature.ts, 16, 3)) +>a2 : Symbol(a2, Decl(comparisonOperatorWithNoRelationshipObjectsOnInstantiatedConstructorSignature.ts, 15, 3)) + +var r2b3 = b3 > a3; +>r2b3 : Symbol(r2b3, Decl(comparisonOperatorWithNoRelationshipObjectsOnInstantiatedConstructorSignature.ts, 55, 3)) +>b3 : Symbol(b3, Decl(comparisonOperatorWithNoRelationshipObjectsOnInstantiatedConstructorSignature.ts, 19, 3)) +>a3 : Symbol(a3, Decl(comparisonOperatorWithNoRelationshipObjectsOnInstantiatedConstructorSignature.ts, 18, 3)) + +var r2b4 = b4 > a4; +>r2b4 : Symbol(r2b4, Decl(comparisonOperatorWithNoRelationshipObjectsOnInstantiatedConstructorSignature.ts, 56, 3)) +>b4 : Symbol(b4, Decl(comparisonOperatorWithNoRelationshipObjectsOnInstantiatedConstructorSignature.ts, 22, 3)) +>a4 : Symbol(a4, Decl(comparisonOperatorWithNoRelationshipObjectsOnInstantiatedConstructorSignature.ts, 21, 3)) + +var r2b5 = b5 > a5; +>r2b5 : Symbol(r2b5, Decl(comparisonOperatorWithNoRelationshipObjectsOnInstantiatedConstructorSignature.ts, 57, 3)) +>b5 : Symbol(b5, Decl(comparisonOperatorWithNoRelationshipObjectsOnInstantiatedConstructorSignature.ts, 25, 3)) +>a5 : Symbol(a5, Decl(comparisonOperatorWithNoRelationshipObjectsOnInstantiatedConstructorSignature.ts, 24, 3)) + +var r2b6 = b6 > a6; +>r2b6 : Symbol(r2b6, Decl(comparisonOperatorWithNoRelationshipObjectsOnInstantiatedConstructorSignature.ts, 58, 3)) +>b6 : Symbol(b6, Decl(comparisonOperatorWithNoRelationshipObjectsOnInstantiatedConstructorSignature.ts, 28, 3)) +>a6 : Symbol(a6, Decl(comparisonOperatorWithNoRelationshipObjectsOnInstantiatedConstructorSignature.ts, 27, 3)) + +// operator <= +var r3a1 = a1 <= b1; +>r3a1 : Symbol(r3a1, Decl(comparisonOperatorWithNoRelationshipObjectsOnInstantiatedConstructorSignature.ts, 61, 3)) +>a1 : Symbol(a1, Decl(comparisonOperatorWithNoRelationshipObjectsOnInstantiatedConstructorSignature.ts, 12, 3)) +>b1 : Symbol(b1, Decl(comparisonOperatorWithNoRelationshipObjectsOnInstantiatedConstructorSignature.ts, 13, 3)) + +var r3a2 = a2 <= b2; +>r3a2 : Symbol(r3a2, Decl(comparisonOperatorWithNoRelationshipObjectsOnInstantiatedConstructorSignature.ts, 62, 3)) +>a2 : Symbol(a2, Decl(comparisonOperatorWithNoRelationshipObjectsOnInstantiatedConstructorSignature.ts, 15, 3)) +>b2 : Symbol(b2, Decl(comparisonOperatorWithNoRelationshipObjectsOnInstantiatedConstructorSignature.ts, 16, 3)) + +var r3a3 = a3 <= b3; +>r3a3 : Symbol(r3a3, Decl(comparisonOperatorWithNoRelationshipObjectsOnInstantiatedConstructorSignature.ts, 63, 3)) +>a3 : Symbol(a3, Decl(comparisonOperatorWithNoRelationshipObjectsOnInstantiatedConstructorSignature.ts, 18, 3)) +>b3 : Symbol(b3, Decl(comparisonOperatorWithNoRelationshipObjectsOnInstantiatedConstructorSignature.ts, 19, 3)) + +var r3a4 = a4 <= b4; +>r3a4 : Symbol(r3a4, Decl(comparisonOperatorWithNoRelationshipObjectsOnInstantiatedConstructorSignature.ts, 64, 3)) +>a4 : Symbol(a4, Decl(comparisonOperatorWithNoRelationshipObjectsOnInstantiatedConstructorSignature.ts, 21, 3)) +>b4 : Symbol(b4, Decl(comparisonOperatorWithNoRelationshipObjectsOnInstantiatedConstructorSignature.ts, 22, 3)) + +var r3a5 = a5 <= b5; +>r3a5 : Symbol(r3a5, Decl(comparisonOperatorWithNoRelationshipObjectsOnInstantiatedConstructorSignature.ts, 65, 3)) +>a5 : Symbol(a5, Decl(comparisonOperatorWithNoRelationshipObjectsOnInstantiatedConstructorSignature.ts, 24, 3)) +>b5 : Symbol(b5, Decl(comparisonOperatorWithNoRelationshipObjectsOnInstantiatedConstructorSignature.ts, 25, 3)) + +var r3a6 = a6 <= b6; +>r3a6 : Symbol(r3a6, Decl(comparisonOperatorWithNoRelationshipObjectsOnInstantiatedConstructorSignature.ts, 66, 3)) +>a6 : Symbol(a6, Decl(comparisonOperatorWithNoRelationshipObjectsOnInstantiatedConstructorSignature.ts, 27, 3)) +>b6 : Symbol(b6, Decl(comparisonOperatorWithNoRelationshipObjectsOnInstantiatedConstructorSignature.ts, 28, 3)) + +var r3b1 = b1 <= a1; +>r3b1 : Symbol(r3b1, Decl(comparisonOperatorWithNoRelationshipObjectsOnInstantiatedConstructorSignature.ts, 68, 3)) +>b1 : Symbol(b1, Decl(comparisonOperatorWithNoRelationshipObjectsOnInstantiatedConstructorSignature.ts, 13, 3)) +>a1 : Symbol(a1, Decl(comparisonOperatorWithNoRelationshipObjectsOnInstantiatedConstructorSignature.ts, 12, 3)) + +var r3b2 = b2 <= a2; +>r3b2 : Symbol(r3b2, Decl(comparisonOperatorWithNoRelationshipObjectsOnInstantiatedConstructorSignature.ts, 69, 3)) +>b2 : Symbol(b2, Decl(comparisonOperatorWithNoRelationshipObjectsOnInstantiatedConstructorSignature.ts, 16, 3)) +>a2 : Symbol(a2, Decl(comparisonOperatorWithNoRelationshipObjectsOnInstantiatedConstructorSignature.ts, 15, 3)) + +var r3b3 = b3 <= a3; +>r3b3 : Symbol(r3b3, Decl(comparisonOperatorWithNoRelationshipObjectsOnInstantiatedConstructorSignature.ts, 70, 3)) +>b3 : Symbol(b3, Decl(comparisonOperatorWithNoRelationshipObjectsOnInstantiatedConstructorSignature.ts, 19, 3)) +>a3 : Symbol(a3, Decl(comparisonOperatorWithNoRelationshipObjectsOnInstantiatedConstructorSignature.ts, 18, 3)) + +var r3b4 = b4 <= a4; +>r3b4 : Symbol(r3b4, Decl(comparisonOperatorWithNoRelationshipObjectsOnInstantiatedConstructorSignature.ts, 71, 3)) +>b4 : Symbol(b4, Decl(comparisonOperatorWithNoRelationshipObjectsOnInstantiatedConstructorSignature.ts, 22, 3)) +>a4 : Symbol(a4, Decl(comparisonOperatorWithNoRelationshipObjectsOnInstantiatedConstructorSignature.ts, 21, 3)) + +var r3b5 = b5 <= a5; +>r3b5 : Symbol(r3b5, Decl(comparisonOperatorWithNoRelationshipObjectsOnInstantiatedConstructorSignature.ts, 72, 3)) +>b5 : Symbol(b5, Decl(comparisonOperatorWithNoRelationshipObjectsOnInstantiatedConstructorSignature.ts, 25, 3)) +>a5 : Symbol(a5, Decl(comparisonOperatorWithNoRelationshipObjectsOnInstantiatedConstructorSignature.ts, 24, 3)) + +var r3b6 = b6 <= a6; +>r3b6 : Symbol(r3b6, Decl(comparisonOperatorWithNoRelationshipObjectsOnInstantiatedConstructorSignature.ts, 73, 3)) +>b6 : Symbol(b6, Decl(comparisonOperatorWithNoRelationshipObjectsOnInstantiatedConstructorSignature.ts, 28, 3)) +>a6 : Symbol(a6, Decl(comparisonOperatorWithNoRelationshipObjectsOnInstantiatedConstructorSignature.ts, 27, 3)) + +// operator >= +var r4a1 = a1 >= b1; +>r4a1 : Symbol(r4a1, Decl(comparisonOperatorWithNoRelationshipObjectsOnInstantiatedConstructorSignature.ts, 76, 3)) +>a1 : Symbol(a1, Decl(comparisonOperatorWithNoRelationshipObjectsOnInstantiatedConstructorSignature.ts, 12, 3)) +>b1 : Symbol(b1, Decl(comparisonOperatorWithNoRelationshipObjectsOnInstantiatedConstructorSignature.ts, 13, 3)) + +var r4a2 = a2 >= b2; +>r4a2 : Symbol(r4a2, Decl(comparisonOperatorWithNoRelationshipObjectsOnInstantiatedConstructorSignature.ts, 77, 3)) +>a2 : Symbol(a2, Decl(comparisonOperatorWithNoRelationshipObjectsOnInstantiatedConstructorSignature.ts, 15, 3)) +>b2 : Symbol(b2, Decl(comparisonOperatorWithNoRelationshipObjectsOnInstantiatedConstructorSignature.ts, 16, 3)) + +var r4a3 = a3 >= b3; +>r4a3 : Symbol(r4a3, Decl(comparisonOperatorWithNoRelationshipObjectsOnInstantiatedConstructorSignature.ts, 78, 3)) +>a3 : Symbol(a3, Decl(comparisonOperatorWithNoRelationshipObjectsOnInstantiatedConstructorSignature.ts, 18, 3)) +>b3 : Symbol(b3, Decl(comparisonOperatorWithNoRelationshipObjectsOnInstantiatedConstructorSignature.ts, 19, 3)) + +var r4a4 = a4 >= b4; +>r4a4 : Symbol(r4a4, Decl(comparisonOperatorWithNoRelationshipObjectsOnInstantiatedConstructorSignature.ts, 79, 3)) +>a4 : Symbol(a4, Decl(comparisonOperatorWithNoRelationshipObjectsOnInstantiatedConstructorSignature.ts, 21, 3)) +>b4 : Symbol(b4, Decl(comparisonOperatorWithNoRelationshipObjectsOnInstantiatedConstructorSignature.ts, 22, 3)) + +var r4a5 = a5 >= b5; +>r4a5 : Symbol(r4a5, Decl(comparisonOperatorWithNoRelationshipObjectsOnInstantiatedConstructorSignature.ts, 80, 3)) +>a5 : Symbol(a5, Decl(comparisonOperatorWithNoRelationshipObjectsOnInstantiatedConstructorSignature.ts, 24, 3)) +>b5 : Symbol(b5, Decl(comparisonOperatorWithNoRelationshipObjectsOnInstantiatedConstructorSignature.ts, 25, 3)) + +var r4a6 = a6 >= b6; +>r4a6 : Symbol(r4a6, Decl(comparisonOperatorWithNoRelationshipObjectsOnInstantiatedConstructorSignature.ts, 81, 3)) +>a6 : Symbol(a6, Decl(comparisonOperatorWithNoRelationshipObjectsOnInstantiatedConstructorSignature.ts, 27, 3)) +>b6 : Symbol(b6, Decl(comparisonOperatorWithNoRelationshipObjectsOnInstantiatedConstructorSignature.ts, 28, 3)) + +var r4b1 = b1 >= a1; +>r4b1 : Symbol(r4b1, Decl(comparisonOperatorWithNoRelationshipObjectsOnInstantiatedConstructorSignature.ts, 83, 3)) +>b1 : Symbol(b1, Decl(comparisonOperatorWithNoRelationshipObjectsOnInstantiatedConstructorSignature.ts, 13, 3)) +>a1 : Symbol(a1, Decl(comparisonOperatorWithNoRelationshipObjectsOnInstantiatedConstructorSignature.ts, 12, 3)) + +var r4b2 = b2 >= a2; +>r4b2 : Symbol(r4b2, Decl(comparisonOperatorWithNoRelationshipObjectsOnInstantiatedConstructorSignature.ts, 84, 3)) +>b2 : Symbol(b2, Decl(comparisonOperatorWithNoRelationshipObjectsOnInstantiatedConstructorSignature.ts, 16, 3)) +>a2 : Symbol(a2, Decl(comparisonOperatorWithNoRelationshipObjectsOnInstantiatedConstructorSignature.ts, 15, 3)) + +var r4b3 = b3 >= a3; +>r4b3 : Symbol(r4b3, Decl(comparisonOperatorWithNoRelationshipObjectsOnInstantiatedConstructorSignature.ts, 85, 3)) +>b3 : Symbol(b3, Decl(comparisonOperatorWithNoRelationshipObjectsOnInstantiatedConstructorSignature.ts, 19, 3)) +>a3 : Symbol(a3, Decl(comparisonOperatorWithNoRelationshipObjectsOnInstantiatedConstructorSignature.ts, 18, 3)) + +var r4b4 = b4 >= a4; +>r4b4 : Symbol(r4b4, Decl(comparisonOperatorWithNoRelationshipObjectsOnInstantiatedConstructorSignature.ts, 86, 3)) +>b4 : Symbol(b4, Decl(comparisonOperatorWithNoRelationshipObjectsOnInstantiatedConstructorSignature.ts, 22, 3)) +>a4 : Symbol(a4, Decl(comparisonOperatorWithNoRelationshipObjectsOnInstantiatedConstructorSignature.ts, 21, 3)) + +var r4b5 = b5 >= a5; +>r4b5 : Symbol(r4b5, Decl(comparisonOperatorWithNoRelationshipObjectsOnInstantiatedConstructorSignature.ts, 87, 3)) +>b5 : Symbol(b5, Decl(comparisonOperatorWithNoRelationshipObjectsOnInstantiatedConstructorSignature.ts, 25, 3)) +>a5 : Symbol(a5, Decl(comparisonOperatorWithNoRelationshipObjectsOnInstantiatedConstructorSignature.ts, 24, 3)) + +var r4b6 = b6 >= a6; +>r4b6 : Symbol(r4b6, Decl(comparisonOperatorWithNoRelationshipObjectsOnInstantiatedConstructorSignature.ts, 88, 3)) +>b6 : Symbol(b6, Decl(comparisonOperatorWithNoRelationshipObjectsOnInstantiatedConstructorSignature.ts, 28, 3)) +>a6 : Symbol(a6, Decl(comparisonOperatorWithNoRelationshipObjectsOnInstantiatedConstructorSignature.ts, 27, 3)) + +// operator == +var r5a1 = a1 == b1; +>r5a1 : Symbol(r5a1, Decl(comparisonOperatorWithNoRelationshipObjectsOnInstantiatedConstructorSignature.ts, 91, 3)) +>a1 : Symbol(a1, Decl(comparisonOperatorWithNoRelationshipObjectsOnInstantiatedConstructorSignature.ts, 12, 3)) +>b1 : Symbol(b1, Decl(comparisonOperatorWithNoRelationshipObjectsOnInstantiatedConstructorSignature.ts, 13, 3)) + +var r5a2 = a2 == b2; +>r5a2 : Symbol(r5a2, Decl(comparisonOperatorWithNoRelationshipObjectsOnInstantiatedConstructorSignature.ts, 92, 3)) +>a2 : Symbol(a2, Decl(comparisonOperatorWithNoRelationshipObjectsOnInstantiatedConstructorSignature.ts, 15, 3)) +>b2 : Symbol(b2, Decl(comparisonOperatorWithNoRelationshipObjectsOnInstantiatedConstructorSignature.ts, 16, 3)) + +var r5a3 = a3 == b3; +>r5a3 : Symbol(r5a3, Decl(comparisonOperatorWithNoRelationshipObjectsOnInstantiatedConstructorSignature.ts, 93, 3)) +>a3 : Symbol(a3, Decl(comparisonOperatorWithNoRelationshipObjectsOnInstantiatedConstructorSignature.ts, 18, 3)) +>b3 : Symbol(b3, Decl(comparisonOperatorWithNoRelationshipObjectsOnInstantiatedConstructorSignature.ts, 19, 3)) + +var r5a4 = a4 == b4; +>r5a4 : Symbol(r5a4, Decl(comparisonOperatorWithNoRelationshipObjectsOnInstantiatedConstructorSignature.ts, 94, 3)) +>a4 : Symbol(a4, Decl(comparisonOperatorWithNoRelationshipObjectsOnInstantiatedConstructorSignature.ts, 21, 3)) +>b4 : Symbol(b4, Decl(comparisonOperatorWithNoRelationshipObjectsOnInstantiatedConstructorSignature.ts, 22, 3)) + +var r5a5 = a5 == b5; +>r5a5 : Symbol(r5a5, Decl(comparisonOperatorWithNoRelationshipObjectsOnInstantiatedConstructorSignature.ts, 95, 3)) +>a5 : Symbol(a5, Decl(comparisonOperatorWithNoRelationshipObjectsOnInstantiatedConstructorSignature.ts, 24, 3)) +>b5 : Symbol(b5, Decl(comparisonOperatorWithNoRelationshipObjectsOnInstantiatedConstructorSignature.ts, 25, 3)) + +var r5a6 = a6 == b6; +>r5a6 : Symbol(r5a6, Decl(comparisonOperatorWithNoRelationshipObjectsOnInstantiatedConstructorSignature.ts, 96, 3)) +>a6 : Symbol(a6, Decl(comparisonOperatorWithNoRelationshipObjectsOnInstantiatedConstructorSignature.ts, 27, 3)) +>b6 : Symbol(b6, Decl(comparisonOperatorWithNoRelationshipObjectsOnInstantiatedConstructorSignature.ts, 28, 3)) + +var r5b1 = b1 == a1; +>r5b1 : Symbol(r5b1, Decl(comparisonOperatorWithNoRelationshipObjectsOnInstantiatedConstructorSignature.ts, 98, 3)) +>b1 : Symbol(b1, Decl(comparisonOperatorWithNoRelationshipObjectsOnInstantiatedConstructorSignature.ts, 13, 3)) +>a1 : Symbol(a1, Decl(comparisonOperatorWithNoRelationshipObjectsOnInstantiatedConstructorSignature.ts, 12, 3)) + +var r5b2 = b2 == a2; +>r5b2 : Symbol(r5b2, Decl(comparisonOperatorWithNoRelationshipObjectsOnInstantiatedConstructorSignature.ts, 99, 3)) +>b2 : Symbol(b2, Decl(comparisonOperatorWithNoRelationshipObjectsOnInstantiatedConstructorSignature.ts, 16, 3)) +>a2 : Symbol(a2, Decl(comparisonOperatorWithNoRelationshipObjectsOnInstantiatedConstructorSignature.ts, 15, 3)) + +var r5b3 = b3 == a3; +>r5b3 : Symbol(r5b3, Decl(comparisonOperatorWithNoRelationshipObjectsOnInstantiatedConstructorSignature.ts, 100, 3)) +>b3 : Symbol(b3, Decl(comparisonOperatorWithNoRelationshipObjectsOnInstantiatedConstructorSignature.ts, 19, 3)) +>a3 : Symbol(a3, Decl(comparisonOperatorWithNoRelationshipObjectsOnInstantiatedConstructorSignature.ts, 18, 3)) + +var r5b4 = b4 == a4; +>r5b4 : Symbol(r5b4, Decl(comparisonOperatorWithNoRelationshipObjectsOnInstantiatedConstructorSignature.ts, 101, 3)) +>b4 : Symbol(b4, Decl(comparisonOperatorWithNoRelationshipObjectsOnInstantiatedConstructorSignature.ts, 22, 3)) +>a4 : Symbol(a4, Decl(comparisonOperatorWithNoRelationshipObjectsOnInstantiatedConstructorSignature.ts, 21, 3)) + +var r5b5 = b5 == a5; +>r5b5 : Symbol(r5b5, Decl(comparisonOperatorWithNoRelationshipObjectsOnInstantiatedConstructorSignature.ts, 102, 3)) +>b5 : Symbol(b5, Decl(comparisonOperatorWithNoRelationshipObjectsOnInstantiatedConstructorSignature.ts, 25, 3)) +>a5 : Symbol(a5, Decl(comparisonOperatorWithNoRelationshipObjectsOnInstantiatedConstructorSignature.ts, 24, 3)) + +var r5b6 = b6 == a6; +>r5b6 : Symbol(r5b6, Decl(comparisonOperatorWithNoRelationshipObjectsOnInstantiatedConstructorSignature.ts, 103, 3)) +>b6 : Symbol(b6, Decl(comparisonOperatorWithNoRelationshipObjectsOnInstantiatedConstructorSignature.ts, 28, 3)) +>a6 : Symbol(a6, Decl(comparisonOperatorWithNoRelationshipObjectsOnInstantiatedConstructorSignature.ts, 27, 3)) + +// operator != +var r6a1 = a1 != b1; +>r6a1 : Symbol(r6a1, Decl(comparisonOperatorWithNoRelationshipObjectsOnInstantiatedConstructorSignature.ts, 106, 3)) +>a1 : Symbol(a1, Decl(comparisonOperatorWithNoRelationshipObjectsOnInstantiatedConstructorSignature.ts, 12, 3)) +>b1 : Symbol(b1, Decl(comparisonOperatorWithNoRelationshipObjectsOnInstantiatedConstructorSignature.ts, 13, 3)) + +var r6a2 = a2 != b2; +>r6a2 : Symbol(r6a2, Decl(comparisonOperatorWithNoRelationshipObjectsOnInstantiatedConstructorSignature.ts, 107, 3)) +>a2 : Symbol(a2, Decl(comparisonOperatorWithNoRelationshipObjectsOnInstantiatedConstructorSignature.ts, 15, 3)) +>b2 : Symbol(b2, Decl(comparisonOperatorWithNoRelationshipObjectsOnInstantiatedConstructorSignature.ts, 16, 3)) + +var r6a3 = a3 != b3; +>r6a3 : Symbol(r6a3, Decl(comparisonOperatorWithNoRelationshipObjectsOnInstantiatedConstructorSignature.ts, 108, 3)) +>a3 : Symbol(a3, Decl(comparisonOperatorWithNoRelationshipObjectsOnInstantiatedConstructorSignature.ts, 18, 3)) +>b3 : Symbol(b3, Decl(comparisonOperatorWithNoRelationshipObjectsOnInstantiatedConstructorSignature.ts, 19, 3)) + +var r6a4 = a4 != b4; +>r6a4 : Symbol(r6a4, Decl(comparisonOperatorWithNoRelationshipObjectsOnInstantiatedConstructorSignature.ts, 109, 3)) +>a4 : Symbol(a4, Decl(comparisonOperatorWithNoRelationshipObjectsOnInstantiatedConstructorSignature.ts, 21, 3)) +>b4 : Symbol(b4, Decl(comparisonOperatorWithNoRelationshipObjectsOnInstantiatedConstructorSignature.ts, 22, 3)) + +var r6a5 = a5 != b5; +>r6a5 : Symbol(r6a5, Decl(comparisonOperatorWithNoRelationshipObjectsOnInstantiatedConstructorSignature.ts, 110, 3)) +>a5 : Symbol(a5, Decl(comparisonOperatorWithNoRelationshipObjectsOnInstantiatedConstructorSignature.ts, 24, 3)) +>b5 : Symbol(b5, Decl(comparisonOperatorWithNoRelationshipObjectsOnInstantiatedConstructorSignature.ts, 25, 3)) + +var r6a6 = a6 != b6; +>r6a6 : Symbol(r6a6, Decl(comparisonOperatorWithNoRelationshipObjectsOnInstantiatedConstructorSignature.ts, 111, 3)) +>a6 : Symbol(a6, Decl(comparisonOperatorWithNoRelationshipObjectsOnInstantiatedConstructorSignature.ts, 27, 3)) +>b6 : Symbol(b6, Decl(comparisonOperatorWithNoRelationshipObjectsOnInstantiatedConstructorSignature.ts, 28, 3)) + +var r6b1 = b1 != a1; +>r6b1 : Symbol(r6b1, Decl(comparisonOperatorWithNoRelationshipObjectsOnInstantiatedConstructorSignature.ts, 113, 3)) +>b1 : Symbol(b1, Decl(comparisonOperatorWithNoRelationshipObjectsOnInstantiatedConstructorSignature.ts, 13, 3)) +>a1 : Symbol(a1, Decl(comparisonOperatorWithNoRelationshipObjectsOnInstantiatedConstructorSignature.ts, 12, 3)) + +var r6b2 = b2 != a2; +>r6b2 : Symbol(r6b2, Decl(comparisonOperatorWithNoRelationshipObjectsOnInstantiatedConstructorSignature.ts, 114, 3)) +>b2 : Symbol(b2, Decl(comparisonOperatorWithNoRelationshipObjectsOnInstantiatedConstructorSignature.ts, 16, 3)) +>a2 : Symbol(a2, Decl(comparisonOperatorWithNoRelationshipObjectsOnInstantiatedConstructorSignature.ts, 15, 3)) + +var r6b3 = b3 != a3; +>r6b3 : Symbol(r6b3, Decl(comparisonOperatorWithNoRelationshipObjectsOnInstantiatedConstructorSignature.ts, 115, 3)) +>b3 : Symbol(b3, Decl(comparisonOperatorWithNoRelationshipObjectsOnInstantiatedConstructorSignature.ts, 19, 3)) +>a3 : Symbol(a3, Decl(comparisonOperatorWithNoRelationshipObjectsOnInstantiatedConstructorSignature.ts, 18, 3)) + +var r6b4 = b4 != a4; +>r6b4 : Symbol(r6b4, Decl(comparisonOperatorWithNoRelationshipObjectsOnInstantiatedConstructorSignature.ts, 116, 3)) +>b4 : Symbol(b4, Decl(comparisonOperatorWithNoRelationshipObjectsOnInstantiatedConstructorSignature.ts, 22, 3)) +>a4 : Symbol(a4, Decl(comparisonOperatorWithNoRelationshipObjectsOnInstantiatedConstructorSignature.ts, 21, 3)) + +var r6b5 = b5 != a5; +>r6b5 : Symbol(r6b5, Decl(comparisonOperatorWithNoRelationshipObjectsOnInstantiatedConstructorSignature.ts, 117, 3)) +>b5 : Symbol(b5, Decl(comparisonOperatorWithNoRelationshipObjectsOnInstantiatedConstructorSignature.ts, 25, 3)) +>a5 : Symbol(a5, Decl(comparisonOperatorWithNoRelationshipObjectsOnInstantiatedConstructorSignature.ts, 24, 3)) + +var r6b6 = b6 != a6; +>r6b6 : Symbol(r6b6, Decl(comparisonOperatorWithNoRelationshipObjectsOnInstantiatedConstructorSignature.ts, 118, 3)) +>b6 : Symbol(b6, Decl(comparisonOperatorWithNoRelationshipObjectsOnInstantiatedConstructorSignature.ts, 28, 3)) +>a6 : Symbol(a6, Decl(comparisonOperatorWithNoRelationshipObjectsOnInstantiatedConstructorSignature.ts, 27, 3)) + +// operator === +var r7a1 = a1 === b1; +>r7a1 : Symbol(r7a1, Decl(comparisonOperatorWithNoRelationshipObjectsOnInstantiatedConstructorSignature.ts, 121, 3)) +>a1 : Symbol(a1, Decl(comparisonOperatorWithNoRelationshipObjectsOnInstantiatedConstructorSignature.ts, 12, 3)) +>b1 : Symbol(b1, Decl(comparisonOperatorWithNoRelationshipObjectsOnInstantiatedConstructorSignature.ts, 13, 3)) + +var r7a2 = a2 === b2; +>r7a2 : Symbol(r7a2, Decl(comparisonOperatorWithNoRelationshipObjectsOnInstantiatedConstructorSignature.ts, 122, 3)) +>a2 : Symbol(a2, Decl(comparisonOperatorWithNoRelationshipObjectsOnInstantiatedConstructorSignature.ts, 15, 3)) +>b2 : Symbol(b2, Decl(comparisonOperatorWithNoRelationshipObjectsOnInstantiatedConstructorSignature.ts, 16, 3)) + +var r7a3 = a3 === b3; +>r7a3 : Symbol(r7a3, Decl(comparisonOperatorWithNoRelationshipObjectsOnInstantiatedConstructorSignature.ts, 123, 3)) +>a3 : Symbol(a3, Decl(comparisonOperatorWithNoRelationshipObjectsOnInstantiatedConstructorSignature.ts, 18, 3)) +>b3 : Symbol(b3, Decl(comparisonOperatorWithNoRelationshipObjectsOnInstantiatedConstructorSignature.ts, 19, 3)) + +var r7a4 = a4 === b4; +>r7a4 : Symbol(r7a4, Decl(comparisonOperatorWithNoRelationshipObjectsOnInstantiatedConstructorSignature.ts, 124, 3)) +>a4 : Symbol(a4, Decl(comparisonOperatorWithNoRelationshipObjectsOnInstantiatedConstructorSignature.ts, 21, 3)) +>b4 : Symbol(b4, Decl(comparisonOperatorWithNoRelationshipObjectsOnInstantiatedConstructorSignature.ts, 22, 3)) + +var r7a5 = a5 === b5; +>r7a5 : Symbol(r7a5, Decl(comparisonOperatorWithNoRelationshipObjectsOnInstantiatedConstructorSignature.ts, 125, 3)) +>a5 : Symbol(a5, Decl(comparisonOperatorWithNoRelationshipObjectsOnInstantiatedConstructorSignature.ts, 24, 3)) +>b5 : Symbol(b5, Decl(comparisonOperatorWithNoRelationshipObjectsOnInstantiatedConstructorSignature.ts, 25, 3)) + +var r7a6 = a6 === b6; +>r7a6 : Symbol(r7a6, Decl(comparisonOperatorWithNoRelationshipObjectsOnInstantiatedConstructorSignature.ts, 126, 3)) +>a6 : Symbol(a6, Decl(comparisonOperatorWithNoRelationshipObjectsOnInstantiatedConstructorSignature.ts, 27, 3)) +>b6 : Symbol(b6, Decl(comparisonOperatorWithNoRelationshipObjectsOnInstantiatedConstructorSignature.ts, 28, 3)) + +var r7b1 = b1 === a1; +>r7b1 : Symbol(r7b1, Decl(comparisonOperatorWithNoRelationshipObjectsOnInstantiatedConstructorSignature.ts, 128, 3)) +>b1 : Symbol(b1, Decl(comparisonOperatorWithNoRelationshipObjectsOnInstantiatedConstructorSignature.ts, 13, 3)) +>a1 : Symbol(a1, Decl(comparisonOperatorWithNoRelationshipObjectsOnInstantiatedConstructorSignature.ts, 12, 3)) + +var r7b2 = b2 === a2; +>r7b2 : Symbol(r7b2, Decl(comparisonOperatorWithNoRelationshipObjectsOnInstantiatedConstructorSignature.ts, 129, 3)) +>b2 : Symbol(b2, Decl(comparisonOperatorWithNoRelationshipObjectsOnInstantiatedConstructorSignature.ts, 16, 3)) +>a2 : Symbol(a2, Decl(comparisonOperatorWithNoRelationshipObjectsOnInstantiatedConstructorSignature.ts, 15, 3)) + +var r7b3 = b3 === a3; +>r7b3 : Symbol(r7b3, Decl(comparisonOperatorWithNoRelationshipObjectsOnInstantiatedConstructorSignature.ts, 130, 3)) +>b3 : Symbol(b3, Decl(comparisonOperatorWithNoRelationshipObjectsOnInstantiatedConstructorSignature.ts, 19, 3)) +>a3 : Symbol(a3, Decl(comparisonOperatorWithNoRelationshipObjectsOnInstantiatedConstructorSignature.ts, 18, 3)) + +var r7b4 = b4 === a4; +>r7b4 : Symbol(r7b4, Decl(comparisonOperatorWithNoRelationshipObjectsOnInstantiatedConstructorSignature.ts, 131, 3)) +>b4 : Symbol(b4, Decl(comparisonOperatorWithNoRelationshipObjectsOnInstantiatedConstructorSignature.ts, 22, 3)) +>a4 : Symbol(a4, Decl(comparisonOperatorWithNoRelationshipObjectsOnInstantiatedConstructorSignature.ts, 21, 3)) + +var r7b5 = b5 === a5; +>r7b5 : Symbol(r7b5, Decl(comparisonOperatorWithNoRelationshipObjectsOnInstantiatedConstructorSignature.ts, 132, 3)) +>b5 : Symbol(b5, Decl(comparisonOperatorWithNoRelationshipObjectsOnInstantiatedConstructorSignature.ts, 25, 3)) +>a5 : Symbol(a5, Decl(comparisonOperatorWithNoRelationshipObjectsOnInstantiatedConstructorSignature.ts, 24, 3)) + +var r7b6 = b6 === a6; +>r7b6 : Symbol(r7b6, Decl(comparisonOperatorWithNoRelationshipObjectsOnInstantiatedConstructorSignature.ts, 133, 3)) +>b6 : Symbol(b6, Decl(comparisonOperatorWithNoRelationshipObjectsOnInstantiatedConstructorSignature.ts, 28, 3)) +>a6 : Symbol(a6, Decl(comparisonOperatorWithNoRelationshipObjectsOnInstantiatedConstructorSignature.ts, 27, 3)) + +// operator !== +var r8a1 = a1 !== b1; +>r8a1 : Symbol(r8a1, Decl(comparisonOperatorWithNoRelationshipObjectsOnInstantiatedConstructorSignature.ts, 136, 3)) +>a1 : Symbol(a1, Decl(comparisonOperatorWithNoRelationshipObjectsOnInstantiatedConstructorSignature.ts, 12, 3)) +>b1 : Symbol(b1, Decl(comparisonOperatorWithNoRelationshipObjectsOnInstantiatedConstructorSignature.ts, 13, 3)) + +var r8a2 = a2 !== b2; +>r8a2 : Symbol(r8a2, Decl(comparisonOperatorWithNoRelationshipObjectsOnInstantiatedConstructorSignature.ts, 137, 3)) +>a2 : Symbol(a2, Decl(comparisonOperatorWithNoRelationshipObjectsOnInstantiatedConstructorSignature.ts, 15, 3)) +>b2 : Symbol(b2, Decl(comparisonOperatorWithNoRelationshipObjectsOnInstantiatedConstructorSignature.ts, 16, 3)) + +var r8a3 = a3 !== b3; +>r8a3 : Symbol(r8a3, Decl(comparisonOperatorWithNoRelationshipObjectsOnInstantiatedConstructorSignature.ts, 138, 3)) +>a3 : Symbol(a3, Decl(comparisonOperatorWithNoRelationshipObjectsOnInstantiatedConstructorSignature.ts, 18, 3)) +>b3 : Symbol(b3, Decl(comparisonOperatorWithNoRelationshipObjectsOnInstantiatedConstructorSignature.ts, 19, 3)) + +var r8a4 = a4 !== b4; +>r8a4 : Symbol(r8a4, Decl(comparisonOperatorWithNoRelationshipObjectsOnInstantiatedConstructorSignature.ts, 139, 3)) +>a4 : Symbol(a4, Decl(comparisonOperatorWithNoRelationshipObjectsOnInstantiatedConstructorSignature.ts, 21, 3)) +>b4 : Symbol(b4, Decl(comparisonOperatorWithNoRelationshipObjectsOnInstantiatedConstructorSignature.ts, 22, 3)) + +var r8a5 = a5 !== b5; +>r8a5 : Symbol(r8a5, Decl(comparisonOperatorWithNoRelationshipObjectsOnInstantiatedConstructorSignature.ts, 140, 3)) +>a5 : Symbol(a5, Decl(comparisonOperatorWithNoRelationshipObjectsOnInstantiatedConstructorSignature.ts, 24, 3)) +>b5 : Symbol(b5, Decl(comparisonOperatorWithNoRelationshipObjectsOnInstantiatedConstructorSignature.ts, 25, 3)) + +var r8a6 = a6 !== b6; +>r8a6 : Symbol(r8a6, Decl(comparisonOperatorWithNoRelationshipObjectsOnInstantiatedConstructorSignature.ts, 141, 3)) +>a6 : Symbol(a6, Decl(comparisonOperatorWithNoRelationshipObjectsOnInstantiatedConstructorSignature.ts, 27, 3)) +>b6 : Symbol(b6, Decl(comparisonOperatorWithNoRelationshipObjectsOnInstantiatedConstructorSignature.ts, 28, 3)) + +var r8b1 = b1 !== a1; +>r8b1 : Symbol(r8b1, Decl(comparisonOperatorWithNoRelationshipObjectsOnInstantiatedConstructorSignature.ts, 143, 3)) +>b1 : Symbol(b1, Decl(comparisonOperatorWithNoRelationshipObjectsOnInstantiatedConstructorSignature.ts, 13, 3)) +>a1 : Symbol(a1, Decl(comparisonOperatorWithNoRelationshipObjectsOnInstantiatedConstructorSignature.ts, 12, 3)) + +var r8b2 = b2 !== a2; +>r8b2 : Symbol(r8b2, Decl(comparisonOperatorWithNoRelationshipObjectsOnInstantiatedConstructorSignature.ts, 144, 3)) +>b2 : Symbol(b2, Decl(comparisonOperatorWithNoRelationshipObjectsOnInstantiatedConstructorSignature.ts, 16, 3)) +>a2 : Symbol(a2, Decl(comparisonOperatorWithNoRelationshipObjectsOnInstantiatedConstructorSignature.ts, 15, 3)) + +var r8b3 = b3 !== a3; +>r8b3 : Symbol(r8b3, Decl(comparisonOperatorWithNoRelationshipObjectsOnInstantiatedConstructorSignature.ts, 145, 3)) +>b3 : Symbol(b3, Decl(comparisonOperatorWithNoRelationshipObjectsOnInstantiatedConstructorSignature.ts, 19, 3)) +>a3 : Symbol(a3, Decl(comparisonOperatorWithNoRelationshipObjectsOnInstantiatedConstructorSignature.ts, 18, 3)) + +var r8b4 = b4 !== a4; +>r8b4 : Symbol(r8b4, Decl(comparisonOperatorWithNoRelationshipObjectsOnInstantiatedConstructorSignature.ts, 146, 3)) +>b4 : Symbol(b4, Decl(comparisonOperatorWithNoRelationshipObjectsOnInstantiatedConstructorSignature.ts, 22, 3)) +>a4 : Symbol(a4, Decl(comparisonOperatorWithNoRelationshipObjectsOnInstantiatedConstructorSignature.ts, 21, 3)) + +var r8b5 = b5 !== a5; +>r8b5 : Symbol(r8b5, Decl(comparisonOperatorWithNoRelationshipObjectsOnInstantiatedConstructorSignature.ts, 147, 3)) +>b5 : Symbol(b5, Decl(comparisonOperatorWithNoRelationshipObjectsOnInstantiatedConstructorSignature.ts, 25, 3)) +>a5 : Symbol(a5, Decl(comparisonOperatorWithNoRelationshipObjectsOnInstantiatedConstructorSignature.ts, 24, 3)) + +var r8b6 = b6 !== a6; +>r8b6 : Symbol(r8b6, Decl(comparisonOperatorWithNoRelationshipObjectsOnInstantiatedConstructorSignature.ts, 148, 3)) +>b6 : Symbol(b6, Decl(comparisonOperatorWithNoRelationshipObjectsOnInstantiatedConstructorSignature.ts, 28, 3)) +>a6 : Symbol(a6, Decl(comparisonOperatorWithNoRelationshipObjectsOnInstantiatedConstructorSignature.ts, 27, 3)) + diff --git a/tests/baselines/reference/comparisonOperatorWithNoRelationshipObjectsOnInstantiatedConstructorSignature.types b/tests/baselines/reference/comparisonOperatorWithNoRelationshipObjectsOnInstantiatedConstructorSignature.types new file mode 100644 index 00000000000..83cb4317459 --- /dev/null +++ b/tests/baselines/reference/comparisonOperatorWithNoRelationshipObjectsOnInstantiatedConstructorSignature.types @@ -0,0 +1,683 @@ +=== tests/cases/conformance/expressions/binaryOperators/comparisonOperator/comparisonOperatorWithNoRelationshipObjectsOnInstantiatedConstructorSignature.ts === +class Base { +>Base : Base + + public a: string; +>a : string +} + +class Derived extends Base { +>Derived : Derived +>Base : Base + + public b: string; +>b : string +} + +class C { +>C : C + + public c: string; +>c : string +} + +var a1: { new (x: T): T }; +>a1 : new (x: T) => T +>T : T +>x : T +>T : T +>T : T + +var b1: { new (): string }; +>b1 : new () => string + +var a2: { new (x: T): T }; +>a2 : new (x: T) => T +>T : T +>x : T +>T : T +>T : T + +var b2: { new (x: string): number }; +>b2 : new (x: string) => number +>x : string + +var a3: { new (x?: T): T }; +>a3 : new (x?: T) => T +>T : T +>x : T +>T : T +>T : T + +var b3: { new (x?: string): number }; +>b3 : new (x?: string) => number +>x : string + +var a4: { new (...x: T[]): T }; +>a4 : new (...x: T[]) => T +>T : T +>x : T[] +>T : T +>T : T + +var b4: { new (...x: string[]): number }; +>b4 : new (...x: string[]) => number +>x : string[] + +var a5: { new (x: T, y: T): T }; +>a5 : new (x: T, y: T) => T +>T : T +>x : T +>T : T +>y : T +>T : T +>T : T + +var b5: { new (x: string, y: number): string }; +>b5 : new (x: string, y: number) => string +>x : string +>y : number + +var a6: { new (x: T, y: U): T }; +>a6 : new (x: T, y: U) => T +>T : T +>U : U +>T : T +>x : T +>T : T +>y : U +>U : U +>T : T + +var b6: { new (x: Base, y: C): Base }; +>b6 : new (x: Base, y: C) => Base +>x : Base +>Base : Base +>y : C +>C : C +>Base : Base + +// operator < +var r1a1 = a1 < b1; +>r1a1 : boolean +>a1 < b1 : boolean +>a1 : new (x: T) => T +>b1 : new () => string + +var r1a2 = a2 < b2; +>r1a2 : boolean +>a2 < b2 : boolean +>a2 : new (x: T) => T +>b2 : new (x: string) => number + +var r1a3 = a3 < b3; +>r1a3 : boolean +>a3 < b3 : boolean +>a3 : new (x?: T) => T +>b3 : new (x?: string) => number + +var r1a4 = a4 < b4; +>r1a4 : boolean +>a4 < b4 : boolean +>a4 : new (...x: T[]) => T +>b4 : new (...x: string[]) => number + +var r1a5 = a5 < b5; +>r1a5 : boolean +>a5 < b5 : boolean +>a5 : new (x: T, y: T) => T +>b5 : new (x: string, y: number) => string + +var r1a6 = a6 < b6; +>r1a6 : boolean +>a6 < b6 : boolean +>a6 : new (x: T, y: U) => T +>b6 : new (x: Base, y: C) => Base + +var r1b1 = b1 < a1; +>r1b1 : boolean +>b1 < a1 : boolean +>b1 : new () => string +>a1 : new (x: T) => T + +var r1b2 = b2 < a2; +>r1b2 : boolean +>b2 < a2 : boolean +>b2 : new (x: string) => number +>a2 : new (x: T) => T + +var r1b3 = b3 < a3; +>r1b3 : boolean +>b3 < a3 : boolean +>b3 : new (x?: string) => number +>a3 : new (x?: T) => T + +var r1b4 = b4 < a4; +>r1b4 : boolean +>b4 < a4 : boolean +>b4 : new (...x: string[]) => number +>a4 : new (...x: T[]) => T + +var r1b5 = b5 < a5; +>r1b5 : boolean +>b5 < a5 : boolean +>b5 : new (x: string, y: number) => string +>a5 : new (x: T, y: T) => T + +var r1b6 = b6 < a6; +>r1b6 : boolean +>b6 < a6 : boolean +>b6 : new (x: Base, y: C) => Base +>a6 : new (x: T, y: U) => T + +// operator > +var r2a1 = a1 > b1; +>r2a1 : boolean +>a1 > b1 : boolean +>a1 : new (x: T) => T +>b1 : new () => string + +var r2a2 = a2 > b2; +>r2a2 : boolean +>a2 > b2 : boolean +>a2 : new (x: T) => T +>b2 : new (x: string) => number + +var r2a3 = a3 > b3; +>r2a3 : boolean +>a3 > b3 : boolean +>a3 : new (x?: T) => T +>b3 : new (x?: string) => number + +var r2a4 = a4 > b4; +>r2a4 : boolean +>a4 > b4 : boolean +>a4 : new (...x: T[]) => T +>b4 : new (...x: string[]) => number + +var r2a5 = a5 > b5; +>r2a5 : boolean +>a5 > b5 : boolean +>a5 : new (x: T, y: T) => T +>b5 : new (x: string, y: number) => string + +var r2a6 = a6 > b6; +>r2a6 : boolean +>a6 > b6 : boolean +>a6 : new (x: T, y: U) => T +>b6 : new (x: Base, y: C) => Base + +var r2b1 = b1 > a1; +>r2b1 : boolean +>b1 > a1 : boolean +>b1 : new () => string +>a1 : new (x: T) => T + +var r2b2 = b2 > a2; +>r2b2 : boolean +>b2 > a2 : boolean +>b2 : new (x: string) => number +>a2 : new (x: T) => T + +var r2b3 = b3 > a3; +>r2b3 : boolean +>b3 > a3 : boolean +>b3 : new (x?: string) => number +>a3 : new (x?: T) => T + +var r2b4 = b4 > a4; +>r2b4 : boolean +>b4 > a4 : boolean +>b4 : new (...x: string[]) => number +>a4 : new (...x: T[]) => T + +var r2b5 = b5 > a5; +>r2b5 : boolean +>b5 > a5 : boolean +>b5 : new (x: string, y: number) => string +>a5 : new (x: T, y: T) => T + +var r2b6 = b6 > a6; +>r2b6 : boolean +>b6 > a6 : boolean +>b6 : new (x: Base, y: C) => Base +>a6 : new (x: T, y: U) => T + +// operator <= +var r3a1 = a1 <= b1; +>r3a1 : boolean +>a1 <= b1 : boolean +>a1 : new (x: T) => T +>b1 : new () => string + +var r3a2 = a2 <= b2; +>r3a2 : boolean +>a2 <= b2 : boolean +>a2 : new (x: T) => T +>b2 : new (x: string) => number + +var r3a3 = a3 <= b3; +>r3a3 : boolean +>a3 <= b3 : boolean +>a3 : new (x?: T) => T +>b3 : new (x?: string) => number + +var r3a4 = a4 <= b4; +>r3a4 : boolean +>a4 <= b4 : boolean +>a4 : new (...x: T[]) => T +>b4 : new (...x: string[]) => number + +var r3a5 = a5 <= b5; +>r3a5 : boolean +>a5 <= b5 : boolean +>a5 : new (x: T, y: T) => T +>b5 : new (x: string, y: number) => string + +var r3a6 = a6 <= b6; +>r3a6 : boolean +>a6 <= b6 : boolean +>a6 : new (x: T, y: U) => T +>b6 : new (x: Base, y: C) => Base + +var r3b1 = b1 <= a1; +>r3b1 : boolean +>b1 <= a1 : boolean +>b1 : new () => string +>a1 : new (x: T) => T + +var r3b2 = b2 <= a2; +>r3b2 : boolean +>b2 <= a2 : boolean +>b2 : new (x: string) => number +>a2 : new (x: T) => T + +var r3b3 = b3 <= a3; +>r3b3 : boolean +>b3 <= a3 : boolean +>b3 : new (x?: string) => number +>a3 : new (x?: T) => T + +var r3b4 = b4 <= a4; +>r3b4 : boolean +>b4 <= a4 : boolean +>b4 : new (...x: string[]) => number +>a4 : new (...x: T[]) => T + +var r3b5 = b5 <= a5; +>r3b5 : boolean +>b5 <= a5 : boolean +>b5 : new (x: string, y: number) => string +>a5 : new (x: T, y: T) => T + +var r3b6 = b6 <= a6; +>r3b6 : boolean +>b6 <= a6 : boolean +>b6 : new (x: Base, y: C) => Base +>a6 : new (x: T, y: U) => T + +// operator >= +var r4a1 = a1 >= b1; +>r4a1 : boolean +>a1 >= b1 : boolean +>a1 : new (x: T) => T +>b1 : new () => string + +var r4a2 = a2 >= b2; +>r4a2 : boolean +>a2 >= b2 : boolean +>a2 : new (x: T) => T +>b2 : new (x: string) => number + +var r4a3 = a3 >= b3; +>r4a3 : boolean +>a3 >= b3 : boolean +>a3 : new (x?: T) => T +>b3 : new (x?: string) => number + +var r4a4 = a4 >= b4; +>r4a4 : boolean +>a4 >= b4 : boolean +>a4 : new (...x: T[]) => T +>b4 : new (...x: string[]) => number + +var r4a5 = a5 >= b5; +>r4a5 : boolean +>a5 >= b5 : boolean +>a5 : new (x: T, y: T) => T +>b5 : new (x: string, y: number) => string + +var r4a6 = a6 >= b6; +>r4a6 : boolean +>a6 >= b6 : boolean +>a6 : new (x: T, y: U) => T +>b6 : new (x: Base, y: C) => Base + +var r4b1 = b1 >= a1; +>r4b1 : boolean +>b1 >= a1 : boolean +>b1 : new () => string +>a1 : new (x: T) => T + +var r4b2 = b2 >= a2; +>r4b2 : boolean +>b2 >= a2 : boolean +>b2 : new (x: string) => number +>a2 : new (x: T) => T + +var r4b3 = b3 >= a3; +>r4b3 : boolean +>b3 >= a3 : boolean +>b3 : new (x?: string) => number +>a3 : new (x?: T) => T + +var r4b4 = b4 >= a4; +>r4b4 : boolean +>b4 >= a4 : boolean +>b4 : new (...x: string[]) => number +>a4 : new (...x: T[]) => T + +var r4b5 = b5 >= a5; +>r4b5 : boolean +>b5 >= a5 : boolean +>b5 : new (x: string, y: number) => string +>a5 : new (x: T, y: T) => T + +var r4b6 = b6 >= a6; +>r4b6 : boolean +>b6 >= a6 : boolean +>b6 : new (x: Base, y: C) => Base +>a6 : new (x: T, y: U) => T + +// operator == +var r5a1 = a1 == b1; +>r5a1 : boolean +>a1 == b1 : boolean +>a1 : new (x: T) => T +>b1 : new () => string + +var r5a2 = a2 == b2; +>r5a2 : boolean +>a2 == b2 : boolean +>a2 : new (x: T) => T +>b2 : new (x: string) => number + +var r5a3 = a3 == b3; +>r5a3 : boolean +>a3 == b3 : boolean +>a3 : new (x?: T) => T +>b3 : new (x?: string) => number + +var r5a4 = a4 == b4; +>r5a4 : boolean +>a4 == b4 : boolean +>a4 : new (...x: T[]) => T +>b4 : new (...x: string[]) => number + +var r5a5 = a5 == b5; +>r5a5 : boolean +>a5 == b5 : boolean +>a5 : new (x: T, y: T) => T +>b5 : new (x: string, y: number) => string + +var r5a6 = a6 == b6; +>r5a6 : boolean +>a6 == b6 : boolean +>a6 : new (x: T, y: U) => T +>b6 : new (x: Base, y: C) => Base + +var r5b1 = b1 == a1; +>r5b1 : boolean +>b1 == a1 : boolean +>b1 : new () => string +>a1 : new (x: T) => T + +var r5b2 = b2 == a2; +>r5b2 : boolean +>b2 == a2 : boolean +>b2 : new (x: string) => number +>a2 : new (x: T) => T + +var r5b3 = b3 == a3; +>r5b3 : boolean +>b3 == a3 : boolean +>b3 : new (x?: string) => number +>a3 : new (x?: T) => T + +var r5b4 = b4 == a4; +>r5b4 : boolean +>b4 == a4 : boolean +>b4 : new (...x: string[]) => number +>a4 : new (...x: T[]) => T + +var r5b5 = b5 == a5; +>r5b5 : boolean +>b5 == a5 : boolean +>b5 : new (x: string, y: number) => string +>a5 : new (x: T, y: T) => T + +var r5b6 = b6 == a6; +>r5b6 : boolean +>b6 == a6 : boolean +>b6 : new (x: Base, y: C) => Base +>a6 : new (x: T, y: U) => T + +// operator != +var r6a1 = a1 != b1; +>r6a1 : boolean +>a1 != b1 : boolean +>a1 : new (x: T) => T +>b1 : new () => string + +var r6a2 = a2 != b2; +>r6a2 : boolean +>a2 != b2 : boolean +>a2 : new (x: T) => T +>b2 : new (x: string) => number + +var r6a3 = a3 != b3; +>r6a3 : boolean +>a3 != b3 : boolean +>a3 : new (x?: T) => T +>b3 : new (x?: string) => number + +var r6a4 = a4 != b4; +>r6a4 : boolean +>a4 != b4 : boolean +>a4 : new (...x: T[]) => T +>b4 : new (...x: string[]) => number + +var r6a5 = a5 != b5; +>r6a5 : boolean +>a5 != b5 : boolean +>a5 : new (x: T, y: T) => T +>b5 : new (x: string, y: number) => string + +var r6a6 = a6 != b6; +>r6a6 : boolean +>a6 != b6 : boolean +>a6 : new (x: T, y: U) => T +>b6 : new (x: Base, y: C) => Base + +var r6b1 = b1 != a1; +>r6b1 : boolean +>b1 != a1 : boolean +>b1 : new () => string +>a1 : new (x: T) => T + +var r6b2 = b2 != a2; +>r6b2 : boolean +>b2 != a2 : boolean +>b2 : new (x: string) => number +>a2 : new (x: T) => T + +var r6b3 = b3 != a3; +>r6b3 : boolean +>b3 != a3 : boolean +>b3 : new (x?: string) => number +>a3 : new (x?: T) => T + +var r6b4 = b4 != a4; +>r6b4 : boolean +>b4 != a4 : boolean +>b4 : new (...x: string[]) => number +>a4 : new (...x: T[]) => T + +var r6b5 = b5 != a5; +>r6b5 : boolean +>b5 != a5 : boolean +>b5 : new (x: string, y: number) => string +>a5 : new (x: T, y: T) => T + +var r6b6 = b6 != a6; +>r6b6 : boolean +>b6 != a6 : boolean +>b6 : new (x: Base, y: C) => Base +>a6 : new (x: T, y: U) => T + +// operator === +var r7a1 = a1 === b1; +>r7a1 : boolean +>a1 === b1 : boolean +>a1 : new (x: T) => T +>b1 : new () => string + +var r7a2 = a2 === b2; +>r7a2 : boolean +>a2 === b2 : boolean +>a2 : new (x: T) => T +>b2 : new (x: string) => number + +var r7a3 = a3 === b3; +>r7a3 : boolean +>a3 === b3 : boolean +>a3 : new (x?: T) => T +>b3 : new (x?: string) => number + +var r7a4 = a4 === b4; +>r7a4 : boolean +>a4 === b4 : boolean +>a4 : new (...x: T[]) => T +>b4 : new (...x: string[]) => number + +var r7a5 = a5 === b5; +>r7a5 : boolean +>a5 === b5 : boolean +>a5 : new (x: T, y: T) => T +>b5 : new (x: string, y: number) => string + +var r7a6 = a6 === b6; +>r7a6 : boolean +>a6 === b6 : boolean +>a6 : new (x: T, y: U) => T +>b6 : new (x: Base, y: C) => Base + +var r7b1 = b1 === a1; +>r7b1 : boolean +>b1 === a1 : boolean +>b1 : new () => string +>a1 : new (x: T) => T + +var r7b2 = b2 === a2; +>r7b2 : boolean +>b2 === a2 : boolean +>b2 : new (x: string) => number +>a2 : new (x: T) => T + +var r7b3 = b3 === a3; +>r7b3 : boolean +>b3 === a3 : boolean +>b3 : new (x?: string) => number +>a3 : new (x?: T) => T + +var r7b4 = b4 === a4; +>r7b4 : boolean +>b4 === a4 : boolean +>b4 : new (...x: string[]) => number +>a4 : new (...x: T[]) => T + +var r7b5 = b5 === a5; +>r7b5 : boolean +>b5 === a5 : boolean +>b5 : new (x: string, y: number) => string +>a5 : new (x: T, y: T) => T + +var r7b6 = b6 === a6; +>r7b6 : boolean +>b6 === a6 : boolean +>b6 : new (x: Base, y: C) => Base +>a6 : new (x: T, y: U) => T + +// operator !== +var r8a1 = a1 !== b1; +>r8a1 : boolean +>a1 !== b1 : boolean +>a1 : new (x: T) => T +>b1 : new () => string + +var r8a2 = a2 !== b2; +>r8a2 : boolean +>a2 !== b2 : boolean +>a2 : new (x: T) => T +>b2 : new (x: string) => number + +var r8a3 = a3 !== b3; +>r8a3 : boolean +>a3 !== b3 : boolean +>a3 : new (x?: T) => T +>b3 : new (x?: string) => number + +var r8a4 = a4 !== b4; +>r8a4 : boolean +>a4 !== b4 : boolean +>a4 : new (...x: T[]) => T +>b4 : new (...x: string[]) => number + +var r8a5 = a5 !== b5; +>r8a5 : boolean +>a5 !== b5 : boolean +>a5 : new (x: T, y: T) => T +>b5 : new (x: string, y: number) => string + +var r8a6 = a6 !== b6; +>r8a6 : boolean +>a6 !== b6 : boolean +>a6 : new (x: T, y: U) => T +>b6 : new (x: Base, y: C) => Base + +var r8b1 = b1 !== a1; +>r8b1 : boolean +>b1 !== a1 : boolean +>b1 : new () => string +>a1 : new (x: T) => T + +var r8b2 = b2 !== a2; +>r8b2 : boolean +>b2 !== a2 : boolean +>b2 : new (x: string) => number +>a2 : new (x: T) => T + +var r8b3 = b3 !== a3; +>r8b3 : boolean +>b3 !== a3 : boolean +>b3 : new (x?: string) => number +>a3 : new (x?: T) => T + +var r8b4 = b4 !== a4; +>r8b4 : boolean +>b4 !== a4 : boolean +>b4 : new (...x: string[]) => number +>a4 : new (...x: T[]) => T + +var r8b5 = b5 !== a5; +>r8b5 : boolean +>b5 !== a5 : boolean +>b5 : new (x: string, y: number) => string +>a5 : new (x: T, y: T) => T + +var r8b6 = b6 !== a6; +>r8b6 : boolean +>b6 !== a6 : boolean +>b6 : new (x: Base, y: C) => Base +>a6 : new (x: T, y: U) => T + diff --git a/tests/baselines/reference/constraintReferencingTypeParameterFromSameTypeParameterList.errors.txt b/tests/baselines/reference/constraintReferencingTypeParameterFromSameTypeParameterList.errors.txt deleted file mode 100644 index 15293f3953a..00000000000 --- a/tests/baselines/reference/constraintReferencingTypeParameterFromSameTypeParameterList.errors.txt +++ /dev/null @@ -1,45 +0,0 @@ -tests/cases/compiler/constraintReferencingTypeParameterFromSameTypeParameterList.ts(5,15): error TS2313: Constraint of a type parameter cannot reference any type parameter from the same type parameter list. -tests/cases/compiler/constraintReferencingTypeParameterFromSameTypeParameterList.ts(8,17): error TS2313: Constraint of a type parameter cannot reference any type parameter from the same type parameter list. -tests/cases/compiler/constraintReferencingTypeParameterFromSameTypeParameterList.ts(10,17): error TS2313: Constraint of a type parameter cannot reference any type parameter from the same type parameter list. -tests/cases/compiler/constraintReferencingTypeParameterFromSameTypeParameterList.ts(13,17): error TS2313: Constraint of a type parameter cannot reference any type parameter from the same type parameter list. -tests/cases/compiler/constraintReferencingTypeParameterFromSameTypeParameterList.ts(21,17): error TS2313: Constraint of a type parameter cannot reference any type parameter from the same type parameter list. -tests/cases/compiler/constraintReferencingTypeParameterFromSameTypeParameterList.ts(21,28): error TS2313: Constraint of a type parameter cannot reference any type parameter from the same type parameter list. - - -==== tests/cases/compiler/constraintReferencingTypeParameterFromSameTypeParameterList.ts (6 errors) ==== - // used to be valid, now an error to do this - - interface IComparable { - } - function f>() { - ~~~~~~~~~~~~~~~~~~~~~~~~ -!!! error TS2313: Constraint of a type parameter cannot reference any type parameter from the same type parameter list. - } - - interface I1> { // Error, any does not satisfy the constraint I1 - ~~~~~~~~~~~~~~~~~~~~ -!!! error TS2313: Constraint of a type parameter cannot reference any type parameter from the same type parameter list. - } - interface I2 { - ~~~~~~~~~~~ -!!! error TS2313: Constraint of a type parameter cannot reference any type parameter from the same type parameter list. - } - - interface I4 T> { - ~~~~~~~~~~~~~~~~~ -!!! error TS2313: Constraint of a type parameter cannot reference any type parameter from the same type parameter list. - } - - // No error - interface I3 { - method1(); - } - - function foo(v: V) => void>() { - ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -!!! error TS2313: Constraint of a type parameter cannot reference any type parameter from the same type parameter list. - ~~~~~~~~~~~ -!!! error TS2313: Constraint of a type parameter cannot reference any type parameter from the same type parameter list. - } - - \ No newline at end of file diff --git a/tests/baselines/reference/constraintReferencingTypeParameterFromSameTypeParameterList.symbols b/tests/baselines/reference/constraintReferencingTypeParameterFromSameTypeParameterList.symbols new file mode 100644 index 00000000000..ec987116a43 --- /dev/null +++ b/tests/baselines/reference/constraintReferencingTypeParameterFromSameTypeParameterList.symbols @@ -0,0 +1,60 @@ +=== tests/cases/compiler/constraintReferencingTypeParameterFromSameTypeParameterList.ts === +// used to be valid, now an error to do this + +interface IComparable { +>IComparable : Symbol(IComparable, Decl(constraintReferencingTypeParameterFromSameTypeParameterList.ts, 0, 0)) +>T : Symbol(T, Decl(constraintReferencingTypeParameterFromSameTypeParameterList.ts, 2, 22)) +} +function f>() { +>f : Symbol(f, Decl(constraintReferencingTypeParameterFromSameTypeParameterList.ts, 3, 1)) +>T : Symbol(T, Decl(constraintReferencingTypeParameterFromSameTypeParameterList.ts, 4, 11)) +>I : Symbol(I, Decl(constraintReferencingTypeParameterFromSameTypeParameterList.ts, 4, 13)) +>IComparable : Symbol(IComparable, Decl(constraintReferencingTypeParameterFromSameTypeParameterList.ts, 0, 0)) +>T : Symbol(T, Decl(constraintReferencingTypeParameterFromSameTypeParameterList.ts, 4, 11)) +} + +interface I1> { // Error, any does not satisfy the constraint I1 +>I1 : Symbol(I1, Decl(constraintReferencingTypeParameterFromSameTypeParameterList.ts, 5, 1)) +>T : Symbol(T, Decl(constraintReferencingTypeParameterFromSameTypeParameterList.ts, 7, 13)) +>U : Symbol(U, Decl(constraintReferencingTypeParameterFromSameTypeParameterList.ts, 7, 15)) +>I1 : Symbol(I1, Decl(constraintReferencingTypeParameterFromSameTypeParameterList.ts, 5, 1)) +>T : Symbol(T, Decl(constraintReferencingTypeParameterFromSameTypeParameterList.ts, 7, 13)) +} +interface I2 { +>I2 : Symbol(I2, Decl(constraintReferencingTypeParameterFromSameTypeParameterList.ts, 8, 1)) +>T : Symbol(T, Decl(constraintReferencingTypeParameterFromSameTypeParameterList.ts, 9, 13)) +>U : Symbol(U, Decl(constraintReferencingTypeParameterFromSameTypeParameterList.ts, 9, 15)) +>T : Symbol(T, Decl(constraintReferencingTypeParameterFromSameTypeParameterList.ts, 9, 13)) +} + +interface I4 T> { +>I4 : Symbol(I4, Decl(constraintReferencingTypeParameterFromSameTypeParameterList.ts, 10, 1)) +>T : Symbol(T, Decl(constraintReferencingTypeParameterFromSameTypeParameterList.ts, 12, 13)) +>U : Symbol(U, Decl(constraintReferencingTypeParameterFromSameTypeParameterList.ts, 12, 15)) +>T : Symbol(T, Decl(constraintReferencingTypeParameterFromSameTypeParameterList.ts, 12, 13)) +} + +// No error +interface I3 { +>I3 : Symbol(I3, Decl(constraintReferencingTypeParameterFromSameTypeParameterList.ts, 13, 1)) +>T : Symbol(T, Decl(constraintReferencingTypeParameterFromSameTypeParameterList.ts, 16, 13)) +>U : Symbol(U, Decl(constraintReferencingTypeParameterFromSameTypeParameterList.ts, 16, 15)) + + method1(); +>method1 : Symbol(method1, Decl(constraintReferencingTypeParameterFromSameTypeParameterList.ts, 16, 35)) +>X : Symbol(X, Decl(constraintReferencingTypeParameterFromSameTypeParameterList.ts, 17, 12)) +>Y : Symbol(Y, Decl(constraintReferencingTypeParameterFromSameTypeParameterList.ts, 17, 14)) +>T : Symbol(T, Decl(constraintReferencingTypeParameterFromSameTypeParameterList.ts, 16, 13)) +} + +function foo(v: V) => void>() { +>foo : Symbol(foo, Decl(constraintReferencingTypeParameterFromSameTypeParameterList.ts, 18, 1)) +>T : Symbol(T, Decl(constraintReferencingTypeParameterFromSameTypeParameterList.ts, 20, 13)) +>U : Symbol(U, Decl(constraintReferencingTypeParameterFromSameTypeParameterList.ts, 20, 15)) +>V : Symbol(V, Decl(constraintReferencingTypeParameterFromSameTypeParameterList.ts, 20, 27)) +>T : Symbol(T, Decl(constraintReferencingTypeParameterFromSameTypeParameterList.ts, 20, 13)) +>v : Symbol(v, Decl(constraintReferencingTypeParameterFromSameTypeParameterList.ts, 20, 40)) +>V : Symbol(V, Decl(constraintReferencingTypeParameterFromSameTypeParameterList.ts, 20, 27)) +} + + diff --git a/tests/baselines/reference/constraintReferencingTypeParameterFromSameTypeParameterList.types b/tests/baselines/reference/constraintReferencingTypeParameterFromSameTypeParameterList.types new file mode 100644 index 00000000000..f1303486283 --- /dev/null +++ b/tests/baselines/reference/constraintReferencingTypeParameterFromSameTypeParameterList.types @@ -0,0 +1,60 @@ +=== tests/cases/compiler/constraintReferencingTypeParameterFromSameTypeParameterList.ts === +// used to be valid, now an error to do this + +interface IComparable { +>IComparable : IComparable +>T : T +} +function f>() { +>f : >() => void +>T : T +>I : I +>IComparable : IComparable +>T : T +} + +interface I1> { // Error, any does not satisfy the constraint I1 +>I1 : I1 +>T : T +>U : U +>I1 : I1 +>T : T +} +interface I2 { +>I2 : I2 +>T : T +>U : U +>T : T +} + +interface I4 T> { +>I4 : I4 +>T : T +>U : U +>T : T +} + +// No error +interface I3 { +>I3 : I3 +>T : T +>U : U + + method1(); +>method1 : () => any +>X : X +>Y : Y +>T : T +} + +function foo(v: V) => void>() { +>foo : (v: V) => void>() => void +>T : T +>U : U +>V : V +>T : T +>v : V +>V : V +} + + diff --git a/tests/baselines/reference/constraintSatisfactionWithAny2.errors.txt b/tests/baselines/reference/constraintSatisfactionWithAny2.errors.txt deleted file mode 100644 index b297d2be970..00000000000 --- a/tests/baselines/reference/constraintSatisfactionWithAny2.errors.txt +++ /dev/null @@ -1,14 +0,0 @@ -tests/cases/conformance/types/typeParameters/typeArgumentLists/constraintSatisfactionWithAny2.ts(4,25): error TS2313: Constraint of a type parameter cannot reference any type parameter from the same type parameter list. - - -==== tests/cases/conformance/types/typeParameters/typeArgumentLists/constraintSatisfactionWithAny2.ts (1 errors) ==== - // errors expected for type parameter cannot be referenced in the constraints of the same list - // any is not a valid type argument unless there is no constraint, or the constraint is any - - declare function foo(x: U) => Z>(y: T): Z; - ~~~~~~~~~~~~~~~~~~~~~~~~ -!!! error TS2313: Constraint of a type parameter cannot reference any type parameter from the same type parameter list. - var a: any; - - foo(a); - foo(a); \ No newline at end of file diff --git a/tests/baselines/reference/constraintSatisfactionWithAny2.symbols b/tests/baselines/reference/constraintSatisfactionWithAny2.symbols new file mode 100644 index 00000000000..25d389c5c4a --- /dev/null +++ b/tests/baselines/reference/constraintSatisfactionWithAny2.symbols @@ -0,0 +1,27 @@ +=== tests/cases/conformance/types/typeParameters/typeArgumentLists/constraintSatisfactionWithAny2.ts === +// errors expected for type parameter cannot be referenced in the constraints of the same list +// any is not a valid type argument unless there is no constraint, or the constraint is any + +declare function foo(x: U) => Z>(y: T): Z; +>foo : Symbol(foo, Decl(constraintSatisfactionWithAny2.ts, 0, 0)) +>Z : Symbol(Z, Decl(constraintSatisfactionWithAny2.ts, 3, 21)) +>T : Symbol(T, Decl(constraintSatisfactionWithAny2.ts, 3, 23)) +>U : Symbol(U, Decl(constraintSatisfactionWithAny2.ts, 3, 35)) +>x : Symbol(x, Decl(constraintSatisfactionWithAny2.ts, 3, 38)) +>U : Symbol(U, Decl(constraintSatisfactionWithAny2.ts, 3, 35)) +>Z : Symbol(Z, Decl(constraintSatisfactionWithAny2.ts, 3, 21)) +>y : Symbol(y, Decl(constraintSatisfactionWithAny2.ts, 3, 50)) +>T : Symbol(T, Decl(constraintSatisfactionWithAny2.ts, 3, 23)) +>Z : Symbol(Z, Decl(constraintSatisfactionWithAny2.ts, 3, 21)) + +var a: any; +>a : Symbol(a, Decl(constraintSatisfactionWithAny2.ts, 4, 3)) + +foo(a); +>foo : Symbol(foo, Decl(constraintSatisfactionWithAny2.ts, 0, 0)) +>a : Symbol(a, Decl(constraintSatisfactionWithAny2.ts, 4, 3)) + +foo(a); +>foo : Symbol(foo, Decl(constraintSatisfactionWithAny2.ts, 0, 0)) +>a : Symbol(a, Decl(constraintSatisfactionWithAny2.ts, 4, 3)) + diff --git a/tests/baselines/reference/constraintSatisfactionWithAny2.types b/tests/baselines/reference/constraintSatisfactionWithAny2.types new file mode 100644 index 00000000000..e40e00c5161 --- /dev/null +++ b/tests/baselines/reference/constraintSatisfactionWithAny2.types @@ -0,0 +1,29 @@ +=== tests/cases/conformance/types/typeParameters/typeArgumentLists/constraintSatisfactionWithAny2.ts === +// errors expected for type parameter cannot be referenced in the constraints of the same list +// any is not a valid type argument unless there is no constraint, or the constraint is any + +declare function foo(x: U) => Z>(y: T): Z; +>foo : (x: U) => Z>(y: T) => Z +>Z : Z +>T : T +>U : U +>x : U +>U : U +>Z : Z +>y : T +>T : T +>Z : Z + +var a: any; +>a : any + +foo(a); +>foo(a) : {} +>foo : (x: U) => Z>(y: T) => Z +>a : any + +foo(a); +>foo(a) : any +>foo : (x: U) => Z>(y: T) => Z +>a : any + diff --git a/tests/baselines/reference/constraintsThatReferenceOtherContstraints1.errors.txt b/tests/baselines/reference/constraintsThatReferenceOtherContstraints1.errors.txt deleted file mode 100644 index b7375989e6b..00000000000 --- a/tests/baselines/reference/constraintsThatReferenceOtherContstraints1.errors.txt +++ /dev/null @@ -1,18 +0,0 @@ -tests/cases/compiler/constraintsThatReferenceOtherContstraints1.ts(3,14): error TS2313: Constraint of a type parameter cannot reference any type parameter from the same type parameter list. -tests/cases/compiler/constraintsThatReferenceOtherContstraints1.ts(4,29): error TS2313: Constraint of a type parameter cannot reference any type parameter from the same type parameter list. - - -==== tests/cases/compiler/constraintsThatReferenceOtherContstraints1.ts (2 errors) ==== - interface Object { } - - class Foo { } - ~~~~~~~~~~~ -!!! error TS2313: Constraint of a type parameter cannot reference any type parameter from the same type parameter list. - class Bar { - ~~~~~~~~~~~ -!!! error TS2313: Constraint of a type parameter cannot reference any type parameter from the same type parameter list. - data: Foo; // Error 1 Type 'Object' does not satisfy the constraint 'T' for type parameter 'U extends T'. - } - - var x: Foo< { a: string }, { a: string; b: number }>; // Error 2 Type '{ a: string; b: number; }' does not satisfy the constraint 'T' for type - \ No newline at end of file diff --git a/tests/baselines/reference/constraintsThatReferenceOtherContstraints1.symbols b/tests/baselines/reference/constraintsThatReferenceOtherContstraints1.symbols new file mode 100644 index 00000000000..fa754b23dea --- /dev/null +++ b/tests/baselines/reference/constraintsThatReferenceOtherContstraints1.symbols @@ -0,0 +1,31 @@ +=== tests/cases/compiler/constraintsThatReferenceOtherContstraints1.ts === +interface Object { } +>Object : Symbol(Object, Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --), Decl(constraintsThatReferenceOtherContstraints1.ts, 0, 0)) + +class Foo { } +>Foo : Symbol(Foo, Decl(constraintsThatReferenceOtherContstraints1.ts, 0, 20)) +>T : Symbol(T, Decl(constraintsThatReferenceOtherContstraints1.ts, 2, 10)) +>U : Symbol(U, Decl(constraintsThatReferenceOtherContstraints1.ts, 2, 12)) +>T : Symbol(T, Decl(constraintsThatReferenceOtherContstraints1.ts, 2, 10)) + +class Bar { +>Bar : Symbol(Bar, Decl(constraintsThatReferenceOtherContstraints1.ts, 2, 29)) +>T : Symbol(T, Decl(constraintsThatReferenceOtherContstraints1.ts, 3, 10)) +>Object : Symbol(Object, Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --), Decl(constraintsThatReferenceOtherContstraints1.ts, 0, 0)) +>U : Symbol(U, Decl(constraintsThatReferenceOtherContstraints1.ts, 3, 27)) +>T : Symbol(T, Decl(constraintsThatReferenceOtherContstraints1.ts, 3, 10)) + + data: Foo; // Error 1 Type 'Object' does not satisfy the constraint 'T' for type parameter 'U extends T'. +>data : Symbol(data, Decl(constraintsThatReferenceOtherContstraints1.ts, 3, 42)) +>Foo : Symbol(Foo, Decl(constraintsThatReferenceOtherContstraints1.ts, 0, 20)) +>Object : Symbol(Object, Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --), Decl(constraintsThatReferenceOtherContstraints1.ts, 0, 0)) +>Object : Symbol(Object, Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --), Decl(constraintsThatReferenceOtherContstraints1.ts, 0, 0)) +} + +var x: Foo< { a: string }, { a: string; b: number }>; // Error 2 Type '{ a: string; b: number; }' does not satisfy the constraint 'T' for type +>x : Symbol(x, Decl(constraintsThatReferenceOtherContstraints1.ts, 7, 3)) +>Foo : Symbol(Foo, Decl(constraintsThatReferenceOtherContstraints1.ts, 0, 20)) +>a : Symbol(a, Decl(constraintsThatReferenceOtherContstraints1.ts, 7, 13)) +>a : Symbol(a, Decl(constraintsThatReferenceOtherContstraints1.ts, 7, 28)) +>b : Symbol(b, Decl(constraintsThatReferenceOtherContstraints1.ts, 7, 39)) + diff --git a/tests/baselines/reference/constraintsThatReferenceOtherContstraints1.types b/tests/baselines/reference/constraintsThatReferenceOtherContstraints1.types new file mode 100644 index 00000000000..e3cd5dc51bc --- /dev/null +++ b/tests/baselines/reference/constraintsThatReferenceOtherContstraints1.types @@ -0,0 +1,31 @@ +=== tests/cases/compiler/constraintsThatReferenceOtherContstraints1.ts === +interface Object { } +>Object : Object + +class Foo { } +>Foo : Foo +>T : T +>U : U +>T : T + +class Bar { +>Bar : Bar +>T : T +>Object : Object +>U : U +>T : T + + data: Foo; // Error 1 Type 'Object' does not satisfy the constraint 'T' for type parameter 'U extends T'. +>data : Foo +>Foo : Foo +>Object : Object +>Object : Object +} + +var x: Foo< { a: string }, { a: string; b: number }>; // Error 2 Type '{ a: string; b: number; }' does not satisfy the constraint 'T' for type +>x : Foo<{ a: string; }, { a: string; b: number; }> +>Foo : Foo +>a : string +>a : string +>b : number + diff --git a/tests/baselines/reference/contextuallyTypingOrOperator3.errors.txt b/tests/baselines/reference/contextuallyTypingOrOperator3.errors.txt deleted file mode 100644 index ca7385b9c29..00000000000 --- a/tests/baselines/reference/contextuallyTypingOrOperator3.errors.txt +++ /dev/null @@ -1,9 +0,0 @@ -tests/cases/compiler/contextuallyTypingOrOperator3.ts(1,17): error TS2313: Constraint of a type parameter cannot reference any type parameter from the same type parameter list. - - -==== tests/cases/compiler/contextuallyTypingOrOperator3.ts (1 errors) ==== - function foo(u: U) { - ~~~~~~~~~~~ -!!! error TS2313: Constraint of a type parameter cannot reference any type parameter from the same type parameter list. - var x3: U = u || u; - } \ No newline at end of file diff --git a/tests/baselines/reference/contextuallyTypingOrOperator3.symbols b/tests/baselines/reference/contextuallyTypingOrOperator3.symbols new file mode 100644 index 00000000000..2f8ffb6234c --- /dev/null +++ b/tests/baselines/reference/contextuallyTypingOrOperator3.symbols @@ -0,0 +1,15 @@ +=== tests/cases/compiler/contextuallyTypingOrOperator3.ts === +function foo(u: U) { +>foo : Symbol(foo, Decl(contextuallyTypingOrOperator3.ts, 0, 0)) +>T : Symbol(T, Decl(contextuallyTypingOrOperator3.ts, 0, 13)) +>U : Symbol(U, Decl(contextuallyTypingOrOperator3.ts, 0, 15)) +>T : Symbol(T, Decl(contextuallyTypingOrOperator3.ts, 0, 13)) +>u : Symbol(u, Decl(contextuallyTypingOrOperator3.ts, 0, 29)) +>U : Symbol(U, Decl(contextuallyTypingOrOperator3.ts, 0, 15)) + + var x3: U = u || u; +>x3 : Symbol(x3, Decl(contextuallyTypingOrOperator3.ts, 1, 7)) +>U : Symbol(U, Decl(contextuallyTypingOrOperator3.ts, 0, 15)) +>u : Symbol(u, Decl(contextuallyTypingOrOperator3.ts, 0, 29)) +>u : Symbol(u, Decl(contextuallyTypingOrOperator3.ts, 0, 29)) +} diff --git a/tests/baselines/reference/contextuallyTypingOrOperator3.types b/tests/baselines/reference/contextuallyTypingOrOperator3.types new file mode 100644 index 00000000000..f6ccbbf9ab1 --- /dev/null +++ b/tests/baselines/reference/contextuallyTypingOrOperator3.types @@ -0,0 +1,16 @@ +=== tests/cases/compiler/contextuallyTypingOrOperator3.ts === +function foo(u: U) { +>foo : (u: U) => void +>T : T +>U : U +>T : T +>u : U +>U : U + + var x3: U = u || u; +>x3 : U +>U : U +>u || u : U +>u : U +>u : U +} diff --git a/tests/baselines/reference/enumAssignability.errors.txt b/tests/baselines/reference/enumAssignability.errors.txt index 4a060ac3456..1316727076f 100644 --- a/tests/baselines/reference/enumAssignability.errors.txt +++ b/tests/baselines/reference/enumAssignability.errors.txt @@ -20,7 +20,6 @@ tests/cases/conformance/types/typeRelationships/assignmentCompatibility/enumAssi tests/cases/conformance/types/typeRelationships/assignmentCompatibility/enumAssignability.ts(43,9): error TS2322: Type 'E' is not assignable to type '(x: T) => T'. tests/cases/conformance/types/typeRelationships/assignmentCompatibility/enumAssignability.ts(45,9): error TS2322: Type 'E' is not assignable to type 'String'. Property 'charAt' is missing in type 'Number'. -tests/cases/conformance/types/typeRelationships/assignmentCompatibility/enumAssignability.ts(47,21): error TS2313: Constraint of a type parameter cannot reference any type parameter from the same type parameter list. tests/cases/conformance/types/typeRelationships/assignmentCompatibility/enumAssignability.ts(48,9): error TS2322: Type 'E' is not assignable to type 'T'. tests/cases/conformance/types/typeRelationships/assignmentCompatibility/enumAssignability.ts(49,9): error TS2322: Type 'E' is not assignable to type 'U'. tests/cases/conformance/types/typeRelationships/assignmentCompatibility/enumAssignability.ts(50,9): error TS2322: Type 'E' is not assignable to type 'V'. @@ -28,7 +27,7 @@ tests/cases/conformance/types/typeRelationships/assignmentCompatibility/enumAssi tests/cases/conformance/types/typeRelationships/assignmentCompatibility/enumAssignability.ts(52,13): error TS2322: Type 'E' is not assignable to type 'B'. -==== tests/cases/conformance/types/typeRelationships/assignmentCompatibility/enumAssignability.ts (21 errors) ==== +==== tests/cases/conformance/types/typeRelationships/assignmentCompatibility/enumAssignability.ts (20 errors) ==== // enums assignable to number, any, Object, errors unless otherwise noted enum E { A } @@ -113,8 +112,6 @@ tests/cases/conformance/types/typeRelationships/assignmentCompatibility/enumAssi !!! error TS2322: Property 'charAt' is missing in type 'Number'. function foo(x: T, y: U, z: V) { - ~~~~~~~~~~~ -!!! error TS2313: Constraint of a type parameter cannot reference any type parameter from the same type parameter list. x = e; ~ !!! error TS2322: Type 'E' is not assignable to type 'T'. diff --git a/tests/baselines/reference/enumIsNotASubtypeOfAnythingButNumber.errors.txt b/tests/baselines/reference/enumIsNotASubtypeOfAnythingButNumber.errors.txt index e5c341b34df..1f8def801cc 100644 --- a/tests/baselines/reference/enumIsNotASubtypeOfAnythingButNumber.errors.txt +++ b/tests/baselines/reference/enumIsNotASubtypeOfAnythingButNumber.errors.txt @@ -13,11 +13,10 @@ tests/cases/conformance/types/typeRelationships/subtypesAndSuperTypes/enumIsNotA tests/cases/conformance/types/typeRelationships/subtypesAndSuperTypes/enumIsNotASubtypeOfAnythingButNumber.ts(95,5): error TS2411: Property 'foo' of type 'E' is not assignable to string index type 'typeof f'. tests/cases/conformance/types/typeRelationships/subtypesAndSuperTypes/enumIsNotASubtypeOfAnythingButNumber.ts(105,5): error TS2411: Property 'foo' of type 'E' is not assignable to string index type 'typeof c'. tests/cases/conformance/types/typeRelationships/subtypesAndSuperTypes/enumIsNotASubtypeOfAnythingButNumber.ts(111,5): error TS2411: Property 'foo' of type 'E' is not assignable to string index type 'T'. -tests/cases/conformance/types/typeRelationships/subtypesAndSuperTypes/enumIsNotASubtypeOfAnythingButNumber.ts(115,18): error TS2313: Constraint of a type parameter cannot reference any type parameter from the same type parameter list. tests/cases/conformance/types/typeRelationships/subtypesAndSuperTypes/enumIsNotASubtypeOfAnythingButNumber.ts(117,5): error TS2411: Property 'foo' of type 'E' is not assignable to string index type 'U'. -==== tests/cases/conformance/types/typeRelationships/subtypesAndSuperTypes/enumIsNotASubtypeOfAnythingButNumber.ts (17 errors) ==== +==== tests/cases/conformance/types/typeRelationships/subtypesAndSuperTypes/enumIsNotASubtypeOfAnythingButNumber.ts (16 errors) ==== // enums are only subtypes of number, any and no other types enum E { A } @@ -163,8 +162,6 @@ tests/cases/conformance/types/typeRelationships/subtypesAndSuperTypes/enumIsNotA interface I18 { - ~~~~~~~~~~~ -!!! error TS2313: Constraint of a type parameter cannot reference any type parameter from the same type parameter list. [x: string]: U; foo: E; ~~~~~~~ diff --git a/tests/baselines/reference/functionConstraintSatisfaction2.errors.txt b/tests/baselines/reference/functionConstraintSatisfaction2.errors.txt index 871368da9fe..c7f51b2bd99 100644 --- a/tests/baselines/reference/functionConstraintSatisfaction2.errors.txt +++ b/tests/baselines/reference/functionConstraintSatisfaction2.errors.txt @@ -12,13 +12,14 @@ tests/cases/conformance/types/typeParameters/typeArgumentLists/functionConstrain tests/cases/conformance/types/typeParameters/typeArgumentLists/functionConstraintSatisfaction2.ts(29,16): error TS2345: Argument of type 'typeof C2' is not assignable to parameter of type '(x: string) => string'. tests/cases/conformance/types/typeParameters/typeArgumentLists/functionConstraintSatisfaction2.ts(30,16): error TS2345: Argument of type 'new (x: T) => T' is not assignable to parameter of type '(x: string) => string'. tests/cases/conformance/types/typeParameters/typeArgumentLists/functionConstraintSatisfaction2.ts(34,16): error TS2345: Argument of type 'F2' is not assignable to parameter of type '(x: string) => string'. -tests/cases/conformance/types/typeParameters/typeArgumentLists/functionConstraintSatisfaction2.ts(36,38): error TS2313: Constraint of a type parameter cannot reference any type parameter from the same type parameter list. tests/cases/conformance/types/typeParameters/typeArgumentLists/functionConstraintSatisfaction2.ts(37,10): error TS2345: Argument of type 'T' is not assignable to parameter of type '(x: string) => string'. Type '() => void' is not assignable to type '(x: string) => string'. tests/cases/conformance/types/typeParameters/typeArgumentLists/functionConstraintSatisfaction2.ts(38,10): error TS2345: Argument of type 'U' is not assignable to parameter of type '(x: string) => string'. + Type 'T' is not assignable to type '(x: string) => string'. + Type '() => void' is not assignable to type '(x: string) => string'. -==== tests/cases/conformance/types/typeParameters/typeArgumentLists/functionConstraintSatisfaction2.ts (14 errors) ==== +==== tests/cases/conformance/types/typeParameters/typeArgumentLists/functionConstraintSatisfaction2.ts (13 errors) ==== // satisfaction of a constraint to Function, all of these invocations are errors unless otherwise noted function foo(x: T): T { return x; } @@ -80,8 +81,6 @@ tests/cases/conformance/types/typeParameters/typeArgumentLists/functionConstrain !!! error TS2345: Argument of type 'F2' is not assignable to parameter of type '(x: string) => string'. function fff(x: T, y: U) { - ~~~~~~~~~~~ -!!! error TS2313: Constraint of a type parameter cannot reference any type parameter from the same type parameter list. foo2(x); ~ !!! error TS2345: Argument of type 'T' is not assignable to parameter of type '(x: string) => string'. @@ -89,5 +88,7 @@ tests/cases/conformance/types/typeParameters/typeArgumentLists/functionConstrain foo2(y); ~ !!! error TS2345: Argument of type 'U' is not assignable to parameter of type '(x: string) => string'. +!!! error TS2345: Type 'T' is not assignable to type '(x: string) => string'. +!!! error TS2345: Type '() => void' is not assignable to type '(x: string) => string'. } \ No newline at end of file diff --git a/tests/baselines/reference/functionWithMultipleReturnStatements.errors.txt b/tests/baselines/reference/functionWithMultipleReturnStatements.errors.txt index a981d337093..cc10d4c782c 100644 --- a/tests/baselines/reference/functionWithMultipleReturnStatements.errors.txt +++ b/tests/baselines/reference/functionWithMultipleReturnStatements.errors.txt @@ -4,12 +4,9 @@ tests/cases/conformance/types/typeRelationships/bestCommonType/functionWithMulti tests/cases/conformance/types/typeRelationships/bestCommonType/functionWithMultipleReturnStatements.ts(32,10): error TS2354: No best common type exists among return expressions. tests/cases/conformance/types/typeRelationships/bestCommonType/functionWithMultipleReturnStatements.ts(44,10): error TS2354: No best common type exists among return expressions. tests/cases/conformance/types/typeRelationships/bestCommonType/functionWithMultipleReturnStatements.ts(49,10): error TS2354: No best common type exists among return expressions. -tests/cases/conformance/types/typeRelationships/bestCommonType/functionWithMultipleReturnStatements.ts(57,10): error TS2354: No best common type exists among return expressions. -tests/cases/conformance/types/typeRelationships/bestCommonType/functionWithMultipleReturnStatements.ts(57,13): error TS2313: Constraint of a type parameter cannot reference any type parameter from the same type parameter list. -tests/cases/conformance/types/typeRelationships/bestCommonType/functionWithMultipleReturnStatements.ts(57,26): error TS2313: Constraint of a type parameter cannot reference any type parameter from the same type parameter list. -==== tests/cases/conformance/types/typeRelationships/bestCommonType/functionWithMultipleReturnStatements.ts (9 errors) ==== +==== tests/cases/conformance/types/typeRelationships/bestCommonType/functionWithMultipleReturnStatements.ts (6 errors) ==== // return type of a function with multiple returns is the BCT of each return statement // it is an error if there is no single BCT, these are error cases @@ -79,12 +76,6 @@ tests/cases/conformance/types/typeRelationships/bestCommonType/functionWithMulti } function f8(x: T, y: U) { - ~~ -!!! error TS2354: No best common type exists among return expressions. - ~~~~~~~~~~~ -!!! error TS2313: Constraint of a type parameter cannot reference any type parameter from the same type parameter list. - ~~~~~~~~~~~ -!!! error TS2313: Constraint of a type parameter cannot reference any type parameter from the same type parameter list. if (true) { return x; } else { diff --git a/tests/baselines/reference/genericAssignmentCompatOfFunctionSignatures1.errors.txt b/tests/baselines/reference/genericAssignmentCompatOfFunctionSignatures1.errors.txt deleted file mode 100644 index 2ff34413595..00000000000 --- a/tests/baselines/reference/genericAssignmentCompatOfFunctionSignatures1.errors.txt +++ /dev/null @@ -1,14 +0,0 @@ -tests/cases/compiler/genericAssignmentCompatOfFunctionSignatures1.ts(1,27): error TS2313: Constraint of a type parameter cannot reference any type parameter from the same type parameter list. -tests/cases/compiler/genericAssignmentCompatOfFunctionSignatures1.ts(2,27): error TS2313: Constraint of a type parameter cannot reference any type parameter from the same type parameter list. - - -==== tests/cases/compiler/genericAssignmentCompatOfFunctionSignatures1.ts (2 errors) ==== - var x1 = function foo3(x: T, z: U) { } - ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -!!! error TS2313: Constraint of a type parameter cannot reference any type parameter from the same type parameter list. - var x2 = function foo3(x: T, z: U) { } - ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -!!! error TS2313: Constraint of a type parameter cannot reference any type parameter from the same type parameter list. - - x1 = x2; - x2 = x1; \ No newline at end of file diff --git a/tests/baselines/reference/genericAssignmentCompatOfFunctionSignatures1.symbols b/tests/baselines/reference/genericAssignmentCompatOfFunctionSignatures1.symbols new file mode 100644 index 00000000000..1dfb699d3b4 --- /dev/null +++ b/tests/baselines/reference/genericAssignmentCompatOfFunctionSignatures1.symbols @@ -0,0 +1,35 @@ +=== tests/cases/compiler/genericAssignmentCompatOfFunctionSignatures1.ts === +var x1 = function foo3(x: T, z: U) { } +>x1 : Symbol(x1, Decl(genericAssignmentCompatOfFunctionSignatures1.ts, 0, 3)) +>foo3 : Symbol(foo3, Decl(genericAssignmentCompatOfFunctionSignatures1.ts, 0, 8)) +>T : Symbol(T, Decl(genericAssignmentCompatOfFunctionSignatures1.ts, 0, 23)) +>U : Symbol(U, Decl(genericAssignmentCompatOfFunctionSignatures1.ts, 0, 25)) +>a : Symbol(a, Decl(genericAssignmentCompatOfFunctionSignatures1.ts, 0, 37)) +>T : Symbol(T, Decl(genericAssignmentCompatOfFunctionSignatures1.ts, 0, 23)) +>b : Symbol(b, Decl(genericAssignmentCompatOfFunctionSignatures1.ts, 0, 43)) +>x : Symbol(x, Decl(genericAssignmentCompatOfFunctionSignatures1.ts, 0, 57)) +>T : Symbol(T, Decl(genericAssignmentCompatOfFunctionSignatures1.ts, 0, 23)) +>z : Symbol(z, Decl(genericAssignmentCompatOfFunctionSignatures1.ts, 0, 62)) +>U : Symbol(U, Decl(genericAssignmentCompatOfFunctionSignatures1.ts, 0, 25)) + +var x2 = function foo3(x: T, z: U) { } +>x2 : Symbol(x2, Decl(genericAssignmentCompatOfFunctionSignatures1.ts, 1, 3)) +>foo3 : Symbol(foo3, Decl(genericAssignmentCompatOfFunctionSignatures1.ts, 1, 8)) +>T : Symbol(T, Decl(genericAssignmentCompatOfFunctionSignatures1.ts, 1, 23)) +>U : Symbol(U, Decl(genericAssignmentCompatOfFunctionSignatures1.ts, 1, 25)) +>a : Symbol(a, Decl(genericAssignmentCompatOfFunctionSignatures1.ts, 1, 37)) +>T : Symbol(T, Decl(genericAssignmentCompatOfFunctionSignatures1.ts, 1, 23)) +>b : Symbol(b, Decl(genericAssignmentCompatOfFunctionSignatures1.ts, 1, 43)) +>x : Symbol(x, Decl(genericAssignmentCompatOfFunctionSignatures1.ts, 1, 57)) +>T : Symbol(T, Decl(genericAssignmentCompatOfFunctionSignatures1.ts, 1, 23)) +>z : Symbol(z, Decl(genericAssignmentCompatOfFunctionSignatures1.ts, 1, 62)) +>U : Symbol(U, Decl(genericAssignmentCompatOfFunctionSignatures1.ts, 1, 25)) + +x1 = x2; +>x1 : Symbol(x1, Decl(genericAssignmentCompatOfFunctionSignatures1.ts, 0, 3)) +>x2 : Symbol(x2, Decl(genericAssignmentCompatOfFunctionSignatures1.ts, 1, 3)) + +x2 = x1; +>x2 : Symbol(x2, Decl(genericAssignmentCompatOfFunctionSignatures1.ts, 1, 3)) +>x1 : Symbol(x1, Decl(genericAssignmentCompatOfFunctionSignatures1.ts, 0, 3)) + diff --git a/tests/baselines/reference/genericAssignmentCompatOfFunctionSignatures1.types b/tests/baselines/reference/genericAssignmentCompatOfFunctionSignatures1.types new file mode 100644 index 00000000000..c5765a5adf4 --- /dev/null +++ b/tests/baselines/reference/genericAssignmentCompatOfFunctionSignatures1.types @@ -0,0 +1,39 @@ +=== tests/cases/compiler/genericAssignmentCompatOfFunctionSignatures1.ts === +var x1 = function foo3(x: T, z: U) { } +>x1 : (x: T, z: U) => void +>function foo3(x: T, z: U) { } : (x: T, z: U) => void +>foo3 : (x: T, z: U) => void +>T : T +>U : U +>a : T +>T : T +>b : string +>x : T +>T : T +>z : U +>U : U + +var x2 = function foo3(x: T, z: U) { } +>x2 : (x: T, z: U) => void +>function foo3(x: T, z: U) { } : (x: T, z: U) => void +>foo3 : (x: T, z: U) => void +>T : T +>U : U +>a : T +>T : T +>b : number +>x : T +>T : T +>z : U +>U : U + +x1 = x2; +>x1 = x2 : (x: T, z: U) => void +>x1 : (x: T, z: U) => void +>x2 : (x: T, z: U) => void + +x2 = x1; +>x2 = x1 : (x: T, z: U) => void +>x2 : (x: T, z: U) => void +>x1 : (x: T, z: U) => void + diff --git a/tests/baselines/reference/genericCallWithConstraintsTypeArgumentInference2.errors.txt b/tests/baselines/reference/genericCallWithConstraintsTypeArgumentInference2.errors.txt index d8228dd2243..6ac3c9e6703 100644 --- a/tests/baselines/reference/genericCallWithConstraintsTypeArgumentInference2.errors.txt +++ b/tests/baselines/reference/genericCallWithConstraintsTypeArgumentInference2.errors.txt @@ -1,14 +1,11 @@ -tests/cases/conformance/types/typeRelationships/typeInference/genericCallWithConstraintsTypeArgumentInference2.ts(3,17): error TS2313: Constraint of a type parameter cannot reference any type parameter from the same type parameter list. tests/cases/conformance/types/typeRelationships/typeInference/genericCallWithConstraintsTypeArgumentInference2.ts(11,26): error TS2345: Argument of type 'number' is not assignable to parameter of type 'Date'. Property 'toDateString' is missing in type 'Number'. -==== tests/cases/conformance/types/typeRelationships/typeInference/genericCallWithConstraintsTypeArgumentInference2.ts (2 errors) ==== +==== tests/cases/conformance/types/typeRelationships/typeInference/genericCallWithConstraintsTypeArgumentInference2.ts (1 errors) ==== // Generic call with parameters of T and U, U extends T, no parameter of type U function foo(t: T) { - ~~~~~~~~~~~ -!!! error TS2313: Constraint of a type parameter cannot reference any type parameter from the same type parameter list. var u: U; return u; } diff --git a/tests/baselines/reference/genericCallWithObjectTypeArgsAndConstraints3.errors.txt b/tests/baselines/reference/genericCallWithObjectTypeArgsAndConstraints3.errors.txt index 54455782cc2..6c2be7b10d1 100644 --- a/tests/baselines/reference/genericCallWithObjectTypeArgsAndConstraints3.errors.txt +++ b/tests/baselines/reference/genericCallWithObjectTypeArgsAndConstraints3.errors.txt @@ -1,10 +1,9 @@ tests/cases/conformance/types/typeRelationships/typeInference/genericCallWithObjectTypeArgsAndConstraints3.ts(18,10): error TS2453: The type argument for type parameter 'T' cannot be inferred from the usage. Consider specifying the type arguments explicitly. Type argument candidate 'Derived' is not a valid type argument because it is not a supertype of candidate 'Derived2'. Property 'y' is missing in type 'Derived2'. -tests/cases/conformance/types/typeRelationships/typeInference/genericCallWithObjectTypeArgsAndConstraints3.ts(20,29): error TS2313: Constraint of a type parameter cannot reference any type parameter from the same type parameter list. -==== tests/cases/conformance/types/typeRelationships/typeInference/genericCallWithObjectTypeArgsAndConstraints3.ts (2 errors) ==== +==== tests/cases/conformance/types/typeRelationships/typeInference/genericCallWithObjectTypeArgsAndConstraints3.ts (1 errors) ==== // Generic call with constraints infering type parameter from object member properties class Base { @@ -29,8 +28,6 @@ tests/cases/conformance/types/typeRelationships/typeInference/genericCallWithObj !!! error TS2453: Property 'y' is missing in type 'Derived2'. function f2(a: U) { - ~~~~~~~~~~~~~~~~~~~~~~~~ -!!! error TS2313: Constraint of a type parameter cannot reference any type parameter from the same type parameter list. var r: T; return r; } diff --git a/tests/baselines/reference/genericCallWithObjectTypeArgsAndConstraints4.errors.txt b/tests/baselines/reference/genericCallWithObjectTypeArgsAndConstraints4.errors.txt index 5f416bb8596..cc4eb418596 100644 --- a/tests/baselines/reference/genericCallWithObjectTypeArgsAndConstraints4.errors.txt +++ b/tests/baselines/reference/genericCallWithObjectTypeArgsAndConstraints4.errors.txt @@ -1,9 +1,7 @@ -tests/cases/conformance/types/typeRelationships/typeInference/genericCallWithObjectTypeArgsAndConstraints4.ts(12,17): error TS2313: Constraint of a type parameter cannot reference any type parameter from the same type parameter list. -tests/cases/conformance/types/typeRelationships/typeInference/genericCallWithObjectTypeArgsAndConstraints4.ts(28,19): error TS2313: Constraint of a type parameter cannot reference any type parameter from the same type parameter list. tests/cases/conformance/types/typeRelationships/typeInference/genericCallWithObjectTypeArgsAndConstraints4.ts(30,24): error TS2345: Argument of type 'C' is not assignable to parameter of type 'T'. -==== tests/cases/conformance/types/typeRelationships/typeInference/genericCallWithObjectTypeArgsAndConstraints4.ts (3 errors) ==== +==== tests/cases/conformance/types/typeRelationships/typeInference/genericCallWithObjectTypeArgsAndConstraints4.ts (1 errors) ==== // Generic call with constraints infering type parameter from object member properties class C { @@ -16,8 +14,6 @@ tests/cases/conformance/types/typeRelationships/typeInference/genericCallWithObj } function foo(t: T, t2: U) { - ~~~~~~~~~~~ -!!! error TS2313: Constraint of a type parameter cannot reference any type parameter from the same type parameter list. return (x: T) => t2; } @@ -34,8 +30,6 @@ tests/cases/conformance/types/typeRelationships/typeInference/genericCallWithObj var r9 = foo(() => { }, () => 1); function other() { - ~~~~~~~~~~~ -!!! error TS2313: Constraint of a type parameter cannot reference any type parameter from the same type parameter list. var r4 = foo(c, d); var r5 = foo(c, d); // error ~ diff --git a/tests/baselines/reference/genericCallWithObjectTypeArgsAndConstraints5.errors.txt b/tests/baselines/reference/genericCallWithObjectTypeArgsAndConstraints5.errors.txt index 887abfaff63..b2e69ce7505 100644 --- a/tests/baselines/reference/genericCallWithObjectTypeArgsAndConstraints5.errors.txt +++ b/tests/baselines/reference/genericCallWithObjectTypeArgsAndConstraints5.errors.txt @@ -1,9 +1,7 @@ -tests/cases/conformance/types/typeRelationships/typeInference/genericCallWithObjectTypeArgsAndConstraints5.ts(12,17): error TS2313: Constraint of a type parameter cannot reference any type parameter from the same type parameter list. -tests/cases/conformance/types/typeRelationships/typeInference/genericCallWithObjectTypeArgsAndConstraints5.ts(21,19): error TS2313: Constraint of a type parameter cannot reference any type parameter from the same type parameter list. tests/cases/conformance/types/typeRelationships/typeInference/genericCallWithObjectTypeArgsAndConstraints5.ts(22,24): error TS2345: Argument of type 'C' is not assignable to parameter of type 'T'. -==== tests/cases/conformance/types/typeRelationships/typeInference/genericCallWithObjectTypeArgsAndConstraints5.ts (3 errors) ==== +==== tests/cases/conformance/types/typeRelationships/typeInference/genericCallWithObjectTypeArgsAndConstraints5.ts (1 errors) ==== // Generic call with constraints infering type parameter from object member properties class C { @@ -16,8 +14,6 @@ tests/cases/conformance/types/typeRelationships/typeInference/genericCallWithObj } function foo(t: T, t2: U) { - ~~~~~~~~~~~ -!!! error TS2313: Constraint of a type parameter cannot reference any type parameter from the same type parameter list. return (x: T) => t2; } @@ -27,8 +23,6 @@ tests/cases/conformance/types/typeRelationships/typeInference/genericCallWithObj var r9 = foo(() => 1, () => { }); // the constraints are self-referencing, no downstream error function other() { - ~~~~~~~~~~~ -!!! error TS2313: Constraint of a type parameter cannot reference any type parameter from the same type parameter list. var r5 = foo(c, d); // error ~ !!! error TS2345: Argument of type 'C' is not assignable to parameter of type 'T'. diff --git a/tests/baselines/reference/genericCallWithObjectTypeArgsAndIndexersErrors.errors.txt b/tests/baselines/reference/genericCallWithObjectTypeArgsAndIndexersErrors.errors.txt deleted file mode 100644 index b0c0bee94fd..00000000000 --- a/tests/baselines/reference/genericCallWithObjectTypeArgsAndIndexersErrors.errors.txt +++ /dev/null @@ -1,33 +0,0 @@ -tests/cases/conformance/types/typeRelationships/typeInference/genericCallWithObjectTypeArgsAndIndexersErrors.ts(15,17): error TS2313: Constraint of a type parameter cannot reference any type parameter from the same type parameter list. -tests/cases/conformance/types/typeRelationships/typeInference/genericCallWithObjectTypeArgsAndIndexersErrors.ts(23,9): error TS2322: Type 'T' is not assignable to type 'U'. - - -==== tests/cases/conformance/types/typeRelationships/typeInference/genericCallWithObjectTypeArgsAndIndexersErrors.ts (2 errors) ==== - // Type inference infers from indexers in target type, error cases - - function foo(x: T) { - return x; - } - - function other(arg: T) { - var b: { - [x: string]: Object; - [x: number]: T; // ok, T is a subtype of Object because its apparent type is {} - }; - var r2 = foo(b); // T - } - - function other3(arg: T) { - ~~~~~~~~~~~ -!!! error TS2313: Constraint of a type parameter cannot reference any type parameter from the same type parameter list. - var b: { - [x: string]: Object; - [x: number]: T; - }; - var r2 = foo(b); - var d = r2[1]; - var e = r2['1']; - var u: U = r2[1]; // ok - ~ -!!! error TS2322: Type 'T' is not assignable to type 'U'. - } \ No newline at end of file diff --git a/tests/baselines/reference/genericCallWithObjectTypeArgsAndIndexersErrors.symbols b/tests/baselines/reference/genericCallWithObjectTypeArgsAndIndexersErrors.symbols new file mode 100644 index 00000000000..0f3fe58da01 --- /dev/null +++ b/tests/baselines/reference/genericCallWithObjectTypeArgsAndIndexersErrors.symbols @@ -0,0 +1,76 @@ +=== tests/cases/conformance/types/typeRelationships/typeInference/genericCallWithObjectTypeArgsAndIndexersErrors.ts === +// Type inference infers from indexers in target type, error cases + +function foo(x: T) { +>foo : Symbol(foo, Decl(genericCallWithObjectTypeArgsAndIndexersErrors.ts, 0, 0)) +>T : Symbol(T, Decl(genericCallWithObjectTypeArgsAndIndexersErrors.ts, 2, 13)) +>x : Symbol(x, Decl(genericCallWithObjectTypeArgsAndIndexersErrors.ts, 2, 16)) +>T : Symbol(T, Decl(genericCallWithObjectTypeArgsAndIndexersErrors.ts, 2, 13)) + + return x; +>x : Symbol(x, Decl(genericCallWithObjectTypeArgsAndIndexersErrors.ts, 2, 16)) +} + +function other(arg: T) { +>other : Symbol(other, Decl(genericCallWithObjectTypeArgsAndIndexersErrors.ts, 4, 1)) +>T : Symbol(T, Decl(genericCallWithObjectTypeArgsAndIndexersErrors.ts, 6, 15)) +>arg : Symbol(arg, Decl(genericCallWithObjectTypeArgsAndIndexersErrors.ts, 6, 18)) +>T : Symbol(T, Decl(genericCallWithObjectTypeArgsAndIndexersErrors.ts, 6, 15)) + + var b: { +>b : Symbol(b, Decl(genericCallWithObjectTypeArgsAndIndexersErrors.ts, 7, 7)) + + [x: string]: Object; +>x : Symbol(x, Decl(genericCallWithObjectTypeArgsAndIndexersErrors.ts, 8, 9)) +>Object : Symbol(Object, Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --)) + + [x: number]: T; // ok, T is a subtype of Object because its apparent type is {} +>x : Symbol(x, Decl(genericCallWithObjectTypeArgsAndIndexersErrors.ts, 9, 9)) +>T : Symbol(T, Decl(genericCallWithObjectTypeArgsAndIndexersErrors.ts, 6, 15)) + + }; + var r2 = foo(b); // T +>r2 : Symbol(r2, Decl(genericCallWithObjectTypeArgsAndIndexersErrors.ts, 11, 7)) +>foo : Symbol(foo, Decl(genericCallWithObjectTypeArgsAndIndexersErrors.ts, 0, 0)) +>b : Symbol(b, Decl(genericCallWithObjectTypeArgsAndIndexersErrors.ts, 7, 7)) +} + +function other3(arg: T) { +>other3 : Symbol(other3, Decl(genericCallWithObjectTypeArgsAndIndexersErrors.ts, 12, 1)) +>T : Symbol(T, Decl(genericCallWithObjectTypeArgsAndIndexersErrors.ts, 14, 16)) +>U : Symbol(U, Decl(genericCallWithObjectTypeArgsAndIndexersErrors.ts, 14, 28)) +>U : Symbol(U, Decl(genericCallWithObjectTypeArgsAndIndexersErrors.ts, 14, 28)) +>Date : Symbol(Date, Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --)) +>arg : Symbol(arg, Decl(genericCallWithObjectTypeArgsAndIndexersErrors.ts, 14, 45)) +>T : Symbol(T, Decl(genericCallWithObjectTypeArgsAndIndexersErrors.ts, 14, 16)) + + var b: { +>b : Symbol(b, Decl(genericCallWithObjectTypeArgsAndIndexersErrors.ts, 15, 7)) + + [x: string]: Object; +>x : Symbol(x, Decl(genericCallWithObjectTypeArgsAndIndexersErrors.ts, 16, 9)) +>Object : Symbol(Object, Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --)) + + [x: number]: T; +>x : Symbol(x, Decl(genericCallWithObjectTypeArgsAndIndexersErrors.ts, 17, 9)) +>T : Symbol(T, Decl(genericCallWithObjectTypeArgsAndIndexersErrors.ts, 14, 16)) + + }; + var r2 = foo(b); +>r2 : Symbol(r2, Decl(genericCallWithObjectTypeArgsAndIndexersErrors.ts, 19, 7)) +>foo : Symbol(foo, Decl(genericCallWithObjectTypeArgsAndIndexersErrors.ts, 0, 0)) +>b : Symbol(b, Decl(genericCallWithObjectTypeArgsAndIndexersErrors.ts, 15, 7)) + + var d = r2[1]; +>d : Symbol(d, Decl(genericCallWithObjectTypeArgsAndIndexersErrors.ts, 20, 7)) +>r2 : Symbol(r2, Decl(genericCallWithObjectTypeArgsAndIndexersErrors.ts, 19, 7)) + + var e = r2['1']; +>e : Symbol(e, Decl(genericCallWithObjectTypeArgsAndIndexersErrors.ts, 21, 7)) +>r2 : Symbol(r2, Decl(genericCallWithObjectTypeArgsAndIndexersErrors.ts, 19, 7)) + + var u: U = r2[1]; // ok +>u : Symbol(u, Decl(genericCallWithObjectTypeArgsAndIndexersErrors.ts, 22, 7)) +>U : Symbol(U, Decl(genericCallWithObjectTypeArgsAndIndexersErrors.ts, 14, 28)) +>r2 : Symbol(r2, Decl(genericCallWithObjectTypeArgsAndIndexersErrors.ts, 19, 7)) +} diff --git a/tests/baselines/reference/genericCallWithObjectTypeArgsAndIndexersErrors.types b/tests/baselines/reference/genericCallWithObjectTypeArgsAndIndexersErrors.types new file mode 100644 index 00000000000..bde72409edc --- /dev/null +++ b/tests/baselines/reference/genericCallWithObjectTypeArgsAndIndexersErrors.types @@ -0,0 +1,84 @@ +=== tests/cases/conformance/types/typeRelationships/typeInference/genericCallWithObjectTypeArgsAndIndexersErrors.ts === +// Type inference infers from indexers in target type, error cases + +function foo(x: T) { +>foo : (x: T) => T +>T : T +>x : T +>T : T + + return x; +>x : T +} + +function other(arg: T) { +>other : (arg: T) => void +>T : T +>arg : T +>T : T + + var b: { +>b : { [x: string]: Object; [x: number]: T; } + + [x: string]: Object; +>x : string +>Object : Object + + [x: number]: T; // ok, T is a subtype of Object because its apparent type is {} +>x : number +>T : T + + }; + var r2 = foo(b); // T +>r2 : { [x: string]: Object; [x: number]: T; } +>foo(b) : { [x: string]: Object; [x: number]: T; } +>foo : (x: T) => T +>b : { [x: string]: Object; [x: number]: T; } +} + +function other3(arg: T) { +>other3 : (arg: T) => void +>T : T +>U : U +>U : U +>Date : Date +>arg : T +>T : T + + var b: { +>b : { [x: string]: Object; [x: number]: T; } + + [x: string]: Object; +>x : string +>Object : Object + + [x: number]: T; +>x : number +>T : T + + }; + var r2 = foo(b); +>r2 : { [x: string]: Object; [x: number]: T; } +>foo(b) : { [x: string]: Object; [x: number]: T; } +>foo : (x: T) => T +>b : { [x: string]: Object; [x: number]: T; } + + var d = r2[1]; +>d : T +>r2[1] : T +>r2 : { [x: string]: Object; [x: number]: T; } +>1 : number + + var e = r2['1']; +>e : Object +>r2['1'] : Object +>r2 : { [x: string]: Object; [x: number]: T; } +>'1' : string + + var u: U = r2[1]; // ok +>u : U +>U : U +>r2[1] : T +>r2 : { [x: string]: Object; [x: number]: T; } +>1 : number +} diff --git a/tests/baselines/reference/genericCallWithObjectTypeArgsAndInitializers.errors.txt b/tests/baselines/reference/genericCallWithObjectTypeArgsAndInitializers.errors.txt index e9fae450377..9795248e2f7 100644 --- a/tests/baselines/reference/genericCallWithObjectTypeArgsAndInitializers.errors.txt +++ b/tests/baselines/reference/genericCallWithObjectTypeArgsAndInitializers.errors.txt @@ -1,17 +1,10 @@ tests/cases/conformance/types/typeRelationships/assignmentCompatibility/genericCallWithObjectTypeArgsAndInitializers.ts(5,33): error TS2322: Type 'number' is not assignable to type 'T'. -tests/cases/conformance/types/typeRelationships/assignmentCompatibility/genericCallWithObjectTypeArgsAndInitializers.ts(6,18): error TS2313: Constraint of a type parameter cannot reference any type parameter from the same type parameter list. tests/cases/conformance/types/typeRelationships/assignmentCompatibility/genericCallWithObjectTypeArgsAndInitializers.ts(6,37): error TS2322: Type 'T' is not assignable to type 'U'. -tests/cases/conformance/types/typeRelationships/assignmentCompatibility/genericCallWithObjectTypeArgsAndInitializers.ts(7,18): error TS2313: Constraint of a type parameter cannot reference any type parameter from the same type parameter list. -tests/cases/conformance/types/typeRelationships/assignmentCompatibility/genericCallWithObjectTypeArgsAndInitializers.ts(7,37): error TS2322: Type 'U' is not assignable to type 'T'. -tests/cases/conformance/types/typeRelationships/assignmentCompatibility/genericCallWithObjectTypeArgsAndInitializers.ts(8,18): error TS2313: Constraint of a type parameter cannot reference any type parameter from the same type parameter list. -tests/cases/conformance/types/typeRelationships/assignmentCompatibility/genericCallWithObjectTypeArgsAndInitializers.ts(8,31): error TS2313: Constraint of a type parameter cannot reference any type parameter from the same type parameter list. tests/cases/conformance/types/typeRelationships/assignmentCompatibility/genericCallWithObjectTypeArgsAndInitializers.ts(8,56): error TS2322: Type 'U' is not assignable to type 'V'. -tests/cases/conformance/types/typeRelationships/assignmentCompatibility/genericCallWithObjectTypeArgsAndInitializers.ts(9,18): error TS2313: Constraint of a type parameter cannot reference any type parameter from the same type parameter list. -tests/cases/conformance/types/typeRelationships/assignmentCompatibility/genericCallWithObjectTypeArgsAndInitializers.ts(9,31): error TS2313: Constraint of a type parameter cannot reference any type parameter from the same type parameter list. -tests/cases/conformance/types/typeRelationships/assignmentCompatibility/genericCallWithObjectTypeArgsAndInitializers.ts(9,50): error TS2322: Type 'V' is not assignable to type 'U'. + Type 'T' is not assignable to type 'V'. -==== tests/cases/conformance/types/typeRelationships/assignmentCompatibility/genericCallWithObjectTypeArgsAndInitializers.ts (11 errors) ==== +==== tests/cases/conformance/types/typeRelationships/assignmentCompatibility/genericCallWithObjectTypeArgsAndInitializers.ts (3 errors) ==== // Generic typed parameters with initializers function foo(x: T = null) { return x; } // ok @@ -20,26 +13,11 @@ tests/cases/conformance/types/typeRelationships/assignmentCompatibility/genericC ~~~~~~~~ !!! error TS2322: Type 'number' is not assignable to type 'T'. function foo4(x: T, y: U = x) { } // error - ~~~~~~~~~~~ -!!! error TS2313: Constraint of a type parameter cannot reference any type parameter from the same type parameter list. ~~~~~~~~ !!! error TS2322: Type 'T' is not assignable to type 'U'. function foo5(x: U, y: T = x) { } // ok - ~~~~~~~~~~~ -!!! error TS2313: Constraint of a type parameter cannot reference any type parameter from the same type parameter list. - ~~~~~~~~ -!!! error TS2322: Type 'U' is not assignable to type 'T'. function foo6(x: T, y: U, z: V = y) { } // error - ~~~~~~~~~~~ -!!! error TS2313: Constraint of a type parameter cannot reference any type parameter from the same type parameter list. - ~~~~~~~~~~~ -!!! error TS2313: Constraint of a type parameter cannot reference any type parameter from the same type parameter list. ~~~~~~~~ !!! error TS2322: Type 'U' is not assignable to type 'V'. - function foo7(x: V, y: U = x) { } // should be ok - ~~~~~~~~~~~ -!!! error TS2313: Constraint of a type parameter cannot reference any type parameter from the same type parameter list. - ~~~~~~~~~~~ -!!! error TS2313: Constraint of a type parameter cannot reference any type parameter from the same type parameter list. - ~~~~~~~~ -!!! error TS2322: Type 'V' is not assignable to type 'U'. \ No newline at end of file +!!! error TS2322: Type 'T' is not assignable to type 'V'. + function foo7(x: V, y: U = x) { } // should be ok \ No newline at end of file diff --git a/tests/baselines/reference/genericConstraint2.errors.txt b/tests/baselines/reference/genericConstraint2.errors.txt index c1be6fc2325..97d468f5d5d 100644 --- a/tests/baselines/reference/genericConstraint2.errors.txt +++ b/tests/baselines/reference/genericConstraint2.errors.txt @@ -1,18 +1,15 @@ -tests/cases/compiler/genericConstraint2.ts(5,18): error TS2313: Constraint of a type parameter cannot reference any type parameter from the same type parameter list. tests/cases/compiler/genericConstraint2.ts(11,7): error TS2420: Class 'ComparableString' incorrectly implements interface 'Comparable'. Property 'comparer' is missing in type 'ComparableString'. -tests/cases/compiler/genericConstraint2.ts(21,17): error TS2344: Type 'ComparableString' does not satisfy the constraint 'Comparable'. +tests/cases/compiler/genericConstraint2.ts(21,17): error TS2344: Type 'ComparableString' does not satisfy the constraint 'Comparable'. Property 'comparer' is missing in type 'ComparableString'. -==== tests/cases/compiler/genericConstraint2.ts (3 errors) ==== +==== tests/cases/compiler/genericConstraint2.ts (2 errors) ==== interface Comparable { comparer(other: T): number; } function compare>(x: T, y: T): number { - ~~~~~~~~~~~~~~~~~~~~~~~ -!!! error TS2313: Constraint of a type parameter cannot reference any type parameter from the same type parameter list. if (x == null) return y == null ? 0 : -1; if (y == null) return 1; return x.comparer(y); @@ -33,5 +30,5 @@ tests/cases/compiler/genericConstraint2.ts(21,17): error TS2344: Type 'Comparabl var b = new ComparableString("b"); var c = compare(a, b); ~~~~~~~~~~~~~~~~ -!!! error TS2344: Type 'ComparableString' does not satisfy the constraint 'Comparable'. +!!! error TS2344: Type 'ComparableString' does not satisfy the constraint 'Comparable'. !!! error TS2344: Property 'comparer' is missing in type 'ComparableString'. \ No newline at end of file diff --git a/tests/baselines/reference/genericConstraint3.errors.txt b/tests/baselines/reference/genericConstraint3.errors.txt deleted file mode 100644 index 525b11504fb..00000000000 --- a/tests/baselines/reference/genericConstraint3.errors.txt +++ /dev/null @@ -1,9 +0,0 @@ -tests/cases/compiler/genericConstraint3.ts(2,16): error TS2313: Constraint of a type parameter cannot reference any type parameter from the same type parameter list. - - -==== tests/cases/compiler/genericConstraint3.ts (1 errors) ==== - interface C

{ x: P; } - interface A> { x: U; } - ~~~~~~~~~~~~~~ -!!! error TS2313: Constraint of a type parameter cannot reference any type parameter from the same type parameter list. - interface B extends A<{}, { x: {} }> { } // Should not produce an error \ No newline at end of file diff --git a/tests/baselines/reference/genericConstraint3.symbols b/tests/baselines/reference/genericConstraint3.symbols new file mode 100644 index 00000000000..57cb9d03115 --- /dev/null +++ b/tests/baselines/reference/genericConstraint3.symbols @@ -0,0 +1,21 @@ +=== tests/cases/compiler/genericConstraint3.ts === +interface C

{ x: P; } +>C : Symbol(C, Decl(genericConstraint3.ts, 0, 0)) +>P : Symbol(P, Decl(genericConstraint3.ts, 0, 12)) +>x : Symbol(x, Decl(genericConstraint3.ts, 0, 16)) +>P : Symbol(P, Decl(genericConstraint3.ts, 0, 12)) + +interface A> { x: U; } +>A : Symbol(A, Decl(genericConstraint3.ts, 0, 24)) +>T : Symbol(T, Decl(genericConstraint3.ts, 1, 12)) +>U : Symbol(U, Decl(genericConstraint3.ts, 1, 14)) +>C : Symbol(C, Decl(genericConstraint3.ts, 0, 0)) +>T : Symbol(T, Decl(genericConstraint3.ts, 1, 12)) +>x : Symbol(x, Decl(genericConstraint3.ts, 1, 32)) +>U : Symbol(U, Decl(genericConstraint3.ts, 1, 14)) + +interface B extends A<{}, { x: {} }> { } // Should not produce an error +>B : Symbol(B, Decl(genericConstraint3.ts, 1, 40)) +>A : Symbol(A, Decl(genericConstraint3.ts, 0, 24)) +>x : Symbol(x, Decl(genericConstraint3.ts, 2, 27)) + diff --git a/tests/baselines/reference/genericConstraint3.types b/tests/baselines/reference/genericConstraint3.types new file mode 100644 index 00000000000..84d6f0676f5 --- /dev/null +++ b/tests/baselines/reference/genericConstraint3.types @@ -0,0 +1,21 @@ +=== tests/cases/compiler/genericConstraint3.ts === +interface C

{ x: P; } +>C : C

+>P : P +>x : P +>P : P + +interface A> { x: U; } +>A : A +>T : T +>U : U +>C : C

+>T : T +>x : U +>U : U + +interface B extends A<{}, { x: {} }> { } // Should not produce an error +>B : B +>A : A +>x : {} + diff --git a/tests/baselines/reference/genericMemberFunction.errors.txt b/tests/baselines/reference/genericMemberFunction.errors.txt index 2199966ea56..1410b6d94e3 100644 --- a/tests/baselines/reference/genericMemberFunction.errors.txt +++ b/tests/baselines/reference/genericMemberFunction.errors.txt @@ -1,45 +1,30 @@ -tests/cases/compiler/genericMemberFunction.ts(2,20): error TS2313: Constraint of a type parameter cannot reference any type parameter from the same type parameter list. -tests/cases/compiler/genericMemberFunction.ts(7,20): error TS2313: Constraint of a type parameter cannot reference any type parameter from the same type parameter list. -tests/cases/compiler/genericMemberFunction.ts(10,20): error TS2313: Constraint of a type parameter cannot reference any type parameter from the same type parameter list. -tests/cases/compiler/genericMemberFunction.ts(15,19): error TS2313: Constraint of a type parameter cannot reference any type parameter from the same type parameter list. tests/cases/compiler/genericMemberFunction.ts(16,5): error TS2304: Cannot find name 'a'. tests/cases/compiler/genericMemberFunction.ts(17,5): error TS2304: Cannot find name 'removedFiles'. -tests/cases/compiler/genericMemberFunction.ts(17,30): error TS2313: Constraint of a type parameter cannot reference any type parameter from the same type parameter list. tests/cases/compiler/genericMemberFunction.ts(18,12): error TS2339: Property 'removeFile' does not exist on type 'BuildResult'. -==== tests/cases/compiler/genericMemberFunction.ts (8 errors) ==== +==== tests/cases/compiler/genericMemberFunction.ts (3 errors) ==== export class BuildError{ public parent(): FileWithErrors { - ~~~~~~~~~~~ -!!! error TS2313: Constraint of a type parameter cannot reference any type parameter from the same type parameter list. return undefined; } } export class FileWithErrors{ public errors(): BuildError[] { - ~~~~~~~~~~~ -!!! error TS2313: Constraint of a type parameter cannot reference any type parameter from the same type parameter list. return undefined; } public parent(): BuildResult { - ~~~~~~~~~~~ -!!! error TS2313: Constraint of a type parameter cannot reference any type parameter from the same type parameter list. return undefined; } } export class BuildResult{ public merge(other: BuildResult): void { - ~~~~~~~~~~~ -!!! error TS2313: Constraint of a type parameter cannot reference any type parameter from the same type parameter list. a.b.c.d.e.f.g = 0; ~ !!! error TS2304: Cannot find name 'a'. removedFiles.forEach((each: FileWithErrors) => { ~~~~~~~~~~~~ !!! error TS2304: Cannot find name 'removedFiles'. - ~~~~~~~~~~~ -!!! error TS2313: Constraint of a type parameter cannot reference any type parameter from the same type parameter list. this.removeFile(each); ~~~~~~~~~~ !!! error TS2339: Property 'removeFile' does not exist on type 'BuildResult'. diff --git a/tests/baselines/reference/genericMergedDeclarationUsingTypeParameter.errors.txt b/tests/baselines/reference/genericMergedDeclarationUsingTypeParameter.errors.txt index 43a73e76a3e..7778e1c3346 100644 --- a/tests/baselines/reference/genericMergedDeclarationUsingTypeParameter.errors.txt +++ b/tests/baselines/reference/genericMergedDeclarationUsingTypeParameter.errors.txt @@ -1,12 +1,9 @@ -tests/cases/compiler/genericMergedDeclarationUsingTypeParameter.ts(1,14): error TS2313: Constraint of a type parameter cannot reference any type parameter from the same type parameter list. tests/cases/compiler/genericMergedDeclarationUsingTypeParameter.ts(3,19): error TS2304: Cannot find name 'T'. tests/cases/compiler/genericMergedDeclarationUsingTypeParameter.ts(4,14): error TS2304: Cannot find name 'T'. -==== tests/cases/compiler/genericMergedDeclarationUsingTypeParameter.ts (3 errors) ==== +==== tests/cases/compiler/genericMergedDeclarationUsingTypeParameter.ts (2 errors) ==== function foo(y: T, z: U) { return y; } - ~~~~~~~~~~~ -!!! error TS2313: Constraint of a type parameter cannot reference any type parameter from the same type parameter list. module foo { export var x: T; ~ diff --git a/tests/baselines/reference/infiniteExpansionThroughInstantiation2.errors.txt b/tests/baselines/reference/infiniteExpansionThroughInstantiation2.errors.txt deleted file mode 100644 index 1778e092715..00000000000 --- a/tests/baselines/reference/infiniteExpansionThroughInstantiation2.errors.txt +++ /dev/null @@ -1,17 +0,0 @@ -tests/cases/conformance/types/typeRelationships/recursiveTypes/infiniteExpansionThroughInstantiation2.ts(4,14): error TS2313: Constraint of a type parameter cannot reference any type parameter from the same type parameter list. - - -==== tests/cases/conformance/types/typeRelationships/recursiveTypes/infiniteExpansionThroughInstantiation2.ts (1 errors) ==== - // instantiating a derived type can cause an infinitely expanding type reference to be generated - // which could be used in an assignment check for constraint satisfaction - - interface AA> // now an error due to referencing type parameter in constraint - ~~~~~~~~~~~~~~~ -!!! error TS2313: Constraint of a type parameter cannot reference any type parameter from the same type parameter list. - { - x: T - } - - interface BB extends AA> - { - } \ No newline at end of file diff --git a/tests/baselines/reference/infiniteExpansionThroughInstantiation2.symbols b/tests/baselines/reference/infiniteExpansionThroughInstantiation2.symbols new file mode 100644 index 00000000000..0c5b0cf5a65 --- /dev/null +++ b/tests/baselines/reference/infiniteExpansionThroughInstantiation2.symbols @@ -0,0 +1,22 @@ +=== tests/cases/conformance/types/typeRelationships/recursiveTypes/infiniteExpansionThroughInstantiation2.ts === +// instantiating a derived type can cause an infinitely expanding type reference to be generated +// which could be used in an assignment check for constraint satisfaction + +interface AA> // now an error due to referencing type parameter in constraint +>AA : Symbol(AA, Decl(infiniteExpansionThroughInstantiation2.ts, 0, 0)) +>T : Symbol(T, Decl(infiniteExpansionThroughInstantiation2.ts, 3, 13)) +>AA : Symbol(AA, Decl(infiniteExpansionThroughInstantiation2.ts, 0, 0)) +>T : Symbol(T, Decl(infiniteExpansionThroughInstantiation2.ts, 3, 13)) +{ + x: T +>x : Symbol(x, Decl(infiniteExpansionThroughInstantiation2.ts, 4, 1)) +>T : Symbol(T, Decl(infiniteExpansionThroughInstantiation2.ts, 3, 13)) +} + +interface BB extends AA> +>BB : Symbol(BB, Decl(infiniteExpansionThroughInstantiation2.ts, 6, 1)) +>AA : Symbol(AA, Decl(infiniteExpansionThroughInstantiation2.ts, 0, 0)) +>AA : Symbol(AA, Decl(infiniteExpansionThroughInstantiation2.ts, 0, 0)) +>BB : Symbol(BB, Decl(infiniteExpansionThroughInstantiation2.ts, 6, 1)) +{ +} diff --git a/tests/baselines/reference/infiniteExpansionThroughInstantiation2.types b/tests/baselines/reference/infiniteExpansionThroughInstantiation2.types new file mode 100644 index 00000000000..c9249b90010 --- /dev/null +++ b/tests/baselines/reference/infiniteExpansionThroughInstantiation2.types @@ -0,0 +1,22 @@ +=== tests/cases/conformance/types/typeRelationships/recursiveTypes/infiniteExpansionThroughInstantiation2.ts === +// instantiating a derived type can cause an infinitely expanding type reference to be generated +// which could be used in an assignment check for constraint satisfaction + +interface AA> // now an error due to referencing type parameter in constraint +>AA : AA +>T : T +>AA : AA +>T : T +{ + x: T +>x : T +>T : T +} + +interface BB extends AA> +>BB : BB +>AA : AA +>AA : AA +>BB : BB +{ +} diff --git a/tests/baselines/reference/instantiateConstraintsToTypeArguments2.errors.txt b/tests/baselines/reference/instantiateConstraintsToTypeArguments2.errors.txt deleted file mode 100644 index f5d53c582f6..00000000000 --- a/tests/baselines/reference/instantiateConstraintsToTypeArguments2.errors.txt +++ /dev/null @@ -1,17 +0,0 @@ -tests/cases/compiler/instantiateConstraintsToTypeArguments2.ts(1,13): error TS2313: Constraint of a type parameter cannot reference any type parameter from the same type parameter list. -tests/cases/compiler/instantiateConstraintsToTypeArguments2.ts(1,32): error TS2313: Constraint of a type parameter cannot reference any type parameter from the same type parameter list. -tests/cases/compiler/instantiateConstraintsToTypeArguments2.ts(2,13): error TS2313: Constraint of a type parameter cannot reference any type parameter from the same type parameter list. -tests/cases/compiler/instantiateConstraintsToTypeArguments2.ts(2,32): error TS2313: Constraint of a type parameter cannot reference any type parameter from the same type parameter list. - - -==== tests/cases/compiler/instantiateConstraintsToTypeArguments2.ts (4 errors) ==== - interface A, S extends A> { } - ~~~~~~~~~~~~~~~~~ -!!! error TS2313: Constraint of a type parameter cannot reference any type parameter from the same type parameter list. - ~~~~~~~~~~~~~~~~~ -!!! error TS2313: Constraint of a type parameter cannot reference any type parameter from the same type parameter list. - interface B, S extends B> extends A, B> { } - ~~~~~~~~~~~~~~~~~ -!!! error TS2313: Constraint of a type parameter cannot reference any type parameter from the same type parameter list. - ~~~~~~~~~~~~~~~~~ -!!! error TS2313: Constraint of a type parameter cannot reference any type parameter from the same type parameter list. \ No newline at end of file diff --git a/tests/baselines/reference/instantiateConstraintsToTypeArguments2.symbols b/tests/baselines/reference/instantiateConstraintsToTypeArguments2.symbols new file mode 100644 index 00000000000..40c886e1b47 --- /dev/null +++ b/tests/baselines/reference/instantiateConstraintsToTypeArguments2.symbols @@ -0,0 +1,30 @@ +=== tests/cases/compiler/instantiateConstraintsToTypeArguments2.ts === +interface A, S extends A> { } +>A : Symbol(A, Decl(instantiateConstraintsToTypeArguments2.ts, 0, 0)) +>T : Symbol(T, Decl(instantiateConstraintsToTypeArguments2.ts, 0, 12)) +>A : Symbol(A, Decl(instantiateConstraintsToTypeArguments2.ts, 0, 0)) +>T : Symbol(T, Decl(instantiateConstraintsToTypeArguments2.ts, 0, 12)) +>S : Symbol(S, Decl(instantiateConstraintsToTypeArguments2.ts, 0, 30)) +>S : Symbol(S, Decl(instantiateConstraintsToTypeArguments2.ts, 0, 30)) +>A : Symbol(A, Decl(instantiateConstraintsToTypeArguments2.ts, 0, 0)) +>T : Symbol(T, Decl(instantiateConstraintsToTypeArguments2.ts, 0, 12)) +>S : Symbol(S, Decl(instantiateConstraintsToTypeArguments2.ts, 0, 30)) + +interface B, S extends B> extends A, B> { } +>B : Symbol(B, Decl(instantiateConstraintsToTypeArguments2.ts, 0, 53)) +>T : Symbol(T, Decl(instantiateConstraintsToTypeArguments2.ts, 1, 12)) +>B : Symbol(B, Decl(instantiateConstraintsToTypeArguments2.ts, 0, 53)) +>T : Symbol(T, Decl(instantiateConstraintsToTypeArguments2.ts, 1, 12)) +>S : Symbol(S, Decl(instantiateConstraintsToTypeArguments2.ts, 1, 30)) +>S : Symbol(S, Decl(instantiateConstraintsToTypeArguments2.ts, 1, 30)) +>B : Symbol(B, Decl(instantiateConstraintsToTypeArguments2.ts, 0, 53)) +>T : Symbol(T, Decl(instantiateConstraintsToTypeArguments2.ts, 1, 12)) +>S : Symbol(S, Decl(instantiateConstraintsToTypeArguments2.ts, 1, 30)) +>A : Symbol(A, Decl(instantiateConstraintsToTypeArguments2.ts, 0, 0)) +>B : Symbol(B, Decl(instantiateConstraintsToTypeArguments2.ts, 0, 53)) +>T : Symbol(T, Decl(instantiateConstraintsToTypeArguments2.ts, 1, 12)) +>S : Symbol(S, Decl(instantiateConstraintsToTypeArguments2.ts, 1, 30)) +>B : Symbol(B, Decl(instantiateConstraintsToTypeArguments2.ts, 0, 53)) +>T : Symbol(T, Decl(instantiateConstraintsToTypeArguments2.ts, 1, 12)) +>S : Symbol(S, Decl(instantiateConstraintsToTypeArguments2.ts, 1, 30)) + diff --git a/tests/baselines/reference/instantiateConstraintsToTypeArguments2.types b/tests/baselines/reference/instantiateConstraintsToTypeArguments2.types new file mode 100644 index 00000000000..1952a661c16 --- /dev/null +++ b/tests/baselines/reference/instantiateConstraintsToTypeArguments2.types @@ -0,0 +1,30 @@ +=== tests/cases/compiler/instantiateConstraintsToTypeArguments2.ts === +interface A, S extends A> { } +>A : A +>T : T +>A : A +>T : T +>S : S +>S : S +>A : A +>T : T +>S : S + +interface B, S extends B> extends A, B> { } +>B : B +>T : T +>B : B +>T : T +>S : S +>S : S +>B : B +>T : T +>S : S +>A : A +>B : B +>T : T +>S : S +>B : B +>T : T +>S : S + diff --git a/tests/baselines/reference/instantiatedBaseTypeConstraints.errors.txt b/tests/baselines/reference/instantiatedBaseTypeConstraints.errors.txt deleted file mode 100644 index db62abe5688..00000000000 --- a/tests/baselines/reference/instantiatedBaseTypeConstraints.errors.txt +++ /dev/null @@ -1,17 +0,0 @@ -tests/cases/compiler/instantiatedBaseTypeConstraints.ts(1,15): error TS2313: Constraint of a type parameter cannot reference any type parameter from the same type parameter list. - - -==== tests/cases/compiler/instantiatedBaseTypeConstraints.ts (1 errors) ==== - interface Foo, C> { - ~~~~~~~~~~~~~~~~~~~ -!!! error TS2313: Constraint of a type parameter cannot reference any type parameter from the same type parameter list. - foo(bar: C): void; - } - - class Bar implements Foo { - foo(bar: string): void { - } - } - - - \ No newline at end of file diff --git a/tests/baselines/reference/instantiatedBaseTypeConstraints.symbols b/tests/baselines/reference/instantiatedBaseTypeConstraints.symbols new file mode 100644 index 00000000000..e92097c309c --- /dev/null +++ b/tests/baselines/reference/instantiatedBaseTypeConstraints.symbols @@ -0,0 +1,28 @@ +=== tests/cases/compiler/instantiatedBaseTypeConstraints.ts === +interface Foo, C> { +>Foo : Symbol(Foo, Decl(instantiatedBaseTypeConstraints.ts, 0, 0)) +>T : Symbol(T, Decl(instantiatedBaseTypeConstraints.ts, 0, 14)) +>Foo : Symbol(Foo, Decl(instantiatedBaseTypeConstraints.ts, 0, 0)) +>T : Symbol(T, Decl(instantiatedBaseTypeConstraints.ts, 0, 14)) +>C : Symbol(C, Decl(instantiatedBaseTypeConstraints.ts, 0, 34)) +>C : Symbol(C, Decl(instantiatedBaseTypeConstraints.ts, 0, 34)) + + foo(bar: C): void; +>foo : Symbol(foo, Decl(instantiatedBaseTypeConstraints.ts, 0, 39)) +>bar : Symbol(bar, Decl(instantiatedBaseTypeConstraints.ts, 1, 6)) +>C : Symbol(C, Decl(instantiatedBaseTypeConstraints.ts, 0, 34)) +} + +class Bar implements Foo { +>Bar : Symbol(Bar, Decl(instantiatedBaseTypeConstraints.ts, 2, 1)) +>Foo : Symbol(Foo, Decl(instantiatedBaseTypeConstraints.ts, 0, 0)) +>Bar : Symbol(Bar, Decl(instantiatedBaseTypeConstraints.ts, 2, 1)) + + foo(bar: string): void { +>foo : Symbol(foo, Decl(instantiatedBaseTypeConstraints.ts, 4, 39)) +>bar : Symbol(bar, Decl(instantiatedBaseTypeConstraints.ts, 5, 6)) + } +} + + + diff --git a/tests/baselines/reference/instantiatedBaseTypeConstraints.types b/tests/baselines/reference/instantiatedBaseTypeConstraints.types new file mode 100644 index 00000000000..e83d8250158 --- /dev/null +++ b/tests/baselines/reference/instantiatedBaseTypeConstraints.types @@ -0,0 +1,28 @@ +=== tests/cases/compiler/instantiatedBaseTypeConstraints.ts === +interface Foo, C> { +>Foo : Foo +>T : T +>Foo : Foo +>T : T +>C : C +>C : C + + foo(bar: C): void; +>foo : (bar: C) => void +>bar : C +>C : C +} + +class Bar implements Foo { +>Bar : Bar +>Foo : Foo +>Bar : Bar + + foo(bar: string): void { +>foo : (bar: string) => void +>bar : string + } +} + + + diff --git a/tests/baselines/reference/instantiatedBaseTypeConstraints2.errors.txt b/tests/baselines/reference/instantiatedBaseTypeConstraints2.errors.txt deleted file mode 100644 index d5c6d838a84..00000000000 --- a/tests/baselines/reference/instantiatedBaseTypeConstraints2.errors.txt +++ /dev/null @@ -1,11 +0,0 @@ -tests/cases/compiler/instantiatedBaseTypeConstraints2.ts(1,13): error TS2313: Constraint of a type parameter cannot reference any type parameter from the same type parameter list. -tests/cases/compiler/instantiatedBaseTypeConstraints2.ts(1,32): error TS2313: Constraint of a type parameter cannot reference any type parameter from the same type parameter list. - - -==== tests/cases/compiler/instantiatedBaseTypeConstraints2.ts (2 errors) ==== - interface A, S extends A> { } - ~~~~~~~~~~~~~~~~~ -!!! error TS2313: Constraint of a type parameter cannot reference any type parameter from the same type parameter list. - ~~~~~~~~~~~~~~~~~ -!!! error TS2313: Constraint of a type parameter cannot reference any type parameter from the same type parameter list. - interface B extends A, B> { } \ No newline at end of file diff --git a/tests/baselines/reference/instantiatedBaseTypeConstraints2.symbols b/tests/baselines/reference/instantiatedBaseTypeConstraints2.symbols new file mode 100644 index 00000000000..9122bbed975 --- /dev/null +++ b/tests/baselines/reference/instantiatedBaseTypeConstraints2.symbols @@ -0,0 +1,21 @@ +=== tests/cases/compiler/instantiatedBaseTypeConstraints2.ts === +interface A, S extends A> { } +>A : Symbol(A, Decl(instantiatedBaseTypeConstraints2.ts, 0, 0)) +>T : Symbol(T, Decl(instantiatedBaseTypeConstraints2.ts, 0, 12)) +>A : Symbol(A, Decl(instantiatedBaseTypeConstraints2.ts, 0, 0)) +>T : Symbol(T, Decl(instantiatedBaseTypeConstraints2.ts, 0, 12)) +>S : Symbol(S, Decl(instantiatedBaseTypeConstraints2.ts, 0, 30)) +>S : Symbol(S, Decl(instantiatedBaseTypeConstraints2.ts, 0, 30)) +>A : Symbol(A, Decl(instantiatedBaseTypeConstraints2.ts, 0, 0)) +>T : Symbol(T, Decl(instantiatedBaseTypeConstraints2.ts, 0, 12)) +>S : Symbol(S, Decl(instantiatedBaseTypeConstraints2.ts, 0, 30)) + +interface B extends A, B> { } +>B : Symbol(B, Decl(instantiatedBaseTypeConstraints2.ts, 0, 53)) +>U : Symbol(U, Decl(instantiatedBaseTypeConstraints2.ts, 1, 12)) +>A : Symbol(A, Decl(instantiatedBaseTypeConstraints2.ts, 0, 0)) +>B : Symbol(B, Decl(instantiatedBaseTypeConstraints2.ts, 0, 53)) +>U : Symbol(U, Decl(instantiatedBaseTypeConstraints2.ts, 1, 12)) +>B : Symbol(B, Decl(instantiatedBaseTypeConstraints2.ts, 0, 53)) +>U : Symbol(U, Decl(instantiatedBaseTypeConstraints2.ts, 1, 12)) + diff --git a/tests/baselines/reference/instantiatedBaseTypeConstraints2.types b/tests/baselines/reference/instantiatedBaseTypeConstraints2.types new file mode 100644 index 00000000000..3b6ca2ea75b --- /dev/null +++ b/tests/baselines/reference/instantiatedBaseTypeConstraints2.types @@ -0,0 +1,21 @@ +=== tests/cases/compiler/instantiatedBaseTypeConstraints2.ts === +interface A, S extends A> { } +>A : A +>T : T +>A : A +>T : T +>S : S +>S : S +>A : A +>T : T +>S : S + +interface B extends A, B> { } +>B : B +>U : U +>A : A +>B : B +>U : U +>B : B +>U : U + diff --git a/tests/baselines/reference/interfaceWithMultipleDeclarations.errors.txt b/tests/baselines/reference/interfaceWithMultipleDeclarations.errors.txt index 9afd0d37733..e4b37db8a7a 100644 --- a/tests/baselines/reference/interfaceWithMultipleDeclarations.errors.txt +++ b/tests/baselines/reference/interfaceWithMultipleDeclarations.errors.txt @@ -1,9 +1,7 @@ tests/cases/compiler/interfaceWithMultipleDeclarations.ts(3,11): error TS2428: All declarations of an interface must have identical type parameters. tests/cases/compiler/interfaceWithMultipleDeclarations.ts(5,11): error TS2428: All declarations of an interface must have identical type parameters. -tests/cases/compiler/interfaceWithMultipleDeclarations.ts(5,17): error TS2313: Constraint of a type parameter cannot reference any type parameter from the same type parameter list. tests/cases/compiler/interfaceWithMultipleDeclarations.ts(7,11): error TS2428: All declarations of an interface must have identical type parameters. tests/cases/compiler/interfaceWithMultipleDeclarations.ts(9,11): error TS2428: All declarations of an interface must have identical type parameters. -tests/cases/compiler/interfaceWithMultipleDeclarations.ts(9,17): error TS2313: Constraint of a type parameter cannot reference any type parameter from the same type parameter list. tests/cases/compiler/interfaceWithMultipleDeclarations.ts(11,11): error TS2428: All declarations of an interface must have identical type parameters. tests/cases/compiler/interfaceWithMultipleDeclarations.ts(16,11): error TS2428: All declarations of an interface must have identical type parameters. tests/cases/compiler/interfaceWithMultipleDeclarations.ts(18,11): error TS2428: All declarations of an interface must have identical type parameters. @@ -11,11 +9,9 @@ tests/cases/compiler/interfaceWithMultipleDeclarations.ts(20,11): error TS2428: tests/cases/compiler/interfaceWithMultipleDeclarations.ts(22,11): error TS2428: All declarations of an interface must have identical type parameters. tests/cases/compiler/interfaceWithMultipleDeclarations.ts(24,11): error TS2428: All declarations of an interface must have identical type parameters. tests/cases/compiler/interfaceWithMultipleDeclarations.ts(29,11): error TS2428: All declarations of an interface must have identical type parameters. -tests/cases/compiler/interfaceWithMultipleDeclarations.ts(34,14): error TS2313: Constraint of a type parameter cannot reference any type parameter from the same type parameter list. -tests/cases/compiler/interfaceWithMultipleDeclarations.ts(36,14): error TS2313: Constraint of a type parameter cannot reference any type parameter from the same type parameter list. -==== tests/cases/compiler/interfaceWithMultipleDeclarations.ts (15 errors) ==== +==== tests/cases/compiler/interfaceWithMultipleDeclarations.ts (11 errors) ==== interface I1 { } interface I1 { // Name mismatch @@ -25,8 +21,6 @@ tests/cases/compiler/interfaceWithMultipleDeclarations.ts(36,14): error TS2313: interface I1 { // Length mismatch ~~ !!! error TS2428: All declarations of an interface must have identical type parameters. - ~~~~~~~~~~~ -!!! error TS2313: Constraint of a type parameter cannot reference any type parameter from the same type parameter list. } interface I1 { // constraint present ~~ @@ -35,8 +29,6 @@ tests/cases/compiler/interfaceWithMultipleDeclarations.ts(36,14): error TS2313: interface I1 { // Length mismatch ~~ !!! error TS2428: All declarations of an interface must have identical type parameters. - ~~~~~~~~~~~ -!!! error TS2313: Constraint of a type parameter cannot reference any type parameter from the same type parameter list. } interface I1 { // Length mismatch ~~ @@ -76,10 +68,6 @@ tests/cases/compiler/interfaceWithMultipleDeclarations.ts(36,14): error TS2313: class Foo { } interface I4> { - ~~~~~~~~~~~~~~~~ -!!! error TS2313: Constraint of a type parameter cannot reference any type parameter from the same type parameter list. } interface I4> { // Should not be error - ~~~~~~~~~~~~~~~~ -!!! error TS2313: Constraint of a type parameter cannot reference any type parameter from the same type parameter list. } \ No newline at end of file diff --git a/tests/baselines/reference/invalidConstraint1.errors.txt b/tests/baselines/reference/invalidConstraint1.errors.txt index bac8f805c0f..e8a4ec43c09 100644 --- a/tests/baselines/reference/invalidConstraint1.errors.txt +++ b/tests/baselines/reference/invalidConstraint1.errors.txt @@ -1,12 +1,16 @@ -tests/cases/compiler/invalidConstraint1.ts(1,15): error TS2313: Constraint of a type parameter cannot reference any type parameter from the same type parameter list. +tests/cases/compiler/invalidConstraint1.ts(4,11): error TS2344: Type '{ a: number; }' does not satisfy the constraint '{ a: string; }'. + Types of property 'a' are incompatible. + Type 'number' is not assignable to type 'string'. ==== tests/cases/compiler/invalidConstraint1.ts (1 errors) ==== function f() { - ~~~~~~~~~~~~~~~~~~ -!!! error TS2313: Constraint of a type parameter cannot reference any type parameter from the same type parameter list. return undefined; } f(); // should error + ~~~~~~~~~~~~~ +!!! error TS2344: Type '{ a: number; }' does not satisfy the constraint '{ a: string; }'. +!!! error TS2344: Types of property 'a' are incompatible. +!!! error TS2344: Type 'number' is not assignable to type 'string'. \ No newline at end of file diff --git a/tests/baselines/reference/matchingOfObjectLiteralConstraints.errors.txt b/tests/baselines/reference/matchingOfObjectLiteralConstraints.errors.txt deleted file mode 100644 index edd917a4602..00000000000 --- a/tests/baselines/reference/matchingOfObjectLiteralConstraints.errors.txt +++ /dev/null @@ -1,10 +0,0 @@ -tests/cases/compiler/matchingOfObjectLiteralConstraints.ts(1,18): error TS2313: Constraint of a type parameter cannot reference any type parameter from the same type parameter list. - - -==== tests/cases/compiler/matchingOfObjectLiteralConstraints.ts (1 errors) ==== - function foo2(x: U, z: T) { } - ~~~~~~~~~~~~~~~~~~~ -!!! error TS2313: Constraint of a type parameter cannot reference any type parameter from the same type parameter list. - foo2({ y: "foo" }, "foo"); - - \ No newline at end of file diff --git a/tests/baselines/reference/matchingOfObjectLiteralConstraints.symbols b/tests/baselines/reference/matchingOfObjectLiteralConstraints.symbols new file mode 100644 index 00000000000..8a7fb7b47fc --- /dev/null +++ b/tests/baselines/reference/matchingOfObjectLiteralConstraints.symbols @@ -0,0 +1,17 @@ +=== tests/cases/compiler/matchingOfObjectLiteralConstraints.ts === +function foo2(x: U, z: T) { } +>foo2 : Symbol(foo2, Decl(matchingOfObjectLiteralConstraints.ts, 0, 0)) +>T : Symbol(T, Decl(matchingOfObjectLiteralConstraints.ts, 0, 14)) +>U : Symbol(U, Decl(matchingOfObjectLiteralConstraints.ts, 0, 16)) +>y : Symbol(y, Decl(matchingOfObjectLiteralConstraints.ts, 0, 28)) +>T : Symbol(T, Decl(matchingOfObjectLiteralConstraints.ts, 0, 14)) +>x : Symbol(x, Decl(matchingOfObjectLiteralConstraints.ts, 0, 38)) +>U : Symbol(U, Decl(matchingOfObjectLiteralConstraints.ts, 0, 16)) +>z : Symbol(z, Decl(matchingOfObjectLiteralConstraints.ts, 0, 43)) +>T : Symbol(T, Decl(matchingOfObjectLiteralConstraints.ts, 0, 14)) + +foo2({ y: "foo" }, "foo"); +>foo2 : Symbol(foo2, Decl(matchingOfObjectLiteralConstraints.ts, 0, 0)) +>y : Symbol(y, Decl(matchingOfObjectLiteralConstraints.ts, 1, 6)) + + diff --git a/tests/baselines/reference/matchingOfObjectLiteralConstraints.types b/tests/baselines/reference/matchingOfObjectLiteralConstraints.types new file mode 100644 index 00000000000..f694571c727 --- /dev/null +++ b/tests/baselines/reference/matchingOfObjectLiteralConstraints.types @@ -0,0 +1,21 @@ +=== tests/cases/compiler/matchingOfObjectLiteralConstraints.ts === +function foo2(x: U, z: T) { } +>foo2 : (x: U, z: T) => void +>T : T +>U : U +>y : T +>T : T +>x : U +>U : U +>z : T +>T : T + +foo2({ y: "foo" }, "foo"); +>foo2({ y: "foo" }, "foo") : void +>foo2 : (x: U, z: T) => void +>{ y: "foo" } : { y: string; } +>y : string +>"foo" : string +>"foo" : string + + diff --git a/tests/baselines/reference/maxConstraints.errors.txt b/tests/baselines/reference/maxConstraints.errors.txt index 16ae5bd2063..1f8af2ffacd 100644 --- a/tests/baselines/reference/maxConstraints.errors.txt +++ b/tests/baselines/reference/maxConstraints.errors.txt @@ -1,16 +1,13 @@ -tests/cases/compiler/maxConstraints.ts(5,6): error TS2313: Constraint of a type parameter cannot reference any type parameter from the same type parameter list. tests/cases/compiler/maxConstraints.ts(8,22): error TS2345: Argument of type 'number' is not assignable to parameter of type 'Comparable'. Property 'compareTo' is missing in type 'Number'. -==== tests/cases/compiler/maxConstraints.ts (2 errors) ==== +==== tests/cases/compiler/maxConstraints.ts (1 errors) ==== interface Comparable { compareTo(other: T): number; } interface Comparer { >(x: T, y: T): T; - ~~~~~~~~~~~~~~~~~~~~~~~ -!!! error TS2313: Constraint of a type parameter cannot reference any type parameter from the same type parameter list. } var max2: Comparer = (x, y) => { return (x.compareTo(y) > 0) ? x : y }; var maxResult = max2(1, 2); diff --git a/tests/baselines/reference/objectTypeWithRecursiveWrappedPropertyCheckedNominally.errors.txt b/tests/baselines/reference/objectTypeWithRecursiveWrappedPropertyCheckedNominally.errors.txt index 1f2f432c9da..f112a590071 100644 --- a/tests/baselines/reference/objectTypeWithRecursiveWrappedPropertyCheckedNominally.errors.txt +++ b/tests/baselines/reference/objectTypeWithRecursiveWrappedPropertyCheckedNominally.errors.txt @@ -8,15 +8,11 @@ tests/cases/conformance/types/typeRelationships/recursiveTypes/objectTypeWithRec Type 'MyList' is not assignable to type 'T'. tests/cases/conformance/types/typeRelationships/recursiveTypes/objectTypeWithRecursiveWrappedPropertyCheckedNominally.ts(31,5): error TS2322: Type 'T' is not assignable to type 'U'. Type 'List' is not assignable to type 'U'. -tests/cases/conformance/types/typeRelationships/recursiveTypes/objectTypeWithRecursiveWrappedPropertyCheckedNominally.ts(41,15): error TS2313: Constraint of a type parameter cannot reference any type parameter from the same type parameter list. tests/cases/conformance/types/typeRelationships/recursiveTypes/objectTypeWithRecursiveWrappedPropertyCheckedNominally.ts(42,5): error TS2322: Type 'U' is not assignable to type 'T'. Type 'MyList' is not assignable to type 'T'. -tests/cases/conformance/types/typeRelationships/recursiveTypes/objectTypeWithRecursiveWrappedPropertyCheckedNominally.ts(43,5): error TS2322: Type 'T' is not assignable to type 'U'. -tests/cases/conformance/types/typeRelationships/recursiveTypes/objectTypeWithRecursiveWrappedPropertyCheckedNominally.ts(48,5): error TS2322: Type 'T' is not assignable to type 'List'. -tests/cases/conformance/types/typeRelationships/recursiveTypes/objectTypeWithRecursiveWrappedPropertyCheckedNominally.ts(50,5): error TS2322: Type 'T' is not assignable to type 'MyList'. -==== tests/cases/conformance/types/typeRelationships/recursiveTypes/objectTypeWithRecursiveWrappedPropertyCheckedNominally.ts (9 errors) ==== +==== tests/cases/conformance/types/typeRelationships/recursiveTypes/objectTypeWithRecursiveWrappedPropertyCheckedNominally.ts (5 errors) ==== // Types with infinitely expanding recursive types are type checked nominally class List { @@ -72,25 +68,17 @@ tests/cases/conformance/types/typeRelationships/recursiveTypes/objectTypeWithRec } function foo2>(t: T, u: U) { - ~~~~~~~~~~~ -!!! error TS2313: Constraint of a type parameter cannot reference any type parameter from the same type parameter list. t = u; // error ~ !!! error TS2322: Type 'U' is not assignable to type 'T'. !!! error TS2322: Type 'MyList' is not assignable to type 'T'. u = t; // was error, ok after constraint made illegal, doesn't matter - ~ -!!! error TS2322: Type 'T' is not assignable to type 'U'. var a: List; var b: MyList; a = t; // error - ~ -!!! error TS2322: Type 'T' is not assignable to type 'List'. a = u; // error b = t; // ok - ~ -!!! error TS2322: Type 'T' is not assignable to type 'MyList'. b = u; // ok } \ No newline at end of file diff --git a/tests/baselines/reference/objectTypesIdentityWithComplexConstraints.errors.txt b/tests/baselines/reference/objectTypesIdentityWithComplexConstraints.errors.txt deleted file mode 100644 index dce23ed96e5..00000000000 --- a/tests/baselines/reference/objectTypesIdentityWithComplexConstraints.errors.txt +++ /dev/null @@ -1,22 +0,0 @@ -tests/cases/conformance/types/typeRelationships/typeAndMemberIdentity/objectTypesIdentityWithComplexConstraints.ts(2,8): error TS2313: Constraint of a type parameter cannot reference any type parameter from the same type parameter list. - - -==== tests/cases/conformance/types/typeRelationships/typeAndMemberIdentity/objectTypesIdentityWithComplexConstraints.ts (1 errors) ==== - interface A { - (x: T, y: S): void - ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ - }>(x: T, y: T): void - ~~~~~~~ -!!! error TS2313: Constraint of a type parameter cannot reference any type parameter from the same type parameter list. - } - - interface B { - (x: U, y: U): void - } - - // ok, not considered identical because the steps of contextual signature instantiation create fresh type parameters - function foo(x: A); - function foo(x: B); // error after constraints above made illegal - function foo(x: any) { } \ No newline at end of file diff --git a/tests/baselines/reference/objectTypesIdentityWithComplexConstraints.symbols b/tests/baselines/reference/objectTypesIdentityWithComplexConstraints.symbols new file mode 100644 index 00000000000..66314d9c5db --- /dev/null +++ b/tests/baselines/reference/objectTypesIdentityWithComplexConstraints.symbols @@ -0,0 +1,49 @@ +=== tests/cases/conformance/types/typeRelationships/typeAndMemberIdentity/objectTypesIdentityWithComplexConstraints.ts === +interface A { +>A : Symbol(A, Decl(objectTypesIdentityWithComplexConstraints.ts, 0, 0)) + + T : Symbol(T, Decl(objectTypesIdentityWithComplexConstraints.ts, 1, 7)) + + (x: T, y: S): void +>S : Symbol(S, Decl(objectTypesIdentityWithComplexConstraints.ts, 2, 13)) +>A : Symbol(A, Decl(objectTypesIdentityWithComplexConstraints.ts, 0, 0)) +>x : Symbol(x, Decl(objectTypesIdentityWithComplexConstraints.ts, 2, 26)) +>T : Symbol(T, Decl(objectTypesIdentityWithComplexConstraints.ts, 1, 7)) +>y : Symbol(y, Decl(objectTypesIdentityWithComplexConstraints.ts, 2, 31)) +>S : Symbol(S, Decl(objectTypesIdentityWithComplexConstraints.ts, 2, 13)) + + }>(x: T, y: T): void +>x : Symbol(x, Decl(objectTypesIdentityWithComplexConstraints.ts, 3, 9)) +>T : Symbol(T, Decl(objectTypesIdentityWithComplexConstraints.ts, 1, 7)) +>y : Symbol(y, Decl(objectTypesIdentityWithComplexConstraints.ts, 3, 14)) +>T : Symbol(T, Decl(objectTypesIdentityWithComplexConstraints.ts, 1, 7)) +} + +interface B { +>B : Symbol(B, Decl(objectTypesIdentityWithComplexConstraints.ts, 4, 1)) + + (x: U, y: U): void +>U : Symbol(U, Decl(objectTypesIdentityWithComplexConstraints.ts, 7, 7)) +>B : Symbol(B, Decl(objectTypesIdentityWithComplexConstraints.ts, 4, 1)) +>x : Symbol(x, Decl(objectTypesIdentityWithComplexConstraints.ts, 7, 20)) +>U : Symbol(U, Decl(objectTypesIdentityWithComplexConstraints.ts, 7, 7)) +>y : Symbol(y, Decl(objectTypesIdentityWithComplexConstraints.ts, 7, 25)) +>U : Symbol(U, Decl(objectTypesIdentityWithComplexConstraints.ts, 7, 7)) +} + +// ok, not considered identical because the steps of contextual signature instantiation create fresh type parameters +function foo(x: A); +>foo : Symbol(foo, Decl(objectTypesIdentityWithComplexConstraints.ts, 8, 1), Decl(objectTypesIdentityWithComplexConstraints.ts, 11, 19), Decl(objectTypesIdentityWithComplexConstraints.ts, 12, 19)) +>x : Symbol(x, Decl(objectTypesIdentityWithComplexConstraints.ts, 11, 13)) +>A : Symbol(A, Decl(objectTypesIdentityWithComplexConstraints.ts, 0, 0)) + +function foo(x: B); // error after constraints above made illegal +>foo : Symbol(foo, Decl(objectTypesIdentityWithComplexConstraints.ts, 8, 1), Decl(objectTypesIdentityWithComplexConstraints.ts, 11, 19), Decl(objectTypesIdentityWithComplexConstraints.ts, 12, 19)) +>x : Symbol(x, Decl(objectTypesIdentityWithComplexConstraints.ts, 12, 13)) +>B : Symbol(B, Decl(objectTypesIdentityWithComplexConstraints.ts, 4, 1)) + +function foo(x: any) { } +>foo : Symbol(foo, Decl(objectTypesIdentityWithComplexConstraints.ts, 8, 1), Decl(objectTypesIdentityWithComplexConstraints.ts, 11, 19), Decl(objectTypesIdentityWithComplexConstraints.ts, 12, 19)) +>x : Symbol(x, Decl(objectTypesIdentityWithComplexConstraints.ts, 13, 13)) + diff --git a/tests/baselines/reference/objectTypesIdentityWithComplexConstraints.types b/tests/baselines/reference/objectTypesIdentityWithComplexConstraints.types new file mode 100644 index 00000000000..aeb1c467dce --- /dev/null +++ b/tests/baselines/reference/objectTypesIdentityWithComplexConstraints.types @@ -0,0 +1,49 @@ +=== tests/cases/conformance/types/typeRelationships/typeAndMemberIdentity/objectTypesIdentityWithComplexConstraints.ts === +interface A { +>A : A + + T : T + + (x: T, y: S): void +>S : S +>A : A +>x : T +>T : T +>y : S +>S : S + + }>(x: T, y: T): void +>x : T +>T : T +>y : T +>T : T +} + +interface B { +>B : B + + (x: U, y: U): void +>U : U +>B : B +>x : U +>U : U +>y : U +>U : U +} + +// ok, not considered identical because the steps of contextual signature instantiation create fresh type parameters +function foo(x: A); +>foo : { (x: A): any; (x: B): any; } +>x : A +>A : A + +function foo(x: B); // error after constraints above made illegal +>foo : { (x: A): any; (x: B): any; } +>x : B +>B : B + +function foo(x: any) { } +>foo : { (x: A): any; (x: B): any; } +>x : any + diff --git a/tests/baselines/reference/objectTypesIdentityWithGenericCallSignaturesDifferingByConstraints2.errors.txt b/tests/baselines/reference/objectTypesIdentityWithGenericCallSignaturesDifferingByConstraints2.errors.txt deleted file mode 100644 index b1221bb21aa..00000000000 --- a/tests/baselines/reference/objectTypesIdentityWithGenericCallSignaturesDifferingByConstraints2.errors.txt +++ /dev/null @@ -1,141 +0,0 @@ -tests/cases/conformance/types/typeRelationships/typeAndMemberIdentity/objectTypesIdentityWithGenericCallSignaturesDifferingByConstraints2.ts(6,9): error TS2313: Constraint of a type parameter cannot reference any type parameter from the same type parameter list. -tests/cases/conformance/types/typeRelationships/typeAndMemberIdentity/objectTypesIdentityWithGenericCallSignaturesDifferingByConstraints2.ts(9,9): error TS2313: Constraint of a type parameter cannot reference any type parameter from the same type parameter list. -tests/cases/conformance/types/typeRelationships/typeAndMemberIdentity/objectTypesIdentityWithGenericCallSignaturesDifferingByConstraints2.ts(13,9): error TS2313: Constraint of a type parameter cannot reference any type parameter from the same type parameter list. -tests/cases/conformance/types/typeRelationships/typeAndMemberIdentity/objectTypesIdentityWithGenericCallSignaturesDifferingByConstraints2.ts(17,9): error TS2313: Constraint of a type parameter cannot reference any type parameter from the same type parameter list. -tests/cases/conformance/types/typeRelationships/typeAndMemberIdentity/objectTypesIdentityWithGenericCallSignaturesDifferingByConstraints2.ts(21,13): error TS2313: Constraint of a type parameter cannot reference any type parameter from the same type parameter list. -tests/cases/conformance/types/typeRelationships/typeAndMemberIdentity/objectTypesIdentityWithGenericCallSignaturesDifferingByConstraints2.ts(26,9): error TS2313: Constraint of a type parameter cannot reference any type parameter from the same type parameter list. -tests/cases/conformance/types/typeRelationships/typeAndMemberIdentity/objectTypesIdentityWithGenericCallSignaturesDifferingByConstraints2.ts(29,14): error TS2313: Constraint of a type parameter cannot reference any type parameter from the same type parameter list. -tests/cases/conformance/types/typeRelationships/typeAndMemberIdentity/objectTypesIdentityWithGenericCallSignaturesDifferingByConstraints2.ts(30,15): error TS2313: Constraint of a type parameter cannot reference any type parameter from the same type parameter list. - - -==== tests/cases/conformance/types/typeRelationships/typeAndMemberIdentity/objectTypesIdentityWithGenericCallSignaturesDifferingByConstraints2.ts (8 errors) ==== - // Two call or construct signatures are considered identical when they have the same number of type parameters and, considering those - // parameters pairwise identical, have identical type parameter constraints, identical number of parameters with identical kind(required, - // optional or rest) and types, and identical return types. - - class A { - foo(x: T, y: U): string { return null; } - ~~~~~~~~~~~ -!!! error TS2313: Constraint of a type parameter cannot reference any type parameter from the same type parameter list. - } - - class B> { - ~~~~~~~~~~~ -!!! error TS2313: Constraint of a type parameter cannot reference any type parameter from the same type parameter list. - foo(x: T, y: U): string { return null; } - } - - class C { - ~~~~~~~~~~~ -!!! error TS2313: Constraint of a type parameter cannot reference any type parameter from the same type parameter list. - foo(x: T, y: U): string { return null; } - } - - class D { - ~~~~~~~~~~~ -!!! error TS2313: Constraint of a type parameter cannot reference any type parameter from the same type parameter list. - foo(x: T, y: U): string { return null; } - } - - interface I { - ~~~~~~~~~~~ -!!! error TS2313: Constraint of a type parameter cannot reference any type parameter from the same type parameter list. - foo(x: T, y: U): string; - } - - interface I2 { - foo(x: T, y: U): string; - ~~~~~~~~~~~ -!!! error TS2313: Constraint of a type parameter cannot reference any type parameter from the same type parameter list. - } - - var a: { foo>(x: T, y: U): string } - ~~~~~~~~~~~ -!!! error TS2313: Constraint of a type parameter cannot reference any type parameter from the same type parameter list. - var b = { foo(x: T, y: U) { return ''; } }; - ~~~~~~~~~~~ -!!! error TS2313: Constraint of a type parameter cannot reference any type parameter from the same type parameter list. - - function foo1(x: A); - function foo1(x: A); // error - function foo1(x: any) { } - - function foo1b(x: B, Array>); - function foo1b(x: B, Array>); // error - function foo1b(x: any) { } - - function foo1c(x: C); - function foo1c(x: C); // error - function foo1c(x: any) { } - - function foo2(x: I); - function foo2(x: I); // error - function foo2(x: any) { } - - function foo3(x: typeof a); - function foo3(x: typeof a); // error - function foo3(x: any) { } - - function foo4(x: typeof b); - function foo4(x: typeof b); // error - function foo4(x: any) { } - - function foo5(x: A); - function foo5(x: B, Array>); // ok - function foo5(x: any) { } - - function foo5b(x: A); - function foo5b(x: C); // ok - function foo5b(x: any) { } - - function foo5c(x: C); - function foo5c(x: D); // ok - function foo5c(x: any) { } - - function foo6c(x: C); - function foo6c(x: D); // error, "any" does not satisfy the constraint - function foo6c(x: any) { } - - function foo6(x: A); - function foo6(x: I); // ok - function foo6(x: any) { } - - function foo7(x: A); - function foo7(x: typeof a); // ok - function foo7(x: any) { } - - function foo8(x: B, Array>); - function foo8(x: I); // ok - function foo8(x: any) { } - - function foo9(x: B, Array>); - function foo9(x: C); // ok - function foo9(x: any) { } - - function foo10(x: B, Array>); - function foo10(x: typeof a); // ok - function foo10(x: any) { } - - function foo11(x: B, Array>); - function foo11(x: typeof b); // ok - function foo11(x: any) { } - - function foo12(x: I); - function foo12(x: C); // ok - function foo12(x: any) { } - - function foo12b(x: I2); - function foo12b(x: C); // ok - function foo12b(x: any) { } - - function foo13(x: I); - function foo13(x: typeof a); // ok - function foo13(x: any) { } - - function foo14(x: I); - function foo14(x: typeof b); // ok - function foo14(x: any) { } - - function foo15(x: I2); - function foo15(x: C); // ok - function foo15(x: any) { } \ No newline at end of file diff --git a/tests/baselines/reference/objectTypesIdentityWithGenericCallSignaturesDifferingByConstraints2.symbols b/tests/baselines/reference/objectTypesIdentityWithGenericCallSignaturesDifferingByConstraints2.symbols new file mode 100644 index 00000000000..e8c34a1bf99 --- /dev/null +++ b/tests/baselines/reference/objectTypesIdentityWithGenericCallSignaturesDifferingByConstraints2.symbols @@ -0,0 +1,462 @@ +=== tests/cases/conformance/types/typeRelationships/typeAndMemberIdentity/objectTypesIdentityWithGenericCallSignaturesDifferingByConstraints2.ts === +// Two call or construct signatures are considered identical when they have the same number of type parameters and, considering those +// parameters pairwise identical, have identical type parameter constraints, identical number of parameters with identical kind(required, +// optional or rest) and types, and identical return types. + +class A { +>A : Symbol(A, Decl(objectTypesIdentityWithGenericCallSignaturesDifferingByConstraints2.ts, 0, 0)) + + foo(x: T, y: U): string { return null; } +>foo : Symbol(foo, Decl(objectTypesIdentityWithGenericCallSignaturesDifferingByConstraints2.ts, 4, 9)) +>T : Symbol(T, Decl(objectTypesIdentityWithGenericCallSignaturesDifferingByConstraints2.ts, 5, 8)) +>U : Symbol(U, Decl(objectTypesIdentityWithGenericCallSignaturesDifferingByConstraints2.ts, 5, 20)) +>U : Symbol(U, Decl(objectTypesIdentityWithGenericCallSignaturesDifferingByConstraints2.ts, 5, 20)) +>Date : Symbol(Date, Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --)) +>x : Symbol(x, Decl(objectTypesIdentityWithGenericCallSignaturesDifferingByConstraints2.ts, 5, 37)) +>T : Symbol(T, Decl(objectTypesIdentityWithGenericCallSignaturesDifferingByConstraints2.ts, 5, 8)) +>y : Symbol(y, Decl(objectTypesIdentityWithGenericCallSignaturesDifferingByConstraints2.ts, 5, 42)) +>U : Symbol(U, Decl(objectTypesIdentityWithGenericCallSignaturesDifferingByConstraints2.ts, 5, 20)) +} + +class B> { +>B : Symbol(B, Decl(objectTypesIdentityWithGenericCallSignaturesDifferingByConstraints2.ts, 6, 1)) +>T : Symbol(T, Decl(objectTypesIdentityWithGenericCallSignaturesDifferingByConstraints2.ts, 8, 8)) +>U : Symbol(U, Decl(objectTypesIdentityWithGenericCallSignaturesDifferingByConstraints2.ts, 8, 20)) +>U : Symbol(U, Decl(objectTypesIdentityWithGenericCallSignaturesDifferingByConstraints2.ts, 8, 20)) +>Array : Symbol(Array, Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --)) + + foo(x: T, y: U): string { return null; } +>foo : Symbol(foo, Decl(objectTypesIdentityWithGenericCallSignaturesDifferingByConstraints2.ts, 8, 47)) +>x : Symbol(x, Decl(objectTypesIdentityWithGenericCallSignaturesDifferingByConstraints2.ts, 9, 8)) +>T : Symbol(T, Decl(objectTypesIdentityWithGenericCallSignaturesDifferingByConstraints2.ts, 8, 8)) +>y : Symbol(y, Decl(objectTypesIdentityWithGenericCallSignaturesDifferingByConstraints2.ts, 9, 13)) +>U : Symbol(U, Decl(objectTypesIdentityWithGenericCallSignaturesDifferingByConstraints2.ts, 8, 20)) +} + +class C { +>C : Symbol(C, Decl(objectTypesIdentityWithGenericCallSignaturesDifferingByConstraints2.ts, 10, 1)) +>T : Symbol(T, Decl(objectTypesIdentityWithGenericCallSignaturesDifferingByConstraints2.ts, 12, 8)) +>U : Symbol(U, Decl(objectTypesIdentityWithGenericCallSignaturesDifferingByConstraints2.ts, 12, 20)) +>U : Symbol(U, Decl(objectTypesIdentityWithGenericCallSignaturesDifferingByConstraints2.ts, 12, 20)) +>String : Symbol(String, Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --)) + + foo(x: T, y: U): string { return null; } +>foo : Symbol(foo, Decl(objectTypesIdentityWithGenericCallSignaturesDifferingByConstraints2.ts, 12, 40)) +>x : Symbol(x, Decl(objectTypesIdentityWithGenericCallSignaturesDifferingByConstraints2.ts, 13, 8)) +>T : Symbol(T, Decl(objectTypesIdentityWithGenericCallSignaturesDifferingByConstraints2.ts, 12, 8)) +>y : Symbol(y, Decl(objectTypesIdentityWithGenericCallSignaturesDifferingByConstraints2.ts, 13, 13)) +>U : Symbol(U, Decl(objectTypesIdentityWithGenericCallSignaturesDifferingByConstraints2.ts, 12, 20)) +} + +class D { +>D : Symbol(D, Decl(objectTypesIdentityWithGenericCallSignaturesDifferingByConstraints2.ts, 14, 1)) +>T : Symbol(T, Decl(objectTypesIdentityWithGenericCallSignaturesDifferingByConstraints2.ts, 16, 8)) +>U : Symbol(U, Decl(objectTypesIdentityWithGenericCallSignaturesDifferingByConstraints2.ts, 16, 20)) +>U : Symbol(U, Decl(objectTypesIdentityWithGenericCallSignaturesDifferingByConstraints2.ts, 16, 20)) +>Number : Symbol(Number, Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --)) + + foo(x: T, y: U): string { return null; } +>foo : Symbol(foo, Decl(objectTypesIdentityWithGenericCallSignaturesDifferingByConstraints2.ts, 16, 40)) +>x : Symbol(x, Decl(objectTypesIdentityWithGenericCallSignaturesDifferingByConstraints2.ts, 17, 8)) +>T : Symbol(T, Decl(objectTypesIdentityWithGenericCallSignaturesDifferingByConstraints2.ts, 16, 8)) +>y : Symbol(y, Decl(objectTypesIdentityWithGenericCallSignaturesDifferingByConstraints2.ts, 17, 13)) +>U : Symbol(U, Decl(objectTypesIdentityWithGenericCallSignaturesDifferingByConstraints2.ts, 16, 20)) +} + +interface I { +>I : Symbol(I, Decl(objectTypesIdentityWithGenericCallSignaturesDifferingByConstraints2.ts, 18, 1)) +>T : Symbol(T, Decl(objectTypesIdentityWithGenericCallSignaturesDifferingByConstraints2.ts, 20, 12)) +>U : Symbol(U, Decl(objectTypesIdentityWithGenericCallSignaturesDifferingByConstraints2.ts, 20, 24)) +>U : Symbol(U, Decl(objectTypesIdentityWithGenericCallSignaturesDifferingByConstraints2.ts, 20, 24)) +>Number : Symbol(Number, Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --)) + + foo(x: T, y: U): string; +>foo : Symbol(foo, Decl(objectTypesIdentityWithGenericCallSignaturesDifferingByConstraints2.ts, 20, 44)) +>x : Symbol(x, Decl(objectTypesIdentityWithGenericCallSignaturesDifferingByConstraints2.ts, 21, 8)) +>T : Symbol(T, Decl(objectTypesIdentityWithGenericCallSignaturesDifferingByConstraints2.ts, 20, 12)) +>y : Symbol(y, Decl(objectTypesIdentityWithGenericCallSignaturesDifferingByConstraints2.ts, 21, 13)) +>U : Symbol(U, Decl(objectTypesIdentityWithGenericCallSignaturesDifferingByConstraints2.ts, 20, 24)) +} + +interface I2 { +>I2 : Symbol(I2, Decl(objectTypesIdentityWithGenericCallSignaturesDifferingByConstraints2.ts, 22, 1)) + + foo(x: T, y: U): string; +>foo : Symbol(foo, Decl(objectTypesIdentityWithGenericCallSignaturesDifferingByConstraints2.ts, 24, 14)) +>T : Symbol(T, Decl(objectTypesIdentityWithGenericCallSignaturesDifferingByConstraints2.ts, 25, 8)) +>U : Symbol(U, Decl(objectTypesIdentityWithGenericCallSignaturesDifferingByConstraints2.ts, 25, 20)) +>U : Symbol(U, Decl(objectTypesIdentityWithGenericCallSignaturesDifferingByConstraints2.ts, 25, 20)) +>Boolean : Symbol(Boolean, Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --)) +>x : Symbol(x, Decl(objectTypesIdentityWithGenericCallSignaturesDifferingByConstraints2.ts, 25, 40)) +>T : Symbol(T, Decl(objectTypesIdentityWithGenericCallSignaturesDifferingByConstraints2.ts, 25, 8)) +>y : Symbol(y, Decl(objectTypesIdentityWithGenericCallSignaturesDifferingByConstraints2.ts, 25, 45)) +>U : Symbol(U, Decl(objectTypesIdentityWithGenericCallSignaturesDifferingByConstraints2.ts, 25, 20)) +} + +var a: { foo>(x: T, y: U): string } +>a : Symbol(a, Decl(objectTypesIdentityWithGenericCallSignaturesDifferingByConstraints2.ts, 28, 3)) +>foo : Symbol(foo, Decl(objectTypesIdentityWithGenericCallSignaturesDifferingByConstraints2.ts, 28, 8)) +>T : Symbol(T, Decl(objectTypesIdentityWithGenericCallSignaturesDifferingByConstraints2.ts, 28, 13)) +>U : Symbol(U, Decl(objectTypesIdentityWithGenericCallSignaturesDifferingByConstraints2.ts, 28, 25)) +>U : Symbol(U, Decl(objectTypesIdentityWithGenericCallSignaturesDifferingByConstraints2.ts, 28, 25)) +>Array : Symbol(Array, Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --)) +>x : Symbol(x, Decl(objectTypesIdentityWithGenericCallSignaturesDifferingByConstraints2.ts, 28, 51)) +>T : Symbol(T, Decl(objectTypesIdentityWithGenericCallSignaturesDifferingByConstraints2.ts, 28, 13)) +>y : Symbol(y, Decl(objectTypesIdentityWithGenericCallSignaturesDifferingByConstraints2.ts, 28, 56)) +>U : Symbol(U, Decl(objectTypesIdentityWithGenericCallSignaturesDifferingByConstraints2.ts, 28, 25)) + +var b = { foo(x: T, y: U) { return ''; } }; +>b : Symbol(b, Decl(objectTypesIdentityWithGenericCallSignaturesDifferingByConstraints2.ts, 29, 3)) +>foo : Symbol(foo, Decl(objectTypesIdentityWithGenericCallSignaturesDifferingByConstraints2.ts, 29, 9)) +>T : Symbol(T, Decl(objectTypesIdentityWithGenericCallSignaturesDifferingByConstraints2.ts, 29, 14)) +>U : Symbol(U, Decl(objectTypesIdentityWithGenericCallSignaturesDifferingByConstraints2.ts, 29, 26)) +>U : Symbol(U, Decl(objectTypesIdentityWithGenericCallSignaturesDifferingByConstraints2.ts, 29, 26)) +>RegExp : Symbol(RegExp, Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --)) +>x : Symbol(x, Decl(objectTypesIdentityWithGenericCallSignaturesDifferingByConstraints2.ts, 29, 45)) +>T : Symbol(T, Decl(objectTypesIdentityWithGenericCallSignaturesDifferingByConstraints2.ts, 29, 14)) +>y : Symbol(y, Decl(objectTypesIdentityWithGenericCallSignaturesDifferingByConstraints2.ts, 29, 50)) +>U : Symbol(U, Decl(objectTypesIdentityWithGenericCallSignaturesDifferingByConstraints2.ts, 29, 26)) + +function foo1(x: A); +>foo1 : Symbol(foo1, Decl(objectTypesIdentityWithGenericCallSignaturesDifferingByConstraints2.ts, 29, 74), Decl(objectTypesIdentityWithGenericCallSignaturesDifferingByConstraints2.ts, 31, 20), Decl(objectTypesIdentityWithGenericCallSignaturesDifferingByConstraints2.ts, 32, 20)) +>x : Symbol(x, Decl(objectTypesIdentityWithGenericCallSignaturesDifferingByConstraints2.ts, 31, 14)) +>A : Symbol(A, Decl(objectTypesIdentityWithGenericCallSignaturesDifferingByConstraints2.ts, 0, 0)) + +function foo1(x: A); // error +>foo1 : Symbol(foo1, Decl(objectTypesIdentityWithGenericCallSignaturesDifferingByConstraints2.ts, 29, 74), Decl(objectTypesIdentityWithGenericCallSignaturesDifferingByConstraints2.ts, 31, 20), Decl(objectTypesIdentityWithGenericCallSignaturesDifferingByConstraints2.ts, 32, 20)) +>x : Symbol(x, Decl(objectTypesIdentityWithGenericCallSignaturesDifferingByConstraints2.ts, 32, 14)) +>A : Symbol(A, Decl(objectTypesIdentityWithGenericCallSignaturesDifferingByConstraints2.ts, 0, 0)) + +function foo1(x: any) { } +>foo1 : Symbol(foo1, Decl(objectTypesIdentityWithGenericCallSignaturesDifferingByConstraints2.ts, 29, 74), Decl(objectTypesIdentityWithGenericCallSignaturesDifferingByConstraints2.ts, 31, 20), Decl(objectTypesIdentityWithGenericCallSignaturesDifferingByConstraints2.ts, 32, 20)) +>x : Symbol(x, Decl(objectTypesIdentityWithGenericCallSignaturesDifferingByConstraints2.ts, 33, 14)) + +function foo1b(x: B, Array>); +>foo1b : Symbol(foo1b, Decl(objectTypesIdentityWithGenericCallSignaturesDifferingByConstraints2.ts, 33, 25), Decl(objectTypesIdentityWithGenericCallSignaturesDifferingByConstraints2.ts, 35, 51), Decl(objectTypesIdentityWithGenericCallSignaturesDifferingByConstraints2.ts, 36, 51)) +>x : Symbol(x, Decl(objectTypesIdentityWithGenericCallSignaturesDifferingByConstraints2.ts, 35, 15)) +>B : Symbol(B, Decl(objectTypesIdentityWithGenericCallSignaturesDifferingByConstraints2.ts, 6, 1)) +>Array : Symbol(Array, Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --)) +>Array : Symbol(Array, Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --)) + +function foo1b(x: B, Array>); // error +>foo1b : Symbol(foo1b, Decl(objectTypesIdentityWithGenericCallSignaturesDifferingByConstraints2.ts, 33, 25), Decl(objectTypesIdentityWithGenericCallSignaturesDifferingByConstraints2.ts, 35, 51), Decl(objectTypesIdentityWithGenericCallSignaturesDifferingByConstraints2.ts, 36, 51)) +>x : Symbol(x, Decl(objectTypesIdentityWithGenericCallSignaturesDifferingByConstraints2.ts, 36, 15)) +>B : Symbol(B, Decl(objectTypesIdentityWithGenericCallSignaturesDifferingByConstraints2.ts, 6, 1)) +>Array : Symbol(Array, Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --)) +>Array : Symbol(Array, Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --)) + +function foo1b(x: any) { } +>foo1b : Symbol(foo1b, Decl(objectTypesIdentityWithGenericCallSignaturesDifferingByConstraints2.ts, 33, 25), Decl(objectTypesIdentityWithGenericCallSignaturesDifferingByConstraints2.ts, 35, 51), Decl(objectTypesIdentityWithGenericCallSignaturesDifferingByConstraints2.ts, 36, 51)) +>x : Symbol(x, Decl(objectTypesIdentityWithGenericCallSignaturesDifferingByConstraints2.ts, 37, 15)) + +function foo1c(x: C); +>foo1c : Symbol(foo1c, Decl(objectTypesIdentityWithGenericCallSignaturesDifferingByConstraints2.ts, 37, 26), Decl(objectTypesIdentityWithGenericCallSignaturesDifferingByConstraints2.ts, 39, 37), Decl(objectTypesIdentityWithGenericCallSignaturesDifferingByConstraints2.ts, 40, 37)) +>x : Symbol(x, Decl(objectTypesIdentityWithGenericCallSignaturesDifferingByConstraints2.ts, 39, 15)) +>C : Symbol(C, Decl(objectTypesIdentityWithGenericCallSignaturesDifferingByConstraints2.ts, 10, 1)) +>String : Symbol(String, Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --)) +>String : Symbol(String, Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --)) + +function foo1c(x: C); // error +>foo1c : Symbol(foo1c, Decl(objectTypesIdentityWithGenericCallSignaturesDifferingByConstraints2.ts, 37, 26), Decl(objectTypesIdentityWithGenericCallSignaturesDifferingByConstraints2.ts, 39, 37), Decl(objectTypesIdentityWithGenericCallSignaturesDifferingByConstraints2.ts, 40, 37)) +>x : Symbol(x, Decl(objectTypesIdentityWithGenericCallSignaturesDifferingByConstraints2.ts, 40, 15)) +>C : Symbol(C, Decl(objectTypesIdentityWithGenericCallSignaturesDifferingByConstraints2.ts, 10, 1)) +>String : Symbol(String, Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --)) +>String : Symbol(String, Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --)) + +function foo1c(x: any) { } +>foo1c : Symbol(foo1c, Decl(objectTypesIdentityWithGenericCallSignaturesDifferingByConstraints2.ts, 37, 26), Decl(objectTypesIdentityWithGenericCallSignaturesDifferingByConstraints2.ts, 39, 37), Decl(objectTypesIdentityWithGenericCallSignaturesDifferingByConstraints2.ts, 40, 37)) +>x : Symbol(x, Decl(objectTypesIdentityWithGenericCallSignaturesDifferingByConstraints2.ts, 41, 15)) + +function foo2(x: I); +>foo2 : Symbol(foo2, Decl(objectTypesIdentityWithGenericCallSignaturesDifferingByConstraints2.ts, 41, 26), Decl(objectTypesIdentityWithGenericCallSignaturesDifferingByConstraints2.ts, 43, 36), Decl(objectTypesIdentityWithGenericCallSignaturesDifferingByConstraints2.ts, 44, 36)) +>x : Symbol(x, Decl(objectTypesIdentityWithGenericCallSignaturesDifferingByConstraints2.ts, 43, 14)) +>I : Symbol(I, Decl(objectTypesIdentityWithGenericCallSignaturesDifferingByConstraints2.ts, 18, 1)) +>Number : Symbol(Number, Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --)) +>Number : Symbol(Number, Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --)) + +function foo2(x: I); // error +>foo2 : Symbol(foo2, Decl(objectTypesIdentityWithGenericCallSignaturesDifferingByConstraints2.ts, 41, 26), Decl(objectTypesIdentityWithGenericCallSignaturesDifferingByConstraints2.ts, 43, 36), Decl(objectTypesIdentityWithGenericCallSignaturesDifferingByConstraints2.ts, 44, 36)) +>x : Symbol(x, Decl(objectTypesIdentityWithGenericCallSignaturesDifferingByConstraints2.ts, 44, 14)) +>I : Symbol(I, Decl(objectTypesIdentityWithGenericCallSignaturesDifferingByConstraints2.ts, 18, 1)) +>Number : Symbol(Number, Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --)) +>Number : Symbol(Number, Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --)) + +function foo2(x: any) { } +>foo2 : Symbol(foo2, Decl(objectTypesIdentityWithGenericCallSignaturesDifferingByConstraints2.ts, 41, 26), Decl(objectTypesIdentityWithGenericCallSignaturesDifferingByConstraints2.ts, 43, 36), Decl(objectTypesIdentityWithGenericCallSignaturesDifferingByConstraints2.ts, 44, 36)) +>x : Symbol(x, Decl(objectTypesIdentityWithGenericCallSignaturesDifferingByConstraints2.ts, 45, 14)) + +function foo3(x: typeof a); +>foo3 : Symbol(foo3, Decl(objectTypesIdentityWithGenericCallSignaturesDifferingByConstraints2.ts, 45, 25), Decl(objectTypesIdentityWithGenericCallSignaturesDifferingByConstraints2.ts, 47, 27), Decl(objectTypesIdentityWithGenericCallSignaturesDifferingByConstraints2.ts, 48, 27)) +>x : Symbol(x, Decl(objectTypesIdentityWithGenericCallSignaturesDifferingByConstraints2.ts, 47, 14)) +>a : Symbol(a, Decl(objectTypesIdentityWithGenericCallSignaturesDifferingByConstraints2.ts, 28, 3)) + +function foo3(x: typeof a); // error +>foo3 : Symbol(foo3, Decl(objectTypesIdentityWithGenericCallSignaturesDifferingByConstraints2.ts, 45, 25), Decl(objectTypesIdentityWithGenericCallSignaturesDifferingByConstraints2.ts, 47, 27), Decl(objectTypesIdentityWithGenericCallSignaturesDifferingByConstraints2.ts, 48, 27)) +>x : Symbol(x, Decl(objectTypesIdentityWithGenericCallSignaturesDifferingByConstraints2.ts, 48, 14)) +>a : Symbol(a, Decl(objectTypesIdentityWithGenericCallSignaturesDifferingByConstraints2.ts, 28, 3)) + +function foo3(x: any) { } +>foo3 : Symbol(foo3, Decl(objectTypesIdentityWithGenericCallSignaturesDifferingByConstraints2.ts, 45, 25), Decl(objectTypesIdentityWithGenericCallSignaturesDifferingByConstraints2.ts, 47, 27), Decl(objectTypesIdentityWithGenericCallSignaturesDifferingByConstraints2.ts, 48, 27)) +>x : Symbol(x, Decl(objectTypesIdentityWithGenericCallSignaturesDifferingByConstraints2.ts, 49, 14)) + +function foo4(x: typeof b); +>foo4 : Symbol(foo4, Decl(objectTypesIdentityWithGenericCallSignaturesDifferingByConstraints2.ts, 49, 25), Decl(objectTypesIdentityWithGenericCallSignaturesDifferingByConstraints2.ts, 51, 27), Decl(objectTypesIdentityWithGenericCallSignaturesDifferingByConstraints2.ts, 52, 27)) +>x : Symbol(x, Decl(objectTypesIdentityWithGenericCallSignaturesDifferingByConstraints2.ts, 51, 14)) +>b : Symbol(b, Decl(objectTypesIdentityWithGenericCallSignaturesDifferingByConstraints2.ts, 29, 3)) + +function foo4(x: typeof b); // error +>foo4 : Symbol(foo4, Decl(objectTypesIdentityWithGenericCallSignaturesDifferingByConstraints2.ts, 49, 25), Decl(objectTypesIdentityWithGenericCallSignaturesDifferingByConstraints2.ts, 51, 27), Decl(objectTypesIdentityWithGenericCallSignaturesDifferingByConstraints2.ts, 52, 27)) +>x : Symbol(x, Decl(objectTypesIdentityWithGenericCallSignaturesDifferingByConstraints2.ts, 52, 14)) +>b : Symbol(b, Decl(objectTypesIdentityWithGenericCallSignaturesDifferingByConstraints2.ts, 29, 3)) + +function foo4(x: any) { } +>foo4 : Symbol(foo4, Decl(objectTypesIdentityWithGenericCallSignaturesDifferingByConstraints2.ts, 49, 25), Decl(objectTypesIdentityWithGenericCallSignaturesDifferingByConstraints2.ts, 51, 27), Decl(objectTypesIdentityWithGenericCallSignaturesDifferingByConstraints2.ts, 52, 27)) +>x : Symbol(x, Decl(objectTypesIdentityWithGenericCallSignaturesDifferingByConstraints2.ts, 53, 14)) + +function foo5(x: A); +>foo5 : Symbol(foo5, Decl(objectTypesIdentityWithGenericCallSignaturesDifferingByConstraints2.ts, 53, 25), Decl(objectTypesIdentityWithGenericCallSignaturesDifferingByConstraints2.ts, 55, 20), Decl(objectTypesIdentityWithGenericCallSignaturesDifferingByConstraints2.ts, 56, 50)) +>x : Symbol(x, Decl(objectTypesIdentityWithGenericCallSignaturesDifferingByConstraints2.ts, 55, 14)) +>A : Symbol(A, Decl(objectTypesIdentityWithGenericCallSignaturesDifferingByConstraints2.ts, 0, 0)) + +function foo5(x: B, Array>); // ok +>foo5 : Symbol(foo5, Decl(objectTypesIdentityWithGenericCallSignaturesDifferingByConstraints2.ts, 53, 25), Decl(objectTypesIdentityWithGenericCallSignaturesDifferingByConstraints2.ts, 55, 20), Decl(objectTypesIdentityWithGenericCallSignaturesDifferingByConstraints2.ts, 56, 50)) +>x : Symbol(x, Decl(objectTypesIdentityWithGenericCallSignaturesDifferingByConstraints2.ts, 56, 14)) +>B : Symbol(B, Decl(objectTypesIdentityWithGenericCallSignaturesDifferingByConstraints2.ts, 6, 1)) +>Array : Symbol(Array, Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --)) +>Array : Symbol(Array, Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --)) + +function foo5(x: any) { } +>foo5 : Symbol(foo5, Decl(objectTypesIdentityWithGenericCallSignaturesDifferingByConstraints2.ts, 53, 25), Decl(objectTypesIdentityWithGenericCallSignaturesDifferingByConstraints2.ts, 55, 20), Decl(objectTypesIdentityWithGenericCallSignaturesDifferingByConstraints2.ts, 56, 50)) +>x : Symbol(x, Decl(objectTypesIdentityWithGenericCallSignaturesDifferingByConstraints2.ts, 57, 14)) + +function foo5b(x: A); +>foo5b : Symbol(foo5b, Decl(objectTypesIdentityWithGenericCallSignaturesDifferingByConstraints2.ts, 57, 25), Decl(objectTypesIdentityWithGenericCallSignaturesDifferingByConstraints2.ts, 59, 21), Decl(objectTypesIdentityWithGenericCallSignaturesDifferingByConstraints2.ts, 60, 37)) +>x : Symbol(x, Decl(objectTypesIdentityWithGenericCallSignaturesDifferingByConstraints2.ts, 59, 15)) +>A : Symbol(A, Decl(objectTypesIdentityWithGenericCallSignaturesDifferingByConstraints2.ts, 0, 0)) + +function foo5b(x: C); // ok +>foo5b : Symbol(foo5b, Decl(objectTypesIdentityWithGenericCallSignaturesDifferingByConstraints2.ts, 57, 25), Decl(objectTypesIdentityWithGenericCallSignaturesDifferingByConstraints2.ts, 59, 21), Decl(objectTypesIdentityWithGenericCallSignaturesDifferingByConstraints2.ts, 60, 37)) +>x : Symbol(x, Decl(objectTypesIdentityWithGenericCallSignaturesDifferingByConstraints2.ts, 60, 15)) +>C : Symbol(C, Decl(objectTypesIdentityWithGenericCallSignaturesDifferingByConstraints2.ts, 10, 1)) +>String : Symbol(String, Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --)) +>String : Symbol(String, Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --)) + +function foo5b(x: any) { } +>foo5b : Symbol(foo5b, Decl(objectTypesIdentityWithGenericCallSignaturesDifferingByConstraints2.ts, 57, 25), Decl(objectTypesIdentityWithGenericCallSignaturesDifferingByConstraints2.ts, 59, 21), Decl(objectTypesIdentityWithGenericCallSignaturesDifferingByConstraints2.ts, 60, 37)) +>x : Symbol(x, Decl(objectTypesIdentityWithGenericCallSignaturesDifferingByConstraints2.ts, 61, 15)) + +function foo5c(x: C); +>foo5c : Symbol(foo5c, Decl(objectTypesIdentityWithGenericCallSignaturesDifferingByConstraints2.ts, 61, 26), Decl(objectTypesIdentityWithGenericCallSignaturesDifferingByConstraints2.ts, 63, 37), Decl(objectTypesIdentityWithGenericCallSignaturesDifferingByConstraints2.ts, 64, 37)) +>x : Symbol(x, Decl(objectTypesIdentityWithGenericCallSignaturesDifferingByConstraints2.ts, 63, 15)) +>C : Symbol(C, Decl(objectTypesIdentityWithGenericCallSignaturesDifferingByConstraints2.ts, 10, 1)) +>String : Symbol(String, Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --)) +>String : Symbol(String, Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --)) + +function foo5c(x: D); // ok +>foo5c : Symbol(foo5c, Decl(objectTypesIdentityWithGenericCallSignaturesDifferingByConstraints2.ts, 61, 26), Decl(objectTypesIdentityWithGenericCallSignaturesDifferingByConstraints2.ts, 63, 37), Decl(objectTypesIdentityWithGenericCallSignaturesDifferingByConstraints2.ts, 64, 37)) +>x : Symbol(x, Decl(objectTypesIdentityWithGenericCallSignaturesDifferingByConstraints2.ts, 64, 15)) +>D : Symbol(D, Decl(objectTypesIdentityWithGenericCallSignaturesDifferingByConstraints2.ts, 14, 1)) +>Number : Symbol(Number, Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --)) +>Number : Symbol(Number, Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --)) + +function foo5c(x: any) { } +>foo5c : Symbol(foo5c, Decl(objectTypesIdentityWithGenericCallSignaturesDifferingByConstraints2.ts, 61, 26), Decl(objectTypesIdentityWithGenericCallSignaturesDifferingByConstraints2.ts, 63, 37), Decl(objectTypesIdentityWithGenericCallSignaturesDifferingByConstraints2.ts, 64, 37)) +>x : Symbol(x, Decl(objectTypesIdentityWithGenericCallSignaturesDifferingByConstraints2.ts, 65, 15)) + +function foo6c(x: C); +>foo6c : Symbol(foo6c, Decl(objectTypesIdentityWithGenericCallSignaturesDifferingByConstraints2.ts, 65, 26), Decl(objectTypesIdentityWithGenericCallSignaturesDifferingByConstraints2.ts, 67, 37), Decl(objectTypesIdentityWithGenericCallSignaturesDifferingByConstraints2.ts, 68, 34)) +>x : Symbol(x, Decl(objectTypesIdentityWithGenericCallSignaturesDifferingByConstraints2.ts, 67, 15)) +>C : Symbol(C, Decl(objectTypesIdentityWithGenericCallSignaturesDifferingByConstraints2.ts, 10, 1)) +>String : Symbol(String, Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --)) +>String : Symbol(String, Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --)) + +function foo6c(x: D); // error, "any" does not satisfy the constraint +>foo6c : Symbol(foo6c, Decl(objectTypesIdentityWithGenericCallSignaturesDifferingByConstraints2.ts, 65, 26), Decl(objectTypesIdentityWithGenericCallSignaturesDifferingByConstraints2.ts, 67, 37), Decl(objectTypesIdentityWithGenericCallSignaturesDifferingByConstraints2.ts, 68, 34)) +>x : Symbol(x, Decl(objectTypesIdentityWithGenericCallSignaturesDifferingByConstraints2.ts, 68, 15)) +>D : Symbol(D, Decl(objectTypesIdentityWithGenericCallSignaturesDifferingByConstraints2.ts, 14, 1)) +>Number : Symbol(Number, Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --)) + +function foo6c(x: any) { } +>foo6c : Symbol(foo6c, Decl(objectTypesIdentityWithGenericCallSignaturesDifferingByConstraints2.ts, 65, 26), Decl(objectTypesIdentityWithGenericCallSignaturesDifferingByConstraints2.ts, 67, 37), Decl(objectTypesIdentityWithGenericCallSignaturesDifferingByConstraints2.ts, 68, 34)) +>x : Symbol(x, Decl(objectTypesIdentityWithGenericCallSignaturesDifferingByConstraints2.ts, 69, 15)) + +function foo6(x: A); +>foo6 : Symbol(foo6, Decl(objectTypesIdentityWithGenericCallSignaturesDifferingByConstraints2.ts, 69, 26), Decl(objectTypesIdentityWithGenericCallSignaturesDifferingByConstraints2.ts, 71, 20), Decl(objectTypesIdentityWithGenericCallSignaturesDifferingByConstraints2.ts, 72, 36)) +>x : Symbol(x, Decl(objectTypesIdentityWithGenericCallSignaturesDifferingByConstraints2.ts, 71, 14)) +>A : Symbol(A, Decl(objectTypesIdentityWithGenericCallSignaturesDifferingByConstraints2.ts, 0, 0)) + +function foo6(x: I); // ok +>foo6 : Symbol(foo6, Decl(objectTypesIdentityWithGenericCallSignaturesDifferingByConstraints2.ts, 69, 26), Decl(objectTypesIdentityWithGenericCallSignaturesDifferingByConstraints2.ts, 71, 20), Decl(objectTypesIdentityWithGenericCallSignaturesDifferingByConstraints2.ts, 72, 36)) +>x : Symbol(x, Decl(objectTypesIdentityWithGenericCallSignaturesDifferingByConstraints2.ts, 72, 14)) +>I : Symbol(I, Decl(objectTypesIdentityWithGenericCallSignaturesDifferingByConstraints2.ts, 18, 1)) +>Number : Symbol(Number, Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --)) +>Number : Symbol(Number, Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --)) + +function foo6(x: any) { } +>foo6 : Symbol(foo6, Decl(objectTypesIdentityWithGenericCallSignaturesDifferingByConstraints2.ts, 69, 26), Decl(objectTypesIdentityWithGenericCallSignaturesDifferingByConstraints2.ts, 71, 20), Decl(objectTypesIdentityWithGenericCallSignaturesDifferingByConstraints2.ts, 72, 36)) +>x : Symbol(x, Decl(objectTypesIdentityWithGenericCallSignaturesDifferingByConstraints2.ts, 73, 14)) + +function foo7(x: A); +>foo7 : Symbol(foo7, Decl(objectTypesIdentityWithGenericCallSignaturesDifferingByConstraints2.ts, 73, 25), Decl(objectTypesIdentityWithGenericCallSignaturesDifferingByConstraints2.ts, 75, 20), Decl(objectTypesIdentityWithGenericCallSignaturesDifferingByConstraints2.ts, 76, 27)) +>x : Symbol(x, Decl(objectTypesIdentityWithGenericCallSignaturesDifferingByConstraints2.ts, 75, 14)) +>A : Symbol(A, Decl(objectTypesIdentityWithGenericCallSignaturesDifferingByConstraints2.ts, 0, 0)) + +function foo7(x: typeof a); // ok +>foo7 : Symbol(foo7, Decl(objectTypesIdentityWithGenericCallSignaturesDifferingByConstraints2.ts, 73, 25), Decl(objectTypesIdentityWithGenericCallSignaturesDifferingByConstraints2.ts, 75, 20), Decl(objectTypesIdentityWithGenericCallSignaturesDifferingByConstraints2.ts, 76, 27)) +>x : Symbol(x, Decl(objectTypesIdentityWithGenericCallSignaturesDifferingByConstraints2.ts, 76, 14)) +>a : Symbol(a, Decl(objectTypesIdentityWithGenericCallSignaturesDifferingByConstraints2.ts, 28, 3)) + +function foo7(x: any) { } +>foo7 : Symbol(foo7, Decl(objectTypesIdentityWithGenericCallSignaturesDifferingByConstraints2.ts, 73, 25), Decl(objectTypesIdentityWithGenericCallSignaturesDifferingByConstraints2.ts, 75, 20), Decl(objectTypesIdentityWithGenericCallSignaturesDifferingByConstraints2.ts, 76, 27)) +>x : Symbol(x, Decl(objectTypesIdentityWithGenericCallSignaturesDifferingByConstraints2.ts, 77, 14)) + +function foo8(x: B, Array>); +>foo8 : Symbol(foo8, Decl(objectTypesIdentityWithGenericCallSignaturesDifferingByConstraints2.ts, 77, 25), Decl(objectTypesIdentityWithGenericCallSignaturesDifferingByConstraints2.ts, 79, 50), Decl(objectTypesIdentityWithGenericCallSignaturesDifferingByConstraints2.ts, 80, 36)) +>x : Symbol(x, Decl(objectTypesIdentityWithGenericCallSignaturesDifferingByConstraints2.ts, 79, 14)) +>B : Symbol(B, Decl(objectTypesIdentityWithGenericCallSignaturesDifferingByConstraints2.ts, 6, 1)) +>Array : Symbol(Array, Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --)) +>Array : Symbol(Array, Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --)) + +function foo8(x: I); // ok +>foo8 : Symbol(foo8, Decl(objectTypesIdentityWithGenericCallSignaturesDifferingByConstraints2.ts, 77, 25), Decl(objectTypesIdentityWithGenericCallSignaturesDifferingByConstraints2.ts, 79, 50), Decl(objectTypesIdentityWithGenericCallSignaturesDifferingByConstraints2.ts, 80, 36)) +>x : Symbol(x, Decl(objectTypesIdentityWithGenericCallSignaturesDifferingByConstraints2.ts, 80, 14)) +>I : Symbol(I, Decl(objectTypesIdentityWithGenericCallSignaturesDifferingByConstraints2.ts, 18, 1)) +>Number : Symbol(Number, Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --)) +>Number : Symbol(Number, Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --)) + +function foo8(x: any) { } +>foo8 : Symbol(foo8, Decl(objectTypesIdentityWithGenericCallSignaturesDifferingByConstraints2.ts, 77, 25), Decl(objectTypesIdentityWithGenericCallSignaturesDifferingByConstraints2.ts, 79, 50), Decl(objectTypesIdentityWithGenericCallSignaturesDifferingByConstraints2.ts, 80, 36)) +>x : Symbol(x, Decl(objectTypesIdentityWithGenericCallSignaturesDifferingByConstraints2.ts, 81, 14)) + +function foo9(x: B, Array>); +>foo9 : Symbol(foo9, Decl(objectTypesIdentityWithGenericCallSignaturesDifferingByConstraints2.ts, 81, 25), Decl(objectTypesIdentityWithGenericCallSignaturesDifferingByConstraints2.ts, 83, 50), Decl(objectTypesIdentityWithGenericCallSignaturesDifferingByConstraints2.ts, 84, 36)) +>x : Symbol(x, Decl(objectTypesIdentityWithGenericCallSignaturesDifferingByConstraints2.ts, 83, 14)) +>B : Symbol(B, Decl(objectTypesIdentityWithGenericCallSignaturesDifferingByConstraints2.ts, 6, 1)) +>Array : Symbol(Array, Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --)) +>Array : Symbol(Array, Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --)) + +function foo9(x: C); // ok +>foo9 : Symbol(foo9, Decl(objectTypesIdentityWithGenericCallSignaturesDifferingByConstraints2.ts, 81, 25), Decl(objectTypesIdentityWithGenericCallSignaturesDifferingByConstraints2.ts, 83, 50), Decl(objectTypesIdentityWithGenericCallSignaturesDifferingByConstraints2.ts, 84, 36)) +>x : Symbol(x, Decl(objectTypesIdentityWithGenericCallSignaturesDifferingByConstraints2.ts, 84, 14)) +>C : Symbol(C, Decl(objectTypesIdentityWithGenericCallSignaturesDifferingByConstraints2.ts, 10, 1)) +>String : Symbol(String, Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --)) +>String : Symbol(String, Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --)) + +function foo9(x: any) { } +>foo9 : Symbol(foo9, Decl(objectTypesIdentityWithGenericCallSignaturesDifferingByConstraints2.ts, 81, 25), Decl(objectTypesIdentityWithGenericCallSignaturesDifferingByConstraints2.ts, 83, 50), Decl(objectTypesIdentityWithGenericCallSignaturesDifferingByConstraints2.ts, 84, 36)) +>x : Symbol(x, Decl(objectTypesIdentityWithGenericCallSignaturesDifferingByConstraints2.ts, 85, 14)) + +function foo10(x: B, Array>); +>foo10 : Symbol(foo10, Decl(objectTypesIdentityWithGenericCallSignaturesDifferingByConstraints2.ts, 85, 25), Decl(objectTypesIdentityWithGenericCallSignaturesDifferingByConstraints2.ts, 87, 51), Decl(objectTypesIdentityWithGenericCallSignaturesDifferingByConstraints2.ts, 88, 28)) +>x : Symbol(x, Decl(objectTypesIdentityWithGenericCallSignaturesDifferingByConstraints2.ts, 87, 15)) +>B : Symbol(B, Decl(objectTypesIdentityWithGenericCallSignaturesDifferingByConstraints2.ts, 6, 1)) +>Array : Symbol(Array, Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --)) +>Array : Symbol(Array, Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --)) + +function foo10(x: typeof a); // ok +>foo10 : Symbol(foo10, Decl(objectTypesIdentityWithGenericCallSignaturesDifferingByConstraints2.ts, 85, 25), Decl(objectTypesIdentityWithGenericCallSignaturesDifferingByConstraints2.ts, 87, 51), Decl(objectTypesIdentityWithGenericCallSignaturesDifferingByConstraints2.ts, 88, 28)) +>x : Symbol(x, Decl(objectTypesIdentityWithGenericCallSignaturesDifferingByConstraints2.ts, 88, 15)) +>a : Symbol(a, Decl(objectTypesIdentityWithGenericCallSignaturesDifferingByConstraints2.ts, 28, 3)) + +function foo10(x: any) { } +>foo10 : Symbol(foo10, Decl(objectTypesIdentityWithGenericCallSignaturesDifferingByConstraints2.ts, 85, 25), Decl(objectTypesIdentityWithGenericCallSignaturesDifferingByConstraints2.ts, 87, 51), Decl(objectTypesIdentityWithGenericCallSignaturesDifferingByConstraints2.ts, 88, 28)) +>x : Symbol(x, Decl(objectTypesIdentityWithGenericCallSignaturesDifferingByConstraints2.ts, 89, 15)) + +function foo11(x: B, Array>); +>foo11 : Symbol(foo11, Decl(objectTypesIdentityWithGenericCallSignaturesDifferingByConstraints2.ts, 89, 26), Decl(objectTypesIdentityWithGenericCallSignaturesDifferingByConstraints2.ts, 91, 51), Decl(objectTypesIdentityWithGenericCallSignaturesDifferingByConstraints2.ts, 92, 28)) +>x : Symbol(x, Decl(objectTypesIdentityWithGenericCallSignaturesDifferingByConstraints2.ts, 91, 15)) +>B : Symbol(B, Decl(objectTypesIdentityWithGenericCallSignaturesDifferingByConstraints2.ts, 6, 1)) +>Array : Symbol(Array, Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --)) +>Array : Symbol(Array, Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --)) + +function foo11(x: typeof b); // ok +>foo11 : Symbol(foo11, Decl(objectTypesIdentityWithGenericCallSignaturesDifferingByConstraints2.ts, 89, 26), Decl(objectTypesIdentityWithGenericCallSignaturesDifferingByConstraints2.ts, 91, 51), Decl(objectTypesIdentityWithGenericCallSignaturesDifferingByConstraints2.ts, 92, 28)) +>x : Symbol(x, Decl(objectTypesIdentityWithGenericCallSignaturesDifferingByConstraints2.ts, 92, 15)) +>b : Symbol(b, Decl(objectTypesIdentityWithGenericCallSignaturesDifferingByConstraints2.ts, 29, 3)) + +function foo11(x: any) { } +>foo11 : Symbol(foo11, Decl(objectTypesIdentityWithGenericCallSignaturesDifferingByConstraints2.ts, 89, 26), Decl(objectTypesIdentityWithGenericCallSignaturesDifferingByConstraints2.ts, 91, 51), Decl(objectTypesIdentityWithGenericCallSignaturesDifferingByConstraints2.ts, 92, 28)) +>x : Symbol(x, Decl(objectTypesIdentityWithGenericCallSignaturesDifferingByConstraints2.ts, 93, 15)) + +function foo12(x: I); +>foo12 : Symbol(foo12, Decl(objectTypesIdentityWithGenericCallSignaturesDifferingByConstraints2.ts, 93, 26), Decl(objectTypesIdentityWithGenericCallSignaturesDifferingByConstraints2.ts, 95, 37), Decl(objectTypesIdentityWithGenericCallSignaturesDifferingByConstraints2.ts, 96, 37)) +>x : Symbol(x, Decl(objectTypesIdentityWithGenericCallSignaturesDifferingByConstraints2.ts, 95, 15)) +>I : Symbol(I, Decl(objectTypesIdentityWithGenericCallSignaturesDifferingByConstraints2.ts, 18, 1)) +>Number : Symbol(Number, Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --)) +>Number : Symbol(Number, Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --)) + +function foo12(x: C); // ok +>foo12 : Symbol(foo12, Decl(objectTypesIdentityWithGenericCallSignaturesDifferingByConstraints2.ts, 93, 26), Decl(objectTypesIdentityWithGenericCallSignaturesDifferingByConstraints2.ts, 95, 37), Decl(objectTypesIdentityWithGenericCallSignaturesDifferingByConstraints2.ts, 96, 37)) +>x : Symbol(x, Decl(objectTypesIdentityWithGenericCallSignaturesDifferingByConstraints2.ts, 96, 15)) +>C : Symbol(C, Decl(objectTypesIdentityWithGenericCallSignaturesDifferingByConstraints2.ts, 10, 1)) +>String : Symbol(String, Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --)) +>String : Symbol(String, Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --)) + +function foo12(x: any) { } +>foo12 : Symbol(foo12, Decl(objectTypesIdentityWithGenericCallSignaturesDifferingByConstraints2.ts, 93, 26), Decl(objectTypesIdentityWithGenericCallSignaturesDifferingByConstraints2.ts, 95, 37), Decl(objectTypesIdentityWithGenericCallSignaturesDifferingByConstraints2.ts, 96, 37)) +>x : Symbol(x, Decl(objectTypesIdentityWithGenericCallSignaturesDifferingByConstraints2.ts, 97, 15)) + +function foo12b(x: I2); +>foo12b : Symbol(foo12b, Decl(objectTypesIdentityWithGenericCallSignaturesDifferingByConstraints2.ts, 97, 26), Decl(objectTypesIdentityWithGenericCallSignaturesDifferingByConstraints2.ts, 99, 23), Decl(objectTypesIdentityWithGenericCallSignaturesDifferingByConstraints2.ts, 100, 38)) +>x : Symbol(x, Decl(objectTypesIdentityWithGenericCallSignaturesDifferingByConstraints2.ts, 99, 16)) +>I2 : Symbol(I2, Decl(objectTypesIdentityWithGenericCallSignaturesDifferingByConstraints2.ts, 22, 1)) + +function foo12b(x: C); // ok +>foo12b : Symbol(foo12b, Decl(objectTypesIdentityWithGenericCallSignaturesDifferingByConstraints2.ts, 97, 26), Decl(objectTypesIdentityWithGenericCallSignaturesDifferingByConstraints2.ts, 99, 23), Decl(objectTypesIdentityWithGenericCallSignaturesDifferingByConstraints2.ts, 100, 38)) +>x : Symbol(x, Decl(objectTypesIdentityWithGenericCallSignaturesDifferingByConstraints2.ts, 100, 16)) +>C : Symbol(C, Decl(objectTypesIdentityWithGenericCallSignaturesDifferingByConstraints2.ts, 10, 1)) +>String : Symbol(String, Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --)) +>String : Symbol(String, Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --)) + +function foo12b(x: any) { } +>foo12b : Symbol(foo12b, Decl(objectTypesIdentityWithGenericCallSignaturesDifferingByConstraints2.ts, 97, 26), Decl(objectTypesIdentityWithGenericCallSignaturesDifferingByConstraints2.ts, 99, 23), Decl(objectTypesIdentityWithGenericCallSignaturesDifferingByConstraints2.ts, 100, 38)) +>x : Symbol(x, Decl(objectTypesIdentityWithGenericCallSignaturesDifferingByConstraints2.ts, 101, 16)) + +function foo13(x: I); +>foo13 : Symbol(foo13, Decl(objectTypesIdentityWithGenericCallSignaturesDifferingByConstraints2.ts, 101, 27), Decl(objectTypesIdentityWithGenericCallSignaturesDifferingByConstraints2.ts, 103, 37), Decl(objectTypesIdentityWithGenericCallSignaturesDifferingByConstraints2.ts, 104, 28)) +>x : Symbol(x, Decl(objectTypesIdentityWithGenericCallSignaturesDifferingByConstraints2.ts, 103, 15)) +>I : Symbol(I, Decl(objectTypesIdentityWithGenericCallSignaturesDifferingByConstraints2.ts, 18, 1)) +>Number : Symbol(Number, Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --)) +>Number : Symbol(Number, Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --)) + +function foo13(x: typeof a); // ok +>foo13 : Symbol(foo13, Decl(objectTypesIdentityWithGenericCallSignaturesDifferingByConstraints2.ts, 101, 27), Decl(objectTypesIdentityWithGenericCallSignaturesDifferingByConstraints2.ts, 103, 37), Decl(objectTypesIdentityWithGenericCallSignaturesDifferingByConstraints2.ts, 104, 28)) +>x : Symbol(x, Decl(objectTypesIdentityWithGenericCallSignaturesDifferingByConstraints2.ts, 104, 15)) +>a : Symbol(a, Decl(objectTypesIdentityWithGenericCallSignaturesDifferingByConstraints2.ts, 28, 3)) + +function foo13(x: any) { } +>foo13 : Symbol(foo13, Decl(objectTypesIdentityWithGenericCallSignaturesDifferingByConstraints2.ts, 101, 27), Decl(objectTypesIdentityWithGenericCallSignaturesDifferingByConstraints2.ts, 103, 37), Decl(objectTypesIdentityWithGenericCallSignaturesDifferingByConstraints2.ts, 104, 28)) +>x : Symbol(x, Decl(objectTypesIdentityWithGenericCallSignaturesDifferingByConstraints2.ts, 105, 15)) + +function foo14(x: I); +>foo14 : Symbol(foo14, Decl(objectTypesIdentityWithGenericCallSignaturesDifferingByConstraints2.ts, 105, 26), Decl(objectTypesIdentityWithGenericCallSignaturesDifferingByConstraints2.ts, 107, 37), Decl(objectTypesIdentityWithGenericCallSignaturesDifferingByConstraints2.ts, 108, 28)) +>x : Symbol(x, Decl(objectTypesIdentityWithGenericCallSignaturesDifferingByConstraints2.ts, 107, 15)) +>I : Symbol(I, Decl(objectTypesIdentityWithGenericCallSignaturesDifferingByConstraints2.ts, 18, 1)) +>Number : Symbol(Number, Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --)) +>Number : Symbol(Number, Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --)) + +function foo14(x: typeof b); // ok +>foo14 : Symbol(foo14, Decl(objectTypesIdentityWithGenericCallSignaturesDifferingByConstraints2.ts, 105, 26), Decl(objectTypesIdentityWithGenericCallSignaturesDifferingByConstraints2.ts, 107, 37), Decl(objectTypesIdentityWithGenericCallSignaturesDifferingByConstraints2.ts, 108, 28)) +>x : Symbol(x, Decl(objectTypesIdentityWithGenericCallSignaturesDifferingByConstraints2.ts, 108, 15)) +>b : Symbol(b, Decl(objectTypesIdentityWithGenericCallSignaturesDifferingByConstraints2.ts, 29, 3)) + +function foo14(x: any) { } +>foo14 : Symbol(foo14, Decl(objectTypesIdentityWithGenericCallSignaturesDifferingByConstraints2.ts, 105, 26), Decl(objectTypesIdentityWithGenericCallSignaturesDifferingByConstraints2.ts, 107, 37), Decl(objectTypesIdentityWithGenericCallSignaturesDifferingByConstraints2.ts, 108, 28)) +>x : Symbol(x, Decl(objectTypesIdentityWithGenericCallSignaturesDifferingByConstraints2.ts, 109, 15)) + +function foo15(x: I2); +>foo15 : Symbol(foo15, Decl(objectTypesIdentityWithGenericCallSignaturesDifferingByConstraints2.ts, 109, 26), Decl(objectTypesIdentityWithGenericCallSignaturesDifferingByConstraints2.ts, 111, 22), Decl(objectTypesIdentityWithGenericCallSignaturesDifferingByConstraints2.ts, 112, 37)) +>x : Symbol(x, Decl(objectTypesIdentityWithGenericCallSignaturesDifferingByConstraints2.ts, 111, 15)) +>I2 : Symbol(I2, Decl(objectTypesIdentityWithGenericCallSignaturesDifferingByConstraints2.ts, 22, 1)) + +function foo15(x: C); // ok +>foo15 : Symbol(foo15, Decl(objectTypesIdentityWithGenericCallSignaturesDifferingByConstraints2.ts, 109, 26), Decl(objectTypesIdentityWithGenericCallSignaturesDifferingByConstraints2.ts, 111, 22), Decl(objectTypesIdentityWithGenericCallSignaturesDifferingByConstraints2.ts, 112, 37)) +>x : Symbol(x, Decl(objectTypesIdentityWithGenericCallSignaturesDifferingByConstraints2.ts, 112, 15)) +>C : Symbol(C, Decl(objectTypesIdentityWithGenericCallSignaturesDifferingByConstraints2.ts, 10, 1)) +>String : Symbol(String, Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --)) +>String : Symbol(String, Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --)) + +function foo15(x: any) { } +>foo15 : Symbol(foo15, Decl(objectTypesIdentityWithGenericCallSignaturesDifferingByConstraints2.ts, 109, 26), Decl(objectTypesIdentityWithGenericCallSignaturesDifferingByConstraints2.ts, 111, 22), Decl(objectTypesIdentityWithGenericCallSignaturesDifferingByConstraints2.ts, 112, 37)) +>x : Symbol(x, Decl(objectTypesIdentityWithGenericCallSignaturesDifferingByConstraints2.ts, 113, 15)) + diff --git a/tests/baselines/reference/objectTypesIdentityWithGenericCallSignaturesDifferingByConstraints2.types b/tests/baselines/reference/objectTypesIdentityWithGenericCallSignaturesDifferingByConstraints2.types new file mode 100644 index 00000000000..4974b0874eb --- /dev/null +++ b/tests/baselines/reference/objectTypesIdentityWithGenericCallSignaturesDifferingByConstraints2.types @@ -0,0 +1,468 @@ +=== tests/cases/conformance/types/typeRelationships/typeAndMemberIdentity/objectTypesIdentityWithGenericCallSignaturesDifferingByConstraints2.ts === +// Two call or construct signatures are considered identical when they have the same number of type parameters and, considering those +// parameters pairwise identical, have identical type parameter constraints, identical number of parameters with identical kind(required, +// optional or rest) and types, and identical return types. + +class A { +>A : A + + foo(x: T, y: U): string { return null; } +>foo : (x: T, y: U) => string +>T : T +>U : U +>U : U +>Date : Date +>x : T +>T : T +>y : U +>U : U +>null : null +} + +class B> { +>B : B +>T : T +>U : U +>U : U +>Array : T[] + + foo(x: T, y: U): string { return null; } +>foo : (x: T, y: U) => string +>x : T +>T : T +>y : U +>U : U +>null : null +} + +class C { +>C : C +>T : T +>U : U +>U : U +>String : String + + foo(x: T, y: U): string { return null; } +>foo : (x: T, y: U) => string +>x : T +>T : T +>y : U +>U : U +>null : null +} + +class D { +>D : D +>T : T +>U : U +>U : U +>Number : Number + + foo(x: T, y: U): string { return null; } +>foo : (x: T, y: U) => string +>x : T +>T : T +>y : U +>U : U +>null : null +} + +interface I { +>I : I +>T : T +>U : U +>U : U +>Number : Number + + foo(x: T, y: U): string; +>foo : (x: T, y: U) => string +>x : T +>T : T +>y : U +>U : U +} + +interface I2 { +>I2 : I2 + + foo(x: T, y: U): string; +>foo : (x: T, y: U) => string +>T : T +>U : U +>U : U +>Boolean : Boolean +>x : T +>T : T +>y : U +>U : U +} + +var a: { foo>(x: T, y: U): string } +>a : { foo(x: T, y: U): string; } +>foo : (x: T, y: U) => string +>T : T +>U : U +>U : U +>Array : T[] +>x : T +>T : T +>y : U +>U : U + +var b = { foo(x: T, y: U) { return ''; } }; +>b : { foo(x: T, y: U): string; } +>{ foo(x: T, y: U) { return ''; } } : { foo(x: T, y: U): string; } +>foo : (x: T, y: U) => string +>T : T +>U : U +>U : U +>RegExp : RegExp +>x : T +>T : T +>y : U +>U : U +>'' : string + +function foo1(x: A); +>foo1 : { (x: A): any; (x: A): any; } +>x : A +>A : A + +function foo1(x: A); // error +>foo1 : { (x: A): any; (x: A): any; } +>x : A +>A : A + +function foo1(x: any) { } +>foo1 : { (x: A): any; (x: A): any; } +>x : any + +function foo1b(x: B, Array>); +>foo1b : { (x: B): any; (x: B): any; } +>x : B +>B : B +>Array : T[] +>Array : T[] + +function foo1b(x: B, Array>); // error +>foo1b : { (x: B): any; (x: B): any; } +>x : B +>B : B +>Array : T[] +>Array : T[] + +function foo1b(x: any) { } +>foo1b : { (x: B): any; (x: B): any; } +>x : any + +function foo1c(x: C); +>foo1c : { (x: C): any; (x: C): any; } +>x : C +>C : C +>String : String +>String : String + +function foo1c(x: C); // error +>foo1c : { (x: C): any; (x: C): any; } +>x : C +>C : C +>String : String +>String : String + +function foo1c(x: any) { } +>foo1c : { (x: C): any; (x: C): any; } +>x : any + +function foo2(x: I); +>foo2 : { (x: I): any; (x: I): any; } +>x : I +>I : I +>Number : Number +>Number : Number + +function foo2(x: I); // error +>foo2 : { (x: I): any; (x: I): any; } +>x : I +>I : I +>Number : Number +>Number : Number + +function foo2(x: any) { } +>foo2 : { (x: I): any; (x: I): any; } +>x : any + +function foo3(x: typeof a); +>foo3 : { (x: { foo(x: T, y: U): string; }): any; (x: { foo(x: T, y: U): string; }): any; } +>x : { foo(x: T, y: U): string; } +>a : { foo(x: T, y: U): string; } + +function foo3(x: typeof a); // error +>foo3 : { (x: { foo(x: T, y: U): string; }): any; (x: { foo(x: T, y: U): string; }): any; } +>x : { foo(x: T, y: U): string; } +>a : { foo(x: T, y: U): string; } + +function foo3(x: any) { } +>foo3 : { (x: { foo(x: T, y: U): string; }): any; (x: { foo(x: T, y: U): string; }): any; } +>x : any + +function foo4(x: typeof b); +>foo4 : { (x: { foo(x: T, y: U): string; }): any; (x: { foo(x: T, y: U): string; }): any; } +>x : { foo(x: T, y: U): string; } +>b : { foo(x: T, y: U): string; } + +function foo4(x: typeof b); // error +>foo4 : { (x: { foo(x: T, y: U): string; }): any; (x: { foo(x: T, y: U): string; }): any; } +>x : { foo(x: T, y: U): string; } +>b : { foo(x: T, y: U): string; } + +function foo4(x: any) { } +>foo4 : { (x: { foo(x: T, y: U): string; }): any; (x: { foo(x: T, y: U): string; }): any; } +>x : any + +function foo5(x: A); +>foo5 : { (x: A): any; (x: B): any; } +>x : A +>A : A + +function foo5(x: B, Array>); // ok +>foo5 : { (x: A): any; (x: B): any; } +>x : B +>B : B +>Array : T[] +>Array : T[] + +function foo5(x: any) { } +>foo5 : { (x: A): any; (x: B): any; } +>x : any + +function foo5b(x: A); +>foo5b : { (x: A): any; (x: C): any; } +>x : A +>A : A + +function foo5b(x: C); // ok +>foo5b : { (x: A): any; (x: C): any; } +>x : C +>C : C +>String : String +>String : String + +function foo5b(x: any) { } +>foo5b : { (x: A): any; (x: C): any; } +>x : any + +function foo5c(x: C); +>foo5c : { (x: C): any; (x: D): any; } +>x : C +>C : C +>String : String +>String : String + +function foo5c(x: D); // ok +>foo5c : { (x: C): any; (x: D): any; } +>x : D +>D : D +>Number : Number +>Number : Number + +function foo5c(x: any) { } +>foo5c : { (x: C): any; (x: D): any; } +>x : any + +function foo6c(x: C); +>foo6c : { (x: C): any; (x: D): any; } +>x : C +>C : C +>String : String +>String : String + +function foo6c(x: D); // error, "any" does not satisfy the constraint +>foo6c : { (x: C): any; (x: D): any; } +>x : D +>D : D +>Number : Number + +function foo6c(x: any) { } +>foo6c : { (x: C): any; (x: D): any; } +>x : any + +function foo6(x: A); +>foo6 : { (x: A): any; (x: I): any; } +>x : A +>A : A + +function foo6(x: I); // ok +>foo6 : { (x: A): any; (x: I): any; } +>x : I +>I : I +>Number : Number +>Number : Number + +function foo6(x: any) { } +>foo6 : { (x: A): any; (x: I): any; } +>x : any + +function foo7(x: A); +>foo7 : { (x: A): any; (x: { foo(x: T, y: U): string; }): any; } +>x : A +>A : A + +function foo7(x: typeof a); // ok +>foo7 : { (x: A): any; (x: { foo(x: T, y: U): string; }): any; } +>x : { foo(x: T, y: U): string; } +>a : { foo(x: T, y: U): string; } + +function foo7(x: any) { } +>foo7 : { (x: A): any; (x: { foo(x: T, y: U): string; }): any; } +>x : any + +function foo8(x: B, Array>); +>foo8 : { (x: B): any; (x: I): any; } +>x : B +>B : B +>Array : T[] +>Array : T[] + +function foo8(x: I); // ok +>foo8 : { (x: B): any; (x: I): any; } +>x : I +>I : I +>Number : Number +>Number : Number + +function foo8(x: any) { } +>foo8 : { (x: B): any; (x: I): any; } +>x : any + +function foo9(x: B, Array>); +>foo9 : { (x: B): any; (x: C): any; } +>x : B +>B : B +>Array : T[] +>Array : T[] + +function foo9(x: C); // ok +>foo9 : { (x: B): any; (x: C): any; } +>x : C +>C : C +>String : String +>String : String + +function foo9(x: any) { } +>foo9 : { (x: B): any; (x: C): any; } +>x : any + +function foo10(x: B, Array>); +>foo10 : { (x: B): any; (x: { foo(x: T, y: U): string; }): any; } +>x : B +>B : B +>Array : T[] +>Array : T[] + +function foo10(x: typeof a); // ok +>foo10 : { (x: B): any; (x: { foo(x: T, y: U): string; }): any; } +>x : { foo(x: T, y: U): string; } +>a : { foo(x: T, y: U): string; } + +function foo10(x: any) { } +>foo10 : { (x: B): any; (x: { foo(x: T, y: U): string; }): any; } +>x : any + +function foo11(x: B, Array>); +>foo11 : { (x: B): any; (x: { foo(x: T, y: U): string; }): any; } +>x : B +>B : B +>Array : T[] +>Array : T[] + +function foo11(x: typeof b); // ok +>foo11 : { (x: B): any; (x: { foo(x: T, y: U): string; }): any; } +>x : { foo(x: T, y: U): string; } +>b : { foo(x: T, y: U): string; } + +function foo11(x: any) { } +>foo11 : { (x: B): any; (x: { foo(x: T, y: U): string; }): any; } +>x : any + +function foo12(x: I); +>foo12 : { (x: I): any; (x: C): any; } +>x : I +>I : I +>Number : Number +>Number : Number + +function foo12(x: C); // ok +>foo12 : { (x: I): any; (x: C): any; } +>x : C +>C : C +>String : String +>String : String + +function foo12(x: any) { } +>foo12 : { (x: I): any; (x: C): any; } +>x : any + +function foo12b(x: I2); +>foo12b : { (x: I2): any; (x: C): any; } +>x : I2 +>I2 : I2 + +function foo12b(x: C); // ok +>foo12b : { (x: I2): any; (x: C): any; } +>x : C +>C : C +>String : String +>String : String + +function foo12b(x: any) { } +>foo12b : { (x: I2): any; (x: C): any; } +>x : any + +function foo13(x: I); +>foo13 : { (x: I): any; (x: { foo(x: T, y: U): string; }): any; } +>x : I +>I : I +>Number : Number +>Number : Number + +function foo13(x: typeof a); // ok +>foo13 : { (x: I): any; (x: { foo(x: T, y: U): string; }): any; } +>x : { foo(x: T, y: U): string; } +>a : { foo(x: T, y: U): string; } + +function foo13(x: any) { } +>foo13 : { (x: I): any; (x: { foo(x: T, y: U): string; }): any; } +>x : any + +function foo14(x: I); +>foo14 : { (x: I): any; (x: { foo(x: T, y: U): string; }): any; } +>x : I +>I : I +>Number : Number +>Number : Number + +function foo14(x: typeof b); // ok +>foo14 : { (x: I): any; (x: { foo(x: T, y: U): string; }): any; } +>x : { foo(x: T, y: U): string; } +>b : { foo(x: T, y: U): string; } + +function foo14(x: any) { } +>foo14 : { (x: I): any; (x: { foo(x: T, y: U): string; }): any; } +>x : any + +function foo15(x: I2); +>foo15 : { (x: I2): any; (x: C): any; } +>x : I2 +>I2 : I2 + +function foo15(x: C); // ok +>foo15 : { (x: I2): any; (x: C): any; } +>x : C +>C : C +>String : String +>String : String + +function foo15(x: any) { } +>foo15 : { (x: I2): any; (x: C): any; } +>x : any + diff --git a/tests/baselines/reference/objectTypesIdentityWithGenericCallSignaturesDifferingByConstraints3.errors.txt b/tests/baselines/reference/objectTypesIdentityWithGenericCallSignaturesDifferingByConstraints3.errors.txt deleted file mode 100644 index 42e7f11e939..00000000000 --- a/tests/baselines/reference/objectTypesIdentityWithGenericCallSignaturesDifferingByConstraints3.errors.txt +++ /dev/null @@ -1,150 +0,0 @@ -tests/cases/conformance/types/typeRelationships/typeAndMemberIdentity/objectTypesIdentityWithGenericCallSignaturesDifferingByConstraints3.ts(15,9): error TS2313: Constraint of a type parameter cannot reference any type parameter from the same type parameter list. -tests/cases/conformance/types/typeRelationships/typeAndMemberIdentity/objectTypesIdentityWithGenericCallSignaturesDifferingByConstraints3.ts(18,9): error TS2313: Constraint of a type parameter cannot reference any type parameter from the same type parameter list. -tests/cases/conformance/types/typeRelationships/typeAndMemberIdentity/objectTypesIdentityWithGenericCallSignaturesDifferingByConstraints3.ts(22,9): error TS2313: Constraint of a type parameter cannot reference any type parameter from the same type parameter list. -tests/cases/conformance/types/typeRelationships/typeAndMemberIdentity/objectTypesIdentityWithGenericCallSignaturesDifferingByConstraints3.ts(26,9): error TS2313: Constraint of a type parameter cannot reference any type parameter from the same type parameter list. -tests/cases/conformance/types/typeRelationships/typeAndMemberIdentity/objectTypesIdentityWithGenericCallSignaturesDifferingByConstraints3.ts(30,13): error TS2313: Constraint of a type parameter cannot reference any type parameter from the same type parameter list. -tests/cases/conformance/types/typeRelationships/typeAndMemberIdentity/objectTypesIdentityWithGenericCallSignaturesDifferingByConstraints3.ts(35,9): error TS2313: Constraint of a type parameter cannot reference any type parameter from the same type parameter list. -tests/cases/conformance/types/typeRelationships/typeAndMemberIdentity/objectTypesIdentityWithGenericCallSignaturesDifferingByConstraints3.ts(38,14): error TS2313: Constraint of a type parameter cannot reference any type parameter from the same type parameter list. -tests/cases/conformance/types/typeRelationships/typeAndMemberIdentity/objectTypesIdentityWithGenericCallSignaturesDifferingByConstraints3.ts(39,15): error TS2313: Constraint of a type parameter cannot reference any type parameter from the same type parameter list. - - -==== tests/cases/conformance/types/typeRelationships/typeAndMemberIdentity/objectTypesIdentityWithGenericCallSignaturesDifferingByConstraints3.ts (8 errors) ==== - // Two call or construct signatures are considered identical when they have the same number of type parameters and, considering those - // parameters pairwise identical, have identical type parameter constraints, identical number of parameters with identical kind(required, - // optional or rest) and types, and identical return types. - - class One { foo: string } - class Two { foo: string } - interface Three { foo: string } - interface Four { foo: T } - interface Five extends Four { } - interface Six { - foo: T; - } - - class A { - foo(x: T, y: U): string { return null; } - ~~~~~~~~~~~ -!!! error TS2313: Constraint of a type parameter cannot reference any type parameter from the same type parameter list. - } - - class B { - ~~~~~~~~~~~ -!!! error TS2313: Constraint of a type parameter cannot reference any type parameter from the same type parameter list. - foo(x: T, y: U): string { return null; } - } - - class C { - ~~~~~~~~~~~ -!!! error TS2313: Constraint of a type parameter cannot reference any type parameter from the same type parameter list. - foo(x: T, y: U): string { return null; } - } - - class D> { - ~~~~~~~~~~~ -!!! error TS2313: Constraint of a type parameter cannot reference any type parameter from the same type parameter list. - foo(x: T, y: U): string { return null; } - } - - interface I> { - ~~~~~~~~~~~ -!!! error TS2313: Constraint of a type parameter cannot reference any type parameter from the same type parameter list. - foo(x: T, y: U): string; - } - - interface I2 { - foo>(x: T, y: U): string; - ~~~~~~~~~~~ -!!! error TS2313: Constraint of a type parameter cannot reference any type parameter from the same type parameter list. - } - - var a: { foo(x: T, y: U): string } - ~~~~~~~~~~~ -!!! error TS2313: Constraint of a type parameter cannot reference any type parameter from the same type parameter list. - var b = { foo(x: T, y: U) { return ''; } }; - ~~~~~~~~~~~ -!!! error TS2313: Constraint of a type parameter cannot reference any type parameter from the same type parameter list. - - function foo1(x: A); - function foo1(x: A); // error - function foo1(x: any) { } - - function foo1b(x: B); - function foo1b(x: B); // error - function foo1b(x: any) { } - - function foo1c(x: C); - function foo1c(x: C); // error - function foo1c(x: any) { } - - function foo2(x: I, Five>); - function foo2(x: I, Five>); // error - function foo2(x: any) { } - - function foo3(x: typeof a); - function foo3(x: typeof a); // error - function foo3(x: any) { } - - function foo4(x: typeof b); - function foo4(x: typeof b); // error - function foo4(x: any) { } - - function foo5(x: A); - function foo5(x: B); // ok - function foo5(x: any) { } - - function foo5b(x: A); - function foo5b(x: C); // ok - function foo5b(x: any) { } - - function foo5c(x: C); - function foo5c(x: D, Four>); // error - function foo5c(x: any) { } - - function foo6c(x: C); - function foo6c(x: D, Four>); // error - function foo6c(x: any) { } - - function foo6(x: A); - function foo6(x: I, Five>); // ok - function foo6(x: any) { } - - function foo7(x: A); - function foo7(x: typeof a); // error - function foo7(x: any) { } - - function foo8(x: B); - function foo8(x: I, Five>); // error - function foo8(x: any) { } - - function foo9(x: B); - function foo9(x: C); // error - function foo9(x: any) { } - - function foo10(x: B); - function foo10(x: typeof a); // ok - function foo10(x: any) { } - - function foo11(x: B); - function foo11(x: typeof b); // ok - function foo11(x: any) { } - - function foo12(x: I, Five>); - function foo12(x: C); // error - function foo12(x: any) { } - - function foo12b(x: I2); - function foo12b(x: C); // ok - function foo12b(x: any) { } - - function foo13(x: I, Five>); - function foo13(x: typeof a); // ok - function foo13(x: any) { } - - function foo14(x: I, Five>); - function foo14(x: typeof b); // ok - function foo14(x: any) { } - - function foo15(x: I2); - function foo15(x: C); // ok - function foo15(x: any) { } \ No newline at end of file diff --git a/tests/baselines/reference/objectTypesIdentityWithGenericCallSignaturesDifferingByConstraints3.symbols b/tests/baselines/reference/objectTypesIdentityWithGenericCallSignaturesDifferingByConstraints3.symbols new file mode 100644 index 00000000000..6bcbd98f225 --- /dev/null +++ b/tests/baselines/reference/objectTypesIdentityWithGenericCallSignaturesDifferingByConstraints3.symbols @@ -0,0 +1,497 @@ +=== tests/cases/conformance/types/typeRelationships/typeAndMemberIdentity/objectTypesIdentityWithGenericCallSignaturesDifferingByConstraints3.ts === +// Two call or construct signatures are considered identical when they have the same number of type parameters and, considering those +// parameters pairwise identical, have identical type parameter constraints, identical number of parameters with identical kind(required, +// optional or rest) and types, and identical return types. + +class One { foo: string } +>One : Symbol(One, Decl(objectTypesIdentityWithGenericCallSignaturesDifferingByConstraints3.ts, 0, 0)) +>foo : Symbol(foo, Decl(objectTypesIdentityWithGenericCallSignaturesDifferingByConstraints3.ts, 4, 11)) + +class Two { foo: string } +>Two : Symbol(Two, Decl(objectTypesIdentityWithGenericCallSignaturesDifferingByConstraints3.ts, 4, 25)) +>foo : Symbol(foo, Decl(objectTypesIdentityWithGenericCallSignaturesDifferingByConstraints3.ts, 5, 11)) + +interface Three { foo: string } +>Three : Symbol(Three, Decl(objectTypesIdentityWithGenericCallSignaturesDifferingByConstraints3.ts, 5, 25)) +>foo : Symbol(foo, Decl(objectTypesIdentityWithGenericCallSignaturesDifferingByConstraints3.ts, 6, 17)) + +interface Four { foo: T } +>Four : Symbol(Four, Decl(objectTypesIdentityWithGenericCallSignaturesDifferingByConstraints3.ts, 6, 31)) +>T : Symbol(T, Decl(objectTypesIdentityWithGenericCallSignaturesDifferingByConstraints3.ts, 7, 15)) +>foo : Symbol(foo, Decl(objectTypesIdentityWithGenericCallSignaturesDifferingByConstraints3.ts, 7, 19)) +>T : Symbol(T, Decl(objectTypesIdentityWithGenericCallSignaturesDifferingByConstraints3.ts, 7, 15)) + +interface Five extends Four { } +>Five : Symbol(Five, Decl(objectTypesIdentityWithGenericCallSignaturesDifferingByConstraints3.ts, 7, 28)) +>T : Symbol(T, Decl(objectTypesIdentityWithGenericCallSignaturesDifferingByConstraints3.ts, 8, 15)) +>Four : Symbol(Four, Decl(objectTypesIdentityWithGenericCallSignaturesDifferingByConstraints3.ts, 6, 31)) +>T : Symbol(T, Decl(objectTypesIdentityWithGenericCallSignaturesDifferingByConstraints3.ts, 8, 15)) + +interface Six { +>Six : Symbol(Six, Decl(objectTypesIdentityWithGenericCallSignaturesDifferingByConstraints3.ts, 8, 37)) +>T : Symbol(T, Decl(objectTypesIdentityWithGenericCallSignaturesDifferingByConstraints3.ts, 9, 14)) +>U : Symbol(U, Decl(objectTypesIdentityWithGenericCallSignaturesDifferingByConstraints3.ts, 9, 16)) + + foo: T; +>foo : Symbol(foo, Decl(objectTypesIdentityWithGenericCallSignaturesDifferingByConstraints3.ts, 9, 21)) +>T : Symbol(T, Decl(objectTypesIdentityWithGenericCallSignaturesDifferingByConstraints3.ts, 9, 14)) +} + +class A { +>A : Symbol(A, Decl(objectTypesIdentityWithGenericCallSignaturesDifferingByConstraints3.ts, 11, 1)) + + foo(x: T, y: U): string { return null; } +>foo : Symbol(foo, Decl(objectTypesIdentityWithGenericCallSignaturesDifferingByConstraints3.ts, 13, 9)) +>T : Symbol(T, Decl(objectTypesIdentityWithGenericCallSignaturesDifferingByConstraints3.ts, 14, 8)) +>U : Symbol(U, Decl(objectTypesIdentityWithGenericCallSignaturesDifferingByConstraints3.ts, 14, 20)) +>U : Symbol(U, Decl(objectTypesIdentityWithGenericCallSignaturesDifferingByConstraints3.ts, 14, 20)) +>One : Symbol(One, Decl(objectTypesIdentityWithGenericCallSignaturesDifferingByConstraints3.ts, 0, 0)) +>x : Symbol(x, Decl(objectTypesIdentityWithGenericCallSignaturesDifferingByConstraints3.ts, 14, 36)) +>T : Symbol(T, Decl(objectTypesIdentityWithGenericCallSignaturesDifferingByConstraints3.ts, 14, 8)) +>y : Symbol(y, Decl(objectTypesIdentityWithGenericCallSignaturesDifferingByConstraints3.ts, 14, 41)) +>U : Symbol(U, Decl(objectTypesIdentityWithGenericCallSignaturesDifferingByConstraints3.ts, 14, 20)) +} + +class B { +>B : Symbol(B, Decl(objectTypesIdentityWithGenericCallSignaturesDifferingByConstraints3.ts, 15, 1)) +>T : Symbol(T, Decl(objectTypesIdentityWithGenericCallSignaturesDifferingByConstraints3.ts, 17, 8)) +>U : Symbol(U, Decl(objectTypesIdentityWithGenericCallSignaturesDifferingByConstraints3.ts, 17, 20)) +>U : Symbol(U, Decl(objectTypesIdentityWithGenericCallSignaturesDifferingByConstraints3.ts, 17, 20)) +>Two : Symbol(Two, Decl(objectTypesIdentityWithGenericCallSignaturesDifferingByConstraints3.ts, 4, 25)) + + foo(x: T, y: U): string { return null; } +>foo : Symbol(foo, Decl(objectTypesIdentityWithGenericCallSignaturesDifferingByConstraints3.ts, 17, 37)) +>x : Symbol(x, Decl(objectTypesIdentityWithGenericCallSignaturesDifferingByConstraints3.ts, 18, 8)) +>T : Symbol(T, Decl(objectTypesIdentityWithGenericCallSignaturesDifferingByConstraints3.ts, 17, 8)) +>y : Symbol(y, Decl(objectTypesIdentityWithGenericCallSignaturesDifferingByConstraints3.ts, 18, 13)) +>U : Symbol(U, Decl(objectTypesIdentityWithGenericCallSignaturesDifferingByConstraints3.ts, 17, 20)) +} + +class C { +>C : Symbol(C, Decl(objectTypesIdentityWithGenericCallSignaturesDifferingByConstraints3.ts, 19, 1)) +>T : Symbol(T, Decl(objectTypesIdentityWithGenericCallSignaturesDifferingByConstraints3.ts, 21, 8)) +>U : Symbol(U, Decl(objectTypesIdentityWithGenericCallSignaturesDifferingByConstraints3.ts, 21, 20)) +>U : Symbol(U, Decl(objectTypesIdentityWithGenericCallSignaturesDifferingByConstraints3.ts, 21, 20)) +>Three : Symbol(Three, Decl(objectTypesIdentityWithGenericCallSignaturesDifferingByConstraints3.ts, 5, 25)) + + foo(x: T, y: U): string { return null; } +>foo : Symbol(foo, Decl(objectTypesIdentityWithGenericCallSignaturesDifferingByConstraints3.ts, 21, 39)) +>x : Symbol(x, Decl(objectTypesIdentityWithGenericCallSignaturesDifferingByConstraints3.ts, 22, 8)) +>T : Symbol(T, Decl(objectTypesIdentityWithGenericCallSignaturesDifferingByConstraints3.ts, 21, 8)) +>y : Symbol(y, Decl(objectTypesIdentityWithGenericCallSignaturesDifferingByConstraints3.ts, 22, 13)) +>U : Symbol(U, Decl(objectTypesIdentityWithGenericCallSignaturesDifferingByConstraints3.ts, 21, 20)) +} + +class D> { +>D : Symbol(D, Decl(objectTypesIdentityWithGenericCallSignaturesDifferingByConstraints3.ts, 23, 1)) +>T : Symbol(T, Decl(objectTypesIdentityWithGenericCallSignaturesDifferingByConstraints3.ts, 25, 8)) +>U : Symbol(U, Decl(objectTypesIdentityWithGenericCallSignaturesDifferingByConstraints3.ts, 25, 20)) +>U : Symbol(U, Decl(objectTypesIdentityWithGenericCallSignaturesDifferingByConstraints3.ts, 25, 20)) +>Four : Symbol(Four, Decl(objectTypesIdentityWithGenericCallSignaturesDifferingByConstraints3.ts, 6, 31)) + + foo(x: T, y: U): string { return null; } +>foo : Symbol(foo, Decl(objectTypesIdentityWithGenericCallSignaturesDifferingByConstraints3.ts, 25, 46)) +>x : Symbol(x, Decl(objectTypesIdentityWithGenericCallSignaturesDifferingByConstraints3.ts, 26, 8)) +>T : Symbol(T, Decl(objectTypesIdentityWithGenericCallSignaturesDifferingByConstraints3.ts, 25, 8)) +>y : Symbol(y, Decl(objectTypesIdentityWithGenericCallSignaturesDifferingByConstraints3.ts, 26, 13)) +>U : Symbol(U, Decl(objectTypesIdentityWithGenericCallSignaturesDifferingByConstraints3.ts, 25, 20)) +} + +interface I> { +>I : Symbol(I, Decl(objectTypesIdentityWithGenericCallSignaturesDifferingByConstraints3.ts, 27, 1)) +>T : Symbol(T, Decl(objectTypesIdentityWithGenericCallSignaturesDifferingByConstraints3.ts, 29, 12)) +>U : Symbol(U, Decl(objectTypesIdentityWithGenericCallSignaturesDifferingByConstraints3.ts, 29, 24)) +>U : Symbol(U, Decl(objectTypesIdentityWithGenericCallSignaturesDifferingByConstraints3.ts, 29, 24)) +>Five : Symbol(Five, Decl(objectTypesIdentityWithGenericCallSignaturesDifferingByConstraints3.ts, 7, 28)) + + foo(x: T, y: U): string; +>foo : Symbol(foo, Decl(objectTypesIdentityWithGenericCallSignaturesDifferingByConstraints3.ts, 29, 50)) +>x : Symbol(x, Decl(objectTypesIdentityWithGenericCallSignaturesDifferingByConstraints3.ts, 30, 8)) +>T : Symbol(T, Decl(objectTypesIdentityWithGenericCallSignaturesDifferingByConstraints3.ts, 29, 12)) +>y : Symbol(y, Decl(objectTypesIdentityWithGenericCallSignaturesDifferingByConstraints3.ts, 30, 13)) +>U : Symbol(U, Decl(objectTypesIdentityWithGenericCallSignaturesDifferingByConstraints3.ts, 29, 24)) +} + +interface I2 { +>I2 : Symbol(I2, Decl(objectTypesIdentityWithGenericCallSignaturesDifferingByConstraints3.ts, 31, 1)) + + foo>(x: T, y: U): string; +>foo : Symbol(foo, Decl(objectTypesIdentityWithGenericCallSignaturesDifferingByConstraints3.ts, 33, 14)) +>T : Symbol(T, Decl(objectTypesIdentityWithGenericCallSignaturesDifferingByConstraints3.ts, 34, 8)) +>U : Symbol(U, Decl(objectTypesIdentityWithGenericCallSignaturesDifferingByConstraints3.ts, 34, 20)) +>U : Symbol(U, Decl(objectTypesIdentityWithGenericCallSignaturesDifferingByConstraints3.ts, 34, 20)) +>Six : Symbol(Six, Decl(objectTypesIdentityWithGenericCallSignaturesDifferingByConstraints3.ts, 8, 37)) +>x : Symbol(x, Decl(objectTypesIdentityWithGenericCallSignaturesDifferingByConstraints3.ts, 34, 52)) +>T : Symbol(T, Decl(objectTypesIdentityWithGenericCallSignaturesDifferingByConstraints3.ts, 34, 8)) +>y : Symbol(y, Decl(objectTypesIdentityWithGenericCallSignaturesDifferingByConstraints3.ts, 34, 57)) +>U : Symbol(U, Decl(objectTypesIdentityWithGenericCallSignaturesDifferingByConstraints3.ts, 34, 20)) +} + +var a: { foo(x: T, y: U): string } +>a : Symbol(a, Decl(objectTypesIdentityWithGenericCallSignaturesDifferingByConstraints3.ts, 37, 3)) +>foo : Symbol(foo, Decl(objectTypesIdentityWithGenericCallSignaturesDifferingByConstraints3.ts, 37, 8)) +>T : Symbol(T, Decl(objectTypesIdentityWithGenericCallSignaturesDifferingByConstraints3.ts, 37, 13)) +>U : Symbol(U, Decl(objectTypesIdentityWithGenericCallSignaturesDifferingByConstraints3.ts, 37, 25)) +>U : Symbol(U, Decl(objectTypesIdentityWithGenericCallSignaturesDifferingByConstraints3.ts, 37, 25)) +>One : Symbol(One, Decl(objectTypesIdentityWithGenericCallSignaturesDifferingByConstraints3.ts, 0, 0)) +>x : Symbol(x, Decl(objectTypesIdentityWithGenericCallSignaturesDifferingByConstraints3.ts, 37, 41)) +>T : Symbol(T, Decl(objectTypesIdentityWithGenericCallSignaturesDifferingByConstraints3.ts, 37, 13)) +>y : Symbol(y, Decl(objectTypesIdentityWithGenericCallSignaturesDifferingByConstraints3.ts, 37, 46)) +>U : Symbol(U, Decl(objectTypesIdentityWithGenericCallSignaturesDifferingByConstraints3.ts, 37, 25)) + +var b = { foo(x: T, y: U) { return ''; } }; +>b : Symbol(b, Decl(objectTypesIdentityWithGenericCallSignaturesDifferingByConstraints3.ts, 38, 3)) +>foo : Symbol(foo, Decl(objectTypesIdentityWithGenericCallSignaturesDifferingByConstraints3.ts, 38, 9)) +>T : Symbol(T, Decl(objectTypesIdentityWithGenericCallSignaturesDifferingByConstraints3.ts, 38, 14)) +>U : Symbol(U, Decl(objectTypesIdentityWithGenericCallSignaturesDifferingByConstraints3.ts, 38, 26)) +>U : Symbol(U, Decl(objectTypesIdentityWithGenericCallSignaturesDifferingByConstraints3.ts, 38, 26)) +>Two : Symbol(Two, Decl(objectTypesIdentityWithGenericCallSignaturesDifferingByConstraints3.ts, 4, 25)) +>x : Symbol(x, Decl(objectTypesIdentityWithGenericCallSignaturesDifferingByConstraints3.ts, 38, 42)) +>T : Symbol(T, Decl(objectTypesIdentityWithGenericCallSignaturesDifferingByConstraints3.ts, 38, 14)) +>y : Symbol(y, Decl(objectTypesIdentityWithGenericCallSignaturesDifferingByConstraints3.ts, 38, 47)) +>U : Symbol(U, Decl(objectTypesIdentityWithGenericCallSignaturesDifferingByConstraints3.ts, 38, 26)) + +function foo1(x: A); +>foo1 : Symbol(foo1, Decl(objectTypesIdentityWithGenericCallSignaturesDifferingByConstraints3.ts, 38, 71), Decl(objectTypesIdentityWithGenericCallSignaturesDifferingByConstraints3.ts, 40, 20), Decl(objectTypesIdentityWithGenericCallSignaturesDifferingByConstraints3.ts, 41, 20)) +>x : Symbol(x, Decl(objectTypesIdentityWithGenericCallSignaturesDifferingByConstraints3.ts, 40, 14)) +>A : Symbol(A, Decl(objectTypesIdentityWithGenericCallSignaturesDifferingByConstraints3.ts, 11, 1)) + +function foo1(x: A); // error +>foo1 : Symbol(foo1, Decl(objectTypesIdentityWithGenericCallSignaturesDifferingByConstraints3.ts, 38, 71), Decl(objectTypesIdentityWithGenericCallSignaturesDifferingByConstraints3.ts, 40, 20), Decl(objectTypesIdentityWithGenericCallSignaturesDifferingByConstraints3.ts, 41, 20)) +>x : Symbol(x, Decl(objectTypesIdentityWithGenericCallSignaturesDifferingByConstraints3.ts, 41, 14)) +>A : Symbol(A, Decl(objectTypesIdentityWithGenericCallSignaturesDifferingByConstraints3.ts, 11, 1)) + +function foo1(x: any) { } +>foo1 : Symbol(foo1, Decl(objectTypesIdentityWithGenericCallSignaturesDifferingByConstraints3.ts, 38, 71), Decl(objectTypesIdentityWithGenericCallSignaturesDifferingByConstraints3.ts, 40, 20), Decl(objectTypesIdentityWithGenericCallSignaturesDifferingByConstraints3.ts, 41, 20)) +>x : Symbol(x, Decl(objectTypesIdentityWithGenericCallSignaturesDifferingByConstraints3.ts, 42, 14)) + +function foo1b(x: B); +>foo1b : Symbol(foo1b, Decl(objectTypesIdentityWithGenericCallSignaturesDifferingByConstraints3.ts, 42, 25), Decl(objectTypesIdentityWithGenericCallSignaturesDifferingByConstraints3.ts, 44, 31), Decl(objectTypesIdentityWithGenericCallSignaturesDifferingByConstraints3.ts, 45, 31)) +>x : Symbol(x, Decl(objectTypesIdentityWithGenericCallSignaturesDifferingByConstraints3.ts, 44, 15)) +>B : Symbol(B, Decl(objectTypesIdentityWithGenericCallSignaturesDifferingByConstraints3.ts, 15, 1)) +>Two : Symbol(Two, Decl(objectTypesIdentityWithGenericCallSignaturesDifferingByConstraints3.ts, 4, 25)) +>Two : Symbol(Two, Decl(objectTypesIdentityWithGenericCallSignaturesDifferingByConstraints3.ts, 4, 25)) + +function foo1b(x: B); // error +>foo1b : Symbol(foo1b, Decl(objectTypesIdentityWithGenericCallSignaturesDifferingByConstraints3.ts, 42, 25), Decl(objectTypesIdentityWithGenericCallSignaturesDifferingByConstraints3.ts, 44, 31), Decl(objectTypesIdentityWithGenericCallSignaturesDifferingByConstraints3.ts, 45, 31)) +>x : Symbol(x, Decl(objectTypesIdentityWithGenericCallSignaturesDifferingByConstraints3.ts, 45, 15)) +>B : Symbol(B, Decl(objectTypesIdentityWithGenericCallSignaturesDifferingByConstraints3.ts, 15, 1)) +>Two : Symbol(Two, Decl(objectTypesIdentityWithGenericCallSignaturesDifferingByConstraints3.ts, 4, 25)) +>Two : Symbol(Two, Decl(objectTypesIdentityWithGenericCallSignaturesDifferingByConstraints3.ts, 4, 25)) + +function foo1b(x: any) { } +>foo1b : Symbol(foo1b, Decl(objectTypesIdentityWithGenericCallSignaturesDifferingByConstraints3.ts, 42, 25), Decl(objectTypesIdentityWithGenericCallSignaturesDifferingByConstraints3.ts, 44, 31), Decl(objectTypesIdentityWithGenericCallSignaturesDifferingByConstraints3.ts, 45, 31)) +>x : Symbol(x, Decl(objectTypesIdentityWithGenericCallSignaturesDifferingByConstraints3.ts, 46, 15)) + +function foo1c(x: C); +>foo1c : Symbol(foo1c, Decl(objectTypesIdentityWithGenericCallSignaturesDifferingByConstraints3.ts, 46, 26), Decl(objectTypesIdentityWithGenericCallSignaturesDifferingByConstraints3.ts, 48, 35), Decl(objectTypesIdentityWithGenericCallSignaturesDifferingByConstraints3.ts, 49, 35)) +>x : Symbol(x, Decl(objectTypesIdentityWithGenericCallSignaturesDifferingByConstraints3.ts, 48, 15)) +>C : Symbol(C, Decl(objectTypesIdentityWithGenericCallSignaturesDifferingByConstraints3.ts, 19, 1)) +>Three : Symbol(Three, Decl(objectTypesIdentityWithGenericCallSignaturesDifferingByConstraints3.ts, 5, 25)) +>Three : Symbol(Three, Decl(objectTypesIdentityWithGenericCallSignaturesDifferingByConstraints3.ts, 5, 25)) + +function foo1c(x: C); // error +>foo1c : Symbol(foo1c, Decl(objectTypesIdentityWithGenericCallSignaturesDifferingByConstraints3.ts, 46, 26), Decl(objectTypesIdentityWithGenericCallSignaturesDifferingByConstraints3.ts, 48, 35), Decl(objectTypesIdentityWithGenericCallSignaturesDifferingByConstraints3.ts, 49, 35)) +>x : Symbol(x, Decl(objectTypesIdentityWithGenericCallSignaturesDifferingByConstraints3.ts, 49, 15)) +>C : Symbol(C, Decl(objectTypesIdentityWithGenericCallSignaturesDifferingByConstraints3.ts, 19, 1)) +>Three : Symbol(Three, Decl(objectTypesIdentityWithGenericCallSignaturesDifferingByConstraints3.ts, 5, 25)) +>Three : Symbol(Three, Decl(objectTypesIdentityWithGenericCallSignaturesDifferingByConstraints3.ts, 5, 25)) + +function foo1c(x: any) { } +>foo1c : Symbol(foo1c, Decl(objectTypesIdentityWithGenericCallSignaturesDifferingByConstraints3.ts, 46, 26), Decl(objectTypesIdentityWithGenericCallSignaturesDifferingByConstraints3.ts, 48, 35), Decl(objectTypesIdentityWithGenericCallSignaturesDifferingByConstraints3.ts, 49, 35)) +>x : Symbol(x, Decl(objectTypesIdentityWithGenericCallSignaturesDifferingByConstraints3.ts, 50, 15)) + +function foo2(x: I, Five>); +>foo2 : Symbol(foo2, Decl(objectTypesIdentityWithGenericCallSignaturesDifferingByConstraints3.ts, 50, 26), Decl(objectTypesIdentityWithGenericCallSignaturesDifferingByConstraints3.ts, 52, 48), Decl(objectTypesIdentityWithGenericCallSignaturesDifferingByConstraints3.ts, 53, 48)) +>x : Symbol(x, Decl(objectTypesIdentityWithGenericCallSignaturesDifferingByConstraints3.ts, 52, 14)) +>I : Symbol(I, Decl(objectTypesIdentityWithGenericCallSignaturesDifferingByConstraints3.ts, 27, 1)) +>Five : Symbol(Five, Decl(objectTypesIdentityWithGenericCallSignaturesDifferingByConstraints3.ts, 7, 28)) +>Five : Symbol(Five, Decl(objectTypesIdentityWithGenericCallSignaturesDifferingByConstraints3.ts, 7, 28)) + +function foo2(x: I, Five>); // error +>foo2 : Symbol(foo2, Decl(objectTypesIdentityWithGenericCallSignaturesDifferingByConstraints3.ts, 50, 26), Decl(objectTypesIdentityWithGenericCallSignaturesDifferingByConstraints3.ts, 52, 48), Decl(objectTypesIdentityWithGenericCallSignaturesDifferingByConstraints3.ts, 53, 48)) +>x : Symbol(x, Decl(objectTypesIdentityWithGenericCallSignaturesDifferingByConstraints3.ts, 53, 14)) +>I : Symbol(I, Decl(objectTypesIdentityWithGenericCallSignaturesDifferingByConstraints3.ts, 27, 1)) +>Five : Symbol(Five, Decl(objectTypesIdentityWithGenericCallSignaturesDifferingByConstraints3.ts, 7, 28)) +>Five : Symbol(Five, Decl(objectTypesIdentityWithGenericCallSignaturesDifferingByConstraints3.ts, 7, 28)) + +function foo2(x: any) { } +>foo2 : Symbol(foo2, Decl(objectTypesIdentityWithGenericCallSignaturesDifferingByConstraints3.ts, 50, 26), Decl(objectTypesIdentityWithGenericCallSignaturesDifferingByConstraints3.ts, 52, 48), Decl(objectTypesIdentityWithGenericCallSignaturesDifferingByConstraints3.ts, 53, 48)) +>x : Symbol(x, Decl(objectTypesIdentityWithGenericCallSignaturesDifferingByConstraints3.ts, 54, 14)) + +function foo3(x: typeof a); +>foo3 : Symbol(foo3, Decl(objectTypesIdentityWithGenericCallSignaturesDifferingByConstraints3.ts, 54, 25), Decl(objectTypesIdentityWithGenericCallSignaturesDifferingByConstraints3.ts, 56, 27), Decl(objectTypesIdentityWithGenericCallSignaturesDifferingByConstraints3.ts, 57, 27)) +>x : Symbol(x, Decl(objectTypesIdentityWithGenericCallSignaturesDifferingByConstraints3.ts, 56, 14)) +>a : Symbol(a, Decl(objectTypesIdentityWithGenericCallSignaturesDifferingByConstraints3.ts, 37, 3)) + +function foo3(x: typeof a); // error +>foo3 : Symbol(foo3, Decl(objectTypesIdentityWithGenericCallSignaturesDifferingByConstraints3.ts, 54, 25), Decl(objectTypesIdentityWithGenericCallSignaturesDifferingByConstraints3.ts, 56, 27), Decl(objectTypesIdentityWithGenericCallSignaturesDifferingByConstraints3.ts, 57, 27)) +>x : Symbol(x, Decl(objectTypesIdentityWithGenericCallSignaturesDifferingByConstraints3.ts, 57, 14)) +>a : Symbol(a, Decl(objectTypesIdentityWithGenericCallSignaturesDifferingByConstraints3.ts, 37, 3)) + +function foo3(x: any) { } +>foo3 : Symbol(foo3, Decl(objectTypesIdentityWithGenericCallSignaturesDifferingByConstraints3.ts, 54, 25), Decl(objectTypesIdentityWithGenericCallSignaturesDifferingByConstraints3.ts, 56, 27), Decl(objectTypesIdentityWithGenericCallSignaturesDifferingByConstraints3.ts, 57, 27)) +>x : Symbol(x, Decl(objectTypesIdentityWithGenericCallSignaturesDifferingByConstraints3.ts, 58, 14)) + +function foo4(x: typeof b); +>foo4 : Symbol(foo4, Decl(objectTypesIdentityWithGenericCallSignaturesDifferingByConstraints3.ts, 58, 25), Decl(objectTypesIdentityWithGenericCallSignaturesDifferingByConstraints3.ts, 60, 27), Decl(objectTypesIdentityWithGenericCallSignaturesDifferingByConstraints3.ts, 61, 27)) +>x : Symbol(x, Decl(objectTypesIdentityWithGenericCallSignaturesDifferingByConstraints3.ts, 60, 14)) +>b : Symbol(b, Decl(objectTypesIdentityWithGenericCallSignaturesDifferingByConstraints3.ts, 38, 3)) + +function foo4(x: typeof b); // error +>foo4 : Symbol(foo4, Decl(objectTypesIdentityWithGenericCallSignaturesDifferingByConstraints3.ts, 58, 25), Decl(objectTypesIdentityWithGenericCallSignaturesDifferingByConstraints3.ts, 60, 27), Decl(objectTypesIdentityWithGenericCallSignaturesDifferingByConstraints3.ts, 61, 27)) +>x : Symbol(x, Decl(objectTypesIdentityWithGenericCallSignaturesDifferingByConstraints3.ts, 61, 14)) +>b : Symbol(b, Decl(objectTypesIdentityWithGenericCallSignaturesDifferingByConstraints3.ts, 38, 3)) + +function foo4(x: any) { } +>foo4 : Symbol(foo4, Decl(objectTypesIdentityWithGenericCallSignaturesDifferingByConstraints3.ts, 58, 25), Decl(objectTypesIdentityWithGenericCallSignaturesDifferingByConstraints3.ts, 60, 27), Decl(objectTypesIdentityWithGenericCallSignaturesDifferingByConstraints3.ts, 61, 27)) +>x : Symbol(x, Decl(objectTypesIdentityWithGenericCallSignaturesDifferingByConstraints3.ts, 62, 14)) + +function foo5(x: A); +>foo5 : Symbol(foo5, Decl(objectTypesIdentityWithGenericCallSignaturesDifferingByConstraints3.ts, 62, 25), Decl(objectTypesIdentityWithGenericCallSignaturesDifferingByConstraints3.ts, 64, 20), Decl(objectTypesIdentityWithGenericCallSignaturesDifferingByConstraints3.ts, 65, 30)) +>x : Symbol(x, Decl(objectTypesIdentityWithGenericCallSignaturesDifferingByConstraints3.ts, 64, 14)) +>A : Symbol(A, Decl(objectTypesIdentityWithGenericCallSignaturesDifferingByConstraints3.ts, 11, 1)) + +function foo5(x: B); // ok +>foo5 : Symbol(foo5, Decl(objectTypesIdentityWithGenericCallSignaturesDifferingByConstraints3.ts, 62, 25), Decl(objectTypesIdentityWithGenericCallSignaturesDifferingByConstraints3.ts, 64, 20), Decl(objectTypesIdentityWithGenericCallSignaturesDifferingByConstraints3.ts, 65, 30)) +>x : Symbol(x, Decl(objectTypesIdentityWithGenericCallSignaturesDifferingByConstraints3.ts, 65, 14)) +>B : Symbol(B, Decl(objectTypesIdentityWithGenericCallSignaturesDifferingByConstraints3.ts, 15, 1)) +>Two : Symbol(Two, Decl(objectTypesIdentityWithGenericCallSignaturesDifferingByConstraints3.ts, 4, 25)) +>Two : Symbol(Two, Decl(objectTypesIdentityWithGenericCallSignaturesDifferingByConstraints3.ts, 4, 25)) + +function foo5(x: any) { } +>foo5 : Symbol(foo5, Decl(objectTypesIdentityWithGenericCallSignaturesDifferingByConstraints3.ts, 62, 25), Decl(objectTypesIdentityWithGenericCallSignaturesDifferingByConstraints3.ts, 64, 20), Decl(objectTypesIdentityWithGenericCallSignaturesDifferingByConstraints3.ts, 65, 30)) +>x : Symbol(x, Decl(objectTypesIdentityWithGenericCallSignaturesDifferingByConstraints3.ts, 66, 14)) + +function foo5b(x: A); +>foo5b : Symbol(foo5b, Decl(objectTypesIdentityWithGenericCallSignaturesDifferingByConstraints3.ts, 66, 25), Decl(objectTypesIdentityWithGenericCallSignaturesDifferingByConstraints3.ts, 68, 21), Decl(objectTypesIdentityWithGenericCallSignaturesDifferingByConstraints3.ts, 69, 35)) +>x : Symbol(x, Decl(objectTypesIdentityWithGenericCallSignaturesDifferingByConstraints3.ts, 68, 15)) +>A : Symbol(A, Decl(objectTypesIdentityWithGenericCallSignaturesDifferingByConstraints3.ts, 11, 1)) + +function foo5b(x: C); // ok +>foo5b : Symbol(foo5b, Decl(objectTypesIdentityWithGenericCallSignaturesDifferingByConstraints3.ts, 66, 25), Decl(objectTypesIdentityWithGenericCallSignaturesDifferingByConstraints3.ts, 68, 21), Decl(objectTypesIdentityWithGenericCallSignaturesDifferingByConstraints3.ts, 69, 35)) +>x : Symbol(x, Decl(objectTypesIdentityWithGenericCallSignaturesDifferingByConstraints3.ts, 69, 15)) +>C : Symbol(C, Decl(objectTypesIdentityWithGenericCallSignaturesDifferingByConstraints3.ts, 19, 1)) +>Three : Symbol(Three, Decl(objectTypesIdentityWithGenericCallSignaturesDifferingByConstraints3.ts, 5, 25)) +>Three : Symbol(Three, Decl(objectTypesIdentityWithGenericCallSignaturesDifferingByConstraints3.ts, 5, 25)) + +function foo5b(x: any) { } +>foo5b : Symbol(foo5b, Decl(objectTypesIdentityWithGenericCallSignaturesDifferingByConstraints3.ts, 66, 25), Decl(objectTypesIdentityWithGenericCallSignaturesDifferingByConstraints3.ts, 68, 21), Decl(objectTypesIdentityWithGenericCallSignaturesDifferingByConstraints3.ts, 69, 35)) +>x : Symbol(x, Decl(objectTypesIdentityWithGenericCallSignaturesDifferingByConstraints3.ts, 70, 15)) + +function foo5c(x: C); +>foo5c : Symbol(foo5c, Decl(objectTypesIdentityWithGenericCallSignaturesDifferingByConstraints3.ts, 70, 26), Decl(objectTypesIdentityWithGenericCallSignaturesDifferingByConstraints3.ts, 72, 35), Decl(objectTypesIdentityWithGenericCallSignaturesDifferingByConstraints3.ts, 73, 49)) +>x : Symbol(x, Decl(objectTypesIdentityWithGenericCallSignaturesDifferingByConstraints3.ts, 72, 15)) +>C : Symbol(C, Decl(objectTypesIdentityWithGenericCallSignaturesDifferingByConstraints3.ts, 19, 1)) +>Three : Symbol(Three, Decl(objectTypesIdentityWithGenericCallSignaturesDifferingByConstraints3.ts, 5, 25)) +>Three : Symbol(Three, Decl(objectTypesIdentityWithGenericCallSignaturesDifferingByConstraints3.ts, 5, 25)) + +function foo5c(x: D, Four>); // error +>foo5c : Symbol(foo5c, Decl(objectTypesIdentityWithGenericCallSignaturesDifferingByConstraints3.ts, 70, 26), Decl(objectTypesIdentityWithGenericCallSignaturesDifferingByConstraints3.ts, 72, 35), Decl(objectTypesIdentityWithGenericCallSignaturesDifferingByConstraints3.ts, 73, 49)) +>x : Symbol(x, Decl(objectTypesIdentityWithGenericCallSignaturesDifferingByConstraints3.ts, 73, 15)) +>D : Symbol(D, Decl(objectTypesIdentityWithGenericCallSignaturesDifferingByConstraints3.ts, 23, 1)) +>Four : Symbol(Four, Decl(objectTypesIdentityWithGenericCallSignaturesDifferingByConstraints3.ts, 6, 31)) +>Four : Symbol(Four, Decl(objectTypesIdentityWithGenericCallSignaturesDifferingByConstraints3.ts, 6, 31)) + +function foo5c(x: any) { } +>foo5c : Symbol(foo5c, Decl(objectTypesIdentityWithGenericCallSignaturesDifferingByConstraints3.ts, 70, 26), Decl(objectTypesIdentityWithGenericCallSignaturesDifferingByConstraints3.ts, 72, 35), Decl(objectTypesIdentityWithGenericCallSignaturesDifferingByConstraints3.ts, 73, 49)) +>x : Symbol(x, Decl(objectTypesIdentityWithGenericCallSignaturesDifferingByConstraints3.ts, 74, 15)) + +function foo6c(x: C); +>foo6c : Symbol(foo6c, Decl(objectTypesIdentityWithGenericCallSignaturesDifferingByConstraints3.ts, 74, 26), Decl(objectTypesIdentityWithGenericCallSignaturesDifferingByConstraints3.ts, 76, 35), Decl(objectTypesIdentityWithGenericCallSignaturesDifferingByConstraints3.ts, 77, 49)) +>x : Symbol(x, Decl(objectTypesIdentityWithGenericCallSignaturesDifferingByConstraints3.ts, 76, 15)) +>C : Symbol(C, Decl(objectTypesIdentityWithGenericCallSignaturesDifferingByConstraints3.ts, 19, 1)) +>Three : Symbol(Three, Decl(objectTypesIdentityWithGenericCallSignaturesDifferingByConstraints3.ts, 5, 25)) +>Three : Symbol(Three, Decl(objectTypesIdentityWithGenericCallSignaturesDifferingByConstraints3.ts, 5, 25)) + +function foo6c(x: D, Four>); // error +>foo6c : Symbol(foo6c, Decl(objectTypesIdentityWithGenericCallSignaturesDifferingByConstraints3.ts, 74, 26), Decl(objectTypesIdentityWithGenericCallSignaturesDifferingByConstraints3.ts, 76, 35), Decl(objectTypesIdentityWithGenericCallSignaturesDifferingByConstraints3.ts, 77, 49)) +>x : Symbol(x, Decl(objectTypesIdentityWithGenericCallSignaturesDifferingByConstraints3.ts, 77, 15)) +>D : Symbol(D, Decl(objectTypesIdentityWithGenericCallSignaturesDifferingByConstraints3.ts, 23, 1)) +>Four : Symbol(Four, Decl(objectTypesIdentityWithGenericCallSignaturesDifferingByConstraints3.ts, 6, 31)) +>Four : Symbol(Four, Decl(objectTypesIdentityWithGenericCallSignaturesDifferingByConstraints3.ts, 6, 31)) + +function foo6c(x: any) { } +>foo6c : Symbol(foo6c, Decl(objectTypesIdentityWithGenericCallSignaturesDifferingByConstraints3.ts, 74, 26), Decl(objectTypesIdentityWithGenericCallSignaturesDifferingByConstraints3.ts, 76, 35), Decl(objectTypesIdentityWithGenericCallSignaturesDifferingByConstraints3.ts, 77, 49)) +>x : Symbol(x, Decl(objectTypesIdentityWithGenericCallSignaturesDifferingByConstraints3.ts, 78, 15)) + +function foo6(x: A); +>foo6 : Symbol(foo6, Decl(objectTypesIdentityWithGenericCallSignaturesDifferingByConstraints3.ts, 78, 26), Decl(objectTypesIdentityWithGenericCallSignaturesDifferingByConstraints3.ts, 80, 20), Decl(objectTypesIdentityWithGenericCallSignaturesDifferingByConstraints3.ts, 81, 48)) +>x : Symbol(x, Decl(objectTypesIdentityWithGenericCallSignaturesDifferingByConstraints3.ts, 80, 14)) +>A : Symbol(A, Decl(objectTypesIdentityWithGenericCallSignaturesDifferingByConstraints3.ts, 11, 1)) + +function foo6(x: I, Five>); // ok +>foo6 : Symbol(foo6, Decl(objectTypesIdentityWithGenericCallSignaturesDifferingByConstraints3.ts, 78, 26), Decl(objectTypesIdentityWithGenericCallSignaturesDifferingByConstraints3.ts, 80, 20), Decl(objectTypesIdentityWithGenericCallSignaturesDifferingByConstraints3.ts, 81, 48)) +>x : Symbol(x, Decl(objectTypesIdentityWithGenericCallSignaturesDifferingByConstraints3.ts, 81, 14)) +>I : Symbol(I, Decl(objectTypesIdentityWithGenericCallSignaturesDifferingByConstraints3.ts, 27, 1)) +>Five : Symbol(Five, Decl(objectTypesIdentityWithGenericCallSignaturesDifferingByConstraints3.ts, 7, 28)) +>Five : Symbol(Five, Decl(objectTypesIdentityWithGenericCallSignaturesDifferingByConstraints3.ts, 7, 28)) + +function foo6(x: any) { } +>foo6 : Symbol(foo6, Decl(objectTypesIdentityWithGenericCallSignaturesDifferingByConstraints3.ts, 78, 26), Decl(objectTypesIdentityWithGenericCallSignaturesDifferingByConstraints3.ts, 80, 20), Decl(objectTypesIdentityWithGenericCallSignaturesDifferingByConstraints3.ts, 81, 48)) +>x : Symbol(x, Decl(objectTypesIdentityWithGenericCallSignaturesDifferingByConstraints3.ts, 82, 14)) + +function foo7(x: A); +>foo7 : Symbol(foo7, Decl(objectTypesIdentityWithGenericCallSignaturesDifferingByConstraints3.ts, 82, 25), Decl(objectTypesIdentityWithGenericCallSignaturesDifferingByConstraints3.ts, 84, 20), Decl(objectTypesIdentityWithGenericCallSignaturesDifferingByConstraints3.ts, 85, 27)) +>x : Symbol(x, Decl(objectTypesIdentityWithGenericCallSignaturesDifferingByConstraints3.ts, 84, 14)) +>A : Symbol(A, Decl(objectTypesIdentityWithGenericCallSignaturesDifferingByConstraints3.ts, 11, 1)) + +function foo7(x: typeof a); // error +>foo7 : Symbol(foo7, Decl(objectTypesIdentityWithGenericCallSignaturesDifferingByConstraints3.ts, 82, 25), Decl(objectTypesIdentityWithGenericCallSignaturesDifferingByConstraints3.ts, 84, 20), Decl(objectTypesIdentityWithGenericCallSignaturesDifferingByConstraints3.ts, 85, 27)) +>x : Symbol(x, Decl(objectTypesIdentityWithGenericCallSignaturesDifferingByConstraints3.ts, 85, 14)) +>a : Symbol(a, Decl(objectTypesIdentityWithGenericCallSignaturesDifferingByConstraints3.ts, 37, 3)) + +function foo7(x: any) { } +>foo7 : Symbol(foo7, Decl(objectTypesIdentityWithGenericCallSignaturesDifferingByConstraints3.ts, 82, 25), Decl(objectTypesIdentityWithGenericCallSignaturesDifferingByConstraints3.ts, 84, 20), Decl(objectTypesIdentityWithGenericCallSignaturesDifferingByConstraints3.ts, 85, 27)) +>x : Symbol(x, Decl(objectTypesIdentityWithGenericCallSignaturesDifferingByConstraints3.ts, 86, 14)) + +function foo8(x: B); +>foo8 : Symbol(foo8, Decl(objectTypesIdentityWithGenericCallSignaturesDifferingByConstraints3.ts, 86, 25), Decl(objectTypesIdentityWithGenericCallSignaturesDifferingByConstraints3.ts, 88, 30), Decl(objectTypesIdentityWithGenericCallSignaturesDifferingByConstraints3.ts, 89, 48)) +>x : Symbol(x, Decl(objectTypesIdentityWithGenericCallSignaturesDifferingByConstraints3.ts, 88, 14)) +>B : Symbol(B, Decl(objectTypesIdentityWithGenericCallSignaturesDifferingByConstraints3.ts, 15, 1)) +>Two : Symbol(Two, Decl(objectTypesIdentityWithGenericCallSignaturesDifferingByConstraints3.ts, 4, 25)) +>Two : Symbol(Two, Decl(objectTypesIdentityWithGenericCallSignaturesDifferingByConstraints3.ts, 4, 25)) + +function foo8(x: I, Five>); // error +>foo8 : Symbol(foo8, Decl(objectTypesIdentityWithGenericCallSignaturesDifferingByConstraints3.ts, 86, 25), Decl(objectTypesIdentityWithGenericCallSignaturesDifferingByConstraints3.ts, 88, 30), Decl(objectTypesIdentityWithGenericCallSignaturesDifferingByConstraints3.ts, 89, 48)) +>x : Symbol(x, Decl(objectTypesIdentityWithGenericCallSignaturesDifferingByConstraints3.ts, 89, 14)) +>I : Symbol(I, Decl(objectTypesIdentityWithGenericCallSignaturesDifferingByConstraints3.ts, 27, 1)) +>Five : Symbol(Five, Decl(objectTypesIdentityWithGenericCallSignaturesDifferingByConstraints3.ts, 7, 28)) +>Five : Symbol(Five, Decl(objectTypesIdentityWithGenericCallSignaturesDifferingByConstraints3.ts, 7, 28)) + +function foo8(x: any) { } +>foo8 : Symbol(foo8, Decl(objectTypesIdentityWithGenericCallSignaturesDifferingByConstraints3.ts, 86, 25), Decl(objectTypesIdentityWithGenericCallSignaturesDifferingByConstraints3.ts, 88, 30), Decl(objectTypesIdentityWithGenericCallSignaturesDifferingByConstraints3.ts, 89, 48)) +>x : Symbol(x, Decl(objectTypesIdentityWithGenericCallSignaturesDifferingByConstraints3.ts, 90, 14)) + +function foo9(x: B); +>foo9 : Symbol(foo9, Decl(objectTypesIdentityWithGenericCallSignaturesDifferingByConstraints3.ts, 90, 25), Decl(objectTypesIdentityWithGenericCallSignaturesDifferingByConstraints3.ts, 92, 30), Decl(objectTypesIdentityWithGenericCallSignaturesDifferingByConstraints3.ts, 93, 34)) +>x : Symbol(x, Decl(objectTypesIdentityWithGenericCallSignaturesDifferingByConstraints3.ts, 92, 14)) +>B : Symbol(B, Decl(objectTypesIdentityWithGenericCallSignaturesDifferingByConstraints3.ts, 15, 1)) +>Two : Symbol(Two, Decl(objectTypesIdentityWithGenericCallSignaturesDifferingByConstraints3.ts, 4, 25)) +>Two : Symbol(Two, Decl(objectTypesIdentityWithGenericCallSignaturesDifferingByConstraints3.ts, 4, 25)) + +function foo9(x: C); // error +>foo9 : Symbol(foo9, Decl(objectTypesIdentityWithGenericCallSignaturesDifferingByConstraints3.ts, 90, 25), Decl(objectTypesIdentityWithGenericCallSignaturesDifferingByConstraints3.ts, 92, 30), Decl(objectTypesIdentityWithGenericCallSignaturesDifferingByConstraints3.ts, 93, 34)) +>x : Symbol(x, Decl(objectTypesIdentityWithGenericCallSignaturesDifferingByConstraints3.ts, 93, 14)) +>C : Symbol(C, Decl(objectTypesIdentityWithGenericCallSignaturesDifferingByConstraints3.ts, 19, 1)) +>Three : Symbol(Three, Decl(objectTypesIdentityWithGenericCallSignaturesDifferingByConstraints3.ts, 5, 25)) +>Three : Symbol(Three, Decl(objectTypesIdentityWithGenericCallSignaturesDifferingByConstraints3.ts, 5, 25)) + +function foo9(x: any) { } +>foo9 : Symbol(foo9, Decl(objectTypesIdentityWithGenericCallSignaturesDifferingByConstraints3.ts, 90, 25), Decl(objectTypesIdentityWithGenericCallSignaturesDifferingByConstraints3.ts, 92, 30), Decl(objectTypesIdentityWithGenericCallSignaturesDifferingByConstraints3.ts, 93, 34)) +>x : Symbol(x, Decl(objectTypesIdentityWithGenericCallSignaturesDifferingByConstraints3.ts, 94, 14)) + +function foo10(x: B); +>foo10 : Symbol(foo10, Decl(objectTypesIdentityWithGenericCallSignaturesDifferingByConstraints3.ts, 94, 25), Decl(objectTypesIdentityWithGenericCallSignaturesDifferingByConstraints3.ts, 96, 31), Decl(objectTypesIdentityWithGenericCallSignaturesDifferingByConstraints3.ts, 97, 28)) +>x : Symbol(x, Decl(objectTypesIdentityWithGenericCallSignaturesDifferingByConstraints3.ts, 96, 15)) +>B : Symbol(B, Decl(objectTypesIdentityWithGenericCallSignaturesDifferingByConstraints3.ts, 15, 1)) +>Two : Symbol(Two, Decl(objectTypesIdentityWithGenericCallSignaturesDifferingByConstraints3.ts, 4, 25)) +>Two : Symbol(Two, Decl(objectTypesIdentityWithGenericCallSignaturesDifferingByConstraints3.ts, 4, 25)) + +function foo10(x: typeof a); // ok +>foo10 : Symbol(foo10, Decl(objectTypesIdentityWithGenericCallSignaturesDifferingByConstraints3.ts, 94, 25), Decl(objectTypesIdentityWithGenericCallSignaturesDifferingByConstraints3.ts, 96, 31), Decl(objectTypesIdentityWithGenericCallSignaturesDifferingByConstraints3.ts, 97, 28)) +>x : Symbol(x, Decl(objectTypesIdentityWithGenericCallSignaturesDifferingByConstraints3.ts, 97, 15)) +>a : Symbol(a, Decl(objectTypesIdentityWithGenericCallSignaturesDifferingByConstraints3.ts, 37, 3)) + +function foo10(x: any) { } +>foo10 : Symbol(foo10, Decl(objectTypesIdentityWithGenericCallSignaturesDifferingByConstraints3.ts, 94, 25), Decl(objectTypesIdentityWithGenericCallSignaturesDifferingByConstraints3.ts, 96, 31), Decl(objectTypesIdentityWithGenericCallSignaturesDifferingByConstraints3.ts, 97, 28)) +>x : Symbol(x, Decl(objectTypesIdentityWithGenericCallSignaturesDifferingByConstraints3.ts, 98, 15)) + +function foo11(x: B); +>foo11 : Symbol(foo11, Decl(objectTypesIdentityWithGenericCallSignaturesDifferingByConstraints3.ts, 98, 26), Decl(objectTypesIdentityWithGenericCallSignaturesDifferingByConstraints3.ts, 100, 31), Decl(objectTypesIdentityWithGenericCallSignaturesDifferingByConstraints3.ts, 101, 28)) +>x : Symbol(x, Decl(objectTypesIdentityWithGenericCallSignaturesDifferingByConstraints3.ts, 100, 15)) +>B : Symbol(B, Decl(objectTypesIdentityWithGenericCallSignaturesDifferingByConstraints3.ts, 15, 1)) +>Two : Symbol(Two, Decl(objectTypesIdentityWithGenericCallSignaturesDifferingByConstraints3.ts, 4, 25)) +>Two : Symbol(Two, Decl(objectTypesIdentityWithGenericCallSignaturesDifferingByConstraints3.ts, 4, 25)) + +function foo11(x: typeof b); // ok +>foo11 : Symbol(foo11, Decl(objectTypesIdentityWithGenericCallSignaturesDifferingByConstraints3.ts, 98, 26), Decl(objectTypesIdentityWithGenericCallSignaturesDifferingByConstraints3.ts, 100, 31), Decl(objectTypesIdentityWithGenericCallSignaturesDifferingByConstraints3.ts, 101, 28)) +>x : Symbol(x, Decl(objectTypesIdentityWithGenericCallSignaturesDifferingByConstraints3.ts, 101, 15)) +>b : Symbol(b, Decl(objectTypesIdentityWithGenericCallSignaturesDifferingByConstraints3.ts, 38, 3)) + +function foo11(x: any) { } +>foo11 : Symbol(foo11, Decl(objectTypesIdentityWithGenericCallSignaturesDifferingByConstraints3.ts, 98, 26), Decl(objectTypesIdentityWithGenericCallSignaturesDifferingByConstraints3.ts, 100, 31), Decl(objectTypesIdentityWithGenericCallSignaturesDifferingByConstraints3.ts, 101, 28)) +>x : Symbol(x, Decl(objectTypesIdentityWithGenericCallSignaturesDifferingByConstraints3.ts, 102, 15)) + +function foo12(x: I, Five>); +>foo12 : Symbol(foo12, Decl(objectTypesIdentityWithGenericCallSignaturesDifferingByConstraints3.ts, 102, 26), Decl(objectTypesIdentityWithGenericCallSignaturesDifferingByConstraints3.ts, 104, 49), Decl(objectTypesIdentityWithGenericCallSignaturesDifferingByConstraints3.ts, 105, 35)) +>x : Symbol(x, Decl(objectTypesIdentityWithGenericCallSignaturesDifferingByConstraints3.ts, 104, 15)) +>I : Symbol(I, Decl(objectTypesIdentityWithGenericCallSignaturesDifferingByConstraints3.ts, 27, 1)) +>Five : Symbol(Five, Decl(objectTypesIdentityWithGenericCallSignaturesDifferingByConstraints3.ts, 7, 28)) +>Five : Symbol(Five, Decl(objectTypesIdentityWithGenericCallSignaturesDifferingByConstraints3.ts, 7, 28)) + +function foo12(x: C); // error +>foo12 : Symbol(foo12, Decl(objectTypesIdentityWithGenericCallSignaturesDifferingByConstraints3.ts, 102, 26), Decl(objectTypesIdentityWithGenericCallSignaturesDifferingByConstraints3.ts, 104, 49), Decl(objectTypesIdentityWithGenericCallSignaturesDifferingByConstraints3.ts, 105, 35)) +>x : Symbol(x, Decl(objectTypesIdentityWithGenericCallSignaturesDifferingByConstraints3.ts, 105, 15)) +>C : Symbol(C, Decl(objectTypesIdentityWithGenericCallSignaturesDifferingByConstraints3.ts, 19, 1)) +>Three : Symbol(Three, Decl(objectTypesIdentityWithGenericCallSignaturesDifferingByConstraints3.ts, 5, 25)) +>Three : Symbol(Three, Decl(objectTypesIdentityWithGenericCallSignaturesDifferingByConstraints3.ts, 5, 25)) + +function foo12(x: any) { } +>foo12 : Symbol(foo12, Decl(objectTypesIdentityWithGenericCallSignaturesDifferingByConstraints3.ts, 102, 26), Decl(objectTypesIdentityWithGenericCallSignaturesDifferingByConstraints3.ts, 104, 49), Decl(objectTypesIdentityWithGenericCallSignaturesDifferingByConstraints3.ts, 105, 35)) +>x : Symbol(x, Decl(objectTypesIdentityWithGenericCallSignaturesDifferingByConstraints3.ts, 106, 15)) + +function foo12b(x: I2); +>foo12b : Symbol(foo12b, Decl(objectTypesIdentityWithGenericCallSignaturesDifferingByConstraints3.ts, 106, 26), Decl(objectTypesIdentityWithGenericCallSignaturesDifferingByConstraints3.ts, 108, 23), Decl(objectTypesIdentityWithGenericCallSignaturesDifferingByConstraints3.ts, 109, 36)) +>x : Symbol(x, Decl(objectTypesIdentityWithGenericCallSignaturesDifferingByConstraints3.ts, 108, 16)) +>I2 : Symbol(I2, Decl(objectTypesIdentityWithGenericCallSignaturesDifferingByConstraints3.ts, 31, 1)) + +function foo12b(x: C); // ok +>foo12b : Symbol(foo12b, Decl(objectTypesIdentityWithGenericCallSignaturesDifferingByConstraints3.ts, 106, 26), Decl(objectTypesIdentityWithGenericCallSignaturesDifferingByConstraints3.ts, 108, 23), Decl(objectTypesIdentityWithGenericCallSignaturesDifferingByConstraints3.ts, 109, 36)) +>x : Symbol(x, Decl(objectTypesIdentityWithGenericCallSignaturesDifferingByConstraints3.ts, 109, 16)) +>C : Symbol(C, Decl(objectTypesIdentityWithGenericCallSignaturesDifferingByConstraints3.ts, 19, 1)) +>Three : Symbol(Three, Decl(objectTypesIdentityWithGenericCallSignaturesDifferingByConstraints3.ts, 5, 25)) +>Three : Symbol(Three, Decl(objectTypesIdentityWithGenericCallSignaturesDifferingByConstraints3.ts, 5, 25)) + +function foo12b(x: any) { } +>foo12b : Symbol(foo12b, Decl(objectTypesIdentityWithGenericCallSignaturesDifferingByConstraints3.ts, 106, 26), Decl(objectTypesIdentityWithGenericCallSignaturesDifferingByConstraints3.ts, 108, 23), Decl(objectTypesIdentityWithGenericCallSignaturesDifferingByConstraints3.ts, 109, 36)) +>x : Symbol(x, Decl(objectTypesIdentityWithGenericCallSignaturesDifferingByConstraints3.ts, 110, 16)) + +function foo13(x: I, Five>); +>foo13 : Symbol(foo13, Decl(objectTypesIdentityWithGenericCallSignaturesDifferingByConstraints3.ts, 110, 27), Decl(objectTypesIdentityWithGenericCallSignaturesDifferingByConstraints3.ts, 112, 49), Decl(objectTypesIdentityWithGenericCallSignaturesDifferingByConstraints3.ts, 113, 28)) +>x : Symbol(x, Decl(objectTypesIdentityWithGenericCallSignaturesDifferingByConstraints3.ts, 112, 15)) +>I : Symbol(I, Decl(objectTypesIdentityWithGenericCallSignaturesDifferingByConstraints3.ts, 27, 1)) +>Five : Symbol(Five, Decl(objectTypesIdentityWithGenericCallSignaturesDifferingByConstraints3.ts, 7, 28)) +>Five : Symbol(Five, Decl(objectTypesIdentityWithGenericCallSignaturesDifferingByConstraints3.ts, 7, 28)) + +function foo13(x: typeof a); // ok +>foo13 : Symbol(foo13, Decl(objectTypesIdentityWithGenericCallSignaturesDifferingByConstraints3.ts, 110, 27), Decl(objectTypesIdentityWithGenericCallSignaturesDifferingByConstraints3.ts, 112, 49), Decl(objectTypesIdentityWithGenericCallSignaturesDifferingByConstraints3.ts, 113, 28)) +>x : Symbol(x, Decl(objectTypesIdentityWithGenericCallSignaturesDifferingByConstraints3.ts, 113, 15)) +>a : Symbol(a, Decl(objectTypesIdentityWithGenericCallSignaturesDifferingByConstraints3.ts, 37, 3)) + +function foo13(x: any) { } +>foo13 : Symbol(foo13, Decl(objectTypesIdentityWithGenericCallSignaturesDifferingByConstraints3.ts, 110, 27), Decl(objectTypesIdentityWithGenericCallSignaturesDifferingByConstraints3.ts, 112, 49), Decl(objectTypesIdentityWithGenericCallSignaturesDifferingByConstraints3.ts, 113, 28)) +>x : Symbol(x, Decl(objectTypesIdentityWithGenericCallSignaturesDifferingByConstraints3.ts, 114, 15)) + +function foo14(x: I, Five>); +>foo14 : Symbol(foo14, Decl(objectTypesIdentityWithGenericCallSignaturesDifferingByConstraints3.ts, 114, 26), Decl(objectTypesIdentityWithGenericCallSignaturesDifferingByConstraints3.ts, 116, 49), Decl(objectTypesIdentityWithGenericCallSignaturesDifferingByConstraints3.ts, 117, 28)) +>x : Symbol(x, Decl(objectTypesIdentityWithGenericCallSignaturesDifferingByConstraints3.ts, 116, 15)) +>I : Symbol(I, Decl(objectTypesIdentityWithGenericCallSignaturesDifferingByConstraints3.ts, 27, 1)) +>Five : Symbol(Five, Decl(objectTypesIdentityWithGenericCallSignaturesDifferingByConstraints3.ts, 7, 28)) +>Five : Symbol(Five, Decl(objectTypesIdentityWithGenericCallSignaturesDifferingByConstraints3.ts, 7, 28)) + +function foo14(x: typeof b); // ok +>foo14 : Symbol(foo14, Decl(objectTypesIdentityWithGenericCallSignaturesDifferingByConstraints3.ts, 114, 26), Decl(objectTypesIdentityWithGenericCallSignaturesDifferingByConstraints3.ts, 116, 49), Decl(objectTypesIdentityWithGenericCallSignaturesDifferingByConstraints3.ts, 117, 28)) +>x : Symbol(x, Decl(objectTypesIdentityWithGenericCallSignaturesDifferingByConstraints3.ts, 117, 15)) +>b : Symbol(b, Decl(objectTypesIdentityWithGenericCallSignaturesDifferingByConstraints3.ts, 38, 3)) + +function foo14(x: any) { } +>foo14 : Symbol(foo14, Decl(objectTypesIdentityWithGenericCallSignaturesDifferingByConstraints3.ts, 114, 26), Decl(objectTypesIdentityWithGenericCallSignaturesDifferingByConstraints3.ts, 116, 49), Decl(objectTypesIdentityWithGenericCallSignaturesDifferingByConstraints3.ts, 117, 28)) +>x : Symbol(x, Decl(objectTypesIdentityWithGenericCallSignaturesDifferingByConstraints3.ts, 118, 15)) + +function foo15(x: I2); +>foo15 : Symbol(foo15, Decl(objectTypesIdentityWithGenericCallSignaturesDifferingByConstraints3.ts, 118, 26), Decl(objectTypesIdentityWithGenericCallSignaturesDifferingByConstraints3.ts, 120, 22), Decl(objectTypesIdentityWithGenericCallSignaturesDifferingByConstraints3.ts, 121, 35)) +>x : Symbol(x, Decl(objectTypesIdentityWithGenericCallSignaturesDifferingByConstraints3.ts, 120, 15)) +>I2 : Symbol(I2, Decl(objectTypesIdentityWithGenericCallSignaturesDifferingByConstraints3.ts, 31, 1)) + +function foo15(x: C); // ok +>foo15 : Symbol(foo15, Decl(objectTypesIdentityWithGenericCallSignaturesDifferingByConstraints3.ts, 118, 26), Decl(objectTypesIdentityWithGenericCallSignaturesDifferingByConstraints3.ts, 120, 22), Decl(objectTypesIdentityWithGenericCallSignaturesDifferingByConstraints3.ts, 121, 35)) +>x : Symbol(x, Decl(objectTypesIdentityWithGenericCallSignaturesDifferingByConstraints3.ts, 121, 15)) +>C : Symbol(C, Decl(objectTypesIdentityWithGenericCallSignaturesDifferingByConstraints3.ts, 19, 1)) +>Three : Symbol(Three, Decl(objectTypesIdentityWithGenericCallSignaturesDifferingByConstraints3.ts, 5, 25)) +>Three : Symbol(Three, Decl(objectTypesIdentityWithGenericCallSignaturesDifferingByConstraints3.ts, 5, 25)) + +function foo15(x: any) { } +>foo15 : Symbol(foo15, Decl(objectTypesIdentityWithGenericCallSignaturesDifferingByConstraints3.ts, 118, 26), Decl(objectTypesIdentityWithGenericCallSignaturesDifferingByConstraints3.ts, 120, 22), Decl(objectTypesIdentityWithGenericCallSignaturesDifferingByConstraints3.ts, 121, 35)) +>x : Symbol(x, Decl(objectTypesIdentityWithGenericCallSignaturesDifferingByConstraints3.ts, 122, 15)) + diff --git a/tests/baselines/reference/objectTypesIdentityWithGenericCallSignaturesDifferingByConstraints3.types b/tests/baselines/reference/objectTypesIdentityWithGenericCallSignaturesDifferingByConstraints3.types new file mode 100644 index 00000000000..b5c2f6bdef0 --- /dev/null +++ b/tests/baselines/reference/objectTypesIdentityWithGenericCallSignaturesDifferingByConstraints3.types @@ -0,0 +1,503 @@ +=== tests/cases/conformance/types/typeRelationships/typeAndMemberIdentity/objectTypesIdentityWithGenericCallSignaturesDifferingByConstraints3.ts === +// Two call or construct signatures are considered identical when they have the same number of type parameters and, considering those +// parameters pairwise identical, have identical type parameter constraints, identical number of parameters with identical kind(required, +// optional or rest) and types, and identical return types. + +class One { foo: string } +>One : One +>foo : string + +class Two { foo: string } +>Two : Two +>foo : string + +interface Three { foo: string } +>Three : Three +>foo : string + +interface Four { foo: T } +>Four : Four +>T : T +>foo : T +>T : T + +interface Five extends Four { } +>Five : Five +>T : T +>Four : Four +>T : T + +interface Six { +>Six : Six +>T : T +>U : U + + foo: T; +>foo : T +>T : T +} + +class A { +>A : A + + foo(x: T, y: U): string { return null; } +>foo : (x: T, y: U) => string +>T : T +>U : U +>U : U +>One : One +>x : T +>T : T +>y : U +>U : U +>null : null +} + +class B { +>B : B +>T : T +>U : U +>U : U +>Two : Two + + foo(x: T, y: U): string { return null; } +>foo : (x: T, y: U) => string +>x : T +>T : T +>y : U +>U : U +>null : null +} + +class C { +>C : C +>T : T +>U : U +>U : U +>Three : Three + + foo(x: T, y: U): string { return null; } +>foo : (x: T, y: U) => string +>x : T +>T : T +>y : U +>U : U +>null : null +} + +class D> { +>D : D +>T : T +>U : U +>U : U +>Four : Four + + foo(x: T, y: U): string { return null; } +>foo : (x: T, y: U) => string +>x : T +>T : T +>y : U +>U : U +>null : null +} + +interface I> { +>I : I +>T : T +>U : U +>U : U +>Five : Five + + foo(x: T, y: U): string; +>foo : (x: T, y: U) => string +>x : T +>T : T +>y : U +>U : U +} + +interface I2 { +>I2 : I2 + + foo>(x: T, y: U): string; +>foo : >(x: T, y: U) => string +>T : T +>U : U +>U : U +>Six : Six +>x : T +>T : T +>y : U +>U : U +} + +var a: { foo(x: T, y: U): string } +>a : { foo(x: T, y: U): string; } +>foo : (x: T, y: U) => string +>T : T +>U : U +>U : U +>One : One +>x : T +>T : T +>y : U +>U : U + +var b = { foo(x: T, y: U) { return ''; } }; +>b : { foo(x: T, y: U): string; } +>{ foo(x: T, y: U) { return ''; } } : { foo(x: T, y: U): string; } +>foo : (x: T, y: U) => string +>T : T +>U : U +>U : U +>Two : Two +>x : T +>T : T +>y : U +>U : U +>'' : string + +function foo1(x: A); +>foo1 : { (x: A): any; (x: A): any; } +>x : A +>A : A + +function foo1(x: A); // error +>foo1 : { (x: A): any; (x: A): any; } +>x : A +>A : A + +function foo1(x: any) { } +>foo1 : { (x: A): any; (x: A): any; } +>x : any + +function foo1b(x: B); +>foo1b : { (x: B): any; (x: B): any; } +>x : B +>B : B +>Two : Two +>Two : Two + +function foo1b(x: B); // error +>foo1b : { (x: B): any; (x: B): any; } +>x : B +>B : B +>Two : Two +>Two : Two + +function foo1b(x: any) { } +>foo1b : { (x: B): any; (x: B): any; } +>x : any + +function foo1c(x: C); +>foo1c : { (x: C): any; (x: C): any; } +>x : C +>C : C +>Three : Three +>Three : Three + +function foo1c(x: C); // error +>foo1c : { (x: C): any; (x: C): any; } +>x : C +>C : C +>Three : Three +>Three : Three + +function foo1c(x: any) { } +>foo1c : { (x: C): any; (x: C): any; } +>x : any + +function foo2(x: I, Five>); +>foo2 : { (x: I, Five>): any; (x: I, Five>): any; } +>x : I, Five> +>I : I +>Five : Five +>Five : Five + +function foo2(x: I, Five>); // error +>foo2 : { (x: I, Five>): any; (x: I, Five>): any; } +>x : I, Five> +>I : I +>Five : Five +>Five : Five + +function foo2(x: any) { } +>foo2 : { (x: I, Five>): any; (x: I, Five>): any; } +>x : any + +function foo3(x: typeof a); +>foo3 : { (x: { foo(x: T, y: U): string; }): any; (x: { foo(x: T, y: U): string; }): any; } +>x : { foo(x: T, y: U): string; } +>a : { foo(x: T, y: U): string; } + +function foo3(x: typeof a); // error +>foo3 : { (x: { foo(x: T, y: U): string; }): any; (x: { foo(x: T, y: U): string; }): any; } +>x : { foo(x: T, y: U): string; } +>a : { foo(x: T, y: U): string; } + +function foo3(x: any) { } +>foo3 : { (x: { foo(x: T, y: U): string; }): any; (x: { foo(x: T, y: U): string; }): any; } +>x : any + +function foo4(x: typeof b); +>foo4 : { (x: { foo(x: T, y: U): string; }): any; (x: { foo(x: T, y: U): string; }): any; } +>x : { foo(x: T, y: U): string; } +>b : { foo(x: T, y: U): string; } + +function foo4(x: typeof b); // error +>foo4 : { (x: { foo(x: T, y: U): string; }): any; (x: { foo(x: T, y: U): string; }): any; } +>x : { foo(x: T, y: U): string; } +>b : { foo(x: T, y: U): string; } + +function foo4(x: any) { } +>foo4 : { (x: { foo(x: T, y: U): string; }): any; (x: { foo(x: T, y: U): string; }): any; } +>x : any + +function foo5(x: A); +>foo5 : { (x: A): any; (x: B): any; } +>x : A +>A : A + +function foo5(x: B); // ok +>foo5 : { (x: A): any; (x: B): any; } +>x : B +>B : B +>Two : Two +>Two : Two + +function foo5(x: any) { } +>foo5 : { (x: A): any; (x: B): any; } +>x : any + +function foo5b(x: A); +>foo5b : { (x: A): any; (x: C): any; } +>x : A +>A : A + +function foo5b(x: C); // ok +>foo5b : { (x: A): any; (x: C): any; } +>x : C +>C : C +>Three : Three +>Three : Three + +function foo5b(x: any) { } +>foo5b : { (x: A): any; (x: C): any; } +>x : any + +function foo5c(x: C); +>foo5c : { (x: C): any; (x: D, Four>): any; } +>x : C +>C : C +>Three : Three +>Three : Three + +function foo5c(x: D, Four>); // error +>foo5c : { (x: C): any; (x: D, Four>): any; } +>x : D, Four> +>D : D +>Four : Four +>Four : Four + +function foo5c(x: any) { } +>foo5c : { (x: C): any; (x: D, Four>): any; } +>x : any + +function foo6c(x: C); +>foo6c : { (x: C): any; (x: D, Four>): any; } +>x : C +>C : C +>Three : Three +>Three : Three + +function foo6c(x: D, Four>); // error +>foo6c : { (x: C): any; (x: D, Four>): any; } +>x : D, Four> +>D : D +>Four : Four +>Four : Four + +function foo6c(x: any) { } +>foo6c : { (x: C): any; (x: D, Four>): any; } +>x : any + +function foo6(x: A); +>foo6 : { (x: A): any; (x: I, Five>): any; } +>x : A +>A : A + +function foo6(x: I, Five>); // ok +>foo6 : { (x: A): any; (x: I, Five>): any; } +>x : I, Five> +>I : I +>Five : Five +>Five : Five + +function foo6(x: any) { } +>foo6 : { (x: A): any; (x: I, Five>): any; } +>x : any + +function foo7(x: A); +>foo7 : { (x: A): any; (x: { foo(x: T, y: U): string; }): any; } +>x : A +>A : A + +function foo7(x: typeof a); // error +>foo7 : { (x: A): any; (x: { foo(x: T, y: U): string; }): any; } +>x : { foo(x: T, y: U): string; } +>a : { foo(x: T, y: U): string; } + +function foo7(x: any) { } +>foo7 : { (x: A): any; (x: { foo(x: T, y: U): string; }): any; } +>x : any + +function foo8(x: B); +>foo8 : { (x: B): any; (x: I, Five>): any; } +>x : B +>B : B +>Two : Two +>Two : Two + +function foo8(x: I, Five>); // error +>foo8 : { (x: B): any; (x: I, Five>): any; } +>x : I, Five> +>I : I +>Five : Five +>Five : Five + +function foo8(x: any) { } +>foo8 : { (x: B): any; (x: I, Five>): any; } +>x : any + +function foo9(x: B); +>foo9 : { (x: B): any; (x: C): any; } +>x : B +>B : B +>Two : Two +>Two : Two + +function foo9(x: C); // error +>foo9 : { (x: B): any; (x: C): any; } +>x : C +>C : C +>Three : Three +>Three : Three + +function foo9(x: any) { } +>foo9 : { (x: B): any; (x: C): any; } +>x : any + +function foo10(x: B); +>foo10 : { (x: B): any; (x: { foo(x: T, y: U): string; }): any; } +>x : B +>B : B +>Two : Two +>Two : Two + +function foo10(x: typeof a); // ok +>foo10 : { (x: B): any; (x: { foo(x: T, y: U): string; }): any; } +>x : { foo(x: T, y: U): string; } +>a : { foo(x: T, y: U): string; } + +function foo10(x: any) { } +>foo10 : { (x: B): any; (x: { foo(x: T, y: U): string; }): any; } +>x : any + +function foo11(x: B); +>foo11 : { (x: B): any; (x: { foo(x: T, y: U): string; }): any; } +>x : B +>B : B +>Two : Two +>Two : Two + +function foo11(x: typeof b); // ok +>foo11 : { (x: B): any; (x: { foo(x: T, y: U): string; }): any; } +>x : { foo(x: T, y: U): string; } +>b : { foo(x: T, y: U): string; } + +function foo11(x: any) { } +>foo11 : { (x: B): any; (x: { foo(x: T, y: U): string; }): any; } +>x : any + +function foo12(x: I, Five>); +>foo12 : { (x: I, Five>): any; (x: C): any; } +>x : I, Five> +>I : I +>Five : Five +>Five : Five + +function foo12(x: C); // error +>foo12 : { (x: I, Five>): any; (x: C): any; } +>x : C +>C : C +>Three : Three +>Three : Three + +function foo12(x: any) { } +>foo12 : { (x: I, Five>): any; (x: C): any; } +>x : any + +function foo12b(x: I2); +>foo12b : { (x: I2): any; (x: C): any; } +>x : I2 +>I2 : I2 + +function foo12b(x: C); // ok +>foo12b : { (x: I2): any; (x: C): any; } +>x : C +>C : C +>Three : Three +>Three : Three + +function foo12b(x: any) { } +>foo12b : { (x: I2): any; (x: C): any; } +>x : any + +function foo13(x: I, Five>); +>foo13 : { (x: I, Five>): any; (x: { foo(x: T, y: U): string; }): any; } +>x : I, Five> +>I : I +>Five : Five +>Five : Five + +function foo13(x: typeof a); // ok +>foo13 : { (x: I, Five>): any; (x: { foo(x: T, y: U): string; }): any; } +>x : { foo(x: T, y: U): string; } +>a : { foo(x: T, y: U): string; } + +function foo13(x: any) { } +>foo13 : { (x: I, Five>): any; (x: { foo(x: T, y: U): string; }): any; } +>x : any + +function foo14(x: I, Five>); +>foo14 : { (x: I, Five>): any; (x: { foo(x: T, y: U): string; }): any; } +>x : I, Five> +>I : I +>Five : Five +>Five : Five + +function foo14(x: typeof b); // ok +>foo14 : { (x: I, Five>): any; (x: { foo(x: T, y: U): string; }): any; } +>x : { foo(x: T, y: U): string; } +>b : { foo(x: T, y: U): string; } + +function foo14(x: any) { } +>foo14 : { (x: I, Five>): any; (x: { foo(x: T, y: U): string; }): any; } +>x : any + +function foo15(x: I2); +>foo15 : { (x: I2): any; (x: C): any; } +>x : I2 +>I2 : I2 + +function foo15(x: C); // ok +>foo15 : { (x: I2): any; (x: C): any; } +>x : C +>C : C +>Three : Three +>Three : Three + +function foo15(x: any) { } +>foo15 : { (x: I2): any; (x: C): any; } +>x : any + diff --git a/tests/baselines/reference/objectTypesIdentityWithGenericConstructSignaturesDifferingByConstraints2.errors.txt b/tests/baselines/reference/objectTypesIdentityWithGenericConstructSignaturesDifferingByConstraints2.errors.txt deleted file mode 100644 index 536be73b5cc..00000000000 --- a/tests/baselines/reference/objectTypesIdentityWithGenericConstructSignaturesDifferingByConstraints2.errors.txt +++ /dev/null @@ -1,110 +0,0 @@ -tests/cases/conformance/types/typeRelationships/typeAndMemberIdentity/objectTypesIdentityWithGenericConstructSignaturesDifferingByConstraints2.ts(5,9): error TS2313: Constraint of a type parameter cannot reference any type parameter from the same type parameter list. -tests/cases/conformance/types/typeRelationships/typeAndMemberIdentity/objectTypesIdentityWithGenericConstructSignaturesDifferingByConstraints2.ts(9,9): error TS2313: Constraint of a type parameter cannot reference any type parameter from the same type parameter list. -tests/cases/conformance/types/typeRelationships/typeAndMemberIdentity/objectTypesIdentityWithGenericConstructSignaturesDifferingByConstraints2.ts(13,9): error TS2313: Constraint of a type parameter cannot reference any type parameter from the same type parameter list. -tests/cases/conformance/types/typeRelationships/typeAndMemberIdentity/objectTypesIdentityWithGenericConstructSignaturesDifferingByConstraints2.ts(17,13): error TS2313: Constraint of a type parameter cannot reference any type parameter from the same type parameter list. -tests/cases/conformance/types/typeRelationships/typeAndMemberIdentity/objectTypesIdentityWithGenericConstructSignaturesDifferingByConstraints2.ts(22,9): error TS2313: Constraint of a type parameter cannot reference any type parameter from the same type parameter list. -tests/cases/conformance/types/typeRelationships/typeAndMemberIdentity/objectTypesIdentityWithGenericConstructSignaturesDifferingByConstraints2.ts(25,14): error TS2313: Constraint of a type parameter cannot reference any type parameter from the same type parameter list. -tests/cases/conformance/types/typeRelationships/typeAndMemberIdentity/objectTypesIdentityWithGenericConstructSignaturesDifferingByConstraints2.ts(26,15): error TS2313: Constraint of a type parameter cannot reference any type parameter from the same type parameter list. - - -==== tests/cases/conformance/types/typeRelationships/typeAndMemberIdentity/objectTypesIdentityWithGenericConstructSignaturesDifferingByConstraints2.ts (7 errors) ==== - // Two call or construct signatures are considered identical when they have the same number of type parameters and, considering those - // parameters pairwise identical, have identical type parameter constraints, identical number of parameters with identical kind(required, - // optional or rest) and types, and identical return types. - - class B> { - ~~~~~~~~~~~ -!!! error TS2313: Constraint of a type parameter cannot reference any type parameter from the same type parameter list. - constructor(x: T, y: U) { return null; } - } - - class C { - ~~~~~~~~~~~ -!!! error TS2313: Constraint of a type parameter cannot reference any type parameter from the same type parameter list. - constructor(x: T, y: U) { return null; } - } - - class D { - ~~~~~~~~~~~ -!!! error TS2313: Constraint of a type parameter cannot reference any type parameter from the same type parameter list. - constructor(x: T, y: U) { return null; } - } - - interface I { - ~~~~~~~~~~~ -!!! error TS2313: Constraint of a type parameter cannot reference any type parameter from the same type parameter list. - new(x: T, y: U): string; - } - - interface I2 { - new(x: T, y: U): string; - ~~~~~~~~~~~ -!!! error TS2313: Constraint of a type parameter cannot reference any type parameter from the same type parameter list. - } - - var a: { new>(x: T, y: U): string } - ~~~~~~~~~~~ -!!! error TS2313: Constraint of a type parameter cannot reference any type parameter from the same type parameter list. - var b = { new(x: T, y: U) { return ''; } }; // not a construct signature, function called new - ~~~~~~~~~~~ -!!! error TS2313: Constraint of a type parameter cannot reference any type parameter from the same type parameter list. - - function foo1b(x: B, Array>); - function foo1b(x: B, Array>); // error - function foo1b(x: any) { } - - function foo1c(x: C); - function foo1c(x: C); // error - function foo1c(x: any) { } - - function foo2(x: I); - function foo2(x: I); // error - function foo2(x: any) { } - - function foo3(x: typeof a); - function foo3(x: typeof a); // error - function foo3(x: any) { } - - function foo4(x: typeof b); - function foo4(x: typeof b); // error - function foo4(x: any) { } - - function foo5c(x: C); - function foo5c(x: D); // ok - function foo5c(x: any) { } - - function foo6c(x: C); - function foo6c(x: D); // ok - function foo6c(x: any) { } - - function foo8(x: B, Array>); - function foo8(x: I); // ok - function foo8(x: any) { } - - function foo9(x: B, Array>); - function foo9(x: C); // error, types are structurally equal - function foo9(x: any) { } - - function foo10(x: B, Array>); - function foo10(x: typeof a); // ok - function foo10(x: any) { } - - function foo11(x: B, Array>); - function foo11(x: typeof b); // ok - function foo11(x: any) { } - - function foo12(x: I); - function foo12(x: C); // ok - function foo12(x: any) { } - - function foo12b(x: I2); - function foo12b(x: C); // ok - function foo12b(x: any) { } - - function foo13(x: I); - function foo13(x: typeof a); // ok - function foo13(x: any) { } - - function foo14(x: I); - function foo14(x: typeof b); // ok - function foo14(x: any) { } \ No newline at end of file diff --git a/tests/baselines/reference/objectTypesIdentityWithGenericConstructSignaturesDifferingByConstraints2.symbols b/tests/baselines/reference/objectTypesIdentityWithGenericConstructSignaturesDifferingByConstraints2.symbols new file mode 100644 index 00000000000..ce55a114621 --- /dev/null +++ b/tests/baselines/reference/objectTypesIdentityWithGenericConstructSignaturesDifferingByConstraints2.symbols @@ -0,0 +1,349 @@ +=== tests/cases/conformance/types/typeRelationships/typeAndMemberIdentity/objectTypesIdentityWithGenericConstructSignaturesDifferingByConstraints2.ts === +// Two call or construct signatures are considered identical when they have the same number of type parameters and, considering those +// parameters pairwise identical, have identical type parameter constraints, identical number of parameters with identical kind(required, +// optional or rest) and types, and identical return types. + +class B> { +>B : Symbol(B, Decl(objectTypesIdentityWithGenericConstructSignaturesDifferingByConstraints2.ts, 0, 0)) +>T : Symbol(T, Decl(objectTypesIdentityWithGenericConstructSignaturesDifferingByConstraints2.ts, 4, 8)) +>U : Symbol(U, Decl(objectTypesIdentityWithGenericConstructSignaturesDifferingByConstraints2.ts, 4, 20)) +>U : Symbol(U, Decl(objectTypesIdentityWithGenericConstructSignaturesDifferingByConstraints2.ts, 4, 20)) +>Array : Symbol(Array, Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --)) + + constructor(x: T, y: U) { return null; } +>x : Symbol(x, Decl(objectTypesIdentityWithGenericConstructSignaturesDifferingByConstraints2.ts, 5, 16)) +>T : Symbol(T, Decl(objectTypesIdentityWithGenericConstructSignaturesDifferingByConstraints2.ts, 4, 8)) +>y : Symbol(y, Decl(objectTypesIdentityWithGenericConstructSignaturesDifferingByConstraints2.ts, 5, 21)) +>U : Symbol(U, Decl(objectTypesIdentityWithGenericConstructSignaturesDifferingByConstraints2.ts, 4, 20)) +} + +class C { +>C : Symbol(C, Decl(objectTypesIdentityWithGenericConstructSignaturesDifferingByConstraints2.ts, 6, 1)) +>T : Symbol(T, Decl(objectTypesIdentityWithGenericConstructSignaturesDifferingByConstraints2.ts, 8, 8)) +>U : Symbol(U, Decl(objectTypesIdentityWithGenericConstructSignaturesDifferingByConstraints2.ts, 8, 20)) +>U : Symbol(U, Decl(objectTypesIdentityWithGenericConstructSignaturesDifferingByConstraints2.ts, 8, 20)) +>String : Symbol(String, Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --)) + + constructor(x: T, y: U) { return null; } +>x : Symbol(x, Decl(objectTypesIdentityWithGenericConstructSignaturesDifferingByConstraints2.ts, 9, 16)) +>T : Symbol(T, Decl(objectTypesIdentityWithGenericConstructSignaturesDifferingByConstraints2.ts, 8, 8)) +>y : Symbol(y, Decl(objectTypesIdentityWithGenericConstructSignaturesDifferingByConstraints2.ts, 9, 21)) +>U : Symbol(U, Decl(objectTypesIdentityWithGenericConstructSignaturesDifferingByConstraints2.ts, 8, 20)) +} + +class D { +>D : Symbol(D, Decl(objectTypesIdentityWithGenericConstructSignaturesDifferingByConstraints2.ts, 10, 1)) +>T : Symbol(T, Decl(objectTypesIdentityWithGenericConstructSignaturesDifferingByConstraints2.ts, 12, 8)) +>U : Symbol(U, Decl(objectTypesIdentityWithGenericConstructSignaturesDifferingByConstraints2.ts, 12, 20)) +>U : Symbol(U, Decl(objectTypesIdentityWithGenericConstructSignaturesDifferingByConstraints2.ts, 12, 20)) +>Number : Symbol(Number, Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --)) + + constructor(x: T, y: U) { return null; } +>x : Symbol(x, Decl(objectTypesIdentityWithGenericConstructSignaturesDifferingByConstraints2.ts, 13, 16)) +>T : Symbol(T, Decl(objectTypesIdentityWithGenericConstructSignaturesDifferingByConstraints2.ts, 12, 8)) +>y : Symbol(y, Decl(objectTypesIdentityWithGenericConstructSignaturesDifferingByConstraints2.ts, 13, 21)) +>U : Symbol(U, Decl(objectTypesIdentityWithGenericConstructSignaturesDifferingByConstraints2.ts, 12, 20)) +} + +interface I { +>I : Symbol(I, Decl(objectTypesIdentityWithGenericConstructSignaturesDifferingByConstraints2.ts, 14, 1)) +>T : Symbol(T, Decl(objectTypesIdentityWithGenericConstructSignaturesDifferingByConstraints2.ts, 16, 12)) +>U : Symbol(U, Decl(objectTypesIdentityWithGenericConstructSignaturesDifferingByConstraints2.ts, 16, 24)) +>U : Symbol(U, Decl(objectTypesIdentityWithGenericConstructSignaturesDifferingByConstraints2.ts, 16, 24)) +>Number : Symbol(Number, Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --)) + + new(x: T, y: U): string; +>x : Symbol(x, Decl(objectTypesIdentityWithGenericConstructSignaturesDifferingByConstraints2.ts, 17, 8)) +>T : Symbol(T, Decl(objectTypesIdentityWithGenericConstructSignaturesDifferingByConstraints2.ts, 16, 12)) +>y : Symbol(y, Decl(objectTypesIdentityWithGenericConstructSignaturesDifferingByConstraints2.ts, 17, 13)) +>U : Symbol(U, Decl(objectTypesIdentityWithGenericConstructSignaturesDifferingByConstraints2.ts, 16, 24)) +} + +interface I2 { +>I2 : Symbol(I2, Decl(objectTypesIdentityWithGenericConstructSignaturesDifferingByConstraints2.ts, 18, 1)) + + new(x: T, y: U): string; +>T : Symbol(T, Decl(objectTypesIdentityWithGenericConstructSignaturesDifferingByConstraints2.ts, 21, 8)) +>U : Symbol(U, Decl(objectTypesIdentityWithGenericConstructSignaturesDifferingByConstraints2.ts, 21, 20)) +>U : Symbol(U, Decl(objectTypesIdentityWithGenericConstructSignaturesDifferingByConstraints2.ts, 21, 20)) +>Boolean : Symbol(Boolean, Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --)) +>x : Symbol(x, Decl(objectTypesIdentityWithGenericConstructSignaturesDifferingByConstraints2.ts, 21, 40)) +>T : Symbol(T, Decl(objectTypesIdentityWithGenericConstructSignaturesDifferingByConstraints2.ts, 21, 8)) +>y : Symbol(y, Decl(objectTypesIdentityWithGenericConstructSignaturesDifferingByConstraints2.ts, 21, 45)) +>U : Symbol(U, Decl(objectTypesIdentityWithGenericConstructSignaturesDifferingByConstraints2.ts, 21, 20)) +} + +var a: { new>(x: T, y: U): string } +>a : Symbol(a, Decl(objectTypesIdentityWithGenericConstructSignaturesDifferingByConstraints2.ts, 24, 3)) +>T : Symbol(T, Decl(objectTypesIdentityWithGenericConstructSignaturesDifferingByConstraints2.ts, 24, 13)) +>U : Symbol(U, Decl(objectTypesIdentityWithGenericConstructSignaturesDifferingByConstraints2.ts, 24, 25)) +>U : Symbol(U, Decl(objectTypesIdentityWithGenericConstructSignaturesDifferingByConstraints2.ts, 24, 25)) +>Array : Symbol(Array, Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --)) +>x : Symbol(x, Decl(objectTypesIdentityWithGenericConstructSignaturesDifferingByConstraints2.ts, 24, 51)) +>T : Symbol(T, Decl(objectTypesIdentityWithGenericConstructSignaturesDifferingByConstraints2.ts, 24, 13)) +>y : Symbol(y, Decl(objectTypesIdentityWithGenericConstructSignaturesDifferingByConstraints2.ts, 24, 56)) +>U : Symbol(U, Decl(objectTypesIdentityWithGenericConstructSignaturesDifferingByConstraints2.ts, 24, 25)) + +var b = { new(x: T, y: U) { return ''; } }; // not a construct signature, function called new +>b : Symbol(b, Decl(objectTypesIdentityWithGenericConstructSignaturesDifferingByConstraints2.ts, 25, 3)) +>new : Symbol(new, Decl(objectTypesIdentityWithGenericConstructSignaturesDifferingByConstraints2.ts, 25, 9)) +>T : Symbol(T, Decl(objectTypesIdentityWithGenericConstructSignaturesDifferingByConstraints2.ts, 25, 14)) +>U : Symbol(U, Decl(objectTypesIdentityWithGenericConstructSignaturesDifferingByConstraints2.ts, 25, 26)) +>U : Symbol(U, Decl(objectTypesIdentityWithGenericConstructSignaturesDifferingByConstraints2.ts, 25, 26)) +>RegExp : Symbol(RegExp, Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --)) +>x : Symbol(x, Decl(objectTypesIdentityWithGenericConstructSignaturesDifferingByConstraints2.ts, 25, 45)) +>T : Symbol(T, Decl(objectTypesIdentityWithGenericConstructSignaturesDifferingByConstraints2.ts, 25, 14)) +>y : Symbol(y, Decl(objectTypesIdentityWithGenericConstructSignaturesDifferingByConstraints2.ts, 25, 50)) +>U : Symbol(U, Decl(objectTypesIdentityWithGenericConstructSignaturesDifferingByConstraints2.ts, 25, 26)) + +function foo1b(x: B, Array>); +>foo1b : Symbol(foo1b, Decl(objectTypesIdentityWithGenericConstructSignaturesDifferingByConstraints2.ts, 25, 74), Decl(objectTypesIdentityWithGenericConstructSignaturesDifferingByConstraints2.ts, 27, 51), Decl(objectTypesIdentityWithGenericConstructSignaturesDifferingByConstraints2.ts, 28, 51)) +>x : Symbol(x, Decl(objectTypesIdentityWithGenericConstructSignaturesDifferingByConstraints2.ts, 27, 15)) +>B : Symbol(B, Decl(objectTypesIdentityWithGenericConstructSignaturesDifferingByConstraints2.ts, 0, 0)) +>Array : Symbol(Array, Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --)) +>Array : Symbol(Array, Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --)) + +function foo1b(x: B, Array>); // error +>foo1b : Symbol(foo1b, Decl(objectTypesIdentityWithGenericConstructSignaturesDifferingByConstraints2.ts, 25, 74), Decl(objectTypesIdentityWithGenericConstructSignaturesDifferingByConstraints2.ts, 27, 51), Decl(objectTypesIdentityWithGenericConstructSignaturesDifferingByConstraints2.ts, 28, 51)) +>x : Symbol(x, Decl(objectTypesIdentityWithGenericConstructSignaturesDifferingByConstraints2.ts, 28, 15)) +>B : Symbol(B, Decl(objectTypesIdentityWithGenericConstructSignaturesDifferingByConstraints2.ts, 0, 0)) +>Array : Symbol(Array, Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --)) +>Array : Symbol(Array, Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --)) + +function foo1b(x: any) { } +>foo1b : Symbol(foo1b, Decl(objectTypesIdentityWithGenericConstructSignaturesDifferingByConstraints2.ts, 25, 74), Decl(objectTypesIdentityWithGenericConstructSignaturesDifferingByConstraints2.ts, 27, 51), Decl(objectTypesIdentityWithGenericConstructSignaturesDifferingByConstraints2.ts, 28, 51)) +>x : Symbol(x, Decl(objectTypesIdentityWithGenericConstructSignaturesDifferingByConstraints2.ts, 29, 15)) + +function foo1c(x: C); +>foo1c : Symbol(foo1c, Decl(objectTypesIdentityWithGenericConstructSignaturesDifferingByConstraints2.ts, 29, 26), Decl(objectTypesIdentityWithGenericConstructSignaturesDifferingByConstraints2.ts, 31, 37), Decl(objectTypesIdentityWithGenericConstructSignaturesDifferingByConstraints2.ts, 32, 37)) +>x : Symbol(x, Decl(objectTypesIdentityWithGenericConstructSignaturesDifferingByConstraints2.ts, 31, 15)) +>C : Symbol(C, Decl(objectTypesIdentityWithGenericConstructSignaturesDifferingByConstraints2.ts, 6, 1)) +>String : Symbol(String, Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --)) +>String : Symbol(String, Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --)) + +function foo1c(x: C); // error +>foo1c : Symbol(foo1c, Decl(objectTypesIdentityWithGenericConstructSignaturesDifferingByConstraints2.ts, 29, 26), Decl(objectTypesIdentityWithGenericConstructSignaturesDifferingByConstraints2.ts, 31, 37), Decl(objectTypesIdentityWithGenericConstructSignaturesDifferingByConstraints2.ts, 32, 37)) +>x : Symbol(x, Decl(objectTypesIdentityWithGenericConstructSignaturesDifferingByConstraints2.ts, 32, 15)) +>C : Symbol(C, Decl(objectTypesIdentityWithGenericConstructSignaturesDifferingByConstraints2.ts, 6, 1)) +>String : Symbol(String, Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --)) +>String : Symbol(String, Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --)) + +function foo1c(x: any) { } +>foo1c : Symbol(foo1c, Decl(objectTypesIdentityWithGenericConstructSignaturesDifferingByConstraints2.ts, 29, 26), Decl(objectTypesIdentityWithGenericConstructSignaturesDifferingByConstraints2.ts, 31, 37), Decl(objectTypesIdentityWithGenericConstructSignaturesDifferingByConstraints2.ts, 32, 37)) +>x : Symbol(x, Decl(objectTypesIdentityWithGenericConstructSignaturesDifferingByConstraints2.ts, 33, 15)) + +function foo2(x: I); +>foo2 : Symbol(foo2, Decl(objectTypesIdentityWithGenericConstructSignaturesDifferingByConstraints2.ts, 33, 26), Decl(objectTypesIdentityWithGenericConstructSignaturesDifferingByConstraints2.ts, 35, 36), Decl(objectTypesIdentityWithGenericConstructSignaturesDifferingByConstraints2.ts, 36, 36)) +>x : Symbol(x, Decl(objectTypesIdentityWithGenericConstructSignaturesDifferingByConstraints2.ts, 35, 14)) +>I : Symbol(I, Decl(objectTypesIdentityWithGenericConstructSignaturesDifferingByConstraints2.ts, 14, 1)) +>Number : Symbol(Number, Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --)) +>Number : Symbol(Number, Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --)) + +function foo2(x: I); // error +>foo2 : Symbol(foo2, Decl(objectTypesIdentityWithGenericConstructSignaturesDifferingByConstraints2.ts, 33, 26), Decl(objectTypesIdentityWithGenericConstructSignaturesDifferingByConstraints2.ts, 35, 36), Decl(objectTypesIdentityWithGenericConstructSignaturesDifferingByConstraints2.ts, 36, 36)) +>x : Symbol(x, Decl(objectTypesIdentityWithGenericConstructSignaturesDifferingByConstraints2.ts, 36, 14)) +>I : Symbol(I, Decl(objectTypesIdentityWithGenericConstructSignaturesDifferingByConstraints2.ts, 14, 1)) +>Number : Symbol(Number, Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --)) +>Number : Symbol(Number, Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --)) + +function foo2(x: any) { } +>foo2 : Symbol(foo2, Decl(objectTypesIdentityWithGenericConstructSignaturesDifferingByConstraints2.ts, 33, 26), Decl(objectTypesIdentityWithGenericConstructSignaturesDifferingByConstraints2.ts, 35, 36), Decl(objectTypesIdentityWithGenericConstructSignaturesDifferingByConstraints2.ts, 36, 36)) +>x : Symbol(x, Decl(objectTypesIdentityWithGenericConstructSignaturesDifferingByConstraints2.ts, 37, 14)) + +function foo3(x: typeof a); +>foo3 : Symbol(foo3, Decl(objectTypesIdentityWithGenericConstructSignaturesDifferingByConstraints2.ts, 37, 25), Decl(objectTypesIdentityWithGenericConstructSignaturesDifferingByConstraints2.ts, 39, 27), Decl(objectTypesIdentityWithGenericConstructSignaturesDifferingByConstraints2.ts, 40, 27)) +>x : Symbol(x, Decl(objectTypesIdentityWithGenericConstructSignaturesDifferingByConstraints2.ts, 39, 14)) +>a : Symbol(a, Decl(objectTypesIdentityWithGenericConstructSignaturesDifferingByConstraints2.ts, 24, 3)) + +function foo3(x: typeof a); // error +>foo3 : Symbol(foo3, Decl(objectTypesIdentityWithGenericConstructSignaturesDifferingByConstraints2.ts, 37, 25), Decl(objectTypesIdentityWithGenericConstructSignaturesDifferingByConstraints2.ts, 39, 27), Decl(objectTypesIdentityWithGenericConstructSignaturesDifferingByConstraints2.ts, 40, 27)) +>x : Symbol(x, Decl(objectTypesIdentityWithGenericConstructSignaturesDifferingByConstraints2.ts, 40, 14)) +>a : Symbol(a, Decl(objectTypesIdentityWithGenericConstructSignaturesDifferingByConstraints2.ts, 24, 3)) + +function foo3(x: any) { } +>foo3 : Symbol(foo3, Decl(objectTypesIdentityWithGenericConstructSignaturesDifferingByConstraints2.ts, 37, 25), Decl(objectTypesIdentityWithGenericConstructSignaturesDifferingByConstraints2.ts, 39, 27), Decl(objectTypesIdentityWithGenericConstructSignaturesDifferingByConstraints2.ts, 40, 27)) +>x : Symbol(x, Decl(objectTypesIdentityWithGenericConstructSignaturesDifferingByConstraints2.ts, 41, 14)) + +function foo4(x: typeof b); +>foo4 : Symbol(foo4, Decl(objectTypesIdentityWithGenericConstructSignaturesDifferingByConstraints2.ts, 41, 25), Decl(objectTypesIdentityWithGenericConstructSignaturesDifferingByConstraints2.ts, 43, 27), Decl(objectTypesIdentityWithGenericConstructSignaturesDifferingByConstraints2.ts, 44, 27)) +>x : Symbol(x, Decl(objectTypesIdentityWithGenericConstructSignaturesDifferingByConstraints2.ts, 43, 14)) +>b : Symbol(b, Decl(objectTypesIdentityWithGenericConstructSignaturesDifferingByConstraints2.ts, 25, 3)) + +function foo4(x: typeof b); // error +>foo4 : Symbol(foo4, Decl(objectTypesIdentityWithGenericConstructSignaturesDifferingByConstraints2.ts, 41, 25), Decl(objectTypesIdentityWithGenericConstructSignaturesDifferingByConstraints2.ts, 43, 27), Decl(objectTypesIdentityWithGenericConstructSignaturesDifferingByConstraints2.ts, 44, 27)) +>x : Symbol(x, Decl(objectTypesIdentityWithGenericConstructSignaturesDifferingByConstraints2.ts, 44, 14)) +>b : Symbol(b, Decl(objectTypesIdentityWithGenericConstructSignaturesDifferingByConstraints2.ts, 25, 3)) + +function foo4(x: any) { } +>foo4 : Symbol(foo4, Decl(objectTypesIdentityWithGenericConstructSignaturesDifferingByConstraints2.ts, 41, 25), Decl(objectTypesIdentityWithGenericConstructSignaturesDifferingByConstraints2.ts, 43, 27), Decl(objectTypesIdentityWithGenericConstructSignaturesDifferingByConstraints2.ts, 44, 27)) +>x : Symbol(x, Decl(objectTypesIdentityWithGenericConstructSignaturesDifferingByConstraints2.ts, 45, 14)) + +function foo5c(x: C); +>foo5c : Symbol(foo5c, Decl(objectTypesIdentityWithGenericConstructSignaturesDifferingByConstraints2.ts, 45, 25), Decl(objectTypesIdentityWithGenericConstructSignaturesDifferingByConstraints2.ts, 47, 37), Decl(objectTypesIdentityWithGenericConstructSignaturesDifferingByConstraints2.ts, 48, 37)) +>x : Symbol(x, Decl(objectTypesIdentityWithGenericConstructSignaturesDifferingByConstraints2.ts, 47, 15)) +>C : Symbol(C, Decl(objectTypesIdentityWithGenericConstructSignaturesDifferingByConstraints2.ts, 6, 1)) +>String : Symbol(String, Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --)) +>String : Symbol(String, Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --)) + +function foo5c(x: D); // ok +>foo5c : Symbol(foo5c, Decl(objectTypesIdentityWithGenericConstructSignaturesDifferingByConstraints2.ts, 45, 25), Decl(objectTypesIdentityWithGenericConstructSignaturesDifferingByConstraints2.ts, 47, 37), Decl(objectTypesIdentityWithGenericConstructSignaturesDifferingByConstraints2.ts, 48, 37)) +>x : Symbol(x, Decl(objectTypesIdentityWithGenericConstructSignaturesDifferingByConstraints2.ts, 48, 15)) +>D : Symbol(D, Decl(objectTypesIdentityWithGenericConstructSignaturesDifferingByConstraints2.ts, 10, 1)) +>Number : Symbol(Number, Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --)) +>Number : Symbol(Number, Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --)) + +function foo5c(x: any) { } +>foo5c : Symbol(foo5c, Decl(objectTypesIdentityWithGenericConstructSignaturesDifferingByConstraints2.ts, 45, 25), Decl(objectTypesIdentityWithGenericConstructSignaturesDifferingByConstraints2.ts, 47, 37), Decl(objectTypesIdentityWithGenericConstructSignaturesDifferingByConstraints2.ts, 48, 37)) +>x : Symbol(x, Decl(objectTypesIdentityWithGenericConstructSignaturesDifferingByConstraints2.ts, 49, 15)) + +function foo6c(x: C); +>foo6c : Symbol(foo6c, Decl(objectTypesIdentityWithGenericConstructSignaturesDifferingByConstraints2.ts, 49, 26), Decl(objectTypesIdentityWithGenericConstructSignaturesDifferingByConstraints2.ts, 51, 37), Decl(objectTypesIdentityWithGenericConstructSignaturesDifferingByConstraints2.ts, 52, 34)) +>x : Symbol(x, Decl(objectTypesIdentityWithGenericConstructSignaturesDifferingByConstraints2.ts, 51, 15)) +>C : Symbol(C, Decl(objectTypesIdentityWithGenericConstructSignaturesDifferingByConstraints2.ts, 6, 1)) +>String : Symbol(String, Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --)) +>String : Symbol(String, Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --)) + +function foo6c(x: D); // ok +>foo6c : Symbol(foo6c, Decl(objectTypesIdentityWithGenericConstructSignaturesDifferingByConstraints2.ts, 49, 26), Decl(objectTypesIdentityWithGenericConstructSignaturesDifferingByConstraints2.ts, 51, 37), Decl(objectTypesIdentityWithGenericConstructSignaturesDifferingByConstraints2.ts, 52, 34)) +>x : Symbol(x, Decl(objectTypesIdentityWithGenericConstructSignaturesDifferingByConstraints2.ts, 52, 15)) +>D : Symbol(D, Decl(objectTypesIdentityWithGenericConstructSignaturesDifferingByConstraints2.ts, 10, 1)) +>Number : Symbol(Number, Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --)) + +function foo6c(x: any) { } +>foo6c : Symbol(foo6c, Decl(objectTypesIdentityWithGenericConstructSignaturesDifferingByConstraints2.ts, 49, 26), Decl(objectTypesIdentityWithGenericConstructSignaturesDifferingByConstraints2.ts, 51, 37), Decl(objectTypesIdentityWithGenericConstructSignaturesDifferingByConstraints2.ts, 52, 34)) +>x : Symbol(x, Decl(objectTypesIdentityWithGenericConstructSignaturesDifferingByConstraints2.ts, 53, 15)) + +function foo8(x: B, Array>); +>foo8 : Symbol(foo8, Decl(objectTypesIdentityWithGenericConstructSignaturesDifferingByConstraints2.ts, 53, 26), Decl(objectTypesIdentityWithGenericConstructSignaturesDifferingByConstraints2.ts, 55, 50), Decl(objectTypesIdentityWithGenericConstructSignaturesDifferingByConstraints2.ts, 56, 36)) +>x : Symbol(x, Decl(objectTypesIdentityWithGenericConstructSignaturesDifferingByConstraints2.ts, 55, 14)) +>B : Symbol(B, Decl(objectTypesIdentityWithGenericConstructSignaturesDifferingByConstraints2.ts, 0, 0)) +>Array : Symbol(Array, Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --)) +>Array : Symbol(Array, Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --)) + +function foo8(x: I); // ok +>foo8 : Symbol(foo8, Decl(objectTypesIdentityWithGenericConstructSignaturesDifferingByConstraints2.ts, 53, 26), Decl(objectTypesIdentityWithGenericConstructSignaturesDifferingByConstraints2.ts, 55, 50), Decl(objectTypesIdentityWithGenericConstructSignaturesDifferingByConstraints2.ts, 56, 36)) +>x : Symbol(x, Decl(objectTypesIdentityWithGenericConstructSignaturesDifferingByConstraints2.ts, 56, 14)) +>I : Symbol(I, Decl(objectTypesIdentityWithGenericConstructSignaturesDifferingByConstraints2.ts, 14, 1)) +>Number : Symbol(Number, Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --)) +>Number : Symbol(Number, Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --)) + +function foo8(x: any) { } +>foo8 : Symbol(foo8, Decl(objectTypesIdentityWithGenericConstructSignaturesDifferingByConstraints2.ts, 53, 26), Decl(objectTypesIdentityWithGenericConstructSignaturesDifferingByConstraints2.ts, 55, 50), Decl(objectTypesIdentityWithGenericConstructSignaturesDifferingByConstraints2.ts, 56, 36)) +>x : Symbol(x, Decl(objectTypesIdentityWithGenericConstructSignaturesDifferingByConstraints2.ts, 57, 14)) + +function foo9(x: B, Array>); +>foo9 : Symbol(foo9, Decl(objectTypesIdentityWithGenericConstructSignaturesDifferingByConstraints2.ts, 57, 25), Decl(objectTypesIdentityWithGenericConstructSignaturesDifferingByConstraints2.ts, 59, 50), Decl(objectTypesIdentityWithGenericConstructSignaturesDifferingByConstraints2.ts, 60, 36)) +>x : Symbol(x, Decl(objectTypesIdentityWithGenericConstructSignaturesDifferingByConstraints2.ts, 59, 14)) +>B : Symbol(B, Decl(objectTypesIdentityWithGenericConstructSignaturesDifferingByConstraints2.ts, 0, 0)) +>Array : Symbol(Array, Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --)) +>Array : Symbol(Array, Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --)) + +function foo9(x: C); // error, types are structurally equal +>foo9 : Symbol(foo9, Decl(objectTypesIdentityWithGenericConstructSignaturesDifferingByConstraints2.ts, 57, 25), Decl(objectTypesIdentityWithGenericConstructSignaturesDifferingByConstraints2.ts, 59, 50), Decl(objectTypesIdentityWithGenericConstructSignaturesDifferingByConstraints2.ts, 60, 36)) +>x : Symbol(x, Decl(objectTypesIdentityWithGenericConstructSignaturesDifferingByConstraints2.ts, 60, 14)) +>C : Symbol(C, Decl(objectTypesIdentityWithGenericConstructSignaturesDifferingByConstraints2.ts, 6, 1)) +>String : Symbol(String, Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --)) +>String : Symbol(String, Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --)) + +function foo9(x: any) { } +>foo9 : Symbol(foo9, Decl(objectTypesIdentityWithGenericConstructSignaturesDifferingByConstraints2.ts, 57, 25), Decl(objectTypesIdentityWithGenericConstructSignaturesDifferingByConstraints2.ts, 59, 50), Decl(objectTypesIdentityWithGenericConstructSignaturesDifferingByConstraints2.ts, 60, 36)) +>x : Symbol(x, Decl(objectTypesIdentityWithGenericConstructSignaturesDifferingByConstraints2.ts, 61, 14)) + +function foo10(x: B, Array>); +>foo10 : Symbol(foo10, Decl(objectTypesIdentityWithGenericConstructSignaturesDifferingByConstraints2.ts, 61, 25), Decl(objectTypesIdentityWithGenericConstructSignaturesDifferingByConstraints2.ts, 63, 51), Decl(objectTypesIdentityWithGenericConstructSignaturesDifferingByConstraints2.ts, 64, 28)) +>x : Symbol(x, Decl(objectTypesIdentityWithGenericConstructSignaturesDifferingByConstraints2.ts, 63, 15)) +>B : Symbol(B, Decl(objectTypesIdentityWithGenericConstructSignaturesDifferingByConstraints2.ts, 0, 0)) +>Array : Symbol(Array, Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --)) +>Array : Symbol(Array, Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --)) + +function foo10(x: typeof a); // ok +>foo10 : Symbol(foo10, Decl(objectTypesIdentityWithGenericConstructSignaturesDifferingByConstraints2.ts, 61, 25), Decl(objectTypesIdentityWithGenericConstructSignaturesDifferingByConstraints2.ts, 63, 51), Decl(objectTypesIdentityWithGenericConstructSignaturesDifferingByConstraints2.ts, 64, 28)) +>x : Symbol(x, Decl(objectTypesIdentityWithGenericConstructSignaturesDifferingByConstraints2.ts, 64, 15)) +>a : Symbol(a, Decl(objectTypesIdentityWithGenericConstructSignaturesDifferingByConstraints2.ts, 24, 3)) + +function foo10(x: any) { } +>foo10 : Symbol(foo10, Decl(objectTypesIdentityWithGenericConstructSignaturesDifferingByConstraints2.ts, 61, 25), Decl(objectTypesIdentityWithGenericConstructSignaturesDifferingByConstraints2.ts, 63, 51), Decl(objectTypesIdentityWithGenericConstructSignaturesDifferingByConstraints2.ts, 64, 28)) +>x : Symbol(x, Decl(objectTypesIdentityWithGenericConstructSignaturesDifferingByConstraints2.ts, 65, 15)) + +function foo11(x: B, Array>); +>foo11 : Symbol(foo11, Decl(objectTypesIdentityWithGenericConstructSignaturesDifferingByConstraints2.ts, 65, 26), Decl(objectTypesIdentityWithGenericConstructSignaturesDifferingByConstraints2.ts, 67, 51), Decl(objectTypesIdentityWithGenericConstructSignaturesDifferingByConstraints2.ts, 68, 28)) +>x : Symbol(x, Decl(objectTypesIdentityWithGenericConstructSignaturesDifferingByConstraints2.ts, 67, 15)) +>B : Symbol(B, Decl(objectTypesIdentityWithGenericConstructSignaturesDifferingByConstraints2.ts, 0, 0)) +>Array : Symbol(Array, Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --)) +>Array : Symbol(Array, Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --)) + +function foo11(x: typeof b); // ok +>foo11 : Symbol(foo11, Decl(objectTypesIdentityWithGenericConstructSignaturesDifferingByConstraints2.ts, 65, 26), Decl(objectTypesIdentityWithGenericConstructSignaturesDifferingByConstraints2.ts, 67, 51), Decl(objectTypesIdentityWithGenericConstructSignaturesDifferingByConstraints2.ts, 68, 28)) +>x : Symbol(x, Decl(objectTypesIdentityWithGenericConstructSignaturesDifferingByConstraints2.ts, 68, 15)) +>b : Symbol(b, Decl(objectTypesIdentityWithGenericConstructSignaturesDifferingByConstraints2.ts, 25, 3)) + +function foo11(x: any) { } +>foo11 : Symbol(foo11, Decl(objectTypesIdentityWithGenericConstructSignaturesDifferingByConstraints2.ts, 65, 26), Decl(objectTypesIdentityWithGenericConstructSignaturesDifferingByConstraints2.ts, 67, 51), Decl(objectTypesIdentityWithGenericConstructSignaturesDifferingByConstraints2.ts, 68, 28)) +>x : Symbol(x, Decl(objectTypesIdentityWithGenericConstructSignaturesDifferingByConstraints2.ts, 69, 15)) + +function foo12(x: I); +>foo12 : Symbol(foo12, Decl(objectTypesIdentityWithGenericConstructSignaturesDifferingByConstraints2.ts, 69, 26), Decl(objectTypesIdentityWithGenericConstructSignaturesDifferingByConstraints2.ts, 71, 37), Decl(objectTypesIdentityWithGenericConstructSignaturesDifferingByConstraints2.ts, 72, 37)) +>x : Symbol(x, Decl(objectTypesIdentityWithGenericConstructSignaturesDifferingByConstraints2.ts, 71, 15)) +>I : Symbol(I, Decl(objectTypesIdentityWithGenericConstructSignaturesDifferingByConstraints2.ts, 14, 1)) +>Number : Symbol(Number, Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --)) +>Number : Symbol(Number, Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --)) + +function foo12(x: C); // ok +>foo12 : Symbol(foo12, Decl(objectTypesIdentityWithGenericConstructSignaturesDifferingByConstraints2.ts, 69, 26), Decl(objectTypesIdentityWithGenericConstructSignaturesDifferingByConstraints2.ts, 71, 37), Decl(objectTypesIdentityWithGenericConstructSignaturesDifferingByConstraints2.ts, 72, 37)) +>x : Symbol(x, Decl(objectTypesIdentityWithGenericConstructSignaturesDifferingByConstraints2.ts, 72, 15)) +>C : Symbol(C, Decl(objectTypesIdentityWithGenericConstructSignaturesDifferingByConstraints2.ts, 6, 1)) +>String : Symbol(String, Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --)) +>String : Symbol(String, Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --)) + +function foo12(x: any) { } +>foo12 : Symbol(foo12, Decl(objectTypesIdentityWithGenericConstructSignaturesDifferingByConstraints2.ts, 69, 26), Decl(objectTypesIdentityWithGenericConstructSignaturesDifferingByConstraints2.ts, 71, 37), Decl(objectTypesIdentityWithGenericConstructSignaturesDifferingByConstraints2.ts, 72, 37)) +>x : Symbol(x, Decl(objectTypesIdentityWithGenericConstructSignaturesDifferingByConstraints2.ts, 73, 15)) + +function foo12b(x: I2); +>foo12b : Symbol(foo12b, Decl(objectTypesIdentityWithGenericConstructSignaturesDifferingByConstraints2.ts, 73, 26), Decl(objectTypesIdentityWithGenericConstructSignaturesDifferingByConstraints2.ts, 75, 23), Decl(objectTypesIdentityWithGenericConstructSignaturesDifferingByConstraints2.ts, 76, 38)) +>x : Symbol(x, Decl(objectTypesIdentityWithGenericConstructSignaturesDifferingByConstraints2.ts, 75, 16)) +>I2 : Symbol(I2, Decl(objectTypesIdentityWithGenericConstructSignaturesDifferingByConstraints2.ts, 18, 1)) + +function foo12b(x: C); // ok +>foo12b : Symbol(foo12b, Decl(objectTypesIdentityWithGenericConstructSignaturesDifferingByConstraints2.ts, 73, 26), Decl(objectTypesIdentityWithGenericConstructSignaturesDifferingByConstraints2.ts, 75, 23), Decl(objectTypesIdentityWithGenericConstructSignaturesDifferingByConstraints2.ts, 76, 38)) +>x : Symbol(x, Decl(objectTypesIdentityWithGenericConstructSignaturesDifferingByConstraints2.ts, 76, 16)) +>C : Symbol(C, Decl(objectTypesIdentityWithGenericConstructSignaturesDifferingByConstraints2.ts, 6, 1)) +>String : Symbol(String, Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --)) +>String : Symbol(String, Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --)) + +function foo12b(x: any) { } +>foo12b : Symbol(foo12b, Decl(objectTypesIdentityWithGenericConstructSignaturesDifferingByConstraints2.ts, 73, 26), Decl(objectTypesIdentityWithGenericConstructSignaturesDifferingByConstraints2.ts, 75, 23), Decl(objectTypesIdentityWithGenericConstructSignaturesDifferingByConstraints2.ts, 76, 38)) +>x : Symbol(x, Decl(objectTypesIdentityWithGenericConstructSignaturesDifferingByConstraints2.ts, 77, 16)) + +function foo13(x: I); +>foo13 : Symbol(foo13, Decl(objectTypesIdentityWithGenericConstructSignaturesDifferingByConstraints2.ts, 77, 27), Decl(objectTypesIdentityWithGenericConstructSignaturesDifferingByConstraints2.ts, 79, 37), Decl(objectTypesIdentityWithGenericConstructSignaturesDifferingByConstraints2.ts, 80, 28)) +>x : Symbol(x, Decl(objectTypesIdentityWithGenericConstructSignaturesDifferingByConstraints2.ts, 79, 15)) +>I : Symbol(I, Decl(objectTypesIdentityWithGenericConstructSignaturesDifferingByConstraints2.ts, 14, 1)) +>Number : Symbol(Number, Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --)) +>Number : Symbol(Number, Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --)) + +function foo13(x: typeof a); // ok +>foo13 : Symbol(foo13, Decl(objectTypesIdentityWithGenericConstructSignaturesDifferingByConstraints2.ts, 77, 27), Decl(objectTypesIdentityWithGenericConstructSignaturesDifferingByConstraints2.ts, 79, 37), Decl(objectTypesIdentityWithGenericConstructSignaturesDifferingByConstraints2.ts, 80, 28)) +>x : Symbol(x, Decl(objectTypesIdentityWithGenericConstructSignaturesDifferingByConstraints2.ts, 80, 15)) +>a : Symbol(a, Decl(objectTypesIdentityWithGenericConstructSignaturesDifferingByConstraints2.ts, 24, 3)) + +function foo13(x: any) { } +>foo13 : Symbol(foo13, Decl(objectTypesIdentityWithGenericConstructSignaturesDifferingByConstraints2.ts, 77, 27), Decl(objectTypesIdentityWithGenericConstructSignaturesDifferingByConstraints2.ts, 79, 37), Decl(objectTypesIdentityWithGenericConstructSignaturesDifferingByConstraints2.ts, 80, 28)) +>x : Symbol(x, Decl(objectTypesIdentityWithGenericConstructSignaturesDifferingByConstraints2.ts, 81, 15)) + +function foo14(x: I); +>foo14 : Symbol(foo14, Decl(objectTypesIdentityWithGenericConstructSignaturesDifferingByConstraints2.ts, 81, 26), Decl(objectTypesIdentityWithGenericConstructSignaturesDifferingByConstraints2.ts, 83, 37), Decl(objectTypesIdentityWithGenericConstructSignaturesDifferingByConstraints2.ts, 84, 28)) +>x : Symbol(x, Decl(objectTypesIdentityWithGenericConstructSignaturesDifferingByConstraints2.ts, 83, 15)) +>I : Symbol(I, Decl(objectTypesIdentityWithGenericConstructSignaturesDifferingByConstraints2.ts, 14, 1)) +>Number : Symbol(Number, Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --)) +>Number : Symbol(Number, Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --)) + +function foo14(x: typeof b); // ok +>foo14 : Symbol(foo14, Decl(objectTypesIdentityWithGenericConstructSignaturesDifferingByConstraints2.ts, 81, 26), Decl(objectTypesIdentityWithGenericConstructSignaturesDifferingByConstraints2.ts, 83, 37), Decl(objectTypesIdentityWithGenericConstructSignaturesDifferingByConstraints2.ts, 84, 28)) +>x : Symbol(x, Decl(objectTypesIdentityWithGenericConstructSignaturesDifferingByConstraints2.ts, 84, 15)) +>b : Symbol(b, Decl(objectTypesIdentityWithGenericConstructSignaturesDifferingByConstraints2.ts, 25, 3)) + +function foo14(x: any) { } +>foo14 : Symbol(foo14, Decl(objectTypesIdentityWithGenericConstructSignaturesDifferingByConstraints2.ts, 81, 26), Decl(objectTypesIdentityWithGenericConstructSignaturesDifferingByConstraints2.ts, 83, 37), Decl(objectTypesIdentityWithGenericConstructSignaturesDifferingByConstraints2.ts, 84, 28)) +>x : Symbol(x, Decl(objectTypesIdentityWithGenericConstructSignaturesDifferingByConstraints2.ts, 85, 15)) + diff --git a/tests/baselines/reference/objectTypesIdentityWithGenericConstructSignaturesDifferingByConstraints2.types b/tests/baselines/reference/objectTypesIdentityWithGenericConstructSignaturesDifferingByConstraints2.types new file mode 100644 index 00000000000..b1d1d79ac05 --- /dev/null +++ b/tests/baselines/reference/objectTypesIdentityWithGenericConstructSignaturesDifferingByConstraints2.types @@ -0,0 +1,354 @@ +=== tests/cases/conformance/types/typeRelationships/typeAndMemberIdentity/objectTypesIdentityWithGenericConstructSignaturesDifferingByConstraints2.ts === +// Two call or construct signatures are considered identical when they have the same number of type parameters and, considering those +// parameters pairwise identical, have identical type parameter constraints, identical number of parameters with identical kind(required, +// optional or rest) and types, and identical return types. + +class B> { +>B : B +>T : T +>U : U +>U : U +>Array : T[] + + constructor(x: T, y: U) { return null; } +>x : T +>T : T +>y : U +>U : U +>null : null +} + +class C { +>C : C +>T : T +>U : U +>U : U +>String : String + + constructor(x: T, y: U) { return null; } +>x : T +>T : T +>y : U +>U : U +>null : null +} + +class D { +>D : D +>T : T +>U : U +>U : U +>Number : Number + + constructor(x: T, y: U) { return null; } +>x : T +>T : T +>y : U +>U : U +>null : null +} + +interface I { +>I : I +>T : T +>U : U +>U : U +>Number : Number + + new(x: T, y: U): string; +>x : T +>T : T +>y : U +>U : U +} + +interface I2 { +>I2 : I2 + + new(x: T, y: U): string; +>T : T +>U : U +>U : U +>Boolean : Boolean +>x : T +>T : T +>y : U +>U : U +} + +var a: { new>(x: T, y: U): string } +>a : new (x: T, y: U) => string +>T : T +>U : U +>U : U +>Array : T[] +>x : T +>T : T +>y : U +>U : U + +var b = { new(x: T, y: U) { return ''; } }; // not a construct signature, function called new +>b : { new(x: T, y: U): string; } +>{ new(x: T, y: U) { return ''; } } : { new(x: T, y: U): string; } +>new : (x: T, y: U) => string +>T : T +>U : U +>U : U +>RegExp : RegExp +>x : T +>T : T +>y : U +>U : U +>'' : string + +function foo1b(x: B, Array>); +>foo1b : { (x: B): any; (x: B): any; } +>x : B +>B : B +>Array : T[] +>Array : T[] + +function foo1b(x: B, Array>); // error +>foo1b : { (x: B): any; (x: B): any; } +>x : B +>B : B +>Array : T[] +>Array : T[] + +function foo1b(x: any) { } +>foo1b : { (x: B): any; (x: B): any; } +>x : any + +function foo1c(x: C); +>foo1c : { (x: C): any; (x: C): any; } +>x : C +>C : C +>String : String +>String : String + +function foo1c(x: C); // error +>foo1c : { (x: C): any; (x: C): any; } +>x : C +>C : C +>String : String +>String : String + +function foo1c(x: any) { } +>foo1c : { (x: C): any; (x: C): any; } +>x : any + +function foo2(x: I); +>foo2 : { (x: I): any; (x: I): any; } +>x : I +>I : I +>Number : Number +>Number : Number + +function foo2(x: I); // error +>foo2 : { (x: I): any; (x: I): any; } +>x : I +>I : I +>Number : Number +>Number : Number + +function foo2(x: any) { } +>foo2 : { (x: I): any; (x: I): any; } +>x : any + +function foo3(x: typeof a); +>foo3 : { (x: new (x: T, y: U) => string): any; (x: new (x: T, y: U) => string): any; } +>x : new (x: T, y: U) => string +>a : new (x: T, y: U) => string + +function foo3(x: typeof a); // error +>foo3 : { (x: new (x: T, y: U) => string): any; (x: new (x: T, y: U) => string): any; } +>x : new (x: T, y: U) => string +>a : new (x: T, y: U) => string + +function foo3(x: any) { } +>foo3 : { (x: new (x: T, y: U) => string): any; (x: new (x: T, y: U) => string): any; } +>x : any + +function foo4(x: typeof b); +>foo4 : { (x: { new(x: T, y: U): string; }): any; (x: { new(x: T, y: U): string; }): any; } +>x : { new(x: T, y: U): string; } +>b : { new(x: T, y: U): string; } + +function foo4(x: typeof b); // error +>foo4 : { (x: { new(x: T, y: U): string; }): any; (x: { new(x: T, y: U): string; }): any; } +>x : { new(x: T, y: U): string; } +>b : { new(x: T, y: U): string; } + +function foo4(x: any) { } +>foo4 : { (x: { new(x: T, y: U): string; }): any; (x: { new(x: T, y: U): string; }): any; } +>x : any + +function foo5c(x: C); +>foo5c : { (x: C): any; (x: D): any; } +>x : C +>C : C +>String : String +>String : String + +function foo5c(x: D); // ok +>foo5c : { (x: C): any; (x: D): any; } +>x : D +>D : D +>Number : Number +>Number : Number + +function foo5c(x: any) { } +>foo5c : { (x: C): any; (x: D): any; } +>x : any + +function foo6c(x: C); +>foo6c : { (x: C): any; (x: D): any; } +>x : C +>C : C +>String : String +>String : String + +function foo6c(x: D); // ok +>foo6c : { (x: C): any; (x: D): any; } +>x : D +>D : D +>Number : Number + +function foo6c(x: any) { } +>foo6c : { (x: C): any; (x: D): any; } +>x : any + +function foo8(x: B, Array>); +>foo8 : { (x: B): any; (x: I): any; } +>x : B +>B : B +>Array : T[] +>Array : T[] + +function foo8(x: I); // ok +>foo8 : { (x: B): any; (x: I): any; } +>x : I +>I : I +>Number : Number +>Number : Number + +function foo8(x: any) { } +>foo8 : { (x: B): any; (x: I): any; } +>x : any + +function foo9(x: B, Array>); +>foo9 : { (x: B): any; (x: C): any; } +>x : B +>B : B +>Array : T[] +>Array : T[] + +function foo9(x: C); // error, types are structurally equal +>foo9 : { (x: B): any; (x: C): any; } +>x : C +>C : C +>String : String +>String : String + +function foo9(x: any) { } +>foo9 : { (x: B): any; (x: C): any; } +>x : any + +function foo10(x: B, Array>); +>foo10 : { (x: B): any; (x: new (x: T, y: U) => string): any; } +>x : B +>B : B +>Array : T[] +>Array : T[] + +function foo10(x: typeof a); // ok +>foo10 : { (x: B): any; (x: new (x: T, y: U) => string): any; } +>x : new (x: T, y: U) => string +>a : new (x: T, y: U) => string + +function foo10(x: any) { } +>foo10 : { (x: B): any; (x: new (x: T, y: U) => string): any; } +>x : any + +function foo11(x: B, Array>); +>foo11 : { (x: B): any; (x: { new(x: T, y: U): string; }): any; } +>x : B +>B : B +>Array : T[] +>Array : T[] + +function foo11(x: typeof b); // ok +>foo11 : { (x: B): any; (x: { new(x: T, y: U): string; }): any; } +>x : { new(x: T, y: U): string; } +>b : { new(x: T, y: U): string; } + +function foo11(x: any) { } +>foo11 : { (x: B): any; (x: { new(x: T, y: U): string; }): any; } +>x : any + +function foo12(x: I); +>foo12 : { (x: I): any; (x: C): any; } +>x : I +>I : I +>Number : Number +>Number : Number + +function foo12(x: C); // ok +>foo12 : { (x: I): any; (x: C): any; } +>x : C +>C : C +>String : String +>String : String + +function foo12(x: any) { } +>foo12 : { (x: I): any; (x: C): any; } +>x : any + +function foo12b(x: I2); +>foo12b : { (x: I2): any; (x: C): any; } +>x : I2 +>I2 : I2 + +function foo12b(x: C); // ok +>foo12b : { (x: I2): any; (x: C): any; } +>x : C +>C : C +>String : String +>String : String + +function foo12b(x: any) { } +>foo12b : { (x: I2): any; (x: C): any; } +>x : any + +function foo13(x: I); +>foo13 : { (x: I): any; (x: new (x: T, y: U) => string): any; } +>x : I +>I : I +>Number : Number +>Number : Number + +function foo13(x: typeof a); // ok +>foo13 : { (x: I): any; (x: new (x: T, y: U) => string): any; } +>x : new (x: T, y: U) => string +>a : new (x: T, y: U) => string + +function foo13(x: any) { } +>foo13 : { (x: I): any; (x: new (x: T, y: U) => string): any; } +>x : any + +function foo14(x: I); +>foo14 : { (x: I): any; (x: { new(x: T, y: U): string; }): any; } +>x : I +>I : I +>Number : Number +>Number : Number + +function foo14(x: typeof b); // ok +>foo14 : { (x: I): any; (x: { new(x: T, y: U): string; }): any; } +>x : { new(x: T, y: U): string; } +>b : { new(x: T, y: U): string; } + +function foo14(x: any) { } +>foo14 : { (x: I): any; (x: { new(x: T, y: U): string; }): any; } +>x : any + diff --git a/tests/baselines/reference/objectTypesIdentityWithGenericConstructSignaturesDifferingByConstraints3.errors.txt b/tests/baselines/reference/objectTypesIdentityWithGenericConstructSignaturesDifferingByConstraints3.errors.txt deleted file mode 100644 index 33a62356d1c..00000000000 --- a/tests/baselines/reference/objectTypesIdentityWithGenericConstructSignaturesDifferingByConstraints3.errors.txt +++ /dev/null @@ -1,119 +0,0 @@ -tests/cases/conformance/types/typeRelationships/typeAndMemberIdentity/objectTypesIdentityWithGenericConstructSignaturesDifferingByConstraints3.ts(14,9): error TS2313: Constraint of a type parameter cannot reference any type parameter from the same type parameter list. -tests/cases/conformance/types/typeRelationships/typeAndMemberIdentity/objectTypesIdentityWithGenericConstructSignaturesDifferingByConstraints3.ts(18,9): error TS2313: Constraint of a type parameter cannot reference any type parameter from the same type parameter list. -tests/cases/conformance/types/typeRelationships/typeAndMemberIdentity/objectTypesIdentityWithGenericConstructSignaturesDifferingByConstraints3.ts(22,9): error TS2313: Constraint of a type parameter cannot reference any type parameter from the same type parameter list. -tests/cases/conformance/types/typeRelationships/typeAndMemberIdentity/objectTypesIdentityWithGenericConstructSignaturesDifferingByConstraints3.ts(26,13): error TS2313: Constraint of a type parameter cannot reference any type parameter from the same type parameter list. -tests/cases/conformance/types/typeRelationships/typeAndMemberIdentity/objectTypesIdentityWithGenericConstructSignaturesDifferingByConstraints3.ts(31,9): error TS2313: Constraint of a type parameter cannot reference any type parameter from the same type parameter list. -tests/cases/conformance/types/typeRelationships/typeAndMemberIdentity/objectTypesIdentityWithGenericConstructSignaturesDifferingByConstraints3.ts(34,14): error TS2313: Constraint of a type parameter cannot reference any type parameter from the same type parameter list. -tests/cases/conformance/types/typeRelationships/typeAndMemberIdentity/objectTypesIdentityWithGenericConstructSignaturesDifferingByConstraints3.ts(35,15): error TS2313: Constraint of a type parameter cannot reference any type parameter from the same type parameter list. - - -==== tests/cases/conformance/types/typeRelationships/typeAndMemberIdentity/objectTypesIdentityWithGenericConstructSignaturesDifferingByConstraints3.ts (7 errors) ==== - // Two call or construct signatures are considered identical when they have the same number of type parameters and, considering those - // parameters pairwise identical, have identical type parameter constraints, identical number of parameters with identical kind(required, - // optional or rest) and types, and identical return types. - - class One { foo: string } - class Two { foo: string } - interface Three { foo: string } - interface Four { foo: T } - interface Five extends Four { } - interface Six { - foo: T; - } - - class B { - ~~~~~~~~~~~ -!!! error TS2313: Constraint of a type parameter cannot reference any type parameter from the same type parameter list. - constructor(x: T, y: U) { return null; } - } - - class C { - ~~~~~~~~~~~ -!!! error TS2313: Constraint of a type parameter cannot reference any type parameter from the same type parameter list. - constructor(x: T, y: U) { return null; } - } - - class D> { - ~~~~~~~~~~~ -!!! error TS2313: Constraint of a type parameter cannot reference any type parameter from the same type parameter list. - constructor(x: T, y: U) { return null; } - } - - interface I> { - ~~~~~~~~~~~ -!!! error TS2313: Constraint of a type parameter cannot reference any type parameter from the same type parameter list. - new(x: T, y: U): string; - } - - interface I2 { - new>(x: T, y: U): string; - ~~~~~~~~~~~ -!!! error TS2313: Constraint of a type parameter cannot reference any type parameter from the same type parameter list. - } - - var a: { new(x: T, y: U): string } - ~~~~~~~~~~~ -!!! error TS2313: Constraint of a type parameter cannot reference any type parameter from the same type parameter list. - var b = { new(x: T, y: U) { return ''; } }; // not a construct signature, function called new - ~~~~~~~~~~~ -!!! error TS2313: Constraint of a type parameter cannot reference any type parameter from the same type parameter list. - - function foo1b(x: B); - function foo1b(x: B); // error - function foo1b(x: any) { } - - function foo1c(x: C); - function foo1c(x: C); // error - function foo1c(x: any) { } - - function foo2(x: I, Five>); - function foo2(x: I, Five>); // error - function foo2(x: any) { } - - function foo3(x: typeof a); - function foo3(x: typeof a); // error - function foo3(x: any) { } - - function foo4(x: typeof b); - function foo4(x: typeof b); // error - function foo4(x: any) { } - - function foo5c(x: C); - function foo5c(x: D, Four>); // error - function foo5c(x: any) { } - - function foo6c(x: C); - function foo6c(x: D, Four>); // error - function foo6c(x: any) { } - - function foo8(x: B); - function foo8(x: I, Five>); // error - function foo8(x: any) { } - - function foo9(x: B); - function foo9(x: C); // error - function foo9(x: any) { } - - function foo10(x: B); - function foo10(x: typeof a); // ok - function foo10(x: any) { } - - function foo11(x: B); - function foo11(x: typeof b); // ok - function foo11(x: any) { } - - function foo12(x: I, Five>); - function foo12(x: C); // ok - function foo12(x: any) { } - - function foo12b(x: I2); - function foo12b(x: C); // ok - function foo12b(x: any) { } - - function foo13(x: I, Five>); - function foo13(x: typeof a); // ok - function foo13(x: any) { } - - function foo14(x: I, Five>); - function foo14(x: typeof b); // ok - function foo14(x: any) { } \ No newline at end of file diff --git a/tests/baselines/reference/objectTypesIdentityWithGenericConstructSignaturesDifferingByConstraints3.symbols b/tests/baselines/reference/objectTypesIdentityWithGenericConstructSignaturesDifferingByConstraints3.symbols new file mode 100644 index 00000000000..4d7adc798f9 --- /dev/null +++ b/tests/baselines/reference/objectTypesIdentityWithGenericConstructSignaturesDifferingByConstraints3.symbols @@ -0,0 +1,384 @@ +=== tests/cases/conformance/types/typeRelationships/typeAndMemberIdentity/objectTypesIdentityWithGenericConstructSignaturesDifferingByConstraints3.ts === +// Two call or construct signatures are considered identical when they have the same number of type parameters and, considering those +// parameters pairwise identical, have identical type parameter constraints, identical number of parameters with identical kind(required, +// optional or rest) and types, and identical return types. + +class One { foo: string } +>One : Symbol(One, Decl(objectTypesIdentityWithGenericConstructSignaturesDifferingByConstraints3.ts, 0, 0)) +>foo : Symbol(foo, Decl(objectTypesIdentityWithGenericConstructSignaturesDifferingByConstraints3.ts, 4, 11)) + +class Two { foo: string } +>Two : Symbol(Two, Decl(objectTypesIdentityWithGenericConstructSignaturesDifferingByConstraints3.ts, 4, 25)) +>foo : Symbol(foo, Decl(objectTypesIdentityWithGenericConstructSignaturesDifferingByConstraints3.ts, 5, 11)) + +interface Three { foo: string } +>Three : Symbol(Three, Decl(objectTypesIdentityWithGenericConstructSignaturesDifferingByConstraints3.ts, 5, 25)) +>foo : Symbol(foo, Decl(objectTypesIdentityWithGenericConstructSignaturesDifferingByConstraints3.ts, 6, 17)) + +interface Four { foo: T } +>Four : Symbol(Four, Decl(objectTypesIdentityWithGenericConstructSignaturesDifferingByConstraints3.ts, 6, 31)) +>T : Symbol(T, Decl(objectTypesIdentityWithGenericConstructSignaturesDifferingByConstraints3.ts, 7, 15)) +>foo : Symbol(foo, Decl(objectTypesIdentityWithGenericConstructSignaturesDifferingByConstraints3.ts, 7, 19)) +>T : Symbol(T, Decl(objectTypesIdentityWithGenericConstructSignaturesDifferingByConstraints3.ts, 7, 15)) + +interface Five extends Four { } +>Five : Symbol(Five, Decl(objectTypesIdentityWithGenericConstructSignaturesDifferingByConstraints3.ts, 7, 28)) +>T : Symbol(T, Decl(objectTypesIdentityWithGenericConstructSignaturesDifferingByConstraints3.ts, 8, 15)) +>Four : Symbol(Four, Decl(objectTypesIdentityWithGenericConstructSignaturesDifferingByConstraints3.ts, 6, 31)) +>T : Symbol(T, Decl(objectTypesIdentityWithGenericConstructSignaturesDifferingByConstraints3.ts, 8, 15)) + +interface Six { +>Six : Symbol(Six, Decl(objectTypesIdentityWithGenericConstructSignaturesDifferingByConstraints3.ts, 8, 37)) +>T : Symbol(T, Decl(objectTypesIdentityWithGenericConstructSignaturesDifferingByConstraints3.ts, 9, 14)) +>U : Symbol(U, Decl(objectTypesIdentityWithGenericConstructSignaturesDifferingByConstraints3.ts, 9, 16)) + + foo: T; +>foo : Symbol(foo, Decl(objectTypesIdentityWithGenericConstructSignaturesDifferingByConstraints3.ts, 9, 21)) +>T : Symbol(T, Decl(objectTypesIdentityWithGenericConstructSignaturesDifferingByConstraints3.ts, 9, 14)) +} + +class B { +>B : Symbol(B, Decl(objectTypesIdentityWithGenericConstructSignaturesDifferingByConstraints3.ts, 11, 1)) +>T : Symbol(T, Decl(objectTypesIdentityWithGenericConstructSignaturesDifferingByConstraints3.ts, 13, 8)) +>U : Symbol(U, Decl(objectTypesIdentityWithGenericConstructSignaturesDifferingByConstraints3.ts, 13, 20)) +>U : Symbol(U, Decl(objectTypesIdentityWithGenericConstructSignaturesDifferingByConstraints3.ts, 13, 20)) +>Two : Symbol(Two, Decl(objectTypesIdentityWithGenericConstructSignaturesDifferingByConstraints3.ts, 4, 25)) + + constructor(x: T, y: U) { return null; } +>x : Symbol(x, Decl(objectTypesIdentityWithGenericConstructSignaturesDifferingByConstraints3.ts, 14, 16)) +>T : Symbol(T, Decl(objectTypesIdentityWithGenericConstructSignaturesDifferingByConstraints3.ts, 13, 8)) +>y : Symbol(y, Decl(objectTypesIdentityWithGenericConstructSignaturesDifferingByConstraints3.ts, 14, 21)) +>U : Symbol(U, Decl(objectTypesIdentityWithGenericConstructSignaturesDifferingByConstraints3.ts, 13, 20)) +} + +class C { +>C : Symbol(C, Decl(objectTypesIdentityWithGenericConstructSignaturesDifferingByConstraints3.ts, 15, 1)) +>T : Symbol(T, Decl(objectTypesIdentityWithGenericConstructSignaturesDifferingByConstraints3.ts, 17, 8)) +>U : Symbol(U, Decl(objectTypesIdentityWithGenericConstructSignaturesDifferingByConstraints3.ts, 17, 20)) +>U : Symbol(U, Decl(objectTypesIdentityWithGenericConstructSignaturesDifferingByConstraints3.ts, 17, 20)) +>Three : Symbol(Three, Decl(objectTypesIdentityWithGenericConstructSignaturesDifferingByConstraints3.ts, 5, 25)) + + constructor(x: T, y: U) { return null; } +>x : Symbol(x, Decl(objectTypesIdentityWithGenericConstructSignaturesDifferingByConstraints3.ts, 18, 16)) +>T : Symbol(T, Decl(objectTypesIdentityWithGenericConstructSignaturesDifferingByConstraints3.ts, 17, 8)) +>y : Symbol(y, Decl(objectTypesIdentityWithGenericConstructSignaturesDifferingByConstraints3.ts, 18, 21)) +>U : Symbol(U, Decl(objectTypesIdentityWithGenericConstructSignaturesDifferingByConstraints3.ts, 17, 20)) +} + +class D> { +>D : Symbol(D, Decl(objectTypesIdentityWithGenericConstructSignaturesDifferingByConstraints3.ts, 19, 1)) +>T : Symbol(T, Decl(objectTypesIdentityWithGenericConstructSignaturesDifferingByConstraints3.ts, 21, 8)) +>U : Symbol(U, Decl(objectTypesIdentityWithGenericConstructSignaturesDifferingByConstraints3.ts, 21, 20)) +>U : Symbol(U, Decl(objectTypesIdentityWithGenericConstructSignaturesDifferingByConstraints3.ts, 21, 20)) +>Four : Symbol(Four, Decl(objectTypesIdentityWithGenericConstructSignaturesDifferingByConstraints3.ts, 6, 31)) + + constructor(x: T, y: U) { return null; } +>x : Symbol(x, Decl(objectTypesIdentityWithGenericConstructSignaturesDifferingByConstraints3.ts, 22, 16)) +>T : Symbol(T, Decl(objectTypesIdentityWithGenericConstructSignaturesDifferingByConstraints3.ts, 21, 8)) +>y : Symbol(y, Decl(objectTypesIdentityWithGenericConstructSignaturesDifferingByConstraints3.ts, 22, 21)) +>U : Symbol(U, Decl(objectTypesIdentityWithGenericConstructSignaturesDifferingByConstraints3.ts, 21, 20)) +} + +interface I> { +>I : Symbol(I, Decl(objectTypesIdentityWithGenericConstructSignaturesDifferingByConstraints3.ts, 23, 1)) +>T : Symbol(T, Decl(objectTypesIdentityWithGenericConstructSignaturesDifferingByConstraints3.ts, 25, 12)) +>U : Symbol(U, Decl(objectTypesIdentityWithGenericConstructSignaturesDifferingByConstraints3.ts, 25, 24)) +>U : Symbol(U, Decl(objectTypesIdentityWithGenericConstructSignaturesDifferingByConstraints3.ts, 25, 24)) +>Five : Symbol(Five, Decl(objectTypesIdentityWithGenericConstructSignaturesDifferingByConstraints3.ts, 7, 28)) + + new(x: T, y: U): string; +>x : Symbol(x, Decl(objectTypesIdentityWithGenericConstructSignaturesDifferingByConstraints3.ts, 26, 8)) +>T : Symbol(T, Decl(objectTypesIdentityWithGenericConstructSignaturesDifferingByConstraints3.ts, 25, 12)) +>y : Symbol(y, Decl(objectTypesIdentityWithGenericConstructSignaturesDifferingByConstraints3.ts, 26, 13)) +>U : Symbol(U, Decl(objectTypesIdentityWithGenericConstructSignaturesDifferingByConstraints3.ts, 25, 24)) +} + +interface I2 { +>I2 : Symbol(I2, Decl(objectTypesIdentityWithGenericConstructSignaturesDifferingByConstraints3.ts, 27, 1)) + + new>(x: T, y: U): string; +>T : Symbol(T, Decl(objectTypesIdentityWithGenericConstructSignaturesDifferingByConstraints3.ts, 30, 8)) +>U : Symbol(U, Decl(objectTypesIdentityWithGenericConstructSignaturesDifferingByConstraints3.ts, 30, 20)) +>U : Symbol(U, Decl(objectTypesIdentityWithGenericConstructSignaturesDifferingByConstraints3.ts, 30, 20)) +>Six : Symbol(Six, Decl(objectTypesIdentityWithGenericConstructSignaturesDifferingByConstraints3.ts, 8, 37)) +>x : Symbol(x, Decl(objectTypesIdentityWithGenericConstructSignaturesDifferingByConstraints3.ts, 30, 52)) +>T : Symbol(T, Decl(objectTypesIdentityWithGenericConstructSignaturesDifferingByConstraints3.ts, 30, 8)) +>y : Symbol(y, Decl(objectTypesIdentityWithGenericConstructSignaturesDifferingByConstraints3.ts, 30, 57)) +>U : Symbol(U, Decl(objectTypesIdentityWithGenericConstructSignaturesDifferingByConstraints3.ts, 30, 20)) +} + +var a: { new(x: T, y: U): string } +>a : Symbol(a, Decl(objectTypesIdentityWithGenericConstructSignaturesDifferingByConstraints3.ts, 33, 3)) +>T : Symbol(T, Decl(objectTypesIdentityWithGenericConstructSignaturesDifferingByConstraints3.ts, 33, 13)) +>U : Symbol(U, Decl(objectTypesIdentityWithGenericConstructSignaturesDifferingByConstraints3.ts, 33, 25)) +>U : Symbol(U, Decl(objectTypesIdentityWithGenericConstructSignaturesDifferingByConstraints3.ts, 33, 25)) +>One : Symbol(One, Decl(objectTypesIdentityWithGenericConstructSignaturesDifferingByConstraints3.ts, 0, 0)) +>x : Symbol(x, Decl(objectTypesIdentityWithGenericConstructSignaturesDifferingByConstraints3.ts, 33, 41)) +>T : Symbol(T, Decl(objectTypesIdentityWithGenericConstructSignaturesDifferingByConstraints3.ts, 33, 13)) +>y : Symbol(y, Decl(objectTypesIdentityWithGenericConstructSignaturesDifferingByConstraints3.ts, 33, 46)) +>U : Symbol(U, Decl(objectTypesIdentityWithGenericConstructSignaturesDifferingByConstraints3.ts, 33, 25)) + +var b = { new(x: T, y: U) { return ''; } }; // not a construct signature, function called new +>b : Symbol(b, Decl(objectTypesIdentityWithGenericConstructSignaturesDifferingByConstraints3.ts, 34, 3)) +>new : Symbol(new, Decl(objectTypesIdentityWithGenericConstructSignaturesDifferingByConstraints3.ts, 34, 9)) +>T : Symbol(T, Decl(objectTypesIdentityWithGenericConstructSignaturesDifferingByConstraints3.ts, 34, 14)) +>U : Symbol(U, Decl(objectTypesIdentityWithGenericConstructSignaturesDifferingByConstraints3.ts, 34, 26)) +>U : Symbol(U, Decl(objectTypesIdentityWithGenericConstructSignaturesDifferingByConstraints3.ts, 34, 26)) +>Two : Symbol(Two, Decl(objectTypesIdentityWithGenericConstructSignaturesDifferingByConstraints3.ts, 4, 25)) +>x : Symbol(x, Decl(objectTypesIdentityWithGenericConstructSignaturesDifferingByConstraints3.ts, 34, 42)) +>T : Symbol(T, Decl(objectTypesIdentityWithGenericConstructSignaturesDifferingByConstraints3.ts, 34, 14)) +>y : Symbol(y, Decl(objectTypesIdentityWithGenericConstructSignaturesDifferingByConstraints3.ts, 34, 47)) +>U : Symbol(U, Decl(objectTypesIdentityWithGenericConstructSignaturesDifferingByConstraints3.ts, 34, 26)) + +function foo1b(x: B); +>foo1b : Symbol(foo1b, Decl(objectTypesIdentityWithGenericConstructSignaturesDifferingByConstraints3.ts, 34, 71), Decl(objectTypesIdentityWithGenericConstructSignaturesDifferingByConstraints3.ts, 36, 31), Decl(objectTypesIdentityWithGenericConstructSignaturesDifferingByConstraints3.ts, 37, 31)) +>x : Symbol(x, Decl(objectTypesIdentityWithGenericConstructSignaturesDifferingByConstraints3.ts, 36, 15)) +>B : Symbol(B, Decl(objectTypesIdentityWithGenericConstructSignaturesDifferingByConstraints3.ts, 11, 1)) +>Two : Symbol(Two, Decl(objectTypesIdentityWithGenericConstructSignaturesDifferingByConstraints3.ts, 4, 25)) +>Two : Symbol(Two, Decl(objectTypesIdentityWithGenericConstructSignaturesDifferingByConstraints3.ts, 4, 25)) + +function foo1b(x: B); // error +>foo1b : Symbol(foo1b, Decl(objectTypesIdentityWithGenericConstructSignaturesDifferingByConstraints3.ts, 34, 71), Decl(objectTypesIdentityWithGenericConstructSignaturesDifferingByConstraints3.ts, 36, 31), Decl(objectTypesIdentityWithGenericConstructSignaturesDifferingByConstraints3.ts, 37, 31)) +>x : Symbol(x, Decl(objectTypesIdentityWithGenericConstructSignaturesDifferingByConstraints3.ts, 37, 15)) +>B : Symbol(B, Decl(objectTypesIdentityWithGenericConstructSignaturesDifferingByConstraints3.ts, 11, 1)) +>Two : Symbol(Two, Decl(objectTypesIdentityWithGenericConstructSignaturesDifferingByConstraints3.ts, 4, 25)) +>Two : Symbol(Two, Decl(objectTypesIdentityWithGenericConstructSignaturesDifferingByConstraints3.ts, 4, 25)) + +function foo1b(x: any) { } +>foo1b : Symbol(foo1b, Decl(objectTypesIdentityWithGenericConstructSignaturesDifferingByConstraints3.ts, 34, 71), Decl(objectTypesIdentityWithGenericConstructSignaturesDifferingByConstraints3.ts, 36, 31), Decl(objectTypesIdentityWithGenericConstructSignaturesDifferingByConstraints3.ts, 37, 31)) +>x : Symbol(x, Decl(objectTypesIdentityWithGenericConstructSignaturesDifferingByConstraints3.ts, 38, 15)) + +function foo1c(x: C); +>foo1c : Symbol(foo1c, Decl(objectTypesIdentityWithGenericConstructSignaturesDifferingByConstraints3.ts, 38, 26), Decl(objectTypesIdentityWithGenericConstructSignaturesDifferingByConstraints3.ts, 40, 35), Decl(objectTypesIdentityWithGenericConstructSignaturesDifferingByConstraints3.ts, 41, 35)) +>x : Symbol(x, Decl(objectTypesIdentityWithGenericConstructSignaturesDifferingByConstraints3.ts, 40, 15)) +>C : Symbol(C, Decl(objectTypesIdentityWithGenericConstructSignaturesDifferingByConstraints3.ts, 15, 1)) +>Three : Symbol(Three, Decl(objectTypesIdentityWithGenericConstructSignaturesDifferingByConstraints3.ts, 5, 25)) +>Three : Symbol(Three, Decl(objectTypesIdentityWithGenericConstructSignaturesDifferingByConstraints3.ts, 5, 25)) + +function foo1c(x: C); // error +>foo1c : Symbol(foo1c, Decl(objectTypesIdentityWithGenericConstructSignaturesDifferingByConstraints3.ts, 38, 26), Decl(objectTypesIdentityWithGenericConstructSignaturesDifferingByConstraints3.ts, 40, 35), Decl(objectTypesIdentityWithGenericConstructSignaturesDifferingByConstraints3.ts, 41, 35)) +>x : Symbol(x, Decl(objectTypesIdentityWithGenericConstructSignaturesDifferingByConstraints3.ts, 41, 15)) +>C : Symbol(C, Decl(objectTypesIdentityWithGenericConstructSignaturesDifferingByConstraints3.ts, 15, 1)) +>Three : Symbol(Three, Decl(objectTypesIdentityWithGenericConstructSignaturesDifferingByConstraints3.ts, 5, 25)) +>Three : Symbol(Three, Decl(objectTypesIdentityWithGenericConstructSignaturesDifferingByConstraints3.ts, 5, 25)) + +function foo1c(x: any) { } +>foo1c : Symbol(foo1c, Decl(objectTypesIdentityWithGenericConstructSignaturesDifferingByConstraints3.ts, 38, 26), Decl(objectTypesIdentityWithGenericConstructSignaturesDifferingByConstraints3.ts, 40, 35), Decl(objectTypesIdentityWithGenericConstructSignaturesDifferingByConstraints3.ts, 41, 35)) +>x : Symbol(x, Decl(objectTypesIdentityWithGenericConstructSignaturesDifferingByConstraints3.ts, 42, 15)) + +function foo2(x: I, Five>); +>foo2 : Symbol(foo2, Decl(objectTypesIdentityWithGenericConstructSignaturesDifferingByConstraints3.ts, 42, 26), Decl(objectTypesIdentityWithGenericConstructSignaturesDifferingByConstraints3.ts, 44, 48), Decl(objectTypesIdentityWithGenericConstructSignaturesDifferingByConstraints3.ts, 45, 48)) +>x : Symbol(x, Decl(objectTypesIdentityWithGenericConstructSignaturesDifferingByConstraints3.ts, 44, 14)) +>I : Symbol(I, Decl(objectTypesIdentityWithGenericConstructSignaturesDifferingByConstraints3.ts, 23, 1)) +>Five : Symbol(Five, Decl(objectTypesIdentityWithGenericConstructSignaturesDifferingByConstraints3.ts, 7, 28)) +>Five : Symbol(Five, Decl(objectTypesIdentityWithGenericConstructSignaturesDifferingByConstraints3.ts, 7, 28)) + +function foo2(x: I, Five>); // error +>foo2 : Symbol(foo2, Decl(objectTypesIdentityWithGenericConstructSignaturesDifferingByConstraints3.ts, 42, 26), Decl(objectTypesIdentityWithGenericConstructSignaturesDifferingByConstraints3.ts, 44, 48), Decl(objectTypesIdentityWithGenericConstructSignaturesDifferingByConstraints3.ts, 45, 48)) +>x : Symbol(x, Decl(objectTypesIdentityWithGenericConstructSignaturesDifferingByConstraints3.ts, 45, 14)) +>I : Symbol(I, Decl(objectTypesIdentityWithGenericConstructSignaturesDifferingByConstraints3.ts, 23, 1)) +>Five : Symbol(Five, Decl(objectTypesIdentityWithGenericConstructSignaturesDifferingByConstraints3.ts, 7, 28)) +>Five : Symbol(Five, Decl(objectTypesIdentityWithGenericConstructSignaturesDifferingByConstraints3.ts, 7, 28)) + +function foo2(x: any) { } +>foo2 : Symbol(foo2, Decl(objectTypesIdentityWithGenericConstructSignaturesDifferingByConstraints3.ts, 42, 26), Decl(objectTypesIdentityWithGenericConstructSignaturesDifferingByConstraints3.ts, 44, 48), Decl(objectTypesIdentityWithGenericConstructSignaturesDifferingByConstraints3.ts, 45, 48)) +>x : Symbol(x, Decl(objectTypesIdentityWithGenericConstructSignaturesDifferingByConstraints3.ts, 46, 14)) + +function foo3(x: typeof a); +>foo3 : Symbol(foo3, Decl(objectTypesIdentityWithGenericConstructSignaturesDifferingByConstraints3.ts, 46, 25), Decl(objectTypesIdentityWithGenericConstructSignaturesDifferingByConstraints3.ts, 48, 27), Decl(objectTypesIdentityWithGenericConstructSignaturesDifferingByConstraints3.ts, 49, 27)) +>x : Symbol(x, Decl(objectTypesIdentityWithGenericConstructSignaturesDifferingByConstraints3.ts, 48, 14)) +>a : Symbol(a, Decl(objectTypesIdentityWithGenericConstructSignaturesDifferingByConstraints3.ts, 33, 3)) + +function foo3(x: typeof a); // error +>foo3 : Symbol(foo3, Decl(objectTypesIdentityWithGenericConstructSignaturesDifferingByConstraints3.ts, 46, 25), Decl(objectTypesIdentityWithGenericConstructSignaturesDifferingByConstraints3.ts, 48, 27), Decl(objectTypesIdentityWithGenericConstructSignaturesDifferingByConstraints3.ts, 49, 27)) +>x : Symbol(x, Decl(objectTypesIdentityWithGenericConstructSignaturesDifferingByConstraints3.ts, 49, 14)) +>a : Symbol(a, Decl(objectTypesIdentityWithGenericConstructSignaturesDifferingByConstraints3.ts, 33, 3)) + +function foo3(x: any) { } +>foo3 : Symbol(foo3, Decl(objectTypesIdentityWithGenericConstructSignaturesDifferingByConstraints3.ts, 46, 25), Decl(objectTypesIdentityWithGenericConstructSignaturesDifferingByConstraints3.ts, 48, 27), Decl(objectTypesIdentityWithGenericConstructSignaturesDifferingByConstraints3.ts, 49, 27)) +>x : Symbol(x, Decl(objectTypesIdentityWithGenericConstructSignaturesDifferingByConstraints3.ts, 50, 14)) + +function foo4(x: typeof b); +>foo4 : Symbol(foo4, Decl(objectTypesIdentityWithGenericConstructSignaturesDifferingByConstraints3.ts, 50, 25), Decl(objectTypesIdentityWithGenericConstructSignaturesDifferingByConstraints3.ts, 52, 27), Decl(objectTypesIdentityWithGenericConstructSignaturesDifferingByConstraints3.ts, 53, 27)) +>x : Symbol(x, Decl(objectTypesIdentityWithGenericConstructSignaturesDifferingByConstraints3.ts, 52, 14)) +>b : Symbol(b, Decl(objectTypesIdentityWithGenericConstructSignaturesDifferingByConstraints3.ts, 34, 3)) + +function foo4(x: typeof b); // error +>foo4 : Symbol(foo4, Decl(objectTypesIdentityWithGenericConstructSignaturesDifferingByConstraints3.ts, 50, 25), Decl(objectTypesIdentityWithGenericConstructSignaturesDifferingByConstraints3.ts, 52, 27), Decl(objectTypesIdentityWithGenericConstructSignaturesDifferingByConstraints3.ts, 53, 27)) +>x : Symbol(x, Decl(objectTypesIdentityWithGenericConstructSignaturesDifferingByConstraints3.ts, 53, 14)) +>b : Symbol(b, Decl(objectTypesIdentityWithGenericConstructSignaturesDifferingByConstraints3.ts, 34, 3)) + +function foo4(x: any) { } +>foo4 : Symbol(foo4, Decl(objectTypesIdentityWithGenericConstructSignaturesDifferingByConstraints3.ts, 50, 25), Decl(objectTypesIdentityWithGenericConstructSignaturesDifferingByConstraints3.ts, 52, 27), Decl(objectTypesIdentityWithGenericConstructSignaturesDifferingByConstraints3.ts, 53, 27)) +>x : Symbol(x, Decl(objectTypesIdentityWithGenericConstructSignaturesDifferingByConstraints3.ts, 54, 14)) + +function foo5c(x: C); +>foo5c : Symbol(foo5c, Decl(objectTypesIdentityWithGenericConstructSignaturesDifferingByConstraints3.ts, 54, 25), Decl(objectTypesIdentityWithGenericConstructSignaturesDifferingByConstraints3.ts, 56, 35), Decl(objectTypesIdentityWithGenericConstructSignaturesDifferingByConstraints3.ts, 57, 49)) +>x : Symbol(x, Decl(objectTypesIdentityWithGenericConstructSignaturesDifferingByConstraints3.ts, 56, 15)) +>C : Symbol(C, Decl(objectTypesIdentityWithGenericConstructSignaturesDifferingByConstraints3.ts, 15, 1)) +>Three : Symbol(Three, Decl(objectTypesIdentityWithGenericConstructSignaturesDifferingByConstraints3.ts, 5, 25)) +>Three : Symbol(Three, Decl(objectTypesIdentityWithGenericConstructSignaturesDifferingByConstraints3.ts, 5, 25)) + +function foo5c(x: D, Four>); // error +>foo5c : Symbol(foo5c, Decl(objectTypesIdentityWithGenericConstructSignaturesDifferingByConstraints3.ts, 54, 25), Decl(objectTypesIdentityWithGenericConstructSignaturesDifferingByConstraints3.ts, 56, 35), Decl(objectTypesIdentityWithGenericConstructSignaturesDifferingByConstraints3.ts, 57, 49)) +>x : Symbol(x, Decl(objectTypesIdentityWithGenericConstructSignaturesDifferingByConstraints3.ts, 57, 15)) +>D : Symbol(D, Decl(objectTypesIdentityWithGenericConstructSignaturesDifferingByConstraints3.ts, 19, 1)) +>Four : Symbol(Four, Decl(objectTypesIdentityWithGenericConstructSignaturesDifferingByConstraints3.ts, 6, 31)) +>Four : Symbol(Four, Decl(objectTypesIdentityWithGenericConstructSignaturesDifferingByConstraints3.ts, 6, 31)) + +function foo5c(x: any) { } +>foo5c : Symbol(foo5c, Decl(objectTypesIdentityWithGenericConstructSignaturesDifferingByConstraints3.ts, 54, 25), Decl(objectTypesIdentityWithGenericConstructSignaturesDifferingByConstraints3.ts, 56, 35), Decl(objectTypesIdentityWithGenericConstructSignaturesDifferingByConstraints3.ts, 57, 49)) +>x : Symbol(x, Decl(objectTypesIdentityWithGenericConstructSignaturesDifferingByConstraints3.ts, 58, 15)) + +function foo6c(x: C); +>foo6c : Symbol(foo6c, Decl(objectTypesIdentityWithGenericConstructSignaturesDifferingByConstraints3.ts, 58, 26), Decl(objectTypesIdentityWithGenericConstructSignaturesDifferingByConstraints3.ts, 60, 35), Decl(objectTypesIdentityWithGenericConstructSignaturesDifferingByConstraints3.ts, 61, 49)) +>x : Symbol(x, Decl(objectTypesIdentityWithGenericConstructSignaturesDifferingByConstraints3.ts, 60, 15)) +>C : Symbol(C, Decl(objectTypesIdentityWithGenericConstructSignaturesDifferingByConstraints3.ts, 15, 1)) +>Three : Symbol(Three, Decl(objectTypesIdentityWithGenericConstructSignaturesDifferingByConstraints3.ts, 5, 25)) +>Three : Symbol(Three, Decl(objectTypesIdentityWithGenericConstructSignaturesDifferingByConstraints3.ts, 5, 25)) + +function foo6c(x: D, Four>); // error +>foo6c : Symbol(foo6c, Decl(objectTypesIdentityWithGenericConstructSignaturesDifferingByConstraints3.ts, 58, 26), Decl(objectTypesIdentityWithGenericConstructSignaturesDifferingByConstraints3.ts, 60, 35), Decl(objectTypesIdentityWithGenericConstructSignaturesDifferingByConstraints3.ts, 61, 49)) +>x : Symbol(x, Decl(objectTypesIdentityWithGenericConstructSignaturesDifferingByConstraints3.ts, 61, 15)) +>D : Symbol(D, Decl(objectTypesIdentityWithGenericConstructSignaturesDifferingByConstraints3.ts, 19, 1)) +>Four : Symbol(Four, Decl(objectTypesIdentityWithGenericConstructSignaturesDifferingByConstraints3.ts, 6, 31)) +>Four : Symbol(Four, Decl(objectTypesIdentityWithGenericConstructSignaturesDifferingByConstraints3.ts, 6, 31)) + +function foo6c(x: any) { } +>foo6c : Symbol(foo6c, Decl(objectTypesIdentityWithGenericConstructSignaturesDifferingByConstraints3.ts, 58, 26), Decl(objectTypesIdentityWithGenericConstructSignaturesDifferingByConstraints3.ts, 60, 35), Decl(objectTypesIdentityWithGenericConstructSignaturesDifferingByConstraints3.ts, 61, 49)) +>x : Symbol(x, Decl(objectTypesIdentityWithGenericConstructSignaturesDifferingByConstraints3.ts, 62, 15)) + +function foo8(x: B); +>foo8 : Symbol(foo8, Decl(objectTypesIdentityWithGenericConstructSignaturesDifferingByConstraints3.ts, 62, 26), Decl(objectTypesIdentityWithGenericConstructSignaturesDifferingByConstraints3.ts, 64, 30), Decl(objectTypesIdentityWithGenericConstructSignaturesDifferingByConstraints3.ts, 65, 48)) +>x : Symbol(x, Decl(objectTypesIdentityWithGenericConstructSignaturesDifferingByConstraints3.ts, 64, 14)) +>B : Symbol(B, Decl(objectTypesIdentityWithGenericConstructSignaturesDifferingByConstraints3.ts, 11, 1)) +>Two : Symbol(Two, Decl(objectTypesIdentityWithGenericConstructSignaturesDifferingByConstraints3.ts, 4, 25)) +>Two : Symbol(Two, Decl(objectTypesIdentityWithGenericConstructSignaturesDifferingByConstraints3.ts, 4, 25)) + +function foo8(x: I, Five>); // error +>foo8 : Symbol(foo8, Decl(objectTypesIdentityWithGenericConstructSignaturesDifferingByConstraints3.ts, 62, 26), Decl(objectTypesIdentityWithGenericConstructSignaturesDifferingByConstraints3.ts, 64, 30), Decl(objectTypesIdentityWithGenericConstructSignaturesDifferingByConstraints3.ts, 65, 48)) +>x : Symbol(x, Decl(objectTypesIdentityWithGenericConstructSignaturesDifferingByConstraints3.ts, 65, 14)) +>I : Symbol(I, Decl(objectTypesIdentityWithGenericConstructSignaturesDifferingByConstraints3.ts, 23, 1)) +>Five : Symbol(Five, Decl(objectTypesIdentityWithGenericConstructSignaturesDifferingByConstraints3.ts, 7, 28)) +>Five : Symbol(Five, Decl(objectTypesIdentityWithGenericConstructSignaturesDifferingByConstraints3.ts, 7, 28)) + +function foo8(x: any) { } +>foo8 : Symbol(foo8, Decl(objectTypesIdentityWithGenericConstructSignaturesDifferingByConstraints3.ts, 62, 26), Decl(objectTypesIdentityWithGenericConstructSignaturesDifferingByConstraints3.ts, 64, 30), Decl(objectTypesIdentityWithGenericConstructSignaturesDifferingByConstraints3.ts, 65, 48)) +>x : Symbol(x, Decl(objectTypesIdentityWithGenericConstructSignaturesDifferingByConstraints3.ts, 66, 14)) + +function foo9(x: B); +>foo9 : Symbol(foo9, Decl(objectTypesIdentityWithGenericConstructSignaturesDifferingByConstraints3.ts, 66, 25), Decl(objectTypesIdentityWithGenericConstructSignaturesDifferingByConstraints3.ts, 68, 30), Decl(objectTypesIdentityWithGenericConstructSignaturesDifferingByConstraints3.ts, 69, 34)) +>x : Symbol(x, Decl(objectTypesIdentityWithGenericConstructSignaturesDifferingByConstraints3.ts, 68, 14)) +>B : Symbol(B, Decl(objectTypesIdentityWithGenericConstructSignaturesDifferingByConstraints3.ts, 11, 1)) +>Two : Symbol(Two, Decl(objectTypesIdentityWithGenericConstructSignaturesDifferingByConstraints3.ts, 4, 25)) +>Two : Symbol(Two, Decl(objectTypesIdentityWithGenericConstructSignaturesDifferingByConstraints3.ts, 4, 25)) + +function foo9(x: C); // error +>foo9 : Symbol(foo9, Decl(objectTypesIdentityWithGenericConstructSignaturesDifferingByConstraints3.ts, 66, 25), Decl(objectTypesIdentityWithGenericConstructSignaturesDifferingByConstraints3.ts, 68, 30), Decl(objectTypesIdentityWithGenericConstructSignaturesDifferingByConstraints3.ts, 69, 34)) +>x : Symbol(x, Decl(objectTypesIdentityWithGenericConstructSignaturesDifferingByConstraints3.ts, 69, 14)) +>C : Symbol(C, Decl(objectTypesIdentityWithGenericConstructSignaturesDifferingByConstraints3.ts, 15, 1)) +>Three : Symbol(Three, Decl(objectTypesIdentityWithGenericConstructSignaturesDifferingByConstraints3.ts, 5, 25)) +>Three : Symbol(Three, Decl(objectTypesIdentityWithGenericConstructSignaturesDifferingByConstraints3.ts, 5, 25)) + +function foo9(x: any) { } +>foo9 : Symbol(foo9, Decl(objectTypesIdentityWithGenericConstructSignaturesDifferingByConstraints3.ts, 66, 25), Decl(objectTypesIdentityWithGenericConstructSignaturesDifferingByConstraints3.ts, 68, 30), Decl(objectTypesIdentityWithGenericConstructSignaturesDifferingByConstraints3.ts, 69, 34)) +>x : Symbol(x, Decl(objectTypesIdentityWithGenericConstructSignaturesDifferingByConstraints3.ts, 70, 14)) + +function foo10(x: B); +>foo10 : Symbol(foo10, Decl(objectTypesIdentityWithGenericConstructSignaturesDifferingByConstraints3.ts, 70, 25), Decl(objectTypesIdentityWithGenericConstructSignaturesDifferingByConstraints3.ts, 72, 31), Decl(objectTypesIdentityWithGenericConstructSignaturesDifferingByConstraints3.ts, 73, 28)) +>x : Symbol(x, Decl(objectTypesIdentityWithGenericConstructSignaturesDifferingByConstraints3.ts, 72, 15)) +>B : Symbol(B, Decl(objectTypesIdentityWithGenericConstructSignaturesDifferingByConstraints3.ts, 11, 1)) +>Two : Symbol(Two, Decl(objectTypesIdentityWithGenericConstructSignaturesDifferingByConstraints3.ts, 4, 25)) +>Two : Symbol(Two, Decl(objectTypesIdentityWithGenericConstructSignaturesDifferingByConstraints3.ts, 4, 25)) + +function foo10(x: typeof a); // ok +>foo10 : Symbol(foo10, Decl(objectTypesIdentityWithGenericConstructSignaturesDifferingByConstraints3.ts, 70, 25), Decl(objectTypesIdentityWithGenericConstructSignaturesDifferingByConstraints3.ts, 72, 31), Decl(objectTypesIdentityWithGenericConstructSignaturesDifferingByConstraints3.ts, 73, 28)) +>x : Symbol(x, Decl(objectTypesIdentityWithGenericConstructSignaturesDifferingByConstraints3.ts, 73, 15)) +>a : Symbol(a, Decl(objectTypesIdentityWithGenericConstructSignaturesDifferingByConstraints3.ts, 33, 3)) + +function foo10(x: any) { } +>foo10 : Symbol(foo10, Decl(objectTypesIdentityWithGenericConstructSignaturesDifferingByConstraints3.ts, 70, 25), Decl(objectTypesIdentityWithGenericConstructSignaturesDifferingByConstraints3.ts, 72, 31), Decl(objectTypesIdentityWithGenericConstructSignaturesDifferingByConstraints3.ts, 73, 28)) +>x : Symbol(x, Decl(objectTypesIdentityWithGenericConstructSignaturesDifferingByConstraints3.ts, 74, 15)) + +function foo11(x: B); +>foo11 : Symbol(foo11, Decl(objectTypesIdentityWithGenericConstructSignaturesDifferingByConstraints3.ts, 74, 26), Decl(objectTypesIdentityWithGenericConstructSignaturesDifferingByConstraints3.ts, 76, 31), Decl(objectTypesIdentityWithGenericConstructSignaturesDifferingByConstraints3.ts, 77, 28)) +>x : Symbol(x, Decl(objectTypesIdentityWithGenericConstructSignaturesDifferingByConstraints3.ts, 76, 15)) +>B : Symbol(B, Decl(objectTypesIdentityWithGenericConstructSignaturesDifferingByConstraints3.ts, 11, 1)) +>Two : Symbol(Two, Decl(objectTypesIdentityWithGenericConstructSignaturesDifferingByConstraints3.ts, 4, 25)) +>Two : Symbol(Two, Decl(objectTypesIdentityWithGenericConstructSignaturesDifferingByConstraints3.ts, 4, 25)) + +function foo11(x: typeof b); // ok +>foo11 : Symbol(foo11, Decl(objectTypesIdentityWithGenericConstructSignaturesDifferingByConstraints3.ts, 74, 26), Decl(objectTypesIdentityWithGenericConstructSignaturesDifferingByConstraints3.ts, 76, 31), Decl(objectTypesIdentityWithGenericConstructSignaturesDifferingByConstraints3.ts, 77, 28)) +>x : Symbol(x, Decl(objectTypesIdentityWithGenericConstructSignaturesDifferingByConstraints3.ts, 77, 15)) +>b : Symbol(b, Decl(objectTypesIdentityWithGenericConstructSignaturesDifferingByConstraints3.ts, 34, 3)) + +function foo11(x: any) { } +>foo11 : Symbol(foo11, Decl(objectTypesIdentityWithGenericConstructSignaturesDifferingByConstraints3.ts, 74, 26), Decl(objectTypesIdentityWithGenericConstructSignaturesDifferingByConstraints3.ts, 76, 31), Decl(objectTypesIdentityWithGenericConstructSignaturesDifferingByConstraints3.ts, 77, 28)) +>x : Symbol(x, Decl(objectTypesIdentityWithGenericConstructSignaturesDifferingByConstraints3.ts, 78, 15)) + +function foo12(x: I, Five>); +>foo12 : Symbol(foo12, Decl(objectTypesIdentityWithGenericConstructSignaturesDifferingByConstraints3.ts, 78, 26), Decl(objectTypesIdentityWithGenericConstructSignaturesDifferingByConstraints3.ts, 80, 49), Decl(objectTypesIdentityWithGenericConstructSignaturesDifferingByConstraints3.ts, 81, 35)) +>x : Symbol(x, Decl(objectTypesIdentityWithGenericConstructSignaturesDifferingByConstraints3.ts, 80, 15)) +>I : Symbol(I, Decl(objectTypesIdentityWithGenericConstructSignaturesDifferingByConstraints3.ts, 23, 1)) +>Five : Symbol(Five, Decl(objectTypesIdentityWithGenericConstructSignaturesDifferingByConstraints3.ts, 7, 28)) +>Five : Symbol(Five, Decl(objectTypesIdentityWithGenericConstructSignaturesDifferingByConstraints3.ts, 7, 28)) + +function foo12(x: C); // ok +>foo12 : Symbol(foo12, Decl(objectTypesIdentityWithGenericConstructSignaturesDifferingByConstraints3.ts, 78, 26), Decl(objectTypesIdentityWithGenericConstructSignaturesDifferingByConstraints3.ts, 80, 49), Decl(objectTypesIdentityWithGenericConstructSignaturesDifferingByConstraints3.ts, 81, 35)) +>x : Symbol(x, Decl(objectTypesIdentityWithGenericConstructSignaturesDifferingByConstraints3.ts, 81, 15)) +>C : Symbol(C, Decl(objectTypesIdentityWithGenericConstructSignaturesDifferingByConstraints3.ts, 15, 1)) +>Three : Symbol(Three, Decl(objectTypesIdentityWithGenericConstructSignaturesDifferingByConstraints3.ts, 5, 25)) +>Three : Symbol(Three, Decl(objectTypesIdentityWithGenericConstructSignaturesDifferingByConstraints3.ts, 5, 25)) + +function foo12(x: any) { } +>foo12 : Symbol(foo12, Decl(objectTypesIdentityWithGenericConstructSignaturesDifferingByConstraints3.ts, 78, 26), Decl(objectTypesIdentityWithGenericConstructSignaturesDifferingByConstraints3.ts, 80, 49), Decl(objectTypesIdentityWithGenericConstructSignaturesDifferingByConstraints3.ts, 81, 35)) +>x : Symbol(x, Decl(objectTypesIdentityWithGenericConstructSignaturesDifferingByConstraints3.ts, 82, 15)) + +function foo12b(x: I2); +>foo12b : Symbol(foo12b, Decl(objectTypesIdentityWithGenericConstructSignaturesDifferingByConstraints3.ts, 82, 26), Decl(objectTypesIdentityWithGenericConstructSignaturesDifferingByConstraints3.ts, 84, 23), Decl(objectTypesIdentityWithGenericConstructSignaturesDifferingByConstraints3.ts, 85, 36)) +>x : Symbol(x, Decl(objectTypesIdentityWithGenericConstructSignaturesDifferingByConstraints3.ts, 84, 16)) +>I2 : Symbol(I2, Decl(objectTypesIdentityWithGenericConstructSignaturesDifferingByConstraints3.ts, 27, 1)) + +function foo12b(x: C); // ok +>foo12b : Symbol(foo12b, Decl(objectTypesIdentityWithGenericConstructSignaturesDifferingByConstraints3.ts, 82, 26), Decl(objectTypesIdentityWithGenericConstructSignaturesDifferingByConstraints3.ts, 84, 23), Decl(objectTypesIdentityWithGenericConstructSignaturesDifferingByConstraints3.ts, 85, 36)) +>x : Symbol(x, Decl(objectTypesIdentityWithGenericConstructSignaturesDifferingByConstraints3.ts, 85, 16)) +>C : Symbol(C, Decl(objectTypesIdentityWithGenericConstructSignaturesDifferingByConstraints3.ts, 15, 1)) +>Three : Symbol(Three, Decl(objectTypesIdentityWithGenericConstructSignaturesDifferingByConstraints3.ts, 5, 25)) +>Three : Symbol(Three, Decl(objectTypesIdentityWithGenericConstructSignaturesDifferingByConstraints3.ts, 5, 25)) + +function foo12b(x: any) { } +>foo12b : Symbol(foo12b, Decl(objectTypesIdentityWithGenericConstructSignaturesDifferingByConstraints3.ts, 82, 26), Decl(objectTypesIdentityWithGenericConstructSignaturesDifferingByConstraints3.ts, 84, 23), Decl(objectTypesIdentityWithGenericConstructSignaturesDifferingByConstraints3.ts, 85, 36)) +>x : Symbol(x, Decl(objectTypesIdentityWithGenericConstructSignaturesDifferingByConstraints3.ts, 86, 16)) + +function foo13(x: I, Five>); +>foo13 : Symbol(foo13, Decl(objectTypesIdentityWithGenericConstructSignaturesDifferingByConstraints3.ts, 86, 27), Decl(objectTypesIdentityWithGenericConstructSignaturesDifferingByConstraints3.ts, 88, 49), Decl(objectTypesIdentityWithGenericConstructSignaturesDifferingByConstraints3.ts, 89, 28)) +>x : Symbol(x, Decl(objectTypesIdentityWithGenericConstructSignaturesDifferingByConstraints3.ts, 88, 15)) +>I : Symbol(I, Decl(objectTypesIdentityWithGenericConstructSignaturesDifferingByConstraints3.ts, 23, 1)) +>Five : Symbol(Five, Decl(objectTypesIdentityWithGenericConstructSignaturesDifferingByConstraints3.ts, 7, 28)) +>Five : Symbol(Five, Decl(objectTypesIdentityWithGenericConstructSignaturesDifferingByConstraints3.ts, 7, 28)) + +function foo13(x: typeof a); // ok +>foo13 : Symbol(foo13, Decl(objectTypesIdentityWithGenericConstructSignaturesDifferingByConstraints3.ts, 86, 27), Decl(objectTypesIdentityWithGenericConstructSignaturesDifferingByConstraints3.ts, 88, 49), Decl(objectTypesIdentityWithGenericConstructSignaturesDifferingByConstraints3.ts, 89, 28)) +>x : Symbol(x, Decl(objectTypesIdentityWithGenericConstructSignaturesDifferingByConstraints3.ts, 89, 15)) +>a : Symbol(a, Decl(objectTypesIdentityWithGenericConstructSignaturesDifferingByConstraints3.ts, 33, 3)) + +function foo13(x: any) { } +>foo13 : Symbol(foo13, Decl(objectTypesIdentityWithGenericConstructSignaturesDifferingByConstraints3.ts, 86, 27), Decl(objectTypesIdentityWithGenericConstructSignaturesDifferingByConstraints3.ts, 88, 49), Decl(objectTypesIdentityWithGenericConstructSignaturesDifferingByConstraints3.ts, 89, 28)) +>x : Symbol(x, Decl(objectTypesIdentityWithGenericConstructSignaturesDifferingByConstraints3.ts, 90, 15)) + +function foo14(x: I, Five>); +>foo14 : Symbol(foo14, Decl(objectTypesIdentityWithGenericConstructSignaturesDifferingByConstraints3.ts, 90, 26), Decl(objectTypesIdentityWithGenericConstructSignaturesDifferingByConstraints3.ts, 92, 49), Decl(objectTypesIdentityWithGenericConstructSignaturesDifferingByConstraints3.ts, 93, 28)) +>x : Symbol(x, Decl(objectTypesIdentityWithGenericConstructSignaturesDifferingByConstraints3.ts, 92, 15)) +>I : Symbol(I, Decl(objectTypesIdentityWithGenericConstructSignaturesDifferingByConstraints3.ts, 23, 1)) +>Five : Symbol(Five, Decl(objectTypesIdentityWithGenericConstructSignaturesDifferingByConstraints3.ts, 7, 28)) +>Five : Symbol(Five, Decl(objectTypesIdentityWithGenericConstructSignaturesDifferingByConstraints3.ts, 7, 28)) + +function foo14(x: typeof b); // ok +>foo14 : Symbol(foo14, Decl(objectTypesIdentityWithGenericConstructSignaturesDifferingByConstraints3.ts, 90, 26), Decl(objectTypesIdentityWithGenericConstructSignaturesDifferingByConstraints3.ts, 92, 49), Decl(objectTypesIdentityWithGenericConstructSignaturesDifferingByConstraints3.ts, 93, 28)) +>x : Symbol(x, Decl(objectTypesIdentityWithGenericConstructSignaturesDifferingByConstraints3.ts, 93, 15)) +>b : Symbol(b, Decl(objectTypesIdentityWithGenericConstructSignaturesDifferingByConstraints3.ts, 34, 3)) + +function foo14(x: any) { } +>foo14 : Symbol(foo14, Decl(objectTypesIdentityWithGenericConstructSignaturesDifferingByConstraints3.ts, 90, 26), Decl(objectTypesIdentityWithGenericConstructSignaturesDifferingByConstraints3.ts, 92, 49), Decl(objectTypesIdentityWithGenericConstructSignaturesDifferingByConstraints3.ts, 93, 28)) +>x : Symbol(x, Decl(objectTypesIdentityWithGenericConstructSignaturesDifferingByConstraints3.ts, 94, 15)) + diff --git a/tests/baselines/reference/objectTypesIdentityWithGenericConstructSignaturesDifferingByConstraints3.types b/tests/baselines/reference/objectTypesIdentityWithGenericConstructSignaturesDifferingByConstraints3.types new file mode 100644 index 00000000000..d8109a6a826 --- /dev/null +++ b/tests/baselines/reference/objectTypesIdentityWithGenericConstructSignaturesDifferingByConstraints3.types @@ -0,0 +1,389 @@ +=== tests/cases/conformance/types/typeRelationships/typeAndMemberIdentity/objectTypesIdentityWithGenericConstructSignaturesDifferingByConstraints3.ts === +// Two call or construct signatures are considered identical when they have the same number of type parameters and, considering those +// parameters pairwise identical, have identical type parameter constraints, identical number of parameters with identical kind(required, +// optional or rest) and types, and identical return types. + +class One { foo: string } +>One : One +>foo : string + +class Two { foo: string } +>Two : Two +>foo : string + +interface Three { foo: string } +>Three : Three +>foo : string + +interface Four { foo: T } +>Four : Four +>T : T +>foo : T +>T : T + +interface Five extends Four { } +>Five : Five +>T : T +>Four : Four +>T : T + +interface Six { +>Six : Six +>T : T +>U : U + + foo: T; +>foo : T +>T : T +} + +class B { +>B : B +>T : T +>U : U +>U : U +>Two : Two + + constructor(x: T, y: U) { return null; } +>x : T +>T : T +>y : U +>U : U +>null : null +} + +class C { +>C : C +>T : T +>U : U +>U : U +>Three : Three + + constructor(x: T, y: U) { return null; } +>x : T +>T : T +>y : U +>U : U +>null : null +} + +class D> { +>D : D +>T : T +>U : U +>U : U +>Four : Four + + constructor(x: T, y: U) { return null; } +>x : T +>T : T +>y : U +>U : U +>null : null +} + +interface I> { +>I : I +>T : T +>U : U +>U : U +>Five : Five + + new(x: T, y: U): string; +>x : T +>T : T +>y : U +>U : U +} + +interface I2 { +>I2 : I2 + + new>(x: T, y: U): string; +>T : T +>U : U +>U : U +>Six : Six +>x : T +>T : T +>y : U +>U : U +} + +var a: { new(x: T, y: U): string } +>a : new (x: T, y: U) => string +>T : T +>U : U +>U : U +>One : One +>x : T +>T : T +>y : U +>U : U + +var b = { new(x: T, y: U) { return ''; } }; // not a construct signature, function called new +>b : { new(x: T, y: U): string; } +>{ new(x: T, y: U) { return ''; } } : { new(x: T, y: U): string; } +>new : (x: T, y: U) => string +>T : T +>U : U +>U : U +>Two : Two +>x : T +>T : T +>y : U +>U : U +>'' : string + +function foo1b(x: B); +>foo1b : { (x: B): any; (x: B): any; } +>x : B +>B : B +>Two : Two +>Two : Two + +function foo1b(x: B); // error +>foo1b : { (x: B): any; (x: B): any; } +>x : B +>B : B +>Two : Two +>Two : Two + +function foo1b(x: any) { } +>foo1b : { (x: B): any; (x: B): any; } +>x : any + +function foo1c(x: C); +>foo1c : { (x: C): any; (x: C): any; } +>x : C +>C : C +>Three : Three +>Three : Three + +function foo1c(x: C); // error +>foo1c : { (x: C): any; (x: C): any; } +>x : C +>C : C +>Three : Three +>Three : Three + +function foo1c(x: any) { } +>foo1c : { (x: C): any; (x: C): any; } +>x : any + +function foo2(x: I, Five>); +>foo2 : { (x: I, Five>): any; (x: I, Five>): any; } +>x : I, Five> +>I : I +>Five : Five +>Five : Five + +function foo2(x: I, Five>); // error +>foo2 : { (x: I, Five>): any; (x: I, Five>): any; } +>x : I, Five> +>I : I +>Five : Five +>Five : Five + +function foo2(x: any) { } +>foo2 : { (x: I, Five>): any; (x: I, Five>): any; } +>x : any + +function foo3(x: typeof a); +>foo3 : { (x: new (x: T, y: U) => string): any; (x: new (x: T, y: U) => string): any; } +>x : new (x: T, y: U) => string +>a : new (x: T, y: U) => string + +function foo3(x: typeof a); // error +>foo3 : { (x: new (x: T, y: U) => string): any; (x: new (x: T, y: U) => string): any; } +>x : new (x: T, y: U) => string +>a : new (x: T, y: U) => string + +function foo3(x: any) { } +>foo3 : { (x: new (x: T, y: U) => string): any; (x: new (x: T, y: U) => string): any; } +>x : any + +function foo4(x: typeof b); +>foo4 : { (x: { new(x: T, y: U): string; }): any; (x: { new(x: T, y: U): string; }): any; } +>x : { new(x: T, y: U): string; } +>b : { new(x: T, y: U): string; } + +function foo4(x: typeof b); // error +>foo4 : { (x: { new(x: T, y: U): string; }): any; (x: { new(x: T, y: U): string; }): any; } +>x : { new(x: T, y: U): string; } +>b : { new(x: T, y: U): string; } + +function foo4(x: any) { } +>foo4 : { (x: { new(x: T, y: U): string; }): any; (x: { new(x: T, y: U): string; }): any; } +>x : any + +function foo5c(x: C); +>foo5c : { (x: C): any; (x: D, Four>): any; } +>x : C +>C : C +>Three : Three +>Three : Three + +function foo5c(x: D, Four>); // error +>foo5c : { (x: C): any; (x: D, Four>): any; } +>x : D, Four> +>D : D +>Four : Four +>Four : Four + +function foo5c(x: any) { } +>foo5c : { (x: C): any; (x: D, Four>): any; } +>x : any + +function foo6c(x: C); +>foo6c : { (x: C): any; (x: D, Four>): any; } +>x : C +>C : C +>Three : Three +>Three : Three + +function foo6c(x: D, Four>); // error +>foo6c : { (x: C): any; (x: D, Four>): any; } +>x : D, Four> +>D : D +>Four : Four +>Four : Four + +function foo6c(x: any) { } +>foo6c : { (x: C): any; (x: D, Four>): any; } +>x : any + +function foo8(x: B); +>foo8 : { (x: B): any; (x: I, Five>): any; } +>x : B +>B : B +>Two : Two +>Two : Two + +function foo8(x: I, Five>); // error +>foo8 : { (x: B): any; (x: I, Five>): any; } +>x : I, Five> +>I : I +>Five : Five +>Five : Five + +function foo8(x: any) { } +>foo8 : { (x: B): any; (x: I, Five>): any; } +>x : any + +function foo9(x: B); +>foo9 : { (x: B): any; (x: C): any; } +>x : B +>B : B +>Two : Two +>Two : Two + +function foo9(x: C); // error +>foo9 : { (x: B): any; (x: C): any; } +>x : C +>C : C +>Three : Three +>Three : Three + +function foo9(x: any) { } +>foo9 : { (x: B): any; (x: C): any; } +>x : any + +function foo10(x: B); +>foo10 : { (x: B): any; (x: new (x: T, y: U) => string): any; } +>x : B +>B : B +>Two : Two +>Two : Two + +function foo10(x: typeof a); // ok +>foo10 : { (x: B): any; (x: new (x: T, y: U) => string): any; } +>x : new (x: T, y: U) => string +>a : new (x: T, y: U) => string + +function foo10(x: any) { } +>foo10 : { (x: B): any; (x: new (x: T, y: U) => string): any; } +>x : any + +function foo11(x: B); +>foo11 : { (x: B): any; (x: { new(x: T, y: U): string; }): any; } +>x : B +>B : B +>Two : Two +>Two : Two + +function foo11(x: typeof b); // ok +>foo11 : { (x: B): any; (x: { new(x: T, y: U): string; }): any; } +>x : { new(x: T, y: U): string; } +>b : { new(x: T, y: U): string; } + +function foo11(x: any) { } +>foo11 : { (x: B): any; (x: { new(x: T, y: U): string; }): any; } +>x : any + +function foo12(x: I, Five>); +>foo12 : { (x: I, Five>): any; (x: C): any; } +>x : I, Five> +>I : I +>Five : Five +>Five : Five + +function foo12(x: C); // ok +>foo12 : { (x: I, Five>): any; (x: C): any; } +>x : C +>C : C +>Three : Three +>Three : Three + +function foo12(x: any) { } +>foo12 : { (x: I, Five>): any; (x: C): any; } +>x : any + +function foo12b(x: I2); +>foo12b : { (x: I2): any; (x: C): any; } +>x : I2 +>I2 : I2 + +function foo12b(x: C); // ok +>foo12b : { (x: I2): any; (x: C): any; } +>x : C +>C : C +>Three : Three +>Three : Three + +function foo12b(x: any) { } +>foo12b : { (x: I2): any; (x: C): any; } +>x : any + +function foo13(x: I, Five>); +>foo13 : { (x: I, Five>): any; (x: new (x: T, y: U) => string): any; } +>x : I, Five> +>I : I +>Five : Five +>Five : Five + +function foo13(x: typeof a); // ok +>foo13 : { (x: I, Five>): any; (x: new (x: T, y: U) => string): any; } +>x : new (x: T, y: U) => string +>a : new (x: T, y: U) => string + +function foo13(x: any) { } +>foo13 : { (x: I, Five>): any; (x: new (x: T, y: U) => string): any; } +>x : any + +function foo14(x: I, Five>); +>foo14 : { (x: I, Five>): any; (x: { new(x: T, y: U): string; }): any; } +>x : I, Five> +>I : I +>Five : Five +>Five : Five + +function foo14(x: typeof b); // ok +>foo14 : { (x: I, Five>): any; (x: { new(x: T, y: U): string; }): any; } +>x : { new(x: T, y: U): string; } +>b : { new(x: T, y: U): string; } + +function foo14(x: any) { } +>foo14 : { (x: I, Five>): any; (x: { new(x: T, y: U): string; }): any; } +>x : any + diff --git a/tests/baselines/reference/parserGenericConstraint2.errors.txt b/tests/baselines/reference/parserGenericConstraint2.errors.txt index a1548d81d9a..00fe33457a5 100644 --- a/tests/baselines/reference/parserGenericConstraint2.errors.txt +++ b/tests/baselines/reference/parserGenericConstraint2.errors.txt @@ -1,11 +1,8 @@ -tests/cases/conformance/parser/ecmascript5/Generics/parserGenericConstraint2.ts(1,9): error TS2313: Constraint of a type parameter cannot reference any type parameter from the same type parameter list. tests/cases/conformance/parser/ecmascript5/Generics/parserGenericConstraint2.ts(1,19): error TS2304: Cannot find name 'List'. -==== tests/cases/conformance/parser/ecmascript5/Generics/parserGenericConstraint2.ts (2 errors) ==== +==== tests/cases/conformance/parser/ecmascript5/Generics/parserGenericConstraint2.ts (1 errors) ==== class C > { - ~~~~~~~~~~~~~~~~~ -!!! error TS2313: Constraint of a type parameter cannot reference any type parameter from the same type parameter list. ~~~~ !!! error TS2304: Cannot find name 'List'. } \ No newline at end of file diff --git a/tests/baselines/reference/parserGenericConstraint3.errors.txt b/tests/baselines/reference/parserGenericConstraint3.errors.txt index 1dc7ea4e080..e4e42d5b53b 100644 --- a/tests/baselines/reference/parserGenericConstraint3.errors.txt +++ b/tests/baselines/reference/parserGenericConstraint3.errors.txt @@ -1,11 +1,8 @@ -tests/cases/conformance/parser/ecmascript5/Generics/parserGenericConstraint3.ts(1,9): error TS2313: Constraint of a type parameter cannot reference any type parameter from the same type parameter list. tests/cases/conformance/parser/ecmascript5/Generics/parserGenericConstraint3.ts(1,19): error TS2304: Cannot find name 'List'. -==== tests/cases/conformance/parser/ecmascript5/Generics/parserGenericConstraint3.ts (2 errors) ==== +==== tests/cases/conformance/parser/ecmascript5/Generics/parserGenericConstraint3.ts (1 errors) ==== class C> { - ~~~~~~~~~~~~~~~~~ -!!! error TS2313: Constraint of a type parameter cannot reference any type parameter from the same type parameter list. ~~~~ !!! error TS2304: Cannot find name 'List'. } \ No newline at end of file diff --git a/tests/baselines/reference/parserGenericConstraint4.errors.txt b/tests/baselines/reference/parserGenericConstraint4.errors.txt index 3109bca9a2f..b42570593f7 100644 --- a/tests/baselines/reference/parserGenericConstraint4.errors.txt +++ b/tests/baselines/reference/parserGenericConstraint4.errors.txt @@ -1,11 +1,8 @@ -tests/cases/conformance/parser/ecmascript5/Generics/parserGenericConstraint4.ts(1,9): error TS2313: Constraint of a type parameter cannot reference any type parameter from the same type parameter list. tests/cases/conformance/parser/ecmascript5/Generics/parserGenericConstraint4.ts(1,19): error TS2304: Cannot find name 'List'. -==== tests/cases/conformance/parser/ecmascript5/Generics/parserGenericConstraint4.ts (2 errors) ==== +==== tests/cases/conformance/parser/ecmascript5/Generics/parserGenericConstraint4.ts (1 errors) ==== class C > > { - ~~~~~~~~~~~~~~~~~~~~~~~~ -!!! error TS2313: Constraint of a type parameter cannot reference any type parameter from the same type parameter list. ~~~~ !!! error TS2304: Cannot find name 'List'. } \ No newline at end of file diff --git a/tests/baselines/reference/parserGenericConstraint5.errors.txt b/tests/baselines/reference/parserGenericConstraint5.errors.txt index db8fea938b8..3479731ae13 100644 --- a/tests/baselines/reference/parserGenericConstraint5.errors.txt +++ b/tests/baselines/reference/parserGenericConstraint5.errors.txt @@ -1,11 +1,8 @@ -tests/cases/conformance/parser/ecmascript5/Generics/parserGenericConstraint5.ts(1,9): error TS2313: Constraint of a type parameter cannot reference any type parameter from the same type parameter list. tests/cases/conformance/parser/ecmascript5/Generics/parserGenericConstraint5.ts(1,19): error TS2304: Cannot find name 'List'. -==== tests/cases/conformance/parser/ecmascript5/Generics/parserGenericConstraint5.ts (2 errors) ==== +==== tests/cases/conformance/parser/ecmascript5/Generics/parserGenericConstraint5.ts (1 errors) ==== class C> > { - ~~~~~~~~~~~~~~~~~~~~~~~ -!!! error TS2313: Constraint of a type parameter cannot reference any type parameter from the same type parameter list. ~~~~ !!! error TS2304: Cannot find name 'List'. } \ No newline at end of file diff --git a/tests/baselines/reference/parserGenericConstraint6.errors.txt b/tests/baselines/reference/parserGenericConstraint6.errors.txt index 032ed7fafb3..5efbcc8e8d0 100644 --- a/tests/baselines/reference/parserGenericConstraint6.errors.txt +++ b/tests/baselines/reference/parserGenericConstraint6.errors.txt @@ -1,11 +1,8 @@ -tests/cases/conformance/parser/ecmascript5/Generics/parserGenericConstraint6.ts(1,9): error TS2313: Constraint of a type parameter cannot reference any type parameter from the same type parameter list. tests/cases/conformance/parser/ecmascript5/Generics/parserGenericConstraint6.ts(1,19): error TS2304: Cannot find name 'List'. -==== tests/cases/conformance/parser/ecmascript5/Generics/parserGenericConstraint6.ts (2 errors) ==== +==== tests/cases/conformance/parser/ecmascript5/Generics/parserGenericConstraint6.ts (1 errors) ==== class C >> { - ~~~~~~~~~~~~~~~~~~~~~~~~ -!!! error TS2313: Constraint of a type parameter cannot reference any type parameter from the same type parameter list. ~~~~ !!! error TS2304: Cannot find name 'List'. } \ No newline at end of file diff --git a/tests/baselines/reference/parserGenericConstraint7.errors.txt b/tests/baselines/reference/parserGenericConstraint7.errors.txt index 62dc8373e63..ffff8ea2583 100644 --- a/tests/baselines/reference/parserGenericConstraint7.errors.txt +++ b/tests/baselines/reference/parserGenericConstraint7.errors.txt @@ -1,11 +1,8 @@ -tests/cases/conformance/parser/ecmascript5/Generics/parserGenericConstraint7.ts(1,9): error TS2313: Constraint of a type parameter cannot reference any type parameter from the same type parameter list. tests/cases/conformance/parser/ecmascript5/Generics/parserGenericConstraint7.ts(1,19): error TS2304: Cannot find name 'List'. -==== tests/cases/conformance/parser/ecmascript5/Generics/parserGenericConstraint7.ts (2 errors) ==== +==== tests/cases/conformance/parser/ecmascript5/Generics/parserGenericConstraint7.ts (1 errors) ==== class C>> { - ~~~~~~~~~~~~~~~~~~~~~~~ -!!! error TS2313: Constraint of a type parameter cannot reference any type parameter from the same type parameter list. ~~~~ !!! error TS2304: Cannot find name 'List'. } \ No newline at end of file diff --git a/tests/baselines/reference/primitiveConstraints1.errors.txt b/tests/baselines/reference/primitiveConstraints1.errors.txt index 55d1f24f4ba..fb9591bfc31 100644 --- a/tests/baselines/reference/primitiveConstraints1.errors.txt +++ b/tests/baselines/reference/primitiveConstraints1.errors.txt @@ -1,15 +1,15 @@ -tests/cases/compiler/primitiveConstraints1.ts(1,15): error TS2313: Constraint of a type parameter cannot reference any type parameter from the same type parameter list. -tests/cases/compiler/primitiveConstraints1.ts(4,18): error TS2313: Constraint of a type parameter cannot reference any type parameter from the same type parameter list. +tests/cases/compiler/primitiveConstraints1.ts(2,6): error TS2344: Type 'string' does not satisfy the constraint 'number'. +tests/cases/compiler/primitiveConstraints1.ts(5,14): error TS2344: Type 'string' does not satisfy the constraint 'number'. ==== tests/cases/compiler/primitiveConstraints1.ts (2 errors) ==== function foo1(t: T, u: U) { } - ~~~~~~~~~~~ -!!! error TS2313: Constraint of a type parameter cannot reference any type parameter from the same type parameter list. foo1('hm', 1); // no error + ~~~~~~ +!!! error TS2344: Type 'string' does not satisfy the constraint 'number'. function foo2(t: T, u: U) { } - ~~~~~~~~~~~ -!!! error TS2313: Constraint of a type parameter cannot reference any type parameter from the same type parameter list. foo2(1, 'hm'); // error + ~~~~~~ +!!! error TS2344: Type 'string' does not satisfy the constraint 'number'. \ No newline at end of file diff --git a/tests/baselines/reference/propertyAccessOnTypeParameterWithConstraints3.errors.txt b/tests/baselines/reference/propertyAccessOnTypeParameterWithConstraints3.errors.txt deleted file mode 100644 index 89d6c4dcf2b..00000000000 --- a/tests/baselines/reference/propertyAccessOnTypeParameterWithConstraints3.errors.txt +++ /dev/null @@ -1,77 +0,0 @@ -tests/cases/conformance/types/typeParameters/typeParameterLists/propertyAccessOnTypeParameterWithConstraints3.ts(13,22): error TS2313: Constraint of a type parameter cannot reference any type parameter from the same type parameter list. -tests/cases/conformance/types/typeParameters/typeParameterLists/propertyAccessOnTypeParameterWithConstraints3.ts(31,26): error TS2313: Constraint of a type parameter cannot reference any type parameter from the same type parameter list. -tests/cases/conformance/types/typeParameters/typeParameterLists/propertyAccessOnTypeParameterWithConstraints3.ts(39,19): error TS2313: Constraint of a type parameter cannot reference any type parameter from the same type parameter list. -tests/cases/conformance/types/typeParameters/typeParameterLists/propertyAccessOnTypeParameterWithConstraints3.ts(40,6): error TS2313: Constraint of a type parameter cannot reference any type parameter from the same type parameter list. -tests/cases/conformance/types/typeParameters/typeParameterLists/propertyAccessOnTypeParameterWithConstraints3.ts(42,14): error TS2339: Property 'foo' does not exist on type '{}'. -tests/cases/conformance/types/typeParameters/typeParameterLists/propertyAccessOnTypeParameterWithConstraints3.ts(49,24): error TS2313: Constraint of a type parameter cannot reference any type parameter from the same type parameter list. - - -==== tests/cases/conformance/types/typeParameters/typeParameterLists/propertyAccessOnTypeParameterWithConstraints3.ts (6 errors) ==== - // generic types should behave as if they have properties of their constraint type - - class A { - foo(): string { return ''; } - } - - class B extends A { - bar(): string { - return ''; - } - } - - class C { - ~~~~~~~~~~~ -!!! error TS2313: Constraint of a type parameter cannot reference any type parameter from the same type parameter list. - f() { - var x: T; - // BUG 823818 - var a = x['foo'](); // should be string - return a + x.foo(); - } - - g(x: U) { - // BUG 823818 - var a = x['foo'](); // should be string - return a + x.foo(); - } - } - - var r1a = (new C()).f(); - var r1b = (new C()).g(new B()); - - interface I { - ~~~~~~~~~~~ -!!! error TS2313: Constraint of a type parameter cannot reference any type parameter from the same type parameter list. - foo: T; - } - var i: I; - var r2 = i.foo.foo(); - var r2b = i.foo['foo'](); - - var a: { - (): T; - ~~~~~~~~~~~ -!!! error TS2313: Constraint of a type parameter cannot reference any type parameter from the same type parameter list. - (x: U): U; - ~~~~~~~~~~~ -!!! error TS2313: Constraint of a type parameter cannot reference any type parameter from the same type parameter list. - } - var r3 = a().foo(); // error, no inferences for U so it doesn't satisfy constraint - ~~~ -!!! error TS2339: Property 'foo' does not exist on type '{}'. - var r3b = a()['foo'](); - // parameter supplied for type argument inference for U - var r3c = a(new B()).foo(); // valid call to an invalid function, U is inferred as B, which has a foo - var r3d = a(new B())['foo'](); // valid call to an invalid function, U is inferred as B, which has a foo - - var b = { - foo: (x: T) => { - ~~~~~~~~~~~ -!!! error TS2313: Constraint of a type parameter cannot reference any type parameter from the same type parameter list. - // BUG 823818 - var a = x['foo'](); // should be string - return a + x.foo(); - } - } - - var r4 = b.foo(new B()); // valid call to an invalid function \ No newline at end of file diff --git a/tests/baselines/reference/propertyAccessOnTypeParameterWithConstraints3.symbols b/tests/baselines/reference/propertyAccessOnTypeParameterWithConstraints3.symbols new file mode 100644 index 00000000000..0761c4612f1 --- /dev/null +++ b/tests/baselines/reference/propertyAccessOnTypeParameterWithConstraints3.symbols @@ -0,0 +1,190 @@ +=== tests/cases/conformance/types/typeParameters/typeParameterLists/propertyAccessOnTypeParameterWithConstraints3.ts === +// generic types should behave as if they have properties of their constraint type + +class A { +>A : Symbol(A, Decl(propertyAccessOnTypeParameterWithConstraints3.ts, 0, 0)) + + foo(): string { return ''; } +>foo : Symbol(foo, Decl(propertyAccessOnTypeParameterWithConstraints3.ts, 2, 9)) +} + +class B extends A { +>B : Symbol(B, Decl(propertyAccessOnTypeParameterWithConstraints3.ts, 4, 1)) +>A : Symbol(A, Decl(propertyAccessOnTypeParameterWithConstraints3.ts, 0, 0)) + + bar(): string { +>bar : Symbol(bar, Decl(propertyAccessOnTypeParameterWithConstraints3.ts, 6, 19)) + + return ''; + } +} + +class C { +>C : Symbol(C, Decl(propertyAccessOnTypeParameterWithConstraints3.ts, 10, 1)) +>U : Symbol(U, Decl(propertyAccessOnTypeParameterWithConstraints3.ts, 12, 8)) +>A : Symbol(A, Decl(propertyAccessOnTypeParameterWithConstraints3.ts, 0, 0)) +>T : Symbol(T, Decl(propertyAccessOnTypeParameterWithConstraints3.ts, 12, 20)) +>U : Symbol(U, Decl(propertyAccessOnTypeParameterWithConstraints3.ts, 12, 8)) + + f() { +>f : Symbol(f, Decl(propertyAccessOnTypeParameterWithConstraints3.ts, 12, 35)) + + var x: T; +>x : Symbol(x, Decl(propertyAccessOnTypeParameterWithConstraints3.ts, 14, 11)) +>T : Symbol(T, Decl(propertyAccessOnTypeParameterWithConstraints3.ts, 12, 20)) + + // BUG 823818 + var a = x['foo'](); // should be string +>a : Symbol(a, Decl(propertyAccessOnTypeParameterWithConstraints3.ts, 16, 11)) +>x : Symbol(x, Decl(propertyAccessOnTypeParameterWithConstraints3.ts, 14, 11)) +>'foo' : Symbol(A.foo, Decl(propertyAccessOnTypeParameterWithConstraints3.ts, 2, 9)) + + return a + x.foo(); +>a : Symbol(a, Decl(propertyAccessOnTypeParameterWithConstraints3.ts, 16, 11)) +>x.foo : Symbol(A.foo, Decl(propertyAccessOnTypeParameterWithConstraints3.ts, 2, 9)) +>x : Symbol(x, Decl(propertyAccessOnTypeParameterWithConstraints3.ts, 14, 11)) +>foo : Symbol(A.foo, Decl(propertyAccessOnTypeParameterWithConstraints3.ts, 2, 9)) + } + + g(x: U) { +>g : Symbol(g, Decl(propertyAccessOnTypeParameterWithConstraints3.ts, 18, 5)) +>x : Symbol(x, Decl(propertyAccessOnTypeParameterWithConstraints3.ts, 20, 6)) +>U : Symbol(U, Decl(propertyAccessOnTypeParameterWithConstraints3.ts, 12, 8)) + + // BUG 823818 + var a = x['foo'](); // should be string +>a : Symbol(a, Decl(propertyAccessOnTypeParameterWithConstraints3.ts, 22, 11)) +>x : Symbol(x, Decl(propertyAccessOnTypeParameterWithConstraints3.ts, 20, 6)) +>'foo' : Symbol(A.foo, Decl(propertyAccessOnTypeParameterWithConstraints3.ts, 2, 9)) + + return a + x.foo(); +>a : Symbol(a, Decl(propertyAccessOnTypeParameterWithConstraints3.ts, 22, 11)) +>x.foo : Symbol(A.foo, Decl(propertyAccessOnTypeParameterWithConstraints3.ts, 2, 9)) +>x : Symbol(x, Decl(propertyAccessOnTypeParameterWithConstraints3.ts, 20, 6)) +>foo : Symbol(A.foo, Decl(propertyAccessOnTypeParameterWithConstraints3.ts, 2, 9)) + } +} + +var r1a = (new C()).f(); +>r1a : Symbol(r1a, Decl(propertyAccessOnTypeParameterWithConstraints3.ts, 27, 3)) +>(new C()).f : Symbol(C.f, Decl(propertyAccessOnTypeParameterWithConstraints3.ts, 12, 35)) +>C : Symbol(C, Decl(propertyAccessOnTypeParameterWithConstraints3.ts, 10, 1)) +>A : Symbol(A, Decl(propertyAccessOnTypeParameterWithConstraints3.ts, 0, 0)) +>B : Symbol(B, Decl(propertyAccessOnTypeParameterWithConstraints3.ts, 4, 1)) +>f : Symbol(C.f, Decl(propertyAccessOnTypeParameterWithConstraints3.ts, 12, 35)) + +var r1b = (new C()).g(new B()); +>r1b : Symbol(r1b, Decl(propertyAccessOnTypeParameterWithConstraints3.ts, 28, 3)) +>(new C()).g : Symbol(C.g, Decl(propertyAccessOnTypeParameterWithConstraints3.ts, 18, 5)) +>C : Symbol(C, Decl(propertyAccessOnTypeParameterWithConstraints3.ts, 10, 1)) +>A : Symbol(A, Decl(propertyAccessOnTypeParameterWithConstraints3.ts, 0, 0)) +>B : Symbol(B, Decl(propertyAccessOnTypeParameterWithConstraints3.ts, 4, 1)) +>g : Symbol(C.g, Decl(propertyAccessOnTypeParameterWithConstraints3.ts, 18, 5)) +>B : Symbol(B, Decl(propertyAccessOnTypeParameterWithConstraints3.ts, 4, 1)) + +interface I { +>I : Symbol(I, Decl(propertyAccessOnTypeParameterWithConstraints3.ts, 28, 37)) +>U : Symbol(U, Decl(propertyAccessOnTypeParameterWithConstraints3.ts, 30, 12)) +>A : Symbol(A, Decl(propertyAccessOnTypeParameterWithConstraints3.ts, 0, 0)) +>T : Symbol(T, Decl(propertyAccessOnTypeParameterWithConstraints3.ts, 30, 24)) +>U : Symbol(U, Decl(propertyAccessOnTypeParameterWithConstraints3.ts, 30, 12)) + + foo: T; +>foo : Symbol(foo, Decl(propertyAccessOnTypeParameterWithConstraints3.ts, 30, 39)) +>T : Symbol(T, Decl(propertyAccessOnTypeParameterWithConstraints3.ts, 30, 24)) +} +var i: I; +>i : Symbol(i, Decl(propertyAccessOnTypeParameterWithConstraints3.ts, 33, 3)) +>I : Symbol(I, Decl(propertyAccessOnTypeParameterWithConstraints3.ts, 28, 37)) +>A : Symbol(A, Decl(propertyAccessOnTypeParameterWithConstraints3.ts, 0, 0)) +>B : Symbol(B, Decl(propertyAccessOnTypeParameterWithConstraints3.ts, 4, 1)) + +var r2 = i.foo.foo(); +>r2 : Symbol(r2, Decl(propertyAccessOnTypeParameterWithConstraints3.ts, 34, 3)) +>i.foo.foo : Symbol(A.foo, Decl(propertyAccessOnTypeParameterWithConstraints3.ts, 2, 9)) +>i.foo : Symbol(I.foo, Decl(propertyAccessOnTypeParameterWithConstraints3.ts, 30, 39)) +>i : Symbol(i, Decl(propertyAccessOnTypeParameterWithConstraints3.ts, 33, 3)) +>foo : Symbol(I.foo, Decl(propertyAccessOnTypeParameterWithConstraints3.ts, 30, 39)) +>foo : Symbol(A.foo, Decl(propertyAccessOnTypeParameterWithConstraints3.ts, 2, 9)) + +var r2b = i.foo['foo'](); +>r2b : Symbol(r2b, Decl(propertyAccessOnTypeParameterWithConstraints3.ts, 35, 3)) +>i.foo : Symbol(I.foo, Decl(propertyAccessOnTypeParameterWithConstraints3.ts, 30, 39)) +>i : Symbol(i, Decl(propertyAccessOnTypeParameterWithConstraints3.ts, 33, 3)) +>foo : Symbol(I.foo, Decl(propertyAccessOnTypeParameterWithConstraints3.ts, 30, 39)) +>'foo' : Symbol(A.foo, Decl(propertyAccessOnTypeParameterWithConstraints3.ts, 2, 9)) + +var a: { +>a : Symbol(a, Decl(propertyAccessOnTypeParameterWithConstraints3.ts, 37, 3)) + + (): T; +>U : Symbol(U, Decl(propertyAccessOnTypeParameterWithConstraints3.ts, 38, 5)) +>A : Symbol(A, Decl(propertyAccessOnTypeParameterWithConstraints3.ts, 0, 0)) +>T : Symbol(T, Decl(propertyAccessOnTypeParameterWithConstraints3.ts, 38, 17)) +>U : Symbol(U, Decl(propertyAccessOnTypeParameterWithConstraints3.ts, 38, 5)) +>T : Symbol(T, Decl(propertyAccessOnTypeParameterWithConstraints3.ts, 38, 17)) + + (x: U): U; +>U : Symbol(U, Decl(propertyAccessOnTypeParameterWithConstraints3.ts, 39, 5)) +>T : Symbol(T, Decl(propertyAccessOnTypeParameterWithConstraints3.ts, 39, 17)) +>T : Symbol(T, Decl(propertyAccessOnTypeParameterWithConstraints3.ts, 39, 17)) +>A : Symbol(A, Decl(propertyAccessOnTypeParameterWithConstraints3.ts, 0, 0)) +>x : Symbol(x, Decl(propertyAccessOnTypeParameterWithConstraints3.ts, 39, 31)) +>U : Symbol(U, Decl(propertyAccessOnTypeParameterWithConstraints3.ts, 39, 5)) +>U : Symbol(U, Decl(propertyAccessOnTypeParameterWithConstraints3.ts, 39, 5)) +} +var r3 = a().foo(); // error, no inferences for U so it doesn't satisfy constraint +>r3 : Symbol(r3, Decl(propertyAccessOnTypeParameterWithConstraints3.ts, 41, 3)) +>a : Symbol(a, Decl(propertyAccessOnTypeParameterWithConstraints3.ts, 37, 3)) + +var r3b = a()['foo'](); +>r3b : Symbol(r3b, Decl(propertyAccessOnTypeParameterWithConstraints3.ts, 42, 3)) +>a : Symbol(a, Decl(propertyAccessOnTypeParameterWithConstraints3.ts, 37, 3)) + +// parameter supplied for type argument inference for U +var r3c = a(new B()).foo(); // valid call to an invalid function, U is inferred as B, which has a foo +>r3c : Symbol(r3c, Decl(propertyAccessOnTypeParameterWithConstraints3.ts, 44, 3)) +>a(new B()).foo : Symbol(A.foo, Decl(propertyAccessOnTypeParameterWithConstraints3.ts, 2, 9)) +>a : Symbol(a, Decl(propertyAccessOnTypeParameterWithConstraints3.ts, 37, 3)) +>B : Symbol(B, Decl(propertyAccessOnTypeParameterWithConstraints3.ts, 4, 1)) +>foo : Symbol(A.foo, Decl(propertyAccessOnTypeParameterWithConstraints3.ts, 2, 9)) + +var r3d = a(new B())['foo'](); // valid call to an invalid function, U is inferred as B, which has a foo +>r3d : Symbol(r3d, Decl(propertyAccessOnTypeParameterWithConstraints3.ts, 45, 3)) +>a : Symbol(a, Decl(propertyAccessOnTypeParameterWithConstraints3.ts, 37, 3)) +>B : Symbol(B, Decl(propertyAccessOnTypeParameterWithConstraints3.ts, 4, 1)) +>'foo' : Symbol(A.foo, Decl(propertyAccessOnTypeParameterWithConstraints3.ts, 2, 9)) + +var b = { +>b : Symbol(b, Decl(propertyAccessOnTypeParameterWithConstraints3.ts, 47, 3)) + + foo: (x: T) => { +>foo : Symbol(foo, Decl(propertyAccessOnTypeParameterWithConstraints3.ts, 47, 9)) +>U : Symbol(U, Decl(propertyAccessOnTypeParameterWithConstraints3.ts, 48, 10)) +>A : Symbol(A, Decl(propertyAccessOnTypeParameterWithConstraints3.ts, 0, 0)) +>T : Symbol(T, Decl(propertyAccessOnTypeParameterWithConstraints3.ts, 48, 22)) +>U : Symbol(U, Decl(propertyAccessOnTypeParameterWithConstraints3.ts, 48, 10)) +>x : Symbol(x, Decl(propertyAccessOnTypeParameterWithConstraints3.ts, 48, 36)) +>T : Symbol(T, Decl(propertyAccessOnTypeParameterWithConstraints3.ts, 48, 22)) + + // BUG 823818 + var a = x['foo'](); // should be string +>a : Symbol(a, Decl(propertyAccessOnTypeParameterWithConstraints3.ts, 50, 11)) +>x : Symbol(x, Decl(propertyAccessOnTypeParameterWithConstraints3.ts, 48, 36)) +>'foo' : Symbol(A.foo, Decl(propertyAccessOnTypeParameterWithConstraints3.ts, 2, 9)) + + return a + x.foo(); +>a : Symbol(a, Decl(propertyAccessOnTypeParameterWithConstraints3.ts, 50, 11)) +>x.foo : Symbol(A.foo, Decl(propertyAccessOnTypeParameterWithConstraints3.ts, 2, 9)) +>x : Symbol(x, Decl(propertyAccessOnTypeParameterWithConstraints3.ts, 48, 36)) +>foo : Symbol(A.foo, Decl(propertyAccessOnTypeParameterWithConstraints3.ts, 2, 9)) + } +} + +var r4 = b.foo(new B()); // valid call to an invalid function +>r4 : Symbol(r4, Decl(propertyAccessOnTypeParameterWithConstraints3.ts, 55, 3)) +>b.foo : Symbol(foo, Decl(propertyAccessOnTypeParameterWithConstraints3.ts, 47, 9)) +>b : Symbol(b, Decl(propertyAccessOnTypeParameterWithConstraints3.ts, 47, 3)) +>foo : Symbol(foo, Decl(propertyAccessOnTypeParameterWithConstraints3.ts, 47, 9)) +>B : Symbol(B, Decl(propertyAccessOnTypeParameterWithConstraints3.ts, 4, 1)) + diff --git a/tests/baselines/reference/propertyAccessOnTypeParameterWithConstraints3.types b/tests/baselines/reference/propertyAccessOnTypeParameterWithConstraints3.types new file mode 100644 index 00000000000..ea325190da6 --- /dev/null +++ b/tests/baselines/reference/propertyAccessOnTypeParameterWithConstraints3.types @@ -0,0 +1,233 @@ +=== tests/cases/conformance/types/typeParameters/typeParameterLists/propertyAccessOnTypeParameterWithConstraints3.ts === +// generic types should behave as if they have properties of their constraint type + +class A { +>A : A + + foo(): string { return ''; } +>foo : () => string +>'' : string +} + +class B extends A { +>B : B +>A : A + + bar(): string { +>bar : () => string + + return ''; +>'' : string + } +} + +class C { +>C : C +>U : U +>A : A +>T : T +>U : U + + f() { +>f : () => string + + var x: T; +>x : T +>T : T + + // BUG 823818 + var a = x['foo'](); // should be string +>a : string +>x['foo']() : string +>x['foo'] : () => string +>x : T +>'foo' : string + + return a + x.foo(); +>a + x.foo() : string +>a : string +>x.foo() : string +>x.foo : () => string +>x : T +>foo : () => string + } + + g(x: U) { +>g : (x: U) => string +>x : U +>U : U + + // BUG 823818 + var a = x['foo'](); // should be string +>a : string +>x['foo']() : string +>x['foo'] : () => string +>x : U +>'foo' : string + + return a + x.foo(); +>a + x.foo() : string +>a : string +>x.foo() : string +>x.foo : () => string +>x : U +>foo : () => string + } +} + +var r1a = (new C()).f(); +>r1a : string +>(new C()).f() : string +>(new C()).f : () => string +>(new C()) : C +>new C() : C +>C : typeof C +>A : A +>B : B +>f : () => string + +var r1b = (new C()).g(new B()); +>r1b : string +>(new C()).g(new B()) : string +>(new C()).g : (x: A) => string +>(new C()) : C +>new C() : C +>C : typeof C +>A : A +>B : B +>g : (x: A) => string +>new B() : B +>B : typeof B + +interface I { +>I : I +>U : U +>A : A +>T : T +>U : U + + foo: T; +>foo : T +>T : T +} +var i: I; +>i : I +>I : I +>A : A +>B : B + +var r2 = i.foo.foo(); +>r2 : string +>i.foo.foo() : string +>i.foo.foo : () => string +>i.foo : B +>i : I +>foo : B +>foo : () => string + +var r2b = i.foo['foo'](); +>r2b : string +>i.foo['foo']() : string +>i.foo['foo'] : () => string +>i.foo : B +>i : I +>foo : B +>'foo' : string + +var a: { +>a : { (): T; (x: U): U; } + + (): T; +>U : U +>A : A +>T : T +>U : U +>T : T + + (x: U): U; +>U : U +>T : T +>T : T +>A : A +>x : U +>U : U +>U : U +} +var r3 = a().foo(); // error, no inferences for U so it doesn't satisfy constraint +>r3 : any +>a().foo() : any +>a().foo : any +>a() : any +>a : { (): T; (x: U): U; } +>foo : any + +var r3b = a()['foo'](); +>r3b : any +>a()['foo']() : any +>a()['foo'] : any +>a() : any +>a : { (): T; (x: U): U; } +>'foo' : string + +// parameter supplied for type argument inference for U +var r3c = a(new B()).foo(); // valid call to an invalid function, U is inferred as B, which has a foo +>r3c : string +>a(new B()).foo() : string +>a(new B()).foo : () => string +>a(new B()) : B +>a : { (): T; (x: U): U; } +>new B() : B +>B : typeof B +>foo : () => string + +var r3d = a(new B())['foo'](); // valid call to an invalid function, U is inferred as B, which has a foo +>r3d : string +>a(new B())['foo']() : string +>a(new B())['foo'] : () => string +>a(new B()) : B +>a : { (): T; (x: U): U; } +>new B() : B +>B : typeof B +>'foo' : string + +var b = { +>b : { foo: (x: T) => string; } +>{ foo: (x: T) => { // BUG 823818 var a = x['foo'](); // should be string return a + x.foo(); }} : { foo: (x: T) => string; } + + foo: (x: T) => { +>foo : (x: T) => string +>(x: T) => { // BUG 823818 var a = x['foo'](); // should be string return a + x.foo(); } : (x: T) => string +>U : U +>A : A +>T : T +>U : U +>x : T +>T : T + + // BUG 823818 + var a = x['foo'](); // should be string +>a : string +>x['foo']() : string +>x['foo'] : () => string +>x : T +>'foo' : string + + return a + x.foo(); +>a + x.foo() : string +>a : string +>x.foo() : string +>x.foo : () => string +>x : T +>foo : () => string + } +} + +var r4 = b.foo(new B()); // valid call to an invalid function +>r4 : string +>b.foo(new B()) : string +>b.foo : (x: T) => string +>b : { foo: (x: T) => string; } +>foo : (x: T) => string +>new B() : B +>B : typeof B + diff --git a/tests/baselines/reference/propertyAccessOnTypeParameterWithConstraints5.errors.txt b/tests/baselines/reference/propertyAccessOnTypeParameterWithConstraints5.errors.txt index bf45f90564b..d7aa10cc353 100644 --- a/tests/baselines/reference/propertyAccessOnTypeParameterWithConstraints5.errors.txt +++ b/tests/baselines/reference/propertyAccessOnTypeParameterWithConstraints5.errors.txt @@ -1,12 +1,10 @@ -tests/cases/conformance/types/typeParameters/typeParameterLists/propertyAccessOnTypeParameterWithConstraints5.ts(11,9): error TS2313: Constraint of a type parameter cannot reference any type parameter from the same type parameter list. -tests/cases/conformance/types/typeParameters/typeParameterLists/propertyAccessOnTypeParameterWithConstraints5.ts(21,13): error TS2313: Constraint of a type parameter cannot reference any type parameter from the same type parameter list. +tests/cases/conformance/types/typeParameters/typeParameterLists/propertyAccessOnTypeParameterWithConstraints5.ts(15,32): error TS2339: Property 'notHere' does not exist on type 'U'. tests/cases/conformance/types/typeParameters/typeParameterLists/propertyAccessOnTypeParameterWithConstraints5.ts(25,16): error TS2339: Property 'notHere' does not exist on type 'B'. -tests/cases/conformance/types/typeParameters/typeParameterLists/propertyAccessOnTypeParameterWithConstraints5.ts(29,6): error TS2313: Constraint of a type parameter cannot reference any type parameter from the same type parameter list. -tests/cases/conformance/types/typeParameters/typeParameterLists/propertyAccessOnTypeParameterWithConstraints5.ts(32,22): error TS2339: Property 'notHere' does not exist on type '{}'. -tests/cases/conformance/types/typeParameters/typeParameterLists/propertyAccessOnTypeParameterWithConstraints5.ts(36,11): error TS2313: Constraint of a type parameter cannot reference any type parameter from the same type parameter list. +tests/cases/conformance/types/typeParameters/typeParameterLists/propertyAccessOnTypeParameterWithConstraints5.ts(38,16): error TS2322: Type 'string' is not assignable to type 'U'. +tests/cases/conformance/types/typeParameters/typeParameterLists/propertyAccessOnTypeParameterWithConstraints5.ts(38,22): error TS2339: Property 'notHere' does not exist on type 'U'. -==== tests/cases/conformance/types/typeParameters/typeParameterLists/propertyAccessOnTypeParameterWithConstraints5.ts (6 errors) ==== +==== tests/cases/conformance/types/typeParameters/typeParameterLists/propertyAccessOnTypeParameterWithConstraints5.ts (4 errors) ==== class A { foo(): string { return ''; } } @@ -18,20 +16,18 @@ tests/cases/conformance/types/typeParameters/typeParameterLists/propertyAccessOn } class C { - ~~~~~~~~~~~ -!!! error TS2313: Constraint of a type parameter cannot reference any type parameter from the same type parameter list. f() { var x: U; var a = x['foo'](); // should be string return a + x.foo() + x.notHere(); + ~~~~~~~ +!!! error TS2339: Property 'notHere' does not exist on type 'U'. } } var r = (new C()).f(); interface I { - ~~~~~~~~~~~ -!!! error TS2313: Constraint of a type parameter cannot reference any type parameter from the same type parameter list. foo: U; } var i: I; @@ -42,21 +38,19 @@ tests/cases/conformance/types/typeParameters/typeParameterLists/propertyAccessOn var a: { (): U; - ~~~~~~~~~~~ -!!! error TS2313: Constraint of a type parameter cannot reference any type parameter from the same type parameter list. } // BUG 794164 var r3: string = a().notHere(); - ~~~~~~~ -!!! error TS2339: Property 'notHere' does not exist on type '{}'. var r3b: string = a()['foo'](); var b = { foo: (x: U): U => { - ~~~~~~~~~~~ -!!! error TS2313: Constraint of a type parameter cannot reference any type parameter from the same type parameter list. var a = x['foo'](); // should be string return a + x.notHere(); + ~~~~~~~~~~~~~~~ +!!! error TS2322: Type 'string' is not assignable to type 'U'. + ~~~~~~~ +!!! error TS2339: Property 'notHere' does not exist on type 'U'. }, // BUG 794164 bar: b.foo(1).notHere() diff --git a/tests/baselines/reference/recursiveGenericTypeHierarchy.errors.txt b/tests/baselines/reference/recursiveGenericTypeHierarchy.errors.txt deleted file mode 100644 index 3c1e6e2017c..00000000000 --- a/tests/baselines/reference/recursiveGenericTypeHierarchy.errors.txt +++ /dev/null @@ -1,18 +0,0 @@ -tests/cases/compiler/recursiveGenericTypeHierarchy.ts(2,13): error TS2313: Constraint of a type parameter cannot reference any type parameter from the same type parameter list. -tests/cases/compiler/recursiveGenericTypeHierarchy.ts(2,32): error TS2313: Constraint of a type parameter cannot reference any type parameter from the same type parameter list. -tests/cases/compiler/recursiveGenericTypeHierarchy.ts(3,13): error TS2313: Constraint of a type parameter cannot reference any type parameter from the same type parameter list. -tests/cases/compiler/recursiveGenericTypeHierarchy.ts(3,32): error TS2313: Constraint of a type parameter cannot reference any type parameter from the same type parameter list. - - -==== tests/cases/compiler/recursiveGenericTypeHierarchy.ts (4 errors) ==== - // used to ICE - interface A, S extends A> { } - ~~~~~~~~~~~~~~~~~ -!!! error TS2313: Constraint of a type parameter cannot reference any type parameter from the same type parameter list. - ~~~~~~~~~~~~~~~~~ -!!! error TS2313: Constraint of a type parameter cannot reference any type parameter from the same type parameter list. - interface B, S extends B> extends A, B> { } - ~~~~~~~~~~~~~~~~~ -!!! error TS2313: Constraint of a type parameter cannot reference any type parameter from the same type parameter list. - ~~~~~~~~~~~~~~~~~ -!!! error TS2313: Constraint of a type parameter cannot reference any type parameter from the same type parameter list. \ No newline at end of file diff --git a/tests/baselines/reference/recursiveGenericTypeHierarchy.symbols b/tests/baselines/reference/recursiveGenericTypeHierarchy.symbols new file mode 100644 index 00000000000..c46174c1e04 --- /dev/null +++ b/tests/baselines/reference/recursiveGenericTypeHierarchy.symbols @@ -0,0 +1,31 @@ +=== tests/cases/compiler/recursiveGenericTypeHierarchy.ts === +// used to ICE +interface A, S extends A> { } +>A : Symbol(A, Decl(recursiveGenericTypeHierarchy.ts, 0, 0)) +>T : Symbol(T, Decl(recursiveGenericTypeHierarchy.ts, 1, 12)) +>A : Symbol(A, Decl(recursiveGenericTypeHierarchy.ts, 0, 0)) +>T : Symbol(T, Decl(recursiveGenericTypeHierarchy.ts, 1, 12)) +>S : Symbol(S, Decl(recursiveGenericTypeHierarchy.ts, 1, 30)) +>S : Symbol(S, Decl(recursiveGenericTypeHierarchy.ts, 1, 30)) +>A : Symbol(A, Decl(recursiveGenericTypeHierarchy.ts, 0, 0)) +>T : Symbol(T, Decl(recursiveGenericTypeHierarchy.ts, 1, 12)) +>S : Symbol(S, Decl(recursiveGenericTypeHierarchy.ts, 1, 30)) + +interface B, S extends B> extends A, B> { } +>B : Symbol(B, Decl(recursiveGenericTypeHierarchy.ts, 1, 53)) +>T : Symbol(T, Decl(recursiveGenericTypeHierarchy.ts, 2, 12)) +>B : Symbol(B, Decl(recursiveGenericTypeHierarchy.ts, 1, 53)) +>T : Symbol(T, Decl(recursiveGenericTypeHierarchy.ts, 2, 12)) +>S : Symbol(S, Decl(recursiveGenericTypeHierarchy.ts, 2, 30)) +>S : Symbol(S, Decl(recursiveGenericTypeHierarchy.ts, 2, 30)) +>B : Symbol(B, Decl(recursiveGenericTypeHierarchy.ts, 1, 53)) +>T : Symbol(T, Decl(recursiveGenericTypeHierarchy.ts, 2, 12)) +>S : Symbol(S, Decl(recursiveGenericTypeHierarchy.ts, 2, 30)) +>A : Symbol(A, Decl(recursiveGenericTypeHierarchy.ts, 0, 0)) +>B : Symbol(B, Decl(recursiveGenericTypeHierarchy.ts, 1, 53)) +>T : Symbol(T, Decl(recursiveGenericTypeHierarchy.ts, 2, 12)) +>S : Symbol(S, Decl(recursiveGenericTypeHierarchy.ts, 2, 30)) +>B : Symbol(B, Decl(recursiveGenericTypeHierarchy.ts, 1, 53)) +>T : Symbol(T, Decl(recursiveGenericTypeHierarchy.ts, 2, 12)) +>S : Symbol(S, Decl(recursiveGenericTypeHierarchy.ts, 2, 30)) + diff --git a/tests/baselines/reference/recursiveGenericTypeHierarchy.types b/tests/baselines/reference/recursiveGenericTypeHierarchy.types new file mode 100644 index 00000000000..72936b93299 --- /dev/null +++ b/tests/baselines/reference/recursiveGenericTypeHierarchy.types @@ -0,0 +1,31 @@ +=== tests/cases/compiler/recursiveGenericTypeHierarchy.ts === +// used to ICE +interface A, S extends A> { } +>A : A +>T : T +>A : A +>T : T +>S : S +>S : S +>A : A +>T : T +>S : S + +interface B, S extends B> extends A, B> { } +>B : B +>T : T +>B : B +>T : T +>S : S +>S : S +>B : B +>T : T +>S : S +>A : A +>B : B +>T : T +>S : S +>B : B +>T : T +>S : S + diff --git a/tests/baselines/reference/recursiveIdenticalAssignment.errors.txt b/tests/baselines/reference/recursiveIdenticalAssignment.errors.txt deleted file mode 100644 index e33515f9378..00000000000 --- a/tests/baselines/reference/recursiveIdenticalAssignment.errors.txt +++ /dev/null @@ -1,17 +0,0 @@ -tests/cases/compiler/recursiveIdenticalAssignment.ts(5,13): error TS2313: Constraint of a type parameter cannot reference any type parameter from the same type parameter list. - - -==== tests/cases/compiler/recursiveIdenticalAssignment.ts (1 errors) ==== - interface A { - x: A - } - - interface B>> { // error, constraint referencing itself - ~~~~~~~~~~~~~~~~~ -!!! error TS2313: Constraint of a type parameter cannot reference any type parameter from the same type parameter list. - x: B - } - - var a: A> - var b: B> = a // Error, any does not satisfy constraint B> - \ No newline at end of file diff --git a/tests/baselines/reference/recursiveIdenticalAssignment.symbols b/tests/baselines/reference/recursiveIdenticalAssignment.symbols new file mode 100644 index 00000000000..b82fe1d9d17 --- /dev/null +++ b/tests/baselines/reference/recursiveIdenticalAssignment.symbols @@ -0,0 +1,35 @@ +=== tests/cases/compiler/recursiveIdenticalAssignment.ts === +interface A { +>A : Symbol(A, Decl(recursiveIdenticalAssignment.ts, 0, 0)) +>T : Symbol(T, Decl(recursiveIdenticalAssignment.ts, 0, 12)) + + x: A +>x : Symbol(x, Decl(recursiveIdenticalAssignment.ts, 0, 16)) +>A : Symbol(A, Decl(recursiveIdenticalAssignment.ts, 0, 0)) +>T : Symbol(T, Decl(recursiveIdenticalAssignment.ts, 0, 12)) +} + +interface B>> { // error, constraint referencing itself +>B : Symbol(B, Decl(recursiveIdenticalAssignment.ts, 2, 1)) +>T : Symbol(T, Decl(recursiveIdenticalAssignment.ts, 4, 12)) +>B : Symbol(B, Decl(recursiveIdenticalAssignment.ts, 2, 1)) +>B : Symbol(B, Decl(recursiveIdenticalAssignment.ts, 2, 1)) +>T : Symbol(T, Decl(recursiveIdenticalAssignment.ts, 4, 12)) + + x: B +>x : Symbol(x, Decl(recursiveIdenticalAssignment.ts, 4, 32)) +>B : Symbol(B, Decl(recursiveIdenticalAssignment.ts, 2, 1)) +>T : Symbol(T, Decl(recursiveIdenticalAssignment.ts, 4, 12)) +} + +var a: A> +>a : Symbol(a, Decl(recursiveIdenticalAssignment.ts, 8, 3)) +>A : Symbol(A, Decl(recursiveIdenticalAssignment.ts, 0, 0)) +>A : Symbol(A, Decl(recursiveIdenticalAssignment.ts, 0, 0)) + +var b: B> = a // Error, any does not satisfy constraint B> +>b : Symbol(b, Decl(recursiveIdenticalAssignment.ts, 9, 3)) +>B : Symbol(B, Decl(recursiveIdenticalAssignment.ts, 2, 1)) +>B : Symbol(B, Decl(recursiveIdenticalAssignment.ts, 2, 1)) +>a : Symbol(a, Decl(recursiveIdenticalAssignment.ts, 8, 3)) + diff --git a/tests/baselines/reference/recursiveIdenticalAssignment.types b/tests/baselines/reference/recursiveIdenticalAssignment.types new file mode 100644 index 00000000000..aa7bf70bb00 --- /dev/null +++ b/tests/baselines/reference/recursiveIdenticalAssignment.types @@ -0,0 +1,35 @@ +=== tests/cases/compiler/recursiveIdenticalAssignment.ts === +interface A { +>A : A +>T : T + + x: A +>x : A +>A : A +>T : T +} + +interface B>> { // error, constraint referencing itself +>B : B +>T : T +>B : B +>B : B +>T : T + + x: B +>x : B +>B : B +>T : T +} + +var a: A> +>a : A> +>A : A +>A : A + +var b: B> = a // Error, any does not satisfy constraint B> +>b : B> +>B : B +>B : B +>a : A> + diff --git a/tests/baselines/reference/recursiveTypeInGenericConstraint.errors.txt b/tests/baselines/reference/recursiveTypeInGenericConstraint.errors.txt deleted file mode 100644 index c3cf7227308..00000000000 --- a/tests/baselines/reference/recursiveTypeInGenericConstraint.errors.txt +++ /dev/null @@ -1,19 +0,0 @@ -tests/cases/conformance/types/typeRelationships/recursiveTypes/recursiveTypeInGenericConstraint.ts(5,11): error TS2313: Constraint of a type parameter cannot reference any type parameter from the same type parameter list. - - -==== tests/cases/conformance/types/typeRelationships/recursiveTypes/recursiveTypeInGenericConstraint.ts (1 errors) ==== - class G { - x: G>; // infinitely expanding type reference - } - - class Foo> { // error, constraint referencing itself - ~~~~~~~~~~~~~~ -!!! error TS2313: Constraint of a type parameter cannot reference any type parameter from the same type parameter list. - bar: T; - } - - class D { - x: G>; - } - - var c1 = new Foo>(); // ok, circularity in assignment compat check causes success \ No newline at end of file diff --git a/tests/baselines/reference/recursiveTypeInGenericConstraint.symbols b/tests/baselines/reference/recursiveTypeInGenericConstraint.symbols new file mode 100644 index 00000000000..d23245e2187 --- /dev/null +++ b/tests/baselines/reference/recursiveTypeInGenericConstraint.symbols @@ -0,0 +1,39 @@ +=== tests/cases/conformance/types/typeRelationships/recursiveTypes/recursiveTypeInGenericConstraint.ts === +class G { +>G : Symbol(G, Decl(recursiveTypeInGenericConstraint.ts, 0, 0)) +>T : Symbol(T, Decl(recursiveTypeInGenericConstraint.ts, 0, 8)) + + x: G>; // infinitely expanding type reference +>x : Symbol(x, Decl(recursiveTypeInGenericConstraint.ts, 0, 12)) +>G : Symbol(G, Decl(recursiveTypeInGenericConstraint.ts, 0, 0)) +>G : Symbol(G, Decl(recursiveTypeInGenericConstraint.ts, 0, 0)) +>T : Symbol(T, Decl(recursiveTypeInGenericConstraint.ts, 0, 8)) +} + +class Foo> { // error, constraint referencing itself +>Foo : Symbol(Foo, Decl(recursiveTypeInGenericConstraint.ts, 2, 1)) +>T : Symbol(T, Decl(recursiveTypeInGenericConstraint.ts, 4, 10)) +>G : Symbol(G, Decl(recursiveTypeInGenericConstraint.ts, 0, 0)) +>T : Symbol(T, Decl(recursiveTypeInGenericConstraint.ts, 4, 10)) + + bar: T; +>bar : Symbol(bar, Decl(recursiveTypeInGenericConstraint.ts, 4, 27)) +>T : Symbol(T, Decl(recursiveTypeInGenericConstraint.ts, 4, 10)) +} + +class D { +>D : Symbol(D, Decl(recursiveTypeInGenericConstraint.ts, 6, 1)) +>T : Symbol(T, Decl(recursiveTypeInGenericConstraint.ts, 8, 8)) + + x: G>; +>x : Symbol(x, Decl(recursiveTypeInGenericConstraint.ts, 8, 12)) +>G : Symbol(G, Decl(recursiveTypeInGenericConstraint.ts, 0, 0)) +>G : Symbol(G, Decl(recursiveTypeInGenericConstraint.ts, 0, 0)) +>T : Symbol(T, Decl(recursiveTypeInGenericConstraint.ts, 8, 8)) +} + +var c1 = new Foo>(); // ok, circularity in assignment compat check causes success +>c1 : Symbol(c1, Decl(recursiveTypeInGenericConstraint.ts, 12, 3)) +>Foo : Symbol(Foo, Decl(recursiveTypeInGenericConstraint.ts, 2, 1)) +>D : Symbol(D, Decl(recursiveTypeInGenericConstraint.ts, 6, 1)) + diff --git a/tests/baselines/reference/recursiveTypeInGenericConstraint.types b/tests/baselines/reference/recursiveTypeInGenericConstraint.types new file mode 100644 index 00000000000..97f48aa64e5 --- /dev/null +++ b/tests/baselines/reference/recursiveTypeInGenericConstraint.types @@ -0,0 +1,40 @@ +=== tests/cases/conformance/types/typeRelationships/recursiveTypes/recursiveTypeInGenericConstraint.ts === +class G { +>G : G +>T : T + + x: G>; // infinitely expanding type reference +>x : G> +>G : G +>G : G +>T : T +} + +class Foo> { // error, constraint referencing itself +>Foo : Foo +>T : T +>G : G +>T : T + + bar: T; +>bar : T +>T : T +} + +class D { +>D : D +>T : T + + x: G>; +>x : G> +>G : G +>G : G +>T : T +} + +var c1 = new Foo>(); // ok, circularity in assignment compat check causes success +>c1 : Foo> +>new Foo>() : Foo> +>Foo : typeof Foo +>D : D + diff --git a/tests/baselines/reference/recursiveTypes1.errors.txt b/tests/baselines/reference/recursiveTypes1.errors.txt deleted file mode 100644 index 62d4938ef1e..00000000000 --- a/tests/baselines/reference/recursiveTypes1.errors.txt +++ /dev/null @@ -1,22 +0,0 @@ -tests/cases/compiler/recursiveTypes1.ts(1,18): error TS2313: Constraint of a type parameter cannot reference any type parameter from the same type parameter list. -tests/cases/compiler/recursiveTypes1.ts(6,18): error TS2313: Constraint of a type parameter cannot reference any type parameter from the same type parameter list. - - -==== tests/cases/compiler/recursiveTypes1.ts (2 errors) ==== - interface Entity> { - ~~~~~~~~~~~~~~~~~~~ -!!! error TS2313: Constraint of a type parameter cannot reference any type parameter from the same type parameter list. - X: T; - Y: T; - } - - interface Person> extends Entity { - ~~~~~~~~~~~~~~~~~~~ -!!! error TS2313: Constraint of a type parameter cannot reference any type parameter from the same type parameter list. - n: number; - } - - interface Customer extends Person { - s: string; - } - \ No newline at end of file diff --git a/tests/baselines/reference/recursiveTypes1.symbols b/tests/baselines/reference/recursiveTypes1.symbols new file mode 100644 index 00000000000..8ced51db0dc --- /dev/null +++ b/tests/baselines/reference/recursiveTypes1.symbols @@ -0,0 +1,37 @@ +=== tests/cases/compiler/recursiveTypes1.ts === +interface Entity> { +>Entity : Symbol(Entity, Decl(recursiveTypes1.ts, 0, 0)) +>T : Symbol(T, Decl(recursiveTypes1.ts, 0, 17)) +>Entity : Symbol(Entity, Decl(recursiveTypes1.ts, 0, 0)) +>T : Symbol(T, Decl(recursiveTypes1.ts, 0, 17)) + + X: T; +>X : Symbol(X, Decl(recursiveTypes1.ts, 0, 39)) +>T : Symbol(T, Decl(recursiveTypes1.ts, 0, 17)) + + Y: T; +>Y : Symbol(Y, Decl(recursiveTypes1.ts, 1, 8)) +>T : Symbol(T, Decl(recursiveTypes1.ts, 0, 17)) +} + +interface Person> extends Entity { +>Person : Symbol(Person, Decl(recursiveTypes1.ts, 3, 1)) +>U : Symbol(U, Decl(recursiveTypes1.ts, 5, 17)) +>Person : Symbol(Person, Decl(recursiveTypes1.ts, 3, 1)) +>U : Symbol(U, Decl(recursiveTypes1.ts, 5, 17)) +>Entity : Symbol(Entity, Decl(recursiveTypes1.ts, 0, 0)) +>U : Symbol(U, Decl(recursiveTypes1.ts, 5, 17)) + + n: number; +>n : Symbol(n, Decl(recursiveTypes1.ts, 5, 57)) +} + +interface Customer extends Person { +>Customer : Symbol(Customer, Decl(recursiveTypes1.ts, 7, 1)) +>Person : Symbol(Person, Decl(recursiveTypes1.ts, 3, 1)) +>Customer : Symbol(Customer, Decl(recursiveTypes1.ts, 7, 1)) + + s: string; +>s : Symbol(s, Decl(recursiveTypes1.ts, 9, 45)) +} + diff --git a/tests/baselines/reference/recursiveTypes1.types b/tests/baselines/reference/recursiveTypes1.types new file mode 100644 index 00000000000..803c965e471 --- /dev/null +++ b/tests/baselines/reference/recursiveTypes1.types @@ -0,0 +1,37 @@ +=== tests/cases/compiler/recursiveTypes1.ts === +interface Entity> { +>Entity : Entity +>T : T +>Entity : Entity +>T : T + + X: T; +>X : T +>T : T + + Y: T; +>Y : T +>T : T +} + +interface Person> extends Entity { +>Person : Person +>U : U +>Person : Person +>U : U +>Entity : Entity +>U : U + + n: number; +>n : number +} + +interface Customer extends Person { +>Customer : Customer +>Person : Person +>Customer : Customer + + s: string; +>s : string +} + diff --git a/tests/baselines/reference/recursiveTypesUsedAsFunctionParameters.errors.txt b/tests/baselines/reference/recursiveTypesUsedAsFunctionParameters.errors.txt deleted file mode 100644 index 577debaed4e..00000000000 --- a/tests/baselines/reference/recursiveTypesUsedAsFunctionParameters.errors.txt +++ /dev/null @@ -1,49 +0,0 @@ -tests/cases/conformance/types/typeRelationships/recursiveTypes/recursiveTypesUsedAsFunctionParameters.ts(21,16): error TS2313: Constraint of a type parameter cannot reference any type parameter from the same type parameter list. - - -==== tests/cases/conformance/types/typeRelationships/recursiveTypes/recursiveTypesUsedAsFunctionParameters.ts (1 errors) ==== - class List { - data: T; - next: List>; - } - - class MyList { - data: T; - next: MyList>; - } - - function foo(x: List); - function foo(x: List); // error, duplicate - function foo(x: List) { - } - - function foo2(x: List); - function foo2(x: MyList); // ok, nominally compared with first overload - function foo2(x: any) { - } - - function other, U>() { - ~~~~~~~~~~~~~~~~~ -!!! error TS2313: Constraint of a type parameter cannot reference any type parameter from the same type parameter list. - // error but wrong error - // BUG 838247 - function foo3(x: T); - function foo3(x: MyList) { } - - // should be error - // BUG 838247 - function foo4(x: T); - function foo4(x: List) { } - - // ok - function foo5(x: T): string; - function foo5(x: List): number; - function foo5(x: MyList): boolean; - function foo5(x: any): any { return null; } - - var list: List; - var myList: MyList; - - var r = foo5(list); - var r2 = foo5(myList); - } \ No newline at end of file diff --git a/tests/baselines/reference/recursiveTypesUsedAsFunctionParameters.symbols b/tests/baselines/reference/recursiveTypesUsedAsFunctionParameters.symbols new file mode 100644 index 00000000000..9894c6acd45 --- /dev/null +++ b/tests/baselines/reference/recursiveTypesUsedAsFunctionParameters.symbols @@ -0,0 +1,154 @@ +=== tests/cases/conformance/types/typeRelationships/recursiveTypes/recursiveTypesUsedAsFunctionParameters.ts === +class List { +>List : Symbol(List, Decl(recursiveTypesUsedAsFunctionParameters.ts, 0, 0)) +>T : Symbol(T, Decl(recursiveTypesUsedAsFunctionParameters.ts, 0, 11)) + + data: T; +>data : Symbol(data, Decl(recursiveTypesUsedAsFunctionParameters.ts, 0, 15)) +>T : Symbol(T, Decl(recursiveTypesUsedAsFunctionParameters.ts, 0, 11)) + + next: List>; +>next : Symbol(next, Decl(recursiveTypesUsedAsFunctionParameters.ts, 1, 12)) +>List : Symbol(List, Decl(recursiveTypesUsedAsFunctionParameters.ts, 0, 0)) +>List : Symbol(List, Decl(recursiveTypesUsedAsFunctionParameters.ts, 0, 0)) +>T : Symbol(T, Decl(recursiveTypesUsedAsFunctionParameters.ts, 0, 11)) +} + +class MyList { +>MyList : Symbol(MyList, Decl(recursiveTypesUsedAsFunctionParameters.ts, 3, 1)) +>T : Symbol(T, Decl(recursiveTypesUsedAsFunctionParameters.ts, 5, 13)) + + data: T; +>data : Symbol(data, Decl(recursiveTypesUsedAsFunctionParameters.ts, 5, 17)) +>T : Symbol(T, Decl(recursiveTypesUsedAsFunctionParameters.ts, 5, 13)) + + next: MyList>; +>next : Symbol(next, Decl(recursiveTypesUsedAsFunctionParameters.ts, 6, 12)) +>MyList : Symbol(MyList, Decl(recursiveTypesUsedAsFunctionParameters.ts, 3, 1)) +>MyList : Symbol(MyList, Decl(recursiveTypesUsedAsFunctionParameters.ts, 3, 1)) +>T : Symbol(T, Decl(recursiveTypesUsedAsFunctionParameters.ts, 5, 13)) +} + +function foo(x: List); +>foo : Symbol(foo, Decl(recursiveTypesUsedAsFunctionParameters.ts, 8, 1), Decl(recursiveTypesUsedAsFunctionParameters.ts, 10, 28), Decl(recursiveTypesUsedAsFunctionParameters.ts, 11, 28)) +>T : Symbol(T, Decl(recursiveTypesUsedAsFunctionParameters.ts, 10, 13)) +>x : Symbol(x, Decl(recursiveTypesUsedAsFunctionParameters.ts, 10, 16)) +>List : Symbol(List, Decl(recursiveTypesUsedAsFunctionParameters.ts, 0, 0)) +>T : Symbol(T, Decl(recursiveTypesUsedAsFunctionParameters.ts, 10, 13)) + +function foo(x: List); // error, duplicate +>foo : Symbol(foo, Decl(recursiveTypesUsedAsFunctionParameters.ts, 8, 1), Decl(recursiveTypesUsedAsFunctionParameters.ts, 10, 28), Decl(recursiveTypesUsedAsFunctionParameters.ts, 11, 28)) +>U : Symbol(U, Decl(recursiveTypesUsedAsFunctionParameters.ts, 11, 13)) +>x : Symbol(x, Decl(recursiveTypesUsedAsFunctionParameters.ts, 11, 16)) +>List : Symbol(List, Decl(recursiveTypesUsedAsFunctionParameters.ts, 0, 0)) +>U : Symbol(U, Decl(recursiveTypesUsedAsFunctionParameters.ts, 11, 13)) + +function foo(x: List) { +>foo : Symbol(foo, Decl(recursiveTypesUsedAsFunctionParameters.ts, 8, 1), Decl(recursiveTypesUsedAsFunctionParameters.ts, 10, 28), Decl(recursiveTypesUsedAsFunctionParameters.ts, 11, 28)) +>T : Symbol(T, Decl(recursiveTypesUsedAsFunctionParameters.ts, 12, 13)) +>x : Symbol(x, Decl(recursiveTypesUsedAsFunctionParameters.ts, 12, 16)) +>List : Symbol(List, Decl(recursiveTypesUsedAsFunctionParameters.ts, 0, 0)) +>T : Symbol(T, Decl(recursiveTypesUsedAsFunctionParameters.ts, 12, 13)) +} + +function foo2(x: List); +>foo2 : Symbol(foo2, Decl(recursiveTypesUsedAsFunctionParameters.ts, 13, 1), Decl(recursiveTypesUsedAsFunctionParameters.ts, 15, 29), Decl(recursiveTypesUsedAsFunctionParameters.ts, 16, 31)) +>T : Symbol(T, Decl(recursiveTypesUsedAsFunctionParameters.ts, 15, 14)) +>x : Symbol(x, Decl(recursiveTypesUsedAsFunctionParameters.ts, 15, 17)) +>List : Symbol(List, Decl(recursiveTypesUsedAsFunctionParameters.ts, 0, 0)) +>T : Symbol(T, Decl(recursiveTypesUsedAsFunctionParameters.ts, 15, 14)) + +function foo2(x: MyList); // ok, nominally compared with first overload +>foo2 : Symbol(foo2, Decl(recursiveTypesUsedAsFunctionParameters.ts, 13, 1), Decl(recursiveTypesUsedAsFunctionParameters.ts, 15, 29), Decl(recursiveTypesUsedAsFunctionParameters.ts, 16, 31)) +>U : Symbol(U, Decl(recursiveTypesUsedAsFunctionParameters.ts, 16, 14)) +>x : Symbol(x, Decl(recursiveTypesUsedAsFunctionParameters.ts, 16, 17)) +>MyList : Symbol(MyList, Decl(recursiveTypesUsedAsFunctionParameters.ts, 3, 1)) +>U : Symbol(U, Decl(recursiveTypesUsedAsFunctionParameters.ts, 16, 14)) + +function foo2(x: any) { +>foo2 : Symbol(foo2, Decl(recursiveTypesUsedAsFunctionParameters.ts, 13, 1), Decl(recursiveTypesUsedAsFunctionParameters.ts, 15, 29), Decl(recursiveTypesUsedAsFunctionParameters.ts, 16, 31)) +>T : Symbol(T, Decl(recursiveTypesUsedAsFunctionParameters.ts, 17, 14)) +>x : Symbol(x, Decl(recursiveTypesUsedAsFunctionParameters.ts, 17, 17)) +} + +function other, U>() { +>other : Symbol(other, Decl(recursiveTypesUsedAsFunctionParameters.ts, 18, 1)) +>T : Symbol(T, Decl(recursiveTypesUsedAsFunctionParameters.ts, 20, 15)) +>List : Symbol(List, Decl(recursiveTypesUsedAsFunctionParameters.ts, 0, 0)) +>U : Symbol(U, Decl(recursiveTypesUsedAsFunctionParameters.ts, 20, 33)) +>U : Symbol(U, Decl(recursiveTypesUsedAsFunctionParameters.ts, 20, 33)) + + // error but wrong error + // BUG 838247 + function foo3(x: T); +>foo3 : Symbol(foo3, Decl(recursiveTypesUsedAsFunctionParameters.ts, 20, 40), Decl(recursiveTypesUsedAsFunctionParameters.ts, 23, 27)) +>V : Symbol(V, Decl(recursiveTypesUsedAsFunctionParameters.ts, 23, 18)) +>x : Symbol(x, Decl(recursiveTypesUsedAsFunctionParameters.ts, 23, 21)) +>T : Symbol(T, Decl(recursiveTypesUsedAsFunctionParameters.ts, 20, 15)) + + function foo3(x: MyList) { } +>foo3 : Symbol(foo3, Decl(recursiveTypesUsedAsFunctionParameters.ts, 20, 40), Decl(recursiveTypesUsedAsFunctionParameters.ts, 23, 27)) +>V : Symbol(V, Decl(recursiveTypesUsedAsFunctionParameters.ts, 24, 18)) +>x : Symbol(x, Decl(recursiveTypesUsedAsFunctionParameters.ts, 24, 21)) +>MyList : Symbol(MyList, Decl(recursiveTypesUsedAsFunctionParameters.ts, 3, 1)) +>V : Symbol(V, Decl(recursiveTypesUsedAsFunctionParameters.ts, 24, 18)) + + // should be error + // BUG 838247 + function foo4(x: T); +>foo4 : Symbol(foo4, Decl(recursiveTypesUsedAsFunctionParameters.ts, 24, 38), Decl(recursiveTypesUsedAsFunctionParameters.ts, 28, 27)) +>V : Symbol(V, Decl(recursiveTypesUsedAsFunctionParameters.ts, 28, 18)) +>x : Symbol(x, Decl(recursiveTypesUsedAsFunctionParameters.ts, 28, 21)) +>T : Symbol(T, Decl(recursiveTypesUsedAsFunctionParameters.ts, 20, 15)) + + function foo4(x: List) { } +>foo4 : Symbol(foo4, Decl(recursiveTypesUsedAsFunctionParameters.ts, 24, 38), Decl(recursiveTypesUsedAsFunctionParameters.ts, 28, 27)) +>V : Symbol(V, Decl(recursiveTypesUsedAsFunctionParameters.ts, 29, 18)) +>x : Symbol(x, Decl(recursiveTypesUsedAsFunctionParameters.ts, 29, 21)) +>List : Symbol(List, Decl(recursiveTypesUsedAsFunctionParameters.ts, 0, 0)) +>V : Symbol(V, Decl(recursiveTypesUsedAsFunctionParameters.ts, 29, 18)) + + // ok + function foo5(x: T): string; +>foo5 : Symbol(foo5, Decl(recursiveTypesUsedAsFunctionParameters.ts, 29, 36), Decl(recursiveTypesUsedAsFunctionParameters.ts, 32, 35), Decl(recursiveTypesUsedAsFunctionParameters.ts, 33, 41), Decl(recursiveTypesUsedAsFunctionParameters.ts, 34, 44)) +>V : Symbol(V, Decl(recursiveTypesUsedAsFunctionParameters.ts, 32, 18)) +>x : Symbol(x, Decl(recursiveTypesUsedAsFunctionParameters.ts, 32, 21)) +>T : Symbol(T, Decl(recursiveTypesUsedAsFunctionParameters.ts, 20, 15)) + + function foo5(x: List): number; +>foo5 : Symbol(foo5, Decl(recursiveTypesUsedAsFunctionParameters.ts, 29, 36), Decl(recursiveTypesUsedAsFunctionParameters.ts, 32, 35), Decl(recursiveTypesUsedAsFunctionParameters.ts, 33, 41), Decl(recursiveTypesUsedAsFunctionParameters.ts, 34, 44)) +>V : Symbol(V, Decl(recursiveTypesUsedAsFunctionParameters.ts, 33, 18)) +>x : Symbol(x, Decl(recursiveTypesUsedAsFunctionParameters.ts, 33, 21)) +>List : Symbol(List, Decl(recursiveTypesUsedAsFunctionParameters.ts, 0, 0)) +>V : Symbol(V, Decl(recursiveTypesUsedAsFunctionParameters.ts, 33, 18)) + + function foo5(x: MyList): boolean; +>foo5 : Symbol(foo5, Decl(recursiveTypesUsedAsFunctionParameters.ts, 29, 36), Decl(recursiveTypesUsedAsFunctionParameters.ts, 32, 35), Decl(recursiveTypesUsedAsFunctionParameters.ts, 33, 41), Decl(recursiveTypesUsedAsFunctionParameters.ts, 34, 44)) +>V : Symbol(V, Decl(recursiveTypesUsedAsFunctionParameters.ts, 34, 18)) +>x : Symbol(x, Decl(recursiveTypesUsedAsFunctionParameters.ts, 34, 21)) +>MyList : Symbol(MyList, Decl(recursiveTypesUsedAsFunctionParameters.ts, 3, 1)) +>V : Symbol(V, Decl(recursiveTypesUsedAsFunctionParameters.ts, 34, 18)) + + function foo5(x: any): any { return null; } +>foo5 : Symbol(foo5, Decl(recursiveTypesUsedAsFunctionParameters.ts, 29, 36), Decl(recursiveTypesUsedAsFunctionParameters.ts, 32, 35), Decl(recursiveTypesUsedAsFunctionParameters.ts, 33, 41), Decl(recursiveTypesUsedAsFunctionParameters.ts, 34, 44)) +>V : Symbol(V, Decl(recursiveTypesUsedAsFunctionParameters.ts, 35, 18)) +>x : Symbol(x, Decl(recursiveTypesUsedAsFunctionParameters.ts, 35, 21)) + + var list: List; +>list : Symbol(list, Decl(recursiveTypesUsedAsFunctionParameters.ts, 37, 7)) +>List : Symbol(List, Decl(recursiveTypesUsedAsFunctionParameters.ts, 0, 0)) + + var myList: MyList; +>myList : Symbol(myList, Decl(recursiveTypesUsedAsFunctionParameters.ts, 38, 7)) +>MyList : Symbol(MyList, Decl(recursiveTypesUsedAsFunctionParameters.ts, 3, 1)) + + var r = foo5(list); +>r : Symbol(r, Decl(recursiveTypesUsedAsFunctionParameters.ts, 40, 7)) +>foo5 : Symbol(foo5, Decl(recursiveTypesUsedAsFunctionParameters.ts, 29, 36), Decl(recursiveTypesUsedAsFunctionParameters.ts, 32, 35), Decl(recursiveTypesUsedAsFunctionParameters.ts, 33, 41), Decl(recursiveTypesUsedAsFunctionParameters.ts, 34, 44)) +>list : Symbol(list, Decl(recursiveTypesUsedAsFunctionParameters.ts, 37, 7)) + + var r2 = foo5(myList); +>r2 : Symbol(r2, Decl(recursiveTypesUsedAsFunctionParameters.ts, 41, 7)) +>foo5 : Symbol(foo5, Decl(recursiveTypesUsedAsFunctionParameters.ts, 29, 36), Decl(recursiveTypesUsedAsFunctionParameters.ts, 32, 35), Decl(recursiveTypesUsedAsFunctionParameters.ts, 33, 41), Decl(recursiveTypesUsedAsFunctionParameters.ts, 34, 44)) +>myList : Symbol(myList, Decl(recursiveTypesUsedAsFunctionParameters.ts, 38, 7)) +} diff --git a/tests/baselines/reference/recursiveTypesUsedAsFunctionParameters.types b/tests/baselines/reference/recursiveTypesUsedAsFunctionParameters.types new file mode 100644 index 00000000000..b800b2641fe --- /dev/null +++ b/tests/baselines/reference/recursiveTypesUsedAsFunctionParameters.types @@ -0,0 +1,157 @@ +=== tests/cases/conformance/types/typeRelationships/recursiveTypes/recursiveTypesUsedAsFunctionParameters.ts === +class List { +>List : List +>T : T + + data: T; +>data : T +>T : T + + next: List>; +>next : List> +>List : List +>List : List +>T : T +} + +class MyList { +>MyList : MyList +>T : T + + data: T; +>data : T +>T : T + + next: MyList>; +>next : MyList> +>MyList : MyList +>MyList : MyList +>T : T +} + +function foo(x: List); +>foo : { (x: List): any; (x: List): any; } +>T : T +>x : List +>List : List +>T : T + +function foo(x: List); // error, duplicate +>foo : { (x: List): any; (x: List): any; } +>U : U +>x : List +>List : List +>U : U + +function foo(x: List) { +>foo : { (x: List): any; (x: List): any; } +>T : T +>x : List +>List : List +>T : T +} + +function foo2(x: List); +>foo2 : { (x: List): any; (x: MyList): any; } +>T : T +>x : List +>List : List +>T : T + +function foo2(x: MyList); // ok, nominally compared with first overload +>foo2 : { (x: List): any; (x: MyList): any; } +>U : U +>x : MyList +>MyList : MyList +>U : U + +function foo2(x: any) { +>foo2 : { (x: List): any; (x: MyList): any; } +>T : T +>x : any +} + +function other, U>() { +>other : , U>() => void +>T : T +>List : List +>U : U +>U : U + + // error but wrong error + // BUG 838247 + function foo3(x: T); +>foo3 : (x: T) => any +>V : V +>x : T +>T : T + + function foo3(x: MyList) { } +>foo3 : (x: T) => any +>V : V +>x : MyList +>MyList : MyList +>V : V + + // should be error + // BUG 838247 + function foo4(x: T); +>foo4 : (x: T) => any +>V : V +>x : T +>T : T + + function foo4(x: List) { } +>foo4 : (x: T) => any +>V : V +>x : List +>List : List +>V : V + + // ok + function foo5(x: T): string; +>foo5 : { (x: T): string; (x: List): number; (x: MyList): boolean; } +>V : V +>x : T +>T : T + + function foo5(x: List): number; +>foo5 : { (x: T): string; (x: List): number; (x: MyList): boolean; } +>V : V +>x : List +>List : List +>V : V + + function foo5(x: MyList): boolean; +>foo5 : { (x: T): string; (x: List): number; (x: MyList): boolean; } +>V : V +>x : MyList +>MyList : MyList +>V : V + + function foo5(x: any): any { return null; } +>foo5 : { (x: T): string; (x: List): number; (x: MyList): boolean; } +>V : V +>x : any +>null : null + + var list: List; +>list : List +>List : List + + var myList: MyList; +>myList : MyList +>MyList : MyList + + var r = foo5(list); +>r : number +>foo5(list) : number +>foo5 : { (x: T): string; (x: List): number; (x: MyList): boolean; } +>list : List + + var r2 = foo5(myList); +>r2 : number +>foo5(myList) : number +>foo5 : { (x: T): string; (x: List): number; (x: MyList): boolean; } +>myList : MyList +} diff --git a/tests/baselines/reference/stringLiteralTypeIsSubtypeOfString.errors.txt b/tests/baselines/reference/stringLiteralTypeIsSubtypeOfString.errors.txt index 8a916c16b2d..af75273ade3 100644 --- a/tests/baselines/reference/stringLiteralTypeIsSubtypeOfString.errors.txt +++ b/tests/baselines/reference/stringLiteralTypeIsSubtypeOfString.errors.txt @@ -5,15 +5,9 @@ tests/cases/conformance/types/typeRelationships/subtypesAndSuperTypes/stringLite tests/cases/conformance/types/typeRelationships/subtypesAndSuperTypes/stringLiteralTypeIsSubtypeOfString.ts(38,10): error TS2382: Specialized overload signature is not assignable to any non-specialized signature. tests/cases/conformance/types/typeRelationships/subtypesAndSuperTypes/stringLiteralTypeIsSubtypeOfString.ts(77,10): error TS2382: Specialized overload signature is not assignable to any non-specialized signature. tests/cases/conformance/types/typeRelationships/subtypesAndSuperTypes/stringLiteralTypeIsSubtypeOfString.ts(90,10): error TS2382: Specialized overload signature is not assignable to any non-specialized signature. -tests/cases/conformance/types/typeRelationships/subtypesAndSuperTypes/stringLiteralTypeIsSubtypeOfString.ts(94,17): error TS2313: Constraint of a type parameter cannot reference any type parameter from the same type parameter list. -tests/cases/conformance/types/typeRelationships/subtypesAndSuperTypes/stringLiteralTypeIsSubtypeOfString.ts(95,17): error TS2313: Constraint of a type parameter cannot reference any type parameter from the same type parameter list. -tests/cases/conformance/types/typeRelationships/subtypesAndSuperTypes/stringLiteralTypeIsSubtypeOfString.ts(96,17): error TS2313: Constraint of a type parameter cannot reference any type parameter from the same type parameter list. -tests/cases/conformance/types/typeRelationships/subtypesAndSuperTypes/stringLiteralTypeIsSubtypeOfString.ts(98,32): error TS2313: Constraint of a type parameter cannot reference any type parameter from the same type parameter list. -tests/cases/conformance/types/typeRelationships/subtypesAndSuperTypes/stringLiteralTypeIsSubtypeOfString.ts(99,32): error TS2313: Constraint of a type parameter cannot reference any type parameter from the same type parameter list. -tests/cases/conformance/types/typeRelationships/subtypesAndSuperTypes/stringLiteralTypeIsSubtypeOfString.ts(100,32): error TS2313: Constraint of a type parameter cannot reference any type parameter from the same type parameter list. -==== tests/cases/conformance/types/typeRelationships/subtypesAndSuperTypes/stringLiteralTypeIsSubtypeOfString.ts (13 errors) ==== +==== tests/cases/conformance/types/typeRelationships/subtypesAndSuperTypes/stringLiteralTypeIsSubtypeOfString.ts (7 errors) ==== // string literal types are subtypes of string, any // ok @@ -122,21 +116,9 @@ tests/cases/conformance/types/typeRelationships/subtypesAndSuperTypes/stringLite function f14(x: any) { } function f15(x: 'a'); - ~~~~~~~~~~~ -!!! error TS2313: Constraint of a type parameter cannot reference any type parameter from the same type parameter list. function f15(x: U); - ~~~~~~~~~~~ -!!! error TS2313: Constraint of a type parameter cannot reference any type parameter from the same type parameter list. function f15(x: any) { } - ~~~~~~~~~~~ -!!! error TS2313: Constraint of a type parameter cannot reference any type parameter from the same type parameter list. function f16(x: 'a'); - ~~~~~~~~~~~ -!!! error TS2313: Constraint of a type parameter cannot reference any type parameter from the same type parameter list. function f16(x: U); - ~~~~~~~~~~~ -!!! error TS2313: Constraint of a type parameter cannot reference any type parameter from the same type parameter list. - function f16(x: any) { } - ~~~~~~~~~~~ -!!! error TS2313: Constraint of a type parameter cannot reference any type parameter from the same type parameter list. \ No newline at end of file + function f16(x: any) { } \ No newline at end of file diff --git a/tests/baselines/reference/subtypesOfTypeParameter.errors.txt b/tests/baselines/reference/subtypesOfTypeParameter.errors.txt index 042d8227b78..14e2275cbf9 100644 --- a/tests/baselines/reference/subtypesOfTypeParameter.errors.txt +++ b/tests/baselines/reference/subtypesOfTypeParameter.errors.txt @@ -1,10 +1,9 @@ tests/cases/conformance/types/typeRelationships/subtypesAndSuperTypes/subtypesOfTypeParameter.ts(7,7): error TS2415: Class 'D1' incorrectly extends base class 'C3'. Types of property 'foo' are incompatible. Type 'U' is not assignable to type 'T'. -tests/cases/conformance/types/typeRelationships/subtypesAndSuperTypes/subtypesOfTypeParameter.ts(95,21): error TS2313: Constraint of a type parameter cannot reference any type parameter from the same type parameter list. -==== tests/cases/conformance/types/typeRelationships/subtypesAndSuperTypes/subtypesOfTypeParameter.ts (2 errors) ==== +==== tests/cases/conformance/types/typeRelationships/subtypesAndSuperTypes/subtypesOfTypeParameter.ts (1 errors) ==== // checking whether other types are subtypes of type parameters class C3 { @@ -104,8 +103,6 @@ tests/cases/conformance/types/typeRelationships/subtypesAndSuperTypes/subtypesOf } function f18(a: U) { - ~~~~~~~~~~~ -!!! error TS2313: Constraint of a type parameter cannot reference any type parameter from the same type parameter list. var r18 = true ? x : a; var r18 = true ? a : x; } diff --git a/tests/baselines/reference/subtypesOfTypeParameterWithConstraints.errors.txt b/tests/baselines/reference/subtypesOfTypeParameterWithConstraints.errors.txt index 2bb0db83e6d..bd7bbeb007e 100644 --- a/tests/baselines/reference/subtypesOfTypeParameterWithConstraints.errors.txt +++ b/tests/baselines/reference/subtypesOfTypeParameterWithConstraints.errors.txt @@ -1,142 +1,51 @@ -tests/cases/conformance/types/typeRelationships/subtypesAndSuperTypes/subtypesOfTypeParameterWithConstraints.ts(7,10): error TS2313: Constraint of a type parameter cannot reference any type parameter from the same type parameter list. -tests/cases/conformance/types/typeRelationships/subtypesAndSuperTypes/subtypesOfTypeParameterWithConstraints.ts(12,7): error TS2415: Class 'D2' incorrectly extends base class 'C3'. - Types of property 'foo' are incompatible. - Type 'T' is not assignable to type 'U'. -tests/cases/conformance/types/typeRelationships/subtypesAndSuperTypes/subtypesOfTypeParameterWithConstraints.ts(12,10): error TS2313: Constraint of a type parameter cannot reference any type parameter from the same type parameter list. -tests/cases/conformance/types/typeRelationships/subtypesAndSuperTypes/subtypesOfTypeParameterWithConstraints.ts(14,5): error TS2411: Property 'foo' of type 'T' is not assignable to string index type 'U'. tests/cases/conformance/types/typeRelationships/subtypesAndSuperTypes/subtypesOfTypeParameterWithConstraints.ts(17,7): error TS2415: Class 'D3' incorrectly extends base class 'C3'. Types of property 'foo' are incompatible. Type 'U' is not assignable to type 'T'. -tests/cases/conformance/types/typeRelationships/subtypesAndSuperTypes/subtypesOfTypeParameterWithConstraints.ts(17,10): error TS2313: Constraint of a type parameter cannot reference any type parameter from the same type parameter list. tests/cases/conformance/types/typeRelationships/subtypesAndSuperTypes/subtypesOfTypeParameterWithConstraints.ts(19,5): error TS2411: Property 'foo' of type 'U' is not assignable to string index type 'T'. -tests/cases/conformance/types/typeRelationships/subtypesAndSuperTypes/subtypesOfTypeParameterWithConstraints.ts(22,10): error TS2313: Constraint of a type parameter cannot reference any type parameter from the same type parameter list. -tests/cases/conformance/types/typeRelationships/subtypesAndSuperTypes/subtypesOfTypeParameterWithConstraints.ts(31,10): error TS2313: Constraint of a type parameter cannot reference any type parameter from the same type parameter list. -tests/cases/conformance/types/typeRelationships/subtypesAndSuperTypes/subtypesOfTypeParameterWithConstraints.ts(31,23): error TS2313: Constraint of a type parameter cannot reference any type parameter from the same type parameter list. -tests/cases/conformance/types/typeRelationships/subtypesAndSuperTypes/subtypesOfTypeParameterWithConstraints.ts(36,7): error TS2415: Class 'D6' incorrectly extends base class 'C3'. - Types of property 'foo' are incompatible. - Type 'T' is not assignable to type 'U'. -tests/cases/conformance/types/typeRelationships/subtypesAndSuperTypes/subtypesOfTypeParameterWithConstraints.ts(36,10): error TS2313: Constraint of a type parameter cannot reference any type parameter from the same type parameter list. -tests/cases/conformance/types/typeRelationships/subtypesAndSuperTypes/subtypesOfTypeParameterWithConstraints.ts(36,23): error TS2313: Constraint of a type parameter cannot reference any type parameter from the same type parameter list. -tests/cases/conformance/types/typeRelationships/subtypesAndSuperTypes/subtypesOfTypeParameterWithConstraints.ts(38,5): error TS2411: Property 'foo' of type 'T' is not assignable to string index type 'U'. -tests/cases/conformance/types/typeRelationships/subtypesAndSuperTypes/subtypesOfTypeParameterWithConstraints.ts(41,7): error TS2415: Class 'D7' incorrectly extends base class 'C3'. - Types of property 'foo' are incompatible. - Type 'T' is not assignable to type 'V'. -tests/cases/conformance/types/typeRelationships/subtypesAndSuperTypes/subtypesOfTypeParameterWithConstraints.ts(41,10): error TS2313: Constraint of a type parameter cannot reference any type parameter from the same type parameter list. -tests/cases/conformance/types/typeRelationships/subtypesAndSuperTypes/subtypesOfTypeParameterWithConstraints.ts(41,23): error TS2313: Constraint of a type parameter cannot reference any type parameter from the same type parameter list. -tests/cases/conformance/types/typeRelationships/subtypesAndSuperTypes/subtypesOfTypeParameterWithConstraints.ts(43,5): error TS2411: Property 'foo' of type 'T' is not assignable to string index type 'V'. tests/cases/conformance/types/typeRelationships/subtypesAndSuperTypes/subtypesOfTypeParameterWithConstraints.ts(48,7): error TS2415: Class 'D8' incorrectly extends base class 'C3'. Types of property 'foo' are incompatible. Type 'U' is not assignable to type 'T'. -tests/cases/conformance/types/typeRelationships/subtypesAndSuperTypes/subtypesOfTypeParameterWithConstraints.ts(48,10): error TS2313: Constraint of a type parameter cannot reference any type parameter from the same type parameter list. -tests/cases/conformance/types/typeRelationships/subtypesAndSuperTypes/subtypesOfTypeParameterWithConstraints.ts(48,23): error TS2313: Constraint of a type parameter cannot reference any type parameter from the same type parameter list. + Type 'V' is not assignable to type 'T'. tests/cases/conformance/types/typeRelationships/subtypesAndSuperTypes/subtypesOfTypeParameterWithConstraints.ts(50,5): error TS2411: Property 'foo' of type 'U' is not assignable to string index type 'T'. -tests/cases/conformance/types/typeRelationships/subtypesAndSuperTypes/subtypesOfTypeParameterWithConstraints.ts(53,10): error TS2313: Constraint of a type parameter cannot reference any type parameter from the same type parameter list. -tests/cases/conformance/types/typeRelationships/subtypesAndSuperTypes/subtypesOfTypeParameterWithConstraints.ts(53,23): error TS2313: Constraint of a type parameter cannot reference any type parameter from the same type parameter list. -tests/cases/conformance/types/typeRelationships/subtypesAndSuperTypes/subtypesOfTypeParameterWithConstraints.ts(58,7): error TS2415: Class 'D10' incorrectly extends base class 'C3'. - Types of property 'foo' are incompatible. - Type 'U' is not assignable to type 'V'. -tests/cases/conformance/types/typeRelationships/subtypesAndSuperTypes/subtypesOfTypeParameterWithConstraints.ts(58,11): error TS2313: Constraint of a type parameter cannot reference any type parameter from the same type parameter list. -tests/cases/conformance/types/typeRelationships/subtypesAndSuperTypes/subtypesOfTypeParameterWithConstraints.ts(58,24): error TS2313: Constraint of a type parameter cannot reference any type parameter from the same type parameter list. -tests/cases/conformance/types/typeRelationships/subtypesAndSuperTypes/subtypesOfTypeParameterWithConstraints.ts(60,5): error TS2411: Property 'foo' of type 'U' is not assignable to string index type 'V'. tests/cases/conformance/types/typeRelationships/subtypesAndSuperTypes/subtypesOfTypeParameterWithConstraints.ts(65,7): error TS2415: Class 'D11' incorrectly extends base class 'C3'. Types of property 'foo' are incompatible. Type 'V' is not assignable to type 'T'. -tests/cases/conformance/types/typeRelationships/subtypesAndSuperTypes/subtypesOfTypeParameterWithConstraints.ts(65,11): error TS2313: Constraint of a type parameter cannot reference any type parameter from the same type parameter list. -tests/cases/conformance/types/typeRelationships/subtypesAndSuperTypes/subtypesOfTypeParameterWithConstraints.ts(65,24): error TS2313: Constraint of a type parameter cannot reference any type parameter from the same type parameter list. tests/cases/conformance/types/typeRelationships/subtypesAndSuperTypes/subtypesOfTypeParameterWithConstraints.ts(67,5): error TS2411: Property 'foo' of type 'V' is not assignable to string index type 'T'. tests/cases/conformance/types/typeRelationships/subtypesAndSuperTypes/subtypesOfTypeParameterWithConstraints.ts(70,7): error TS2415: Class 'D12' incorrectly extends base class 'C3'. Types of property 'foo' are incompatible. Type 'V' is not assignable to type 'U'. -tests/cases/conformance/types/typeRelationships/subtypesAndSuperTypes/subtypesOfTypeParameterWithConstraints.ts(70,11): error TS2313: Constraint of a type parameter cannot reference any type parameter from the same type parameter list. -tests/cases/conformance/types/typeRelationships/subtypesAndSuperTypes/subtypesOfTypeParameterWithConstraints.ts(70,24): error TS2313: Constraint of a type parameter cannot reference any type parameter from the same type parameter list. tests/cases/conformance/types/typeRelationships/subtypesAndSuperTypes/subtypesOfTypeParameterWithConstraints.ts(72,5): error TS2411: Property 'foo' of type 'V' is not assignable to string index type 'U'. -tests/cases/conformance/types/typeRelationships/subtypesAndSuperTypes/subtypesOfTypeParameterWithConstraints.ts(75,11): error TS2313: Constraint of a type parameter cannot reference any type parameter from the same type parameter list. -tests/cases/conformance/types/typeRelationships/subtypesAndSuperTypes/subtypesOfTypeParameterWithConstraints.ts(75,24): error TS2313: Constraint of a type parameter cannot reference any type parameter from the same type parameter list. -tests/cases/conformance/types/typeRelationships/subtypesAndSuperTypes/subtypesOfTypeParameterWithConstraints.ts(83,7): error TS2415: Class 'D14' incorrectly extends base class 'C3'. - Types of property 'foo' are incompatible. - Type 'T' is not assignable to type 'Date'. -tests/cases/conformance/types/typeRelationships/subtypesAndSuperTypes/subtypesOfTypeParameterWithConstraints.ts(83,11): error TS2313: Constraint of a type parameter cannot reference any type parameter from the same type parameter list. -tests/cases/conformance/types/typeRelationships/subtypesAndSuperTypes/subtypesOfTypeParameterWithConstraints.ts(83,24): error TS2313: Constraint of a type parameter cannot reference any type parameter from the same type parameter list. -tests/cases/conformance/types/typeRelationships/subtypesAndSuperTypes/subtypesOfTypeParameterWithConstraints.ts(85,5): error TS2411: Property 'foo' of type 'T' is not assignable to string index type 'Date'. -tests/cases/conformance/types/typeRelationships/subtypesAndSuperTypes/subtypesOfTypeParameterWithConstraints.ts(88,11): error TS2313: Constraint of a type parameter cannot reference any type parameter from the same type parameter list. -tests/cases/conformance/types/typeRelationships/subtypesAndSuperTypes/subtypesOfTypeParameterWithConstraints.ts(88,24): error TS2313: Constraint of a type parameter cannot reference any type parameter from the same type parameter list. -tests/cases/conformance/types/typeRelationships/subtypesAndSuperTypes/subtypesOfTypeParameterWithConstraints.ts(93,7): error TS2415: Class 'D16' incorrectly extends base class 'C3'. - Types of property 'foo' are incompatible. - Type 'T' is not assignable to type 'U'. -tests/cases/conformance/types/typeRelationships/subtypesAndSuperTypes/subtypesOfTypeParameterWithConstraints.ts(93,11): error TS2313: Constraint of a type parameter cannot reference any type parameter from the same type parameter list. -tests/cases/conformance/types/typeRelationships/subtypesAndSuperTypes/subtypesOfTypeParameterWithConstraints.ts(93,24): error TS2313: Constraint of a type parameter cannot reference any type parameter from the same type parameter list. -tests/cases/conformance/types/typeRelationships/subtypesAndSuperTypes/subtypesOfTypeParameterWithConstraints.ts(95,5): error TS2411: Property 'foo' of type 'T' is not assignable to string index type 'U'. -tests/cases/conformance/types/typeRelationships/subtypesAndSuperTypes/subtypesOfTypeParameterWithConstraints.ts(98,7): error TS2415: Class 'D17' incorrectly extends base class 'C3'. - Types of property 'foo' are incompatible. - Type 'T' is not assignable to type 'V'. -tests/cases/conformance/types/typeRelationships/subtypesAndSuperTypes/subtypesOfTypeParameterWithConstraints.ts(98,11): error TS2313: Constraint of a type parameter cannot reference any type parameter from the same type parameter list. -tests/cases/conformance/types/typeRelationships/subtypesAndSuperTypes/subtypesOfTypeParameterWithConstraints.ts(98,24): error TS2313: Constraint of a type parameter cannot reference any type parameter from the same type parameter list. -tests/cases/conformance/types/typeRelationships/subtypesAndSuperTypes/subtypesOfTypeParameterWithConstraints.ts(100,5): error TS2411: Property 'foo' of type 'T' is not assignable to string index type 'V'. -tests/cases/conformance/types/typeRelationships/subtypesAndSuperTypes/subtypesOfTypeParameterWithConstraints.ts(105,7): error TS2415: Class 'D18' incorrectly extends base class 'C3'. - Types of property 'foo' are incompatible. - Type 'T' is not assignable to type 'Date'. -tests/cases/conformance/types/typeRelationships/subtypesAndSuperTypes/subtypesOfTypeParameterWithConstraints.ts(105,11): error TS2313: Constraint of a type parameter cannot reference any type parameter from the same type parameter list. -tests/cases/conformance/types/typeRelationships/subtypesAndSuperTypes/subtypesOfTypeParameterWithConstraints.ts(105,24): error TS2313: Constraint of a type parameter cannot reference any type parameter from the same type parameter list. -tests/cases/conformance/types/typeRelationships/subtypesAndSuperTypes/subtypesOfTypeParameterWithConstraints.ts(107,5): error TS2411: Property 'foo' of type 'T' is not assignable to string index type 'Date'. tests/cases/conformance/types/typeRelationships/subtypesAndSuperTypes/subtypesOfTypeParameterWithConstraints.ts(110,7): error TS2415: Class 'D19' incorrectly extends base class 'C3'. Types of property 'foo' are incompatible. Type 'U' is not assignable to type 'T'. -tests/cases/conformance/types/typeRelationships/subtypesAndSuperTypes/subtypesOfTypeParameterWithConstraints.ts(110,11): error TS2313: Constraint of a type parameter cannot reference any type parameter from the same type parameter list. -tests/cases/conformance/types/typeRelationships/subtypesAndSuperTypes/subtypesOfTypeParameterWithConstraints.ts(110,24): error TS2313: Constraint of a type parameter cannot reference any type parameter from the same type parameter list. + Type 'V' is not assignable to type 'T'. + Type 'Date' is not assignable to type 'T'. tests/cases/conformance/types/typeRelationships/subtypesAndSuperTypes/subtypesOfTypeParameterWithConstraints.ts(112,5): error TS2411: Property 'foo' of type 'U' is not assignable to string index type 'T'. -tests/cases/conformance/types/typeRelationships/subtypesAndSuperTypes/subtypesOfTypeParameterWithConstraints.ts(115,11): error TS2313: Constraint of a type parameter cannot reference any type parameter from the same type parameter list. -tests/cases/conformance/types/typeRelationships/subtypesAndSuperTypes/subtypesOfTypeParameterWithConstraints.ts(115,24): error TS2313: Constraint of a type parameter cannot reference any type parameter from the same type parameter list. -tests/cases/conformance/types/typeRelationships/subtypesAndSuperTypes/subtypesOfTypeParameterWithConstraints.ts(120,7): error TS2415: Class 'D21' incorrectly extends base class 'C3'. - Types of property 'foo' are incompatible. - Type 'U' is not assignable to type 'V'. -tests/cases/conformance/types/typeRelationships/subtypesAndSuperTypes/subtypesOfTypeParameterWithConstraints.ts(120,11): error TS2313: Constraint of a type parameter cannot reference any type parameter from the same type parameter list. -tests/cases/conformance/types/typeRelationships/subtypesAndSuperTypes/subtypesOfTypeParameterWithConstraints.ts(120,24): error TS2313: Constraint of a type parameter cannot reference any type parameter from the same type parameter list. -tests/cases/conformance/types/typeRelationships/subtypesAndSuperTypes/subtypesOfTypeParameterWithConstraints.ts(122,5): error TS2411: Property 'foo' of type 'U' is not assignable to string index type 'V'. -tests/cases/conformance/types/typeRelationships/subtypesAndSuperTypes/subtypesOfTypeParameterWithConstraints.ts(127,7): error TS2415: Class 'D22' incorrectly extends base class 'C3'. - Types of property 'foo' are incompatible. - Type 'T' is not assignable to type 'Date'. -tests/cases/conformance/types/typeRelationships/subtypesAndSuperTypes/subtypesOfTypeParameterWithConstraints.ts(127,11): error TS2313: Constraint of a type parameter cannot reference any type parameter from the same type parameter list. -tests/cases/conformance/types/typeRelationships/subtypesAndSuperTypes/subtypesOfTypeParameterWithConstraints.ts(127,24): error TS2313: Constraint of a type parameter cannot reference any type parameter from the same type parameter list. -tests/cases/conformance/types/typeRelationships/subtypesAndSuperTypes/subtypesOfTypeParameterWithConstraints.ts(129,5): error TS2411: Property 'foo' of type 'T' is not assignable to string index type 'Date'. tests/cases/conformance/types/typeRelationships/subtypesAndSuperTypes/subtypesOfTypeParameterWithConstraints.ts(132,7): error TS2415: Class 'D23' incorrectly extends base class 'C3'. Types of property 'foo' are incompatible. Type 'V' is not assignable to type 'T'. Type 'Date' is not assignable to type 'T'. -tests/cases/conformance/types/typeRelationships/subtypesAndSuperTypes/subtypesOfTypeParameterWithConstraints.ts(132,11): error TS2313: Constraint of a type parameter cannot reference any type parameter from the same type parameter list. -tests/cases/conformance/types/typeRelationships/subtypesAndSuperTypes/subtypesOfTypeParameterWithConstraints.ts(132,24): error TS2313: Constraint of a type parameter cannot reference any type parameter from the same type parameter list. tests/cases/conformance/types/typeRelationships/subtypesAndSuperTypes/subtypesOfTypeParameterWithConstraints.ts(134,5): error TS2411: Property 'foo' of type 'V' is not assignable to string index type 'T'. tests/cases/conformance/types/typeRelationships/subtypesAndSuperTypes/subtypesOfTypeParameterWithConstraints.ts(137,7): error TS2415: Class 'D24' incorrectly extends base class 'C3'. Types of property 'foo' are incompatible. Type 'V' is not assignable to type 'U'. Type 'Date' is not assignable to type 'U'. -tests/cases/conformance/types/typeRelationships/subtypesAndSuperTypes/subtypesOfTypeParameterWithConstraints.ts(137,11): error TS2313: Constraint of a type parameter cannot reference any type parameter from the same type parameter list. -tests/cases/conformance/types/typeRelationships/subtypesAndSuperTypes/subtypesOfTypeParameterWithConstraints.ts(137,24): error TS2313: Constraint of a type parameter cannot reference any type parameter from the same type parameter list. tests/cases/conformance/types/typeRelationships/subtypesAndSuperTypes/subtypesOfTypeParameterWithConstraints.ts(139,5): error TS2411: Property 'foo' of type 'V' is not assignable to string index type 'U'. -tests/cases/conformance/types/typeRelationships/subtypesAndSuperTypes/subtypesOfTypeParameterWithConstraints.ts(142,11): error TS2313: Constraint of a type parameter cannot reference any type parameter from the same type parameter list. -tests/cases/conformance/types/typeRelationships/subtypesAndSuperTypes/subtypesOfTypeParameterWithConstraints.ts(142,24): error TS2313: Constraint of a type parameter cannot reference any type parameter from the same type parameter list. -tests/cases/conformance/types/typeRelationships/subtypesAndSuperTypes/subtypesOfTypeParameterWithConstraints.ts(149,11): error TS2313: Constraint of a type parameter cannot reference any type parameter from the same type parameter list. -tests/cases/conformance/types/typeRelationships/subtypesAndSuperTypes/subtypesOfTypeParameterWithConstraints.ts(149,24): error TS2313: Constraint of a type parameter cannot reference any type parameter from the same type parameter list. tests/cases/conformance/types/typeRelationships/subtypesAndSuperTypes/subtypesOfTypeParameterWithConstraints.ts(154,7): error TS2415: Class 'D27' incorrectly extends base class 'C3'. Types of property 'foo' are incompatible. Type 'Date' is not assignable to type 'T'. -tests/cases/conformance/types/typeRelationships/subtypesAndSuperTypes/subtypesOfTypeParameterWithConstraints.ts(154,11): error TS2313: Constraint of a type parameter cannot reference any type parameter from the same type parameter list. -tests/cases/conformance/types/typeRelationships/subtypesAndSuperTypes/subtypesOfTypeParameterWithConstraints.ts(154,24): error TS2313: Constraint of a type parameter cannot reference any type parameter from the same type parameter list. tests/cases/conformance/types/typeRelationships/subtypesAndSuperTypes/subtypesOfTypeParameterWithConstraints.ts(156,5): error TS2411: Property 'foo' of type 'Date' is not assignable to string index type 'T'. tests/cases/conformance/types/typeRelationships/subtypesAndSuperTypes/subtypesOfTypeParameterWithConstraints.ts(159,7): error TS2415: Class 'D28' incorrectly extends base class 'C3'. Types of property 'foo' are incompatible. Type 'Date' is not assignable to type 'U'. -tests/cases/conformance/types/typeRelationships/subtypesAndSuperTypes/subtypesOfTypeParameterWithConstraints.ts(159,11): error TS2313: Constraint of a type parameter cannot reference any type parameter from the same type parameter list. -tests/cases/conformance/types/typeRelationships/subtypesAndSuperTypes/subtypesOfTypeParameterWithConstraints.ts(159,24): error TS2313: Constraint of a type parameter cannot reference any type parameter from the same type parameter list. tests/cases/conformance/types/typeRelationships/subtypesAndSuperTypes/subtypesOfTypeParameterWithConstraints.ts(161,5): error TS2411: Property 'foo' of type 'Date' is not assignable to string index type 'U'. tests/cases/conformance/types/typeRelationships/subtypesAndSuperTypes/subtypesOfTypeParameterWithConstraints.ts(164,7): error TS2415: Class 'D29' incorrectly extends base class 'C3'. Types of property 'foo' are incompatible. Type 'Date' is not assignable to type 'V'. -tests/cases/conformance/types/typeRelationships/subtypesAndSuperTypes/subtypesOfTypeParameterWithConstraints.ts(164,11): error TS2313: Constraint of a type parameter cannot reference any type parameter from the same type parameter list. -tests/cases/conformance/types/typeRelationships/subtypesAndSuperTypes/subtypesOfTypeParameterWithConstraints.ts(164,24): error TS2313: Constraint of a type parameter cannot reference any type parameter from the same type parameter list. tests/cases/conformance/types/typeRelationships/subtypesAndSuperTypes/subtypesOfTypeParameterWithConstraints.ts(166,5): error TS2411: Property 'foo' of type 'Date' is not assignable to string index type 'V'. -==== tests/cases/conformance/types/typeRelationships/subtypesAndSuperTypes/subtypesOfTypeParameterWithConstraints.ts (94 errors) ==== +==== tests/cases/conformance/types/typeRelationships/subtypesAndSuperTypes/subtypesOfTypeParameterWithConstraints.ts (20 errors) ==== // checking whether other types are subtypes of type parameters with constraints class C3 { @@ -144,23 +53,13 @@ tests/cases/conformance/types/typeRelationships/subtypesAndSuperTypes/subtypesOf } class D1 extends C3 { - ~~~~~~~~~~~ -!!! error TS2313: Constraint of a type parameter cannot reference any type parameter from the same type parameter list. [x: string]: T; foo: T; // ok } class D2 extends C3 { - ~~ -!!! error TS2415: Class 'D2' incorrectly extends base class 'C3'. -!!! error TS2415: Types of property 'foo' are incompatible. -!!! error TS2415: Type 'T' is not assignable to type 'U'. - ~~~~~~~~~~~ -!!! error TS2313: Constraint of a type parameter cannot reference any type parameter from the same type parameter list. [x: string]: U; foo: T; // ok - ~~~~~~~ -!!! error TS2411: Property 'foo' of type 'T' is not assignable to string index type 'U'. } class D3 extends C3 { @@ -168,8 +67,6 @@ tests/cases/conformance/types/typeRelationships/subtypesAndSuperTypes/subtypesOf !!! error TS2415: Class 'D3' incorrectly extends base class 'C3'. !!! error TS2415: Types of property 'foo' are incompatible. !!! error TS2415: Type 'U' is not assignable to type 'T'. - ~~~~~~~~~~~ -!!! error TS2313: Constraint of a type parameter cannot reference any type parameter from the same type parameter list. [x: string]: T; foo: U; // error ~~~~~~~ @@ -177,8 +74,6 @@ tests/cases/conformance/types/typeRelationships/subtypesAndSuperTypes/subtypesOf } class D4 extends C3 { - ~~~~~~~~~~~ -!!! error TS2313: Constraint of a type parameter cannot reference any type parameter from the same type parameter list. [x: string]: U; foo: U; // ok } @@ -188,42 +83,18 @@ tests/cases/conformance/types/typeRelationships/subtypesAndSuperTypes/subtypesOf // test if T is subtype of T, U, V // should all work class D5 extends C3 { - ~~~~~~~~~~~ -!!! error TS2313: Constraint of a type parameter cannot reference any type parameter from the same type parameter list. - ~~~~~~~~~~~ -!!! error TS2313: Constraint of a type parameter cannot reference any type parameter from the same type parameter list. [x: string]: T; foo: T; // ok } class D6 extends C3 { - ~~ -!!! error TS2415: Class 'D6' incorrectly extends base class 'C3'. -!!! error TS2415: Types of property 'foo' are incompatible. -!!! error TS2415: Type 'T' is not assignable to type 'U'. - ~~~~~~~~~~~ -!!! error TS2313: Constraint of a type parameter cannot reference any type parameter from the same type parameter list. - ~~~~~~~~~~~ -!!! error TS2313: Constraint of a type parameter cannot reference any type parameter from the same type parameter list. [x: string]: U; foo: T; - ~~~~~~~ -!!! error TS2411: Property 'foo' of type 'T' is not assignable to string index type 'U'. } class D7 extends C3 { - ~~ -!!! error TS2415: Class 'D7' incorrectly extends base class 'C3'. -!!! error TS2415: Types of property 'foo' are incompatible. -!!! error TS2415: Type 'T' is not assignable to type 'V'. - ~~~~~~~~~~~ -!!! error TS2313: Constraint of a type parameter cannot reference any type parameter from the same type parameter list. - ~~~~~~~~~~~ -!!! error TS2313: Constraint of a type parameter cannot reference any type parameter from the same type parameter list. [x: string]: V; foo: T; // ok - ~~~~~~~ -!!! error TS2411: Property 'foo' of type 'T' is not assignable to string index type 'V'. } // test if U is a subtype of T, U, V @@ -233,10 +104,7 @@ tests/cases/conformance/types/typeRelationships/subtypesAndSuperTypes/subtypesOf !!! error TS2415: Class 'D8' incorrectly extends base class 'C3'. !!! error TS2415: Types of property 'foo' are incompatible. !!! error TS2415: Type 'U' is not assignable to type 'T'. - ~~~~~~~~~~~ -!!! error TS2313: Constraint of a type parameter cannot reference any type parameter from the same type parameter list. - ~~~~~~~~~~~ -!!! error TS2313: Constraint of a type parameter cannot reference any type parameter from the same type parameter list. +!!! error TS2415: Type 'V' is not assignable to type 'T'. [x: string]: T; foo: U; // error ~~~~~~~ @@ -244,27 +112,13 @@ tests/cases/conformance/types/typeRelationships/subtypesAndSuperTypes/subtypesOf } class D9 extends C3 { - ~~~~~~~~~~~ -!!! error TS2313: Constraint of a type parameter cannot reference any type parameter from the same type parameter list. - ~~~~~~~~~~~ -!!! error TS2313: Constraint of a type parameter cannot reference any type parameter from the same type parameter list. [x: string]: U; foo: U; // ok } class D10 extends C3 { - ~~~ -!!! error TS2415: Class 'D10' incorrectly extends base class 'C3'. -!!! error TS2415: Types of property 'foo' are incompatible. -!!! error TS2415: Type 'U' is not assignable to type 'V'. - ~~~~~~~~~~~ -!!! error TS2313: Constraint of a type parameter cannot reference any type parameter from the same type parameter list. - ~~~~~~~~~~~ -!!! error TS2313: Constraint of a type parameter cannot reference any type parameter from the same type parameter list. [x: string]: V; foo: U; // ok - ~~~~~~~ -!!! error TS2411: Property 'foo' of type 'U' is not assignable to string index type 'V'. } // test if V is a subtype of T, U, V @@ -274,10 +128,6 @@ tests/cases/conformance/types/typeRelationships/subtypesAndSuperTypes/subtypesOf !!! error TS2415: Class 'D11' incorrectly extends base class 'C3'. !!! error TS2415: Types of property 'foo' are incompatible. !!! error TS2415: Type 'V' is not assignable to type 'T'. - ~~~~~~~~~~~ -!!! error TS2313: Constraint of a type parameter cannot reference any type parameter from the same type parameter list. - ~~~~~~~~~~~ -!!! error TS2313: Constraint of a type parameter cannot reference any type parameter from the same type parameter list. [x: string]: T; foo: V; // error ~~~~~~~ @@ -289,10 +139,6 @@ tests/cases/conformance/types/typeRelationships/subtypesAndSuperTypes/subtypesOf !!! error TS2415: Class 'D12' incorrectly extends base class 'C3'. !!! error TS2415: Types of property 'foo' are incompatible. !!! error TS2415: Type 'V' is not assignable to type 'U'. - ~~~~~~~~~~~ -!!! error TS2313: Constraint of a type parameter cannot reference any type parameter from the same type parameter list. - ~~~~~~~~~~~ -!!! error TS2313: Constraint of a type parameter cannot reference any type parameter from the same type parameter list. [x: string]: U; foo: V; // error ~~~~~~~ @@ -300,10 +146,6 @@ tests/cases/conformance/types/typeRelationships/subtypesAndSuperTypes/subtypesOf } class D13 extends C3 { - ~~~~~~~~~~~ -!!! error TS2313: Constraint of a type parameter cannot reference any type parameter from the same type parameter list. - ~~~~~~~~~~~ -!!! error TS2313: Constraint of a type parameter cannot reference any type parameter from the same type parameter list. [x: string]: V; foo: V; // ok } @@ -312,74 +154,30 @@ tests/cases/conformance/types/typeRelationships/subtypesAndSuperTypes/subtypesOf // test if T is subtype of T, U, V, Date // should all work class D14 extends C3 { - ~~~ -!!! error TS2415: Class 'D14' incorrectly extends base class 'C3'. -!!! error TS2415: Types of property 'foo' are incompatible. -!!! error TS2415: Type 'T' is not assignable to type 'Date'. - ~~~~~~~~~~~ -!!! error TS2313: Constraint of a type parameter cannot reference any type parameter from the same type parameter list. - ~~~~~~~~~~~ -!!! error TS2313: Constraint of a type parameter cannot reference any type parameter from the same type parameter list. [x: string]: Date; foo: T; // ok - ~~~~~~~ -!!! error TS2411: Property 'foo' of type 'T' is not assignable to string index type 'Date'. } class D15 extends C3 { - ~~~~~~~~~~~ -!!! error TS2313: Constraint of a type parameter cannot reference any type parameter from the same type parameter list. - ~~~~~~~~~~~ -!!! error TS2313: Constraint of a type parameter cannot reference any type parameter from the same type parameter list. [x: string]: T; foo: T; // ok } class D16 extends C3 { - ~~~ -!!! error TS2415: Class 'D16' incorrectly extends base class 'C3'. -!!! error TS2415: Types of property 'foo' are incompatible. -!!! error TS2415: Type 'T' is not assignable to type 'U'. - ~~~~~~~~~~~ -!!! error TS2313: Constraint of a type parameter cannot reference any type parameter from the same type parameter list. - ~~~~~~~~~~~ -!!! error TS2313: Constraint of a type parameter cannot reference any type parameter from the same type parameter list. [x: string]: U; foo: T; - ~~~~~~~ -!!! error TS2411: Property 'foo' of type 'T' is not assignable to string index type 'U'. } class D17 extends C3 { - ~~~ -!!! error TS2415: Class 'D17' incorrectly extends base class 'C3'. -!!! error TS2415: Types of property 'foo' are incompatible. -!!! error TS2415: Type 'T' is not assignable to type 'V'. - ~~~~~~~~~~~ -!!! error TS2313: Constraint of a type parameter cannot reference any type parameter from the same type parameter list. - ~~~~~~~~~~~ -!!! error TS2313: Constraint of a type parameter cannot reference any type parameter from the same type parameter list. [x: string]: V; foo: T; - ~~~~~~~ -!!! error TS2411: Property 'foo' of type 'T' is not assignable to string index type 'V'. } // test if U is a subtype of T, U, V, Date // only a subtype of V, Date and itself class D18 extends C3 { - ~~~ -!!! error TS2415: Class 'D18' incorrectly extends base class 'C3'. -!!! error TS2415: Types of property 'foo' are incompatible. -!!! error TS2415: Type 'T' is not assignable to type 'Date'. - ~~~~~~~~~~~ -!!! error TS2313: Constraint of a type parameter cannot reference any type parameter from the same type parameter list. - ~~~~~~~~~~~ -!!! error TS2313: Constraint of a type parameter cannot reference any type parameter from the same type parameter list. [x: string]: Date; foo: T; // ok - ~~~~~~~ -!!! error TS2411: Property 'foo' of type 'T' is not assignable to string index type 'Date'. } class D19 extends C3 { @@ -387,10 +185,8 @@ tests/cases/conformance/types/typeRelationships/subtypesAndSuperTypes/subtypesOf !!! error TS2415: Class 'D19' incorrectly extends base class 'C3'. !!! error TS2415: Types of property 'foo' are incompatible. !!! error TS2415: Type 'U' is not assignable to type 'T'. - ~~~~~~~~~~~ -!!! error TS2313: Constraint of a type parameter cannot reference any type parameter from the same type parameter list. - ~~~~~~~~~~~ -!!! error TS2313: Constraint of a type parameter cannot reference any type parameter from the same type parameter list. +!!! error TS2415: Type 'V' is not assignable to type 'T'. +!!! error TS2415: Type 'Date' is not assignable to type 'T'. [x: string]: T; foo: U; // error ~~~~~~~ @@ -398,44 +194,20 @@ tests/cases/conformance/types/typeRelationships/subtypesAndSuperTypes/subtypesOf } class D20 extends C3 { - ~~~~~~~~~~~ -!!! error TS2313: Constraint of a type parameter cannot reference any type parameter from the same type parameter list. - ~~~~~~~~~~~ -!!! error TS2313: Constraint of a type parameter cannot reference any type parameter from the same type parameter list. [x: string]: U; foo: U; // ok } class D21 extends C3 { - ~~~ -!!! error TS2415: Class 'D21' incorrectly extends base class 'C3'. -!!! error TS2415: Types of property 'foo' are incompatible. -!!! error TS2415: Type 'U' is not assignable to type 'V'. - ~~~~~~~~~~~ -!!! error TS2313: Constraint of a type parameter cannot reference any type parameter from the same type parameter list. - ~~~~~~~~~~~ -!!! error TS2313: Constraint of a type parameter cannot reference any type parameter from the same type parameter list. [x: string]: V; foo: U; - ~~~~~~~ -!!! error TS2411: Property 'foo' of type 'U' is not assignable to string index type 'V'. } // test if V is a subtype of T, U, V, Date // only a subtype of itself and Date class D22 extends C3 { - ~~~ -!!! error TS2415: Class 'D22' incorrectly extends base class 'C3'. -!!! error TS2415: Types of property 'foo' are incompatible. -!!! error TS2415: Type 'T' is not assignable to type 'Date'. - ~~~~~~~~~~~ -!!! error TS2313: Constraint of a type parameter cannot reference any type parameter from the same type parameter list. - ~~~~~~~~~~~ -!!! error TS2313: Constraint of a type parameter cannot reference any type parameter from the same type parameter list. [x: string]: Date; foo: T; // ok - ~~~~~~~ -!!! error TS2411: Property 'foo' of type 'T' is not assignable to string index type 'Date'. } class D23 extends C3 { @@ -444,10 +216,6 @@ tests/cases/conformance/types/typeRelationships/subtypesAndSuperTypes/subtypesOf !!! error TS2415: Types of property 'foo' are incompatible. !!! error TS2415: Type 'V' is not assignable to type 'T'. !!! error TS2415: Type 'Date' is not assignable to type 'T'. - ~~~~~~~~~~~ -!!! error TS2313: Constraint of a type parameter cannot reference any type parameter from the same type parameter list. - ~~~~~~~~~~~ -!!! error TS2313: Constraint of a type parameter cannot reference any type parameter from the same type parameter list. [x: string]: T; foo: V; // error ~~~~~~~ @@ -460,10 +228,6 @@ tests/cases/conformance/types/typeRelationships/subtypesAndSuperTypes/subtypesOf !!! error TS2415: Types of property 'foo' are incompatible. !!! error TS2415: Type 'V' is not assignable to type 'U'. !!! error TS2415: Type 'Date' is not assignable to type 'U'. - ~~~~~~~~~~~ -!!! error TS2313: Constraint of a type parameter cannot reference any type parameter from the same type parameter list. - ~~~~~~~~~~~ -!!! error TS2313: Constraint of a type parameter cannot reference any type parameter from the same type parameter list. [x: string]: U; foo: V; // error ~~~~~~~ @@ -471,10 +235,6 @@ tests/cases/conformance/types/typeRelationships/subtypesAndSuperTypes/subtypesOf } class D25 extends C3 { - ~~~~~~~~~~~ -!!! error TS2313: Constraint of a type parameter cannot reference any type parameter from the same type parameter list. - ~~~~~~~~~~~ -!!! error TS2313: Constraint of a type parameter cannot reference any type parameter from the same type parameter list. [x: string]: V; foo: V; // ok } @@ -482,10 +242,6 @@ tests/cases/conformance/types/typeRelationships/subtypesAndSuperTypes/subtypesOf // test if Date is a subtype of T, U, V, Date // only a subtype of itself class D26 extends C3 { - ~~~~~~~~~~~ -!!! error TS2313: Constraint of a type parameter cannot reference any type parameter from the same type parameter list. - ~~~~~~~~~~~ -!!! error TS2313: Constraint of a type parameter cannot reference any type parameter from the same type parameter list. [x: string]: Date; foo: Date; // ok } @@ -495,10 +251,6 @@ tests/cases/conformance/types/typeRelationships/subtypesAndSuperTypes/subtypesOf !!! error TS2415: Class 'D27' incorrectly extends base class 'C3'. !!! error TS2415: Types of property 'foo' are incompatible. !!! error TS2415: Type 'Date' is not assignable to type 'T'. - ~~~~~~~~~~~ -!!! error TS2313: Constraint of a type parameter cannot reference any type parameter from the same type parameter list. - ~~~~~~~~~~~ -!!! error TS2313: Constraint of a type parameter cannot reference any type parameter from the same type parameter list. [x: string]: T; foo: Date; // error ~~~~~~~~~~ @@ -510,10 +262,6 @@ tests/cases/conformance/types/typeRelationships/subtypesAndSuperTypes/subtypesOf !!! error TS2415: Class 'D28' incorrectly extends base class 'C3'. !!! error TS2415: Types of property 'foo' are incompatible. !!! error TS2415: Type 'Date' is not assignable to type 'U'. - ~~~~~~~~~~~ -!!! error TS2313: Constraint of a type parameter cannot reference any type parameter from the same type parameter list. - ~~~~~~~~~~~ -!!! error TS2313: Constraint of a type parameter cannot reference any type parameter from the same type parameter list. [x: string]: U; foo: Date; // error ~~~~~~~~~~ @@ -525,10 +273,6 @@ tests/cases/conformance/types/typeRelationships/subtypesAndSuperTypes/subtypesOf !!! error TS2415: Class 'D29' incorrectly extends base class 'C3'. !!! error TS2415: Types of property 'foo' are incompatible. !!! error TS2415: Type 'Date' is not assignable to type 'V'. - ~~~~~~~~~~~ -!!! error TS2313: Constraint of a type parameter cannot reference any type parameter from the same type parameter list. - ~~~~~~~~~~~ -!!! error TS2313: Constraint of a type parameter cannot reference any type parameter from the same type parameter list. [x: string]: V; foo: Date; // error ~~~~~~~~~~ diff --git a/tests/baselines/reference/subtypesOfTypeParameterWithConstraints2.errors.txt b/tests/baselines/reference/subtypesOfTypeParameterWithConstraints2.errors.txt deleted file mode 100644 index 1a2ced3b6f2..00000000000 --- a/tests/baselines/reference/subtypesOfTypeParameterWithConstraints2.errors.txt +++ /dev/null @@ -1,175 +0,0 @@ -tests/cases/conformance/types/typeRelationships/subtypesAndSuperTypes/subtypesOfTypeParameterWithConstraints2.ts(3,13): error TS2313: Constraint of a type parameter cannot reference any type parameter from the same type parameter list. -tests/cases/conformance/types/typeRelationships/subtypesAndSuperTypes/subtypesOfTypeParameterWithConstraints2.ts(9,13): error TS2313: Constraint of a type parameter cannot reference any type parameter from the same type parameter list. -tests/cases/conformance/types/typeRelationships/subtypesAndSuperTypes/subtypesOfTypeParameterWithConstraints2.ts(9,26): error TS2313: Constraint of a type parameter cannot reference any type parameter from the same type parameter list. -tests/cases/conformance/types/typeRelationships/subtypesAndSuperTypes/subtypesOfTypeParameterWithConstraints2.ts(23,13): error TS2313: Constraint of a type parameter cannot reference any type parameter from the same type parameter list. -tests/cases/conformance/types/typeRelationships/subtypesAndSuperTypes/subtypesOfTypeParameterWithConstraints2.ts(143,18): error TS2313: Constraint of a type parameter cannot reference any type parameter from the same type parameter list. - - -==== tests/cases/conformance/types/typeRelationships/subtypesAndSuperTypes/subtypesOfTypeParameterWithConstraints2.ts (5 errors) ==== - // checking whether other types are subtypes of type parameters with constraints - - function f1(x: T, y: U) { - ~~~~~~~~~~~ -!!! error TS2313: Constraint of a type parameter cannot reference any type parameter from the same type parameter list. - var r = true ? x : y; - var r = true ? y : x; - } - - // V > U > T - function f2(x: T, y: U, z: V) { - ~~~~~~~~~~~ -!!! error TS2313: Constraint of a type parameter cannot reference any type parameter from the same type parameter list. - ~~~~~~~~~~~ -!!! error TS2313: Constraint of a type parameter cannot reference any type parameter from the same type parameter list. - var r = true ? x : y; - var r = true ? y : x; - - // ok - var r2 = true ? z : y; - var r2 = true ? y : z; - - // ok - var r2a = true ? z : x; - var r2b = true ? x : z; - } - - // Date > U > T - function f3(x: T, y: U) { - ~~~~~~~~~~~ -!!! error TS2313: Constraint of a type parameter cannot reference any type parameter from the same type parameter list. - var r = true ? x : y; - var r = true ? y : x; - - // ok - var r2 = true ? x : new Date(); - var r2 = true ? new Date() : x; - - // ok - var r3 = true ? y : new Date(); - var r3 = true ? new Date() : y; - } - - - interface I1 { foo: number; } - class C1 { foo: number; } - class C2 { foo: T; } - enum E { A } - function f() { } - module f { - export var bar = 1; - } - class c { baz: string } - module c { - export var bar = 1; - } - - function f4(x: T) { - var r0 = true ? x : null; // ok - var r0 = true ? null : x; // ok - - var u: typeof undefined; - var r0b = true ? u : x; // ok - var r0b = true ? x : u; // ok - } - - function f5(x: T) { - var r1 = true ? 1 : x; // ok - var r1 = true ? x : 1; // ok - } - - function f6(x: T) { - var r2 = true ? '' : x; // ok - var r2 = true ? x : ''; // ok - } - - function f7(x: T) { - var r3 = true ? true : x; // ok - var r3 = true ? x : true; // ok - } - - function f8(x: T) { - var r4 = true ? new Date() : x; // ok - var r4 = true ? x : new Date(); // ok - } - - function f9(x: T) { - var r5 = true ? /1/ : x; // ok - var r5 = true ? x : /1/; // ok - } - - function f10(x: T) { - var r6 = true ? { foo: 1 } : x; // ok - var r6 = true ? x : { foo: 1 }; // ok - } - - function f11 void>(x: T) { - var r7 = true ? () => { } : x; // ok - var r7 = true ? x : () => { }; // ok - } - - function f12(x: U) => U>(x: T) { - var r8 = true ? (x: T) => { return x } : x; // ok - var r8b = true ? x : (x: T) => { return x }; // ok, type parameters not identical across declarations - } - - function f13(x: T) { - var i1: I1; - var r9 = true ? i1 : x; // ok - var r9 = true ? x : i1; // ok - } - - function f14(x: T) { - var c1: C1; - var r10 = true ? c1 : x; // ok - var r10 = true ? x : c1; // ok - } - - function f15>(x: T) { - var c2: C2; - var r12 = true ? c2 : x; // ok - var r12 = true ? x : c2; // ok - } - - function f16(x: T) { - var r13 = true ? E : x; // ok - var r13 = true ? x : E; // ok - - var r14 = true ? E.A : x; // ok - var r14 = true ? x : E.A; // ok - } - - function f17(x: T) { - var af: typeof f; - var r15 = true ? af : x; // ok - var r15 = true ? x : af; // ok - } - - function f18(x: T) { - var ac: typeof c; - var r16 = true ? ac : x; // ok - var r16 = true ? x : ac; // ok - } - - function f19(x: T) { - function f17(a: U) { - var r17 = true ? x : a; // ok - var r17 = true ? a : x; // ok - } - - function f18(a: V) { - ~~~~~~~~~~~ -!!! error TS2313: Constraint of a type parameter cannot reference any type parameter from the same type parameter list. - var r18 = true ? x : a; // ok - var r18 = true ? a : x; // ok - } - } - - function f20(x: T) { - var r19 = true ? new Object() : x; // ok - var r19 = true ? x : new Object(); // ok - } - - function f21(x: T) { - var r20 = true ? {} : x; // ok - var r20 = true ? x : {}; // ok - } \ No newline at end of file diff --git a/tests/baselines/reference/subtypesOfTypeParameterWithConstraints2.symbols b/tests/baselines/reference/subtypesOfTypeParameterWithConstraints2.symbols new file mode 100644 index 00000000000..05276362cbe --- /dev/null +++ b/tests/baselines/reference/subtypesOfTypeParameterWithConstraints2.symbols @@ -0,0 +1,548 @@ +=== tests/cases/conformance/types/typeRelationships/subtypesAndSuperTypes/subtypesOfTypeParameterWithConstraints2.ts === +// checking whether other types are subtypes of type parameters with constraints + +function f1(x: T, y: U) { +>f1 : Symbol(f1, Decl(subtypesOfTypeParameterWithConstraints2.ts, 0, 0)) +>T : Symbol(T, Decl(subtypesOfTypeParameterWithConstraints2.ts, 2, 12)) +>U : Symbol(U, Decl(subtypesOfTypeParameterWithConstraints2.ts, 2, 24)) +>U : Symbol(U, Decl(subtypesOfTypeParameterWithConstraints2.ts, 2, 24)) +>x : Symbol(x, Decl(subtypesOfTypeParameterWithConstraints2.ts, 2, 28)) +>T : Symbol(T, Decl(subtypesOfTypeParameterWithConstraints2.ts, 2, 12)) +>y : Symbol(y, Decl(subtypesOfTypeParameterWithConstraints2.ts, 2, 33)) +>U : Symbol(U, Decl(subtypesOfTypeParameterWithConstraints2.ts, 2, 24)) + + var r = true ? x : y; +>r : Symbol(r, Decl(subtypesOfTypeParameterWithConstraints2.ts, 3, 7), Decl(subtypesOfTypeParameterWithConstraints2.ts, 4, 7)) +>x : Symbol(x, Decl(subtypesOfTypeParameterWithConstraints2.ts, 2, 28)) +>y : Symbol(y, Decl(subtypesOfTypeParameterWithConstraints2.ts, 2, 33)) + + var r = true ? y : x; +>r : Symbol(r, Decl(subtypesOfTypeParameterWithConstraints2.ts, 3, 7), Decl(subtypesOfTypeParameterWithConstraints2.ts, 4, 7)) +>y : Symbol(y, Decl(subtypesOfTypeParameterWithConstraints2.ts, 2, 33)) +>x : Symbol(x, Decl(subtypesOfTypeParameterWithConstraints2.ts, 2, 28)) +} + +// V > U > T +function f2(x: T, y: U, z: V) { +>f2 : Symbol(f2, Decl(subtypesOfTypeParameterWithConstraints2.ts, 5, 1)) +>T : Symbol(T, Decl(subtypesOfTypeParameterWithConstraints2.ts, 8, 12)) +>U : Symbol(U, Decl(subtypesOfTypeParameterWithConstraints2.ts, 8, 24)) +>U : Symbol(U, Decl(subtypesOfTypeParameterWithConstraints2.ts, 8, 24)) +>V : Symbol(V, Decl(subtypesOfTypeParameterWithConstraints2.ts, 8, 37)) +>V : Symbol(V, Decl(subtypesOfTypeParameterWithConstraints2.ts, 8, 37)) +>x : Symbol(x, Decl(subtypesOfTypeParameterWithConstraints2.ts, 8, 41)) +>T : Symbol(T, Decl(subtypesOfTypeParameterWithConstraints2.ts, 8, 12)) +>y : Symbol(y, Decl(subtypesOfTypeParameterWithConstraints2.ts, 8, 46)) +>U : Symbol(U, Decl(subtypesOfTypeParameterWithConstraints2.ts, 8, 24)) +>z : Symbol(z, Decl(subtypesOfTypeParameterWithConstraints2.ts, 8, 52)) +>V : Symbol(V, Decl(subtypesOfTypeParameterWithConstraints2.ts, 8, 37)) + + var r = true ? x : y; +>r : Symbol(r, Decl(subtypesOfTypeParameterWithConstraints2.ts, 9, 7), Decl(subtypesOfTypeParameterWithConstraints2.ts, 10, 7)) +>x : Symbol(x, Decl(subtypesOfTypeParameterWithConstraints2.ts, 8, 41)) +>y : Symbol(y, Decl(subtypesOfTypeParameterWithConstraints2.ts, 8, 46)) + + var r = true ? y : x; +>r : Symbol(r, Decl(subtypesOfTypeParameterWithConstraints2.ts, 9, 7), Decl(subtypesOfTypeParameterWithConstraints2.ts, 10, 7)) +>y : Symbol(y, Decl(subtypesOfTypeParameterWithConstraints2.ts, 8, 46)) +>x : Symbol(x, Decl(subtypesOfTypeParameterWithConstraints2.ts, 8, 41)) + + // ok + var r2 = true ? z : y; +>r2 : Symbol(r2, Decl(subtypesOfTypeParameterWithConstraints2.ts, 13, 7), Decl(subtypesOfTypeParameterWithConstraints2.ts, 14, 7)) +>z : Symbol(z, Decl(subtypesOfTypeParameterWithConstraints2.ts, 8, 52)) +>y : Symbol(y, Decl(subtypesOfTypeParameterWithConstraints2.ts, 8, 46)) + + var r2 = true ? y : z; +>r2 : Symbol(r2, Decl(subtypesOfTypeParameterWithConstraints2.ts, 13, 7), Decl(subtypesOfTypeParameterWithConstraints2.ts, 14, 7)) +>y : Symbol(y, Decl(subtypesOfTypeParameterWithConstraints2.ts, 8, 46)) +>z : Symbol(z, Decl(subtypesOfTypeParameterWithConstraints2.ts, 8, 52)) + + // ok + var r2a = true ? z : x; +>r2a : Symbol(r2a, Decl(subtypesOfTypeParameterWithConstraints2.ts, 17, 7)) +>z : Symbol(z, Decl(subtypesOfTypeParameterWithConstraints2.ts, 8, 52)) +>x : Symbol(x, Decl(subtypesOfTypeParameterWithConstraints2.ts, 8, 41)) + + var r2b = true ? x : z; +>r2b : Symbol(r2b, Decl(subtypesOfTypeParameterWithConstraints2.ts, 18, 7)) +>x : Symbol(x, Decl(subtypesOfTypeParameterWithConstraints2.ts, 8, 41)) +>z : Symbol(z, Decl(subtypesOfTypeParameterWithConstraints2.ts, 8, 52)) +} + +// Date > U > T +function f3(x: T, y: U) { +>f3 : Symbol(f3, Decl(subtypesOfTypeParameterWithConstraints2.ts, 19, 1)) +>T : Symbol(T, Decl(subtypesOfTypeParameterWithConstraints2.ts, 22, 12)) +>U : Symbol(U, Decl(subtypesOfTypeParameterWithConstraints2.ts, 22, 24)) +>U : Symbol(U, Decl(subtypesOfTypeParameterWithConstraints2.ts, 22, 24)) +>Date : Symbol(Date, Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --)) +>x : Symbol(x, Decl(subtypesOfTypeParameterWithConstraints2.ts, 22, 41)) +>T : Symbol(T, Decl(subtypesOfTypeParameterWithConstraints2.ts, 22, 12)) +>y : Symbol(y, Decl(subtypesOfTypeParameterWithConstraints2.ts, 22, 46)) +>U : Symbol(U, Decl(subtypesOfTypeParameterWithConstraints2.ts, 22, 24)) + + var r = true ? x : y; +>r : Symbol(r, Decl(subtypesOfTypeParameterWithConstraints2.ts, 23, 7), Decl(subtypesOfTypeParameterWithConstraints2.ts, 24, 7)) +>x : Symbol(x, Decl(subtypesOfTypeParameterWithConstraints2.ts, 22, 41)) +>y : Symbol(y, Decl(subtypesOfTypeParameterWithConstraints2.ts, 22, 46)) + + var r = true ? y : x; +>r : Symbol(r, Decl(subtypesOfTypeParameterWithConstraints2.ts, 23, 7), Decl(subtypesOfTypeParameterWithConstraints2.ts, 24, 7)) +>y : Symbol(y, Decl(subtypesOfTypeParameterWithConstraints2.ts, 22, 46)) +>x : Symbol(x, Decl(subtypesOfTypeParameterWithConstraints2.ts, 22, 41)) + + // ok + var r2 = true ? x : new Date(); +>r2 : Symbol(r2, Decl(subtypesOfTypeParameterWithConstraints2.ts, 27, 7), Decl(subtypesOfTypeParameterWithConstraints2.ts, 28, 7)) +>x : Symbol(x, Decl(subtypesOfTypeParameterWithConstraints2.ts, 22, 41)) +>Date : Symbol(Date, Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --)) + + var r2 = true ? new Date() : x; +>r2 : Symbol(r2, Decl(subtypesOfTypeParameterWithConstraints2.ts, 27, 7), Decl(subtypesOfTypeParameterWithConstraints2.ts, 28, 7)) +>Date : Symbol(Date, Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --)) +>x : Symbol(x, Decl(subtypesOfTypeParameterWithConstraints2.ts, 22, 41)) + + // ok + var r3 = true ? y : new Date(); +>r3 : Symbol(r3, Decl(subtypesOfTypeParameterWithConstraints2.ts, 31, 7), Decl(subtypesOfTypeParameterWithConstraints2.ts, 32, 7)) +>y : Symbol(y, Decl(subtypesOfTypeParameterWithConstraints2.ts, 22, 46)) +>Date : Symbol(Date, Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --)) + + var r3 = true ? new Date() : y; +>r3 : Symbol(r3, Decl(subtypesOfTypeParameterWithConstraints2.ts, 31, 7), Decl(subtypesOfTypeParameterWithConstraints2.ts, 32, 7)) +>Date : Symbol(Date, Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --)) +>y : Symbol(y, Decl(subtypesOfTypeParameterWithConstraints2.ts, 22, 46)) +} + + +interface I1 { foo: number; } +>I1 : Symbol(I1, Decl(subtypesOfTypeParameterWithConstraints2.ts, 33, 1)) +>foo : Symbol(foo, Decl(subtypesOfTypeParameterWithConstraints2.ts, 36, 14)) + +class C1 { foo: number; } +>C1 : Symbol(C1, Decl(subtypesOfTypeParameterWithConstraints2.ts, 36, 29)) +>foo : Symbol(foo, Decl(subtypesOfTypeParameterWithConstraints2.ts, 37, 10)) + +class C2 { foo: T; } +>C2 : Symbol(C2, Decl(subtypesOfTypeParameterWithConstraints2.ts, 37, 25)) +>T : Symbol(T, Decl(subtypesOfTypeParameterWithConstraints2.ts, 38, 9)) +>foo : Symbol(foo, Decl(subtypesOfTypeParameterWithConstraints2.ts, 38, 13)) +>T : Symbol(T, Decl(subtypesOfTypeParameterWithConstraints2.ts, 38, 9)) + +enum E { A } +>E : Symbol(E, Decl(subtypesOfTypeParameterWithConstraints2.ts, 38, 23)) +>A : Symbol(E.A, Decl(subtypesOfTypeParameterWithConstraints2.ts, 39, 8)) + +function f() { } +>f : Symbol(f, Decl(subtypesOfTypeParameterWithConstraints2.ts, 39, 12), Decl(subtypesOfTypeParameterWithConstraints2.ts, 40, 16)) + +module f { +>f : Symbol(f, Decl(subtypesOfTypeParameterWithConstraints2.ts, 39, 12), Decl(subtypesOfTypeParameterWithConstraints2.ts, 40, 16)) + + export var bar = 1; +>bar : Symbol(bar, Decl(subtypesOfTypeParameterWithConstraints2.ts, 42, 14)) +} +class c { baz: string } +>c : Symbol(c, Decl(subtypesOfTypeParameterWithConstraints2.ts, 43, 1), Decl(subtypesOfTypeParameterWithConstraints2.ts, 44, 23)) +>baz : Symbol(baz, Decl(subtypesOfTypeParameterWithConstraints2.ts, 44, 9)) + +module c { +>c : Symbol(c, Decl(subtypesOfTypeParameterWithConstraints2.ts, 43, 1), Decl(subtypesOfTypeParameterWithConstraints2.ts, 44, 23)) + + export var bar = 1; +>bar : Symbol(bar, Decl(subtypesOfTypeParameterWithConstraints2.ts, 46, 14)) +} + +function f4(x: T) { +>f4 : Symbol(f4, Decl(subtypesOfTypeParameterWithConstraints2.ts, 47, 1)) +>T : Symbol(T, Decl(subtypesOfTypeParameterWithConstraints2.ts, 49, 12)) +>Number : Symbol(Number, Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --)) +>x : Symbol(x, Decl(subtypesOfTypeParameterWithConstraints2.ts, 49, 30)) +>T : Symbol(T, Decl(subtypesOfTypeParameterWithConstraints2.ts, 49, 12)) + + var r0 = true ? x : null; // ok +>r0 : Symbol(r0, Decl(subtypesOfTypeParameterWithConstraints2.ts, 50, 7), Decl(subtypesOfTypeParameterWithConstraints2.ts, 51, 7)) +>x : Symbol(x, Decl(subtypesOfTypeParameterWithConstraints2.ts, 49, 30)) + + var r0 = true ? null : x; // ok +>r0 : Symbol(r0, Decl(subtypesOfTypeParameterWithConstraints2.ts, 50, 7), Decl(subtypesOfTypeParameterWithConstraints2.ts, 51, 7)) +>x : Symbol(x, Decl(subtypesOfTypeParameterWithConstraints2.ts, 49, 30)) + + var u: typeof undefined; +>u : Symbol(u, Decl(subtypesOfTypeParameterWithConstraints2.ts, 53, 7)) +>undefined : Symbol(undefined) + + var r0b = true ? u : x; // ok +>r0b : Symbol(r0b, Decl(subtypesOfTypeParameterWithConstraints2.ts, 54, 7), Decl(subtypesOfTypeParameterWithConstraints2.ts, 55, 7)) +>u : Symbol(u, Decl(subtypesOfTypeParameterWithConstraints2.ts, 53, 7)) +>x : Symbol(x, Decl(subtypesOfTypeParameterWithConstraints2.ts, 49, 30)) + + var r0b = true ? x : u; // ok +>r0b : Symbol(r0b, Decl(subtypesOfTypeParameterWithConstraints2.ts, 54, 7), Decl(subtypesOfTypeParameterWithConstraints2.ts, 55, 7)) +>x : Symbol(x, Decl(subtypesOfTypeParameterWithConstraints2.ts, 49, 30)) +>u : Symbol(u, Decl(subtypesOfTypeParameterWithConstraints2.ts, 53, 7)) +} + +function f5(x: T) { +>f5 : Symbol(f5, Decl(subtypesOfTypeParameterWithConstraints2.ts, 56, 1)) +>T : Symbol(T, Decl(subtypesOfTypeParameterWithConstraints2.ts, 58, 12)) +>Number : Symbol(Number, Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --)) +>x : Symbol(x, Decl(subtypesOfTypeParameterWithConstraints2.ts, 58, 30)) +>T : Symbol(T, Decl(subtypesOfTypeParameterWithConstraints2.ts, 58, 12)) + + var r1 = true ? 1 : x; // ok +>r1 : Symbol(r1, Decl(subtypesOfTypeParameterWithConstraints2.ts, 59, 7), Decl(subtypesOfTypeParameterWithConstraints2.ts, 60, 7)) +>x : Symbol(x, Decl(subtypesOfTypeParameterWithConstraints2.ts, 58, 30)) + + var r1 = true ? x : 1; // ok +>r1 : Symbol(r1, Decl(subtypesOfTypeParameterWithConstraints2.ts, 59, 7), Decl(subtypesOfTypeParameterWithConstraints2.ts, 60, 7)) +>x : Symbol(x, Decl(subtypesOfTypeParameterWithConstraints2.ts, 58, 30)) +} + +function f6(x: T) { +>f6 : Symbol(f6, Decl(subtypesOfTypeParameterWithConstraints2.ts, 61, 1)) +>T : Symbol(T, Decl(subtypesOfTypeParameterWithConstraints2.ts, 63, 12)) +>String : Symbol(String, Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --)) +>x : Symbol(x, Decl(subtypesOfTypeParameterWithConstraints2.ts, 63, 30)) +>T : Symbol(T, Decl(subtypesOfTypeParameterWithConstraints2.ts, 63, 12)) + + var r2 = true ? '' : x; // ok +>r2 : Symbol(r2, Decl(subtypesOfTypeParameterWithConstraints2.ts, 64, 7), Decl(subtypesOfTypeParameterWithConstraints2.ts, 65, 7)) +>x : Symbol(x, Decl(subtypesOfTypeParameterWithConstraints2.ts, 63, 30)) + + var r2 = true ? x : ''; // ok +>r2 : Symbol(r2, Decl(subtypesOfTypeParameterWithConstraints2.ts, 64, 7), Decl(subtypesOfTypeParameterWithConstraints2.ts, 65, 7)) +>x : Symbol(x, Decl(subtypesOfTypeParameterWithConstraints2.ts, 63, 30)) +} + +function f7(x: T) { +>f7 : Symbol(f7, Decl(subtypesOfTypeParameterWithConstraints2.ts, 66, 1)) +>T : Symbol(T, Decl(subtypesOfTypeParameterWithConstraints2.ts, 68, 12)) +>Boolean : Symbol(Boolean, Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --)) +>x : Symbol(x, Decl(subtypesOfTypeParameterWithConstraints2.ts, 68, 31)) +>T : Symbol(T, Decl(subtypesOfTypeParameterWithConstraints2.ts, 68, 12)) + + var r3 = true ? true : x; // ok +>r3 : Symbol(r3, Decl(subtypesOfTypeParameterWithConstraints2.ts, 69, 7), Decl(subtypesOfTypeParameterWithConstraints2.ts, 70, 7)) +>x : Symbol(x, Decl(subtypesOfTypeParameterWithConstraints2.ts, 68, 31)) + + var r3 = true ? x : true; // ok +>r3 : Symbol(r3, Decl(subtypesOfTypeParameterWithConstraints2.ts, 69, 7), Decl(subtypesOfTypeParameterWithConstraints2.ts, 70, 7)) +>x : Symbol(x, Decl(subtypesOfTypeParameterWithConstraints2.ts, 68, 31)) +} + +function f8(x: T) { +>f8 : Symbol(f8, Decl(subtypesOfTypeParameterWithConstraints2.ts, 71, 1)) +>T : Symbol(T, Decl(subtypesOfTypeParameterWithConstraints2.ts, 73, 12)) +>Date : Symbol(Date, Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --)) +>x : Symbol(x, Decl(subtypesOfTypeParameterWithConstraints2.ts, 73, 28)) +>T : Symbol(T, Decl(subtypesOfTypeParameterWithConstraints2.ts, 73, 12)) + + var r4 = true ? new Date() : x; // ok +>r4 : Symbol(r4, Decl(subtypesOfTypeParameterWithConstraints2.ts, 74, 7), Decl(subtypesOfTypeParameterWithConstraints2.ts, 75, 7)) +>Date : Symbol(Date, Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --)) +>x : Symbol(x, Decl(subtypesOfTypeParameterWithConstraints2.ts, 73, 28)) + + var r4 = true ? x : new Date(); // ok +>r4 : Symbol(r4, Decl(subtypesOfTypeParameterWithConstraints2.ts, 74, 7), Decl(subtypesOfTypeParameterWithConstraints2.ts, 75, 7)) +>x : Symbol(x, Decl(subtypesOfTypeParameterWithConstraints2.ts, 73, 28)) +>Date : Symbol(Date, Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --)) +} + +function f9(x: T) { +>f9 : Symbol(f9, Decl(subtypesOfTypeParameterWithConstraints2.ts, 76, 1)) +>T : Symbol(T, Decl(subtypesOfTypeParameterWithConstraints2.ts, 78, 12)) +>RegExp : Symbol(RegExp, Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --)) +>x : Symbol(x, Decl(subtypesOfTypeParameterWithConstraints2.ts, 78, 30)) +>T : Symbol(T, Decl(subtypesOfTypeParameterWithConstraints2.ts, 78, 12)) + + var r5 = true ? /1/ : x; // ok +>r5 : Symbol(r5, Decl(subtypesOfTypeParameterWithConstraints2.ts, 79, 7), Decl(subtypesOfTypeParameterWithConstraints2.ts, 80, 7)) +>x : Symbol(x, Decl(subtypesOfTypeParameterWithConstraints2.ts, 78, 30)) + + var r5 = true ? x : /1/; // ok +>r5 : Symbol(r5, Decl(subtypesOfTypeParameterWithConstraints2.ts, 79, 7), Decl(subtypesOfTypeParameterWithConstraints2.ts, 80, 7)) +>x : Symbol(x, Decl(subtypesOfTypeParameterWithConstraints2.ts, 78, 30)) +} + +function f10(x: T) { +>f10 : Symbol(f10, Decl(subtypesOfTypeParameterWithConstraints2.ts, 81, 1)) +>T : Symbol(T, Decl(subtypesOfTypeParameterWithConstraints2.ts, 83, 13)) +>foo : Symbol(foo, Decl(subtypesOfTypeParameterWithConstraints2.ts, 83, 24)) +>x : Symbol(x, Decl(subtypesOfTypeParameterWithConstraints2.ts, 83, 40)) +>T : Symbol(T, Decl(subtypesOfTypeParameterWithConstraints2.ts, 83, 13)) + + var r6 = true ? { foo: 1 } : x; // ok +>r6 : Symbol(r6, Decl(subtypesOfTypeParameterWithConstraints2.ts, 84, 7), Decl(subtypesOfTypeParameterWithConstraints2.ts, 85, 7)) +>foo : Symbol(foo, Decl(subtypesOfTypeParameterWithConstraints2.ts, 84, 21)) +>x : Symbol(x, Decl(subtypesOfTypeParameterWithConstraints2.ts, 83, 40)) + + var r6 = true ? x : { foo: 1 }; // ok +>r6 : Symbol(r6, Decl(subtypesOfTypeParameterWithConstraints2.ts, 84, 7), Decl(subtypesOfTypeParameterWithConstraints2.ts, 85, 7)) +>x : Symbol(x, Decl(subtypesOfTypeParameterWithConstraints2.ts, 83, 40)) +>foo : Symbol(foo, Decl(subtypesOfTypeParameterWithConstraints2.ts, 85, 25)) +} + +function f11 void>(x: T) { +>f11 : Symbol(f11, Decl(subtypesOfTypeParameterWithConstraints2.ts, 86, 1)) +>T : Symbol(T, Decl(subtypesOfTypeParameterWithConstraints2.ts, 88, 13)) +>x : Symbol(x, Decl(subtypesOfTypeParameterWithConstraints2.ts, 88, 35)) +>T : Symbol(T, Decl(subtypesOfTypeParameterWithConstraints2.ts, 88, 13)) + + var r7 = true ? () => { } : x; // ok +>r7 : Symbol(r7, Decl(subtypesOfTypeParameterWithConstraints2.ts, 89, 7), Decl(subtypesOfTypeParameterWithConstraints2.ts, 90, 7)) +>x : Symbol(x, Decl(subtypesOfTypeParameterWithConstraints2.ts, 88, 35)) + + var r7 = true ? x : () => { }; // ok +>r7 : Symbol(r7, Decl(subtypesOfTypeParameterWithConstraints2.ts, 89, 7), Decl(subtypesOfTypeParameterWithConstraints2.ts, 90, 7)) +>x : Symbol(x, Decl(subtypesOfTypeParameterWithConstraints2.ts, 88, 35)) +} + +function f12(x: U) => U>(x: T) { +>f12 : Symbol(f12, Decl(subtypesOfTypeParameterWithConstraints2.ts, 91, 1)) +>T : Symbol(T, Decl(subtypesOfTypeParameterWithConstraints2.ts, 93, 13)) +>U : Symbol(U, Decl(subtypesOfTypeParameterWithConstraints2.ts, 93, 24)) +>x : Symbol(x, Decl(subtypesOfTypeParameterWithConstraints2.ts, 93, 27)) +>U : Symbol(U, Decl(subtypesOfTypeParameterWithConstraints2.ts, 93, 24)) +>U : Symbol(U, Decl(subtypesOfTypeParameterWithConstraints2.ts, 93, 24)) +>x : Symbol(x, Decl(subtypesOfTypeParameterWithConstraints2.ts, 93, 39)) +>T : Symbol(T, Decl(subtypesOfTypeParameterWithConstraints2.ts, 93, 13)) + + var r8 = true ? (x: T) => { return x } : x; // ok +>r8 : Symbol(r8, Decl(subtypesOfTypeParameterWithConstraints2.ts, 94, 7)) +>T : Symbol(T, Decl(subtypesOfTypeParameterWithConstraints2.ts, 94, 21)) +>x : Symbol(x, Decl(subtypesOfTypeParameterWithConstraints2.ts, 94, 24)) +>T : Symbol(T, Decl(subtypesOfTypeParameterWithConstraints2.ts, 94, 21)) +>x : Symbol(x, Decl(subtypesOfTypeParameterWithConstraints2.ts, 94, 24)) +>x : Symbol(x, Decl(subtypesOfTypeParameterWithConstraints2.ts, 93, 39)) + + var r8b = true ? x : (x: T) => { return x }; // ok, type parameters not identical across declarations +>r8b : Symbol(r8b, Decl(subtypesOfTypeParameterWithConstraints2.ts, 95, 7)) +>x : Symbol(x, Decl(subtypesOfTypeParameterWithConstraints2.ts, 93, 39)) +>T : Symbol(T, Decl(subtypesOfTypeParameterWithConstraints2.ts, 95, 26)) +>x : Symbol(x, Decl(subtypesOfTypeParameterWithConstraints2.ts, 95, 29)) +>T : Symbol(T, Decl(subtypesOfTypeParameterWithConstraints2.ts, 95, 26)) +>x : Symbol(x, Decl(subtypesOfTypeParameterWithConstraints2.ts, 95, 29)) +} + +function f13(x: T) { +>f13 : Symbol(f13, Decl(subtypesOfTypeParameterWithConstraints2.ts, 96, 1)) +>T : Symbol(T, Decl(subtypesOfTypeParameterWithConstraints2.ts, 98, 13)) +>I1 : Symbol(I1, Decl(subtypesOfTypeParameterWithConstraints2.ts, 33, 1)) +>x : Symbol(x, Decl(subtypesOfTypeParameterWithConstraints2.ts, 98, 27)) +>T : Symbol(T, Decl(subtypesOfTypeParameterWithConstraints2.ts, 98, 13)) + + var i1: I1; +>i1 : Symbol(i1, Decl(subtypesOfTypeParameterWithConstraints2.ts, 99, 7)) +>I1 : Symbol(I1, Decl(subtypesOfTypeParameterWithConstraints2.ts, 33, 1)) + + var r9 = true ? i1 : x; // ok +>r9 : Symbol(r9, Decl(subtypesOfTypeParameterWithConstraints2.ts, 100, 7), Decl(subtypesOfTypeParameterWithConstraints2.ts, 101, 7)) +>i1 : Symbol(i1, Decl(subtypesOfTypeParameterWithConstraints2.ts, 99, 7)) +>x : Symbol(x, Decl(subtypesOfTypeParameterWithConstraints2.ts, 98, 27)) + + var r9 = true ? x : i1; // ok +>r9 : Symbol(r9, Decl(subtypesOfTypeParameterWithConstraints2.ts, 100, 7), Decl(subtypesOfTypeParameterWithConstraints2.ts, 101, 7)) +>x : Symbol(x, Decl(subtypesOfTypeParameterWithConstraints2.ts, 98, 27)) +>i1 : Symbol(i1, Decl(subtypesOfTypeParameterWithConstraints2.ts, 99, 7)) +} + +function f14(x: T) { +>f14 : Symbol(f14, Decl(subtypesOfTypeParameterWithConstraints2.ts, 102, 1)) +>T : Symbol(T, Decl(subtypesOfTypeParameterWithConstraints2.ts, 104, 13)) +>C1 : Symbol(C1, Decl(subtypesOfTypeParameterWithConstraints2.ts, 36, 29)) +>x : Symbol(x, Decl(subtypesOfTypeParameterWithConstraints2.ts, 104, 27)) +>T : Symbol(T, Decl(subtypesOfTypeParameterWithConstraints2.ts, 104, 13)) + + var c1: C1; +>c1 : Symbol(c1, Decl(subtypesOfTypeParameterWithConstraints2.ts, 105, 7)) +>C1 : Symbol(C1, Decl(subtypesOfTypeParameterWithConstraints2.ts, 36, 29)) + + var r10 = true ? c1 : x; // ok +>r10 : Symbol(r10, Decl(subtypesOfTypeParameterWithConstraints2.ts, 106, 7), Decl(subtypesOfTypeParameterWithConstraints2.ts, 107, 7)) +>c1 : Symbol(c1, Decl(subtypesOfTypeParameterWithConstraints2.ts, 105, 7)) +>x : Symbol(x, Decl(subtypesOfTypeParameterWithConstraints2.ts, 104, 27)) + + var r10 = true ? x : c1; // ok +>r10 : Symbol(r10, Decl(subtypesOfTypeParameterWithConstraints2.ts, 106, 7), Decl(subtypesOfTypeParameterWithConstraints2.ts, 107, 7)) +>x : Symbol(x, Decl(subtypesOfTypeParameterWithConstraints2.ts, 104, 27)) +>c1 : Symbol(c1, Decl(subtypesOfTypeParameterWithConstraints2.ts, 105, 7)) +} + +function f15>(x: T) { +>f15 : Symbol(f15, Decl(subtypesOfTypeParameterWithConstraints2.ts, 108, 1)) +>T : Symbol(T, Decl(subtypesOfTypeParameterWithConstraints2.ts, 110, 13)) +>C2 : Symbol(C2, Decl(subtypesOfTypeParameterWithConstraints2.ts, 37, 25)) +>x : Symbol(x, Decl(subtypesOfTypeParameterWithConstraints2.ts, 110, 35)) +>T : Symbol(T, Decl(subtypesOfTypeParameterWithConstraints2.ts, 110, 13)) + + var c2: C2; +>c2 : Symbol(c2, Decl(subtypesOfTypeParameterWithConstraints2.ts, 111, 7)) +>C2 : Symbol(C2, Decl(subtypesOfTypeParameterWithConstraints2.ts, 37, 25)) + + var r12 = true ? c2 : x; // ok +>r12 : Symbol(r12, Decl(subtypesOfTypeParameterWithConstraints2.ts, 112, 7), Decl(subtypesOfTypeParameterWithConstraints2.ts, 113, 7)) +>c2 : Symbol(c2, Decl(subtypesOfTypeParameterWithConstraints2.ts, 111, 7)) +>x : Symbol(x, Decl(subtypesOfTypeParameterWithConstraints2.ts, 110, 35)) + + var r12 = true ? x : c2; // ok +>r12 : Symbol(r12, Decl(subtypesOfTypeParameterWithConstraints2.ts, 112, 7), Decl(subtypesOfTypeParameterWithConstraints2.ts, 113, 7)) +>x : Symbol(x, Decl(subtypesOfTypeParameterWithConstraints2.ts, 110, 35)) +>c2 : Symbol(c2, Decl(subtypesOfTypeParameterWithConstraints2.ts, 111, 7)) +} + +function f16(x: T) { +>f16 : Symbol(f16, Decl(subtypesOfTypeParameterWithConstraints2.ts, 114, 1)) +>T : Symbol(T, Decl(subtypesOfTypeParameterWithConstraints2.ts, 116, 13)) +>E : Symbol(E, Decl(subtypesOfTypeParameterWithConstraints2.ts, 38, 23)) +>x : Symbol(x, Decl(subtypesOfTypeParameterWithConstraints2.ts, 116, 26)) +>T : Symbol(T, Decl(subtypesOfTypeParameterWithConstraints2.ts, 116, 13)) + + var r13 = true ? E : x; // ok +>r13 : Symbol(r13, Decl(subtypesOfTypeParameterWithConstraints2.ts, 117, 7), Decl(subtypesOfTypeParameterWithConstraints2.ts, 118, 7)) +>E : Symbol(E, Decl(subtypesOfTypeParameterWithConstraints2.ts, 38, 23)) +>x : Symbol(x, Decl(subtypesOfTypeParameterWithConstraints2.ts, 116, 26)) + + var r13 = true ? x : E; // ok +>r13 : Symbol(r13, Decl(subtypesOfTypeParameterWithConstraints2.ts, 117, 7), Decl(subtypesOfTypeParameterWithConstraints2.ts, 118, 7)) +>x : Symbol(x, Decl(subtypesOfTypeParameterWithConstraints2.ts, 116, 26)) +>E : Symbol(E, Decl(subtypesOfTypeParameterWithConstraints2.ts, 38, 23)) + + var r14 = true ? E.A : x; // ok +>r14 : Symbol(r14, Decl(subtypesOfTypeParameterWithConstraints2.ts, 120, 7), Decl(subtypesOfTypeParameterWithConstraints2.ts, 121, 7)) +>E.A : Symbol(E.A, Decl(subtypesOfTypeParameterWithConstraints2.ts, 39, 8)) +>E : Symbol(E, Decl(subtypesOfTypeParameterWithConstraints2.ts, 38, 23)) +>A : Symbol(E.A, Decl(subtypesOfTypeParameterWithConstraints2.ts, 39, 8)) +>x : Symbol(x, Decl(subtypesOfTypeParameterWithConstraints2.ts, 116, 26)) + + var r14 = true ? x : E.A; // ok +>r14 : Symbol(r14, Decl(subtypesOfTypeParameterWithConstraints2.ts, 120, 7), Decl(subtypesOfTypeParameterWithConstraints2.ts, 121, 7)) +>x : Symbol(x, Decl(subtypesOfTypeParameterWithConstraints2.ts, 116, 26)) +>E.A : Symbol(E.A, Decl(subtypesOfTypeParameterWithConstraints2.ts, 39, 8)) +>E : Symbol(E, Decl(subtypesOfTypeParameterWithConstraints2.ts, 38, 23)) +>A : Symbol(E.A, Decl(subtypesOfTypeParameterWithConstraints2.ts, 39, 8)) +} + +function f17(x: T) { +>f17 : Symbol(f17, Decl(subtypesOfTypeParameterWithConstraints2.ts, 122, 1)) +>T : Symbol(T, Decl(subtypesOfTypeParameterWithConstraints2.ts, 124, 13)) +>f : Symbol(f, Decl(subtypesOfTypeParameterWithConstraints2.ts, 39, 12), Decl(subtypesOfTypeParameterWithConstraints2.ts, 40, 16)) +>x : Symbol(x, Decl(subtypesOfTypeParameterWithConstraints2.ts, 124, 33)) +>T : Symbol(T, Decl(subtypesOfTypeParameterWithConstraints2.ts, 124, 13)) + + var af: typeof f; +>af : Symbol(af, Decl(subtypesOfTypeParameterWithConstraints2.ts, 125, 7)) +>f : Symbol(f, Decl(subtypesOfTypeParameterWithConstraints2.ts, 39, 12), Decl(subtypesOfTypeParameterWithConstraints2.ts, 40, 16)) + + var r15 = true ? af : x; // ok +>r15 : Symbol(r15, Decl(subtypesOfTypeParameterWithConstraints2.ts, 126, 7), Decl(subtypesOfTypeParameterWithConstraints2.ts, 127, 7)) +>af : Symbol(af, Decl(subtypesOfTypeParameterWithConstraints2.ts, 125, 7)) +>x : Symbol(x, Decl(subtypesOfTypeParameterWithConstraints2.ts, 124, 33)) + + var r15 = true ? x : af; // ok +>r15 : Symbol(r15, Decl(subtypesOfTypeParameterWithConstraints2.ts, 126, 7), Decl(subtypesOfTypeParameterWithConstraints2.ts, 127, 7)) +>x : Symbol(x, Decl(subtypesOfTypeParameterWithConstraints2.ts, 124, 33)) +>af : Symbol(af, Decl(subtypesOfTypeParameterWithConstraints2.ts, 125, 7)) +} + +function f18(x: T) { +>f18 : Symbol(f18, Decl(subtypesOfTypeParameterWithConstraints2.ts, 128, 1)) +>T : Symbol(T, Decl(subtypesOfTypeParameterWithConstraints2.ts, 130, 13)) +>c : Symbol(c, Decl(subtypesOfTypeParameterWithConstraints2.ts, 43, 1), Decl(subtypesOfTypeParameterWithConstraints2.ts, 44, 23)) +>x : Symbol(x, Decl(subtypesOfTypeParameterWithConstraints2.ts, 130, 33)) +>T : Symbol(T, Decl(subtypesOfTypeParameterWithConstraints2.ts, 130, 13)) + + var ac: typeof c; +>ac : Symbol(ac, Decl(subtypesOfTypeParameterWithConstraints2.ts, 131, 7)) +>c : Symbol(c, Decl(subtypesOfTypeParameterWithConstraints2.ts, 43, 1), Decl(subtypesOfTypeParameterWithConstraints2.ts, 44, 23)) + + var r16 = true ? ac : x; // ok +>r16 : Symbol(r16, Decl(subtypesOfTypeParameterWithConstraints2.ts, 132, 7), Decl(subtypesOfTypeParameterWithConstraints2.ts, 133, 7)) +>ac : Symbol(ac, Decl(subtypesOfTypeParameterWithConstraints2.ts, 131, 7)) +>x : Symbol(x, Decl(subtypesOfTypeParameterWithConstraints2.ts, 130, 33)) + + var r16 = true ? x : ac; // ok +>r16 : Symbol(r16, Decl(subtypesOfTypeParameterWithConstraints2.ts, 132, 7), Decl(subtypesOfTypeParameterWithConstraints2.ts, 133, 7)) +>x : Symbol(x, Decl(subtypesOfTypeParameterWithConstraints2.ts, 130, 33)) +>ac : Symbol(ac, Decl(subtypesOfTypeParameterWithConstraints2.ts, 131, 7)) +} + +function f19(x: T) { +>f19 : Symbol(f19, Decl(subtypesOfTypeParameterWithConstraints2.ts, 134, 1)) +>T : Symbol(T, Decl(subtypesOfTypeParameterWithConstraints2.ts, 136, 13)) +>x : Symbol(x, Decl(subtypesOfTypeParameterWithConstraints2.ts, 136, 16)) +>T : Symbol(T, Decl(subtypesOfTypeParameterWithConstraints2.ts, 136, 13)) + + function f17(a: U) { +>f17 : Symbol(f17, Decl(subtypesOfTypeParameterWithConstraints2.ts, 136, 23)) +>U : Symbol(U, Decl(subtypesOfTypeParameterWithConstraints2.ts, 137, 17)) +>T : Symbol(T, Decl(subtypesOfTypeParameterWithConstraints2.ts, 136, 13)) +>a : Symbol(a, Decl(subtypesOfTypeParameterWithConstraints2.ts, 137, 30)) +>U : Symbol(U, Decl(subtypesOfTypeParameterWithConstraints2.ts, 137, 17)) + + var r17 = true ? x : a; // ok +>r17 : Symbol(r17, Decl(subtypesOfTypeParameterWithConstraints2.ts, 138, 11), Decl(subtypesOfTypeParameterWithConstraints2.ts, 139, 11)) +>x : Symbol(x, Decl(subtypesOfTypeParameterWithConstraints2.ts, 136, 16)) +>a : Symbol(a, Decl(subtypesOfTypeParameterWithConstraints2.ts, 137, 30)) + + var r17 = true ? a : x; // ok +>r17 : Symbol(r17, Decl(subtypesOfTypeParameterWithConstraints2.ts, 138, 11), Decl(subtypesOfTypeParameterWithConstraints2.ts, 139, 11)) +>a : Symbol(a, Decl(subtypesOfTypeParameterWithConstraints2.ts, 137, 30)) +>x : Symbol(x, Decl(subtypesOfTypeParameterWithConstraints2.ts, 136, 16)) + } + + function f18(a: V) { +>f18 : Symbol(f18, Decl(subtypesOfTypeParameterWithConstraints2.ts, 140, 5)) +>V : Symbol(V, Decl(subtypesOfTypeParameterWithConstraints2.ts, 142, 17)) +>U : Symbol(U, Decl(subtypesOfTypeParameterWithConstraints2.ts, 142, 29)) +>U : Symbol(U, Decl(subtypesOfTypeParameterWithConstraints2.ts, 142, 29)) +>T : Symbol(T, Decl(subtypesOfTypeParameterWithConstraints2.ts, 136, 13)) +>a : Symbol(a, Decl(subtypesOfTypeParameterWithConstraints2.ts, 142, 43)) +>V : Symbol(V, Decl(subtypesOfTypeParameterWithConstraints2.ts, 142, 17)) + + var r18 = true ? x : a; // ok +>r18 : Symbol(r18, Decl(subtypesOfTypeParameterWithConstraints2.ts, 143, 11), Decl(subtypesOfTypeParameterWithConstraints2.ts, 144, 11)) +>x : Symbol(x, Decl(subtypesOfTypeParameterWithConstraints2.ts, 136, 16)) +>a : Symbol(a, Decl(subtypesOfTypeParameterWithConstraints2.ts, 142, 43)) + + var r18 = true ? a : x; // ok +>r18 : Symbol(r18, Decl(subtypesOfTypeParameterWithConstraints2.ts, 143, 11), Decl(subtypesOfTypeParameterWithConstraints2.ts, 144, 11)) +>a : Symbol(a, Decl(subtypesOfTypeParameterWithConstraints2.ts, 142, 43)) +>x : Symbol(x, Decl(subtypesOfTypeParameterWithConstraints2.ts, 136, 16)) + } +} + +function f20(x: T) { +>f20 : Symbol(f20, Decl(subtypesOfTypeParameterWithConstraints2.ts, 146, 1)) +>T : Symbol(T, Decl(subtypesOfTypeParameterWithConstraints2.ts, 148, 13)) +>Number : Symbol(Number, Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --)) +>x : Symbol(x, Decl(subtypesOfTypeParameterWithConstraints2.ts, 148, 31)) +>T : Symbol(T, Decl(subtypesOfTypeParameterWithConstraints2.ts, 148, 13)) + + var r19 = true ? new Object() : x; // ok +>r19 : Symbol(r19, Decl(subtypesOfTypeParameterWithConstraints2.ts, 149, 7), Decl(subtypesOfTypeParameterWithConstraints2.ts, 150, 7)) +>Object : Symbol(Object, Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --)) +>x : Symbol(x, Decl(subtypesOfTypeParameterWithConstraints2.ts, 148, 31)) + + var r19 = true ? x : new Object(); // ok +>r19 : Symbol(r19, Decl(subtypesOfTypeParameterWithConstraints2.ts, 149, 7), Decl(subtypesOfTypeParameterWithConstraints2.ts, 150, 7)) +>x : Symbol(x, Decl(subtypesOfTypeParameterWithConstraints2.ts, 148, 31)) +>Object : Symbol(Object, Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --)) +} + +function f21(x: T) { +>f21 : Symbol(f21, Decl(subtypesOfTypeParameterWithConstraints2.ts, 151, 1)) +>T : Symbol(T, Decl(subtypesOfTypeParameterWithConstraints2.ts, 153, 13)) +>Number : Symbol(Number, Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --)) +>x : Symbol(x, Decl(subtypesOfTypeParameterWithConstraints2.ts, 153, 31)) +>T : Symbol(T, Decl(subtypesOfTypeParameterWithConstraints2.ts, 153, 13)) + + var r20 = true ? {} : x; // ok +>r20 : Symbol(r20, Decl(subtypesOfTypeParameterWithConstraints2.ts, 154, 7), Decl(subtypesOfTypeParameterWithConstraints2.ts, 155, 7)) +>x : Symbol(x, Decl(subtypesOfTypeParameterWithConstraints2.ts, 153, 31)) + + var r20 = true ? x : {}; // ok +>r20 : Symbol(r20, Decl(subtypesOfTypeParameterWithConstraints2.ts, 154, 7), Decl(subtypesOfTypeParameterWithConstraints2.ts, 155, 7)) +>x : Symbol(x, Decl(subtypesOfTypeParameterWithConstraints2.ts, 153, 31)) +} diff --git a/tests/baselines/reference/subtypesOfTypeParameterWithConstraints2.types b/tests/baselines/reference/subtypesOfTypeParameterWithConstraints2.types new file mode 100644 index 00000000000..39c50bde355 --- /dev/null +++ b/tests/baselines/reference/subtypesOfTypeParameterWithConstraints2.types @@ -0,0 +1,690 @@ +=== tests/cases/conformance/types/typeRelationships/subtypesAndSuperTypes/subtypesOfTypeParameterWithConstraints2.ts === +// checking whether other types are subtypes of type parameters with constraints + +function f1(x: T, y: U) { +>f1 : (x: T, y: U) => void +>T : T +>U : U +>U : U +>x : T +>T : T +>y : U +>U : U + + var r = true ? x : y; +>r : U +>true ? x : y : U +>true : boolean +>x : T +>y : U + + var r = true ? y : x; +>r : U +>true ? y : x : U +>true : boolean +>y : U +>x : T +} + +// V > U > T +function f2(x: T, y: U, z: V) { +>f2 : (x: T, y: U, z: V) => void +>T : T +>U : U +>U : U +>V : V +>V : V +>x : T +>T : T +>y : U +>U : U +>z : V +>V : V + + var r = true ? x : y; +>r : U +>true ? x : y : U +>true : boolean +>x : T +>y : U + + var r = true ? y : x; +>r : U +>true ? y : x : U +>true : boolean +>y : U +>x : T + + // ok + var r2 = true ? z : y; +>r2 : V +>true ? z : y : V +>true : boolean +>z : V +>y : U + + var r2 = true ? y : z; +>r2 : V +>true ? y : z : V +>true : boolean +>y : U +>z : V + + // ok + var r2a = true ? z : x; +>r2a : V +>true ? z : x : V +>true : boolean +>z : V +>x : T + + var r2b = true ? x : z; +>r2b : V +>true ? x : z : V +>true : boolean +>x : T +>z : V +} + +// Date > U > T +function f3(x: T, y: U) { +>f3 : (x: T, y: U) => void +>T : T +>U : U +>U : U +>Date : Date +>x : T +>T : T +>y : U +>U : U + + var r = true ? x : y; +>r : U +>true ? x : y : U +>true : boolean +>x : T +>y : U + + var r = true ? y : x; +>r : U +>true ? y : x : U +>true : boolean +>y : U +>x : T + + // ok + var r2 = true ? x : new Date(); +>r2 : Date +>true ? x : new Date() : Date +>true : boolean +>x : T +>new Date() : Date +>Date : DateConstructor + + var r2 = true ? new Date() : x; +>r2 : Date +>true ? new Date() : x : Date +>true : boolean +>new Date() : Date +>Date : DateConstructor +>x : T + + // ok + var r3 = true ? y : new Date(); +>r3 : Date +>true ? y : new Date() : Date +>true : boolean +>y : U +>new Date() : Date +>Date : DateConstructor + + var r3 = true ? new Date() : y; +>r3 : Date +>true ? new Date() : y : Date +>true : boolean +>new Date() : Date +>Date : DateConstructor +>y : U +} + + +interface I1 { foo: number; } +>I1 : I1 +>foo : number + +class C1 { foo: number; } +>C1 : C1 +>foo : number + +class C2 { foo: T; } +>C2 : C2 +>T : T +>foo : T +>T : T + +enum E { A } +>E : E +>A : E + +function f() { } +>f : typeof f + +module f { +>f : typeof f + + export var bar = 1; +>bar : number +>1 : number +} +class c { baz: string } +>c : c +>baz : string + +module c { +>c : typeof c + + export var bar = 1; +>bar : number +>1 : number +} + +function f4(x: T) { +>f4 : (x: T) => void +>T : T +>Number : Number +>x : T +>T : T + + var r0 = true ? x : null; // ok +>r0 : T +>true ? x : null : T +>true : boolean +>x : T +>null : null + + var r0 = true ? null : x; // ok +>r0 : T +>true ? null : x : T +>true : boolean +>null : null +>x : T + + var u: typeof undefined; +>u : any +>undefined : undefined + + var r0b = true ? u : x; // ok +>r0b : any +>true ? u : x : any +>true : boolean +>u : any +>x : T + + var r0b = true ? x : u; // ok +>r0b : any +>true ? x : u : any +>true : boolean +>x : T +>u : any +} + +function f5(x: T) { +>f5 : (x: T) => void +>T : T +>Number : Number +>x : T +>T : T + + var r1 = true ? 1 : x; // ok +>r1 : number | T +>true ? 1 : x : number | T +>true : boolean +>1 : number +>x : T + + var r1 = true ? x : 1; // ok +>r1 : number | T +>true ? x : 1 : T | number +>true : boolean +>x : T +>1 : number +} + +function f6(x: T) { +>f6 : (x: T) => void +>T : T +>String : String +>x : T +>T : T + + var r2 = true ? '' : x; // ok +>r2 : string | T +>true ? '' : x : string | T +>true : boolean +>'' : string +>x : T + + var r2 = true ? x : ''; // ok +>r2 : string | T +>true ? x : '' : T | string +>true : boolean +>x : T +>'' : string +} + +function f7(x: T) { +>f7 : (x: T) => void +>T : T +>Boolean : Boolean +>x : T +>T : T + + var r3 = true ? true : x; // ok +>r3 : boolean | T +>true ? true : x : boolean | T +>true : boolean +>true : boolean +>x : T + + var r3 = true ? x : true; // ok +>r3 : boolean | T +>true ? x : true : T | boolean +>true : boolean +>x : T +>true : boolean +} + +function f8(x: T) { +>f8 : (x: T) => void +>T : T +>Date : Date +>x : T +>T : T + + var r4 = true ? new Date() : x; // ok +>r4 : Date +>true ? new Date() : x : Date +>true : boolean +>new Date() : Date +>Date : DateConstructor +>x : T + + var r4 = true ? x : new Date(); // ok +>r4 : Date +>true ? x : new Date() : Date +>true : boolean +>x : T +>new Date() : Date +>Date : DateConstructor +} + +function f9(x: T) { +>f9 : (x: T) => void +>T : T +>RegExp : RegExp +>x : T +>T : T + + var r5 = true ? /1/ : x; // ok +>r5 : RegExp +>true ? /1/ : x : RegExp +>true : boolean +>/1/ : RegExp +>x : T + + var r5 = true ? x : /1/; // ok +>r5 : RegExp +>true ? x : /1/ : RegExp +>true : boolean +>x : T +>/1/ : RegExp +} + +function f10(x: T) { +>f10 : (x: T) => void +>T : T +>foo : number +>x : T +>T : T + + var r6 = true ? { foo: 1 } : x; // ok +>r6 : { foo: number; } +>true ? { foo: 1 } : x : { foo: number; } +>true : boolean +>{ foo: 1 } : { foo: number; } +>foo : number +>1 : number +>x : T + + var r6 = true ? x : { foo: 1 }; // ok +>r6 : { foo: number; } +>true ? x : { foo: 1 } : { foo: number; } +>true : boolean +>x : T +>{ foo: 1 } : { foo: number; } +>foo : number +>1 : number +} + +function f11 void>(x: T) { +>f11 : void>(x: T) => void +>T : T +>x : T +>T : T + + var r7 = true ? () => { } : x; // ok +>r7 : () => void +>true ? () => { } : x : () => void +>true : boolean +>() => { } : () => void +>x : T + + var r7 = true ? x : () => { }; // ok +>r7 : () => void +>true ? x : () => { } : () => void +>true : boolean +>x : T +>() => { } : () => void +} + +function f12(x: U) => U>(x: T) { +>f12 : (x: U) => U>(x: T) => void +>T : T +>U : U +>x : U +>U : U +>U : U +>x : T +>T : T + + var r8 = true ? (x: T) => { return x } : x; // ok +>r8 : (x: T) => T +>true ? (x: T) => { return x } : x : (x: T) => T +>true : boolean +>(x: T) => { return x } : (x: T) => T +>T : T +>x : T +>T : T +>x : T +>x : T + + var r8b = true ? x : (x: T) => { return x }; // ok, type parameters not identical across declarations +>r8b : (x: T) => T +>true ? x : (x: T) => { return x } : (x: T) => T +>true : boolean +>x : T +>(x: T) => { return x } : (x: T) => T +>T : T +>x : T +>T : T +>x : T +} + +function f13(x: T) { +>f13 : (x: T) => void +>T : T +>I1 : I1 +>x : T +>T : T + + var i1: I1; +>i1 : I1 +>I1 : I1 + + var r9 = true ? i1 : x; // ok +>r9 : I1 +>true ? i1 : x : I1 +>true : boolean +>i1 : I1 +>x : T + + var r9 = true ? x : i1; // ok +>r9 : I1 +>true ? x : i1 : I1 +>true : boolean +>x : T +>i1 : I1 +} + +function f14(x: T) { +>f14 : (x: T) => void +>T : T +>C1 : C1 +>x : T +>T : T + + var c1: C1; +>c1 : C1 +>C1 : C1 + + var r10 = true ? c1 : x; // ok +>r10 : C1 +>true ? c1 : x : C1 +>true : boolean +>c1 : C1 +>x : T + + var r10 = true ? x : c1; // ok +>r10 : C1 +>true ? x : c1 : C1 +>true : boolean +>x : T +>c1 : C1 +} + +function f15>(x: T) { +>f15 : >(x: T) => void +>T : T +>C2 : C2 +>x : T +>T : T + + var c2: C2; +>c2 : C2 +>C2 : C2 + + var r12 = true ? c2 : x; // ok +>r12 : C2 +>true ? c2 : x : C2 +>true : boolean +>c2 : C2 +>x : T + + var r12 = true ? x : c2; // ok +>r12 : C2 +>true ? x : c2 : C2 +>true : boolean +>x : T +>c2 : C2 +} + +function f16(x: T) { +>f16 : (x: T) => void +>T : T +>E : E +>x : T +>T : T + + var r13 = true ? E : x; // ok +>r13 : typeof E | T +>true ? E : x : typeof E | T +>true : boolean +>E : typeof E +>x : T + + var r13 = true ? x : E; // ok +>r13 : typeof E | T +>true ? x : E : T | typeof E +>true : boolean +>x : T +>E : typeof E + + var r14 = true ? E.A : x; // ok +>r14 : E +>true ? E.A : x : E +>true : boolean +>E.A : E +>E : typeof E +>A : E +>x : T + + var r14 = true ? x : E.A; // ok +>r14 : E +>true ? x : E.A : E +>true : boolean +>x : T +>E.A : E +>E : typeof E +>A : E +} + +function f17(x: T) { +>f17 : (x: T) => void +>T : T +>f : typeof f +>x : T +>T : T + + var af: typeof f; +>af : typeof f +>f : typeof f + + var r15 = true ? af : x; // ok +>r15 : typeof f +>true ? af : x : typeof f +>true : boolean +>af : typeof f +>x : T + + var r15 = true ? x : af; // ok +>r15 : typeof f +>true ? x : af : typeof f +>true : boolean +>x : T +>af : typeof f +} + +function f18(x: T) { +>f18 : (x: T) => void +>T : T +>c : typeof c +>x : T +>T : T + + var ac: typeof c; +>ac : typeof c +>c : typeof c + + var r16 = true ? ac : x; // ok +>r16 : typeof c +>true ? ac : x : typeof c +>true : boolean +>ac : typeof c +>x : T + + var r16 = true ? x : ac; // ok +>r16 : typeof c +>true ? x : ac : typeof c +>true : boolean +>x : T +>ac : typeof c +} + +function f19(x: T) { +>f19 : (x: T) => void +>T : T +>x : T +>T : T + + function f17(a: U) { +>f17 : (a: U) => void +>U : U +>T : T +>a : U +>U : U + + var r17 = true ? x : a; // ok +>r17 : T +>true ? x : a : T +>true : boolean +>x : T +>a : U + + var r17 = true ? a : x; // ok +>r17 : T +>true ? a : x : T +>true : boolean +>a : U +>x : T + } + + function f18(a: V) { +>f18 : (a: V) => void +>V : V +>U : U +>U : U +>T : T +>a : V +>V : V + + var r18 = true ? x : a; // ok +>r18 : T +>true ? x : a : T +>true : boolean +>x : T +>a : V + + var r18 = true ? a : x; // ok +>r18 : T +>true ? a : x : T +>true : boolean +>a : V +>x : T + } +} + +function f20(x: T) { +>f20 : (x: T) => void +>T : T +>Number : Number +>x : T +>T : T + + var r19 = true ? new Object() : x; // ok +>r19 : Object +>true ? new Object() : x : Object +>true : boolean +>new Object() : Object +>Object : ObjectConstructor +>x : T + + var r19 = true ? x : new Object(); // ok +>r19 : Object +>true ? x : new Object() : Object +>true : boolean +>x : T +>new Object() : Object +>Object : ObjectConstructor +} + +function f21(x: T) { +>f21 : (x: T) => void +>T : T +>Number : Number +>x : T +>T : T + + var r20 = true ? {} : x; // ok +>r20 : {} +>true ? {} : x : {} +>true : boolean +>{} : {} +>x : T + + var r20 = true ? x : {}; // ok +>r20 : {} +>true ? x : {} : {} +>true : boolean +>x : T +>{} : {} +} diff --git a/tests/baselines/reference/subtypesOfTypeParameterWithConstraints3.errors.txt b/tests/baselines/reference/subtypesOfTypeParameterWithConstraints3.errors.txt deleted file mode 100644 index 2a5fa5ad362..00000000000 --- a/tests/baselines/reference/subtypesOfTypeParameterWithConstraints3.errors.txt +++ /dev/null @@ -1,21 +0,0 @@ -tests/cases/conformance/types/typeRelationships/subtypesAndSuperTypes/subtypesOfTypeParameterWithConstraints3.ts(3,12): error TS2313: Constraint of a type parameter cannot reference any type parameter from the same type parameter list. - - -==== tests/cases/conformance/types/typeRelationships/subtypesAndSuperTypes/subtypesOfTypeParameterWithConstraints3.ts (1 errors) ==== - // checking whether other types are subtypes of type parameters with constraints - - function f(t: T, u: U, v: V) { - ~~~~~~~~~~~ -!!! error TS2313: Constraint of a type parameter cannot reference any type parameter from the same type parameter list. - // ok - var r = true ? t : u; - var r = true ? u : t; - - // ok - var r2 = true ? t : v; - var r2 = true ? v : t; - - // ok - var r3 = true ? v : u; - var r3 = true ? u : v; - } \ No newline at end of file diff --git a/tests/baselines/reference/subtypesOfTypeParameterWithConstraints3.symbols b/tests/baselines/reference/subtypesOfTypeParameterWithConstraints3.symbols new file mode 100644 index 00000000000..e0223d73574 --- /dev/null +++ b/tests/baselines/reference/subtypesOfTypeParameterWithConstraints3.symbols @@ -0,0 +1,49 @@ +=== tests/cases/conformance/types/typeRelationships/subtypesAndSuperTypes/subtypesOfTypeParameterWithConstraints3.ts === +// checking whether other types are subtypes of type parameters with constraints + +function f(t: T, u: U, v: V) { +>f : Symbol(f, Decl(subtypesOfTypeParameterWithConstraints3.ts, 0, 0)) +>T : Symbol(T, Decl(subtypesOfTypeParameterWithConstraints3.ts, 2, 11)) +>U : Symbol(U, Decl(subtypesOfTypeParameterWithConstraints3.ts, 2, 23)) +>U : Symbol(U, Decl(subtypesOfTypeParameterWithConstraints3.ts, 2, 23)) +>V : Symbol(V, Decl(subtypesOfTypeParameterWithConstraints3.ts, 2, 26)) +>t : Symbol(t, Decl(subtypesOfTypeParameterWithConstraints3.ts, 2, 30)) +>T : Symbol(T, Decl(subtypesOfTypeParameterWithConstraints3.ts, 2, 11)) +>u : Symbol(u, Decl(subtypesOfTypeParameterWithConstraints3.ts, 2, 35)) +>U : Symbol(U, Decl(subtypesOfTypeParameterWithConstraints3.ts, 2, 23)) +>v : Symbol(v, Decl(subtypesOfTypeParameterWithConstraints3.ts, 2, 41)) +>V : Symbol(V, Decl(subtypesOfTypeParameterWithConstraints3.ts, 2, 26)) + + // ok + var r = true ? t : u; +>r : Symbol(r, Decl(subtypesOfTypeParameterWithConstraints3.ts, 4, 7), Decl(subtypesOfTypeParameterWithConstraints3.ts, 5, 7)) +>t : Symbol(t, Decl(subtypesOfTypeParameterWithConstraints3.ts, 2, 30)) +>u : Symbol(u, Decl(subtypesOfTypeParameterWithConstraints3.ts, 2, 35)) + + var r = true ? u : t; +>r : Symbol(r, Decl(subtypesOfTypeParameterWithConstraints3.ts, 4, 7), Decl(subtypesOfTypeParameterWithConstraints3.ts, 5, 7)) +>u : Symbol(u, Decl(subtypesOfTypeParameterWithConstraints3.ts, 2, 35)) +>t : Symbol(t, Decl(subtypesOfTypeParameterWithConstraints3.ts, 2, 30)) + + // ok + var r2 = true ? t : v; +>r2 : Symbol(r2, Decl(subtypesOfTypeParameterWithConstraints3.ts, 8, 7), Decl(subtypesOfTypeParameterWithConstraints3.ts, 9, 7)) +>t : Symbol(t, Decl(subtypesOfTypeParameterWithConstraints3.ts, 2, 30)) +>v : Symbol(v, Decl(subtypesOfTypeParameterWithConstraints3.ts, 2, 41)) + + var r2 = true ? v : t; +>r2 : Symbol(r2, Decl(subtypesOfTypeParameterWithConstraints3.ts, 8, 7), Decl(subtypesOfTypeParameterWithConstraints3.ts, 9, 7)) +>v : Symbol(v, Decl(subtypesOfTypeParameterWithConstraints3.ts, 2, 41)) +>t : Symbol(t, Decl(subtypesOfTypeParameterWithConstraints3.ts, 2, 30)) + + // ok + var r3 = true ? v : u; +>r3 : Symbol(r3, Decl(subtypesOfTypeParameterWithConstraints3.ts, 12, 7), Decl(subtypesOfTypeParameterWithConstraints3.ts, 13, 7)) +>v : Symbol(v, Decl(subtypesOfTypeParameterWithConstraints3.ts, 2, 41)) +>u : Symbol(u, Decl(subtypesOfTypeParameterWithConstraints3.ts, 2, 35)) + + var r3 = true ? u : v; +>r3 : Symbol(r3, Decl(subtypesOfTypeParameterWithConstraints3.ts, 12, 7), Decl(subtypesOfTypeParameterWithConstraints3.ts, 13, 7)) +>u : Symbol(u, Decl(subtypesOfTypeParameterWithConstraints3.ts, 2, 35)) +>v : Symbol(v, Decl(subtypesOfTypeParameterWithConstraints3.ts, 2, 41)) +} diff --git a/tests/baselines/reference/subtypesOfTypeParameterWithConstraints3.types b/tests/baselines/reference/subtypesOfTypeParameterWithConstraints3.types new file mode 100644 index 00000000000..88c58998264 --- /dev/null +++ b/tests/baselines/reference/subtypesOfTypeParameterWithConstraints3.types @@ -0,0 +1,61 @@ +=== tests/cases/conformance/types/typeRelationships/subtypesAndSuperTypes/subtypesOfTypeParameterWithConstraints3.ts === +// checking whether other types are subtypes of type parameters with constraints + +function f(t: T, u: U, v: V) { +>f : (t: T, u: U, v: V) => void +>T : T +>U : U +>U : U +>V : V +>t : T +>T : T +>u : U +>U : U +>v : V +>V : V + + // ok + var r = true ? t : u; +>r : U +>true ? t : u : U +>true : boolean +>t : T +>u : U + + var r = true ? u : t; +>r : U +>true ? u : t : U +>true : boolean +>u : U +>t : T + + // ok + var r2 = true ? t : v; +>r2 : T | V +>true ? t : v : T | V +>true : boolean +>t : T +>v : V + + var r2 = true ? v : t; +>r2 : T | V +>true ? v : t : V | T +>true : boolean +>v : V +>t : T + + // ok + var r3 = true ? v : u; +>r3 : V | U +>true ? v : u : V | U +>true : boolean +>v : V +>u : U + + var r3 = true ? u : v; +>r3 : V | U +>true ? u : v : U | V +>true : boolean +>u : U +>v : V +} diff --git a/tests/baselines/reference/subtypesOfTypeParameterWithRecursiveConstraints.errors.txt b/tests/baselines/reference/subtypesOfTypeParameterWithRecursiveConstraints.errors.txt index 22b8c3cfb35..a7f9d3fad7f 100644 --- a/tests/baselines/reference/subtypesOfTypeParameterWithRecursiveConstraints.errors.txt +++ b/tests/baselines/reference/subtypesOfTypeParameterWithRecursiveConstraints.errors.txt @@ -1,109 +1,82 @@ -tests/cases/conformance/types/typeRelationships/subtypesAndSuperTypes/subtypesOfTypeParameterWithRecursiveConstraints.ts(4,12): error TS2313: Constraint of a type parameter cannot reference any type parameter from the same type parameter list. -tests/cases/conformance/types/typeRelationships/subtypesAndSuperTypes/subtypesOfTypeParameterWithRecursiveConstraints.ts(4,30): error TS2313: Constraint of a type parameter cannot reference any type parameter from the same type parameter list. -tests/cases/conformance/types/typeRelationships/subtypesAndSuperTypes/subtypesOfTypeParameterWithRecursiveConstraints.ts(4,48): error TS2313: Constraint of a type parameter cannot reference any type parameter from the same type parameter list. -tests/cases/conformance/types/typeRelationships/subtypesAndSuperTypes/subtypesOfTypeParameterWithRecursiveConstraints.ts(61,14): error TS2313: Constraint of a type parameter cannot reference any type parameter from the same type parameter list. -tests/cases/conformance/types/typeRelationships/subtypesAndSuperTypes/subtypesOfTypeParameterWithRecursiveConstraints.ts(61,32): error TS2313: Constraint of a type parameter cannot reference any type parameter from the same type parameter list. -tests/cases/conformance/types/typeRelationships/subtypesAndSuperTypes/subtypesOfTypeParameterWithRecursiveConstraints.ts(61,50): error TS2313: Constraint of a type parameter cannot reference any type parameter from the same type parameter list. tests/cases/conformance/types/typeRelationships/subtypesAndSuperTypes/subtypesOfTypeParameterWithRecursiveConstraints.ts(66,11): error TS2415: Class 'D2' incorrectly extends base class 'Base'. Types of property 'foo' are incompatible. Type 'U' is not assignable to type 'T'. - Type 'Foo' is not assignable to type 'T'. -tests/cases/conformance/types/typeRelationships/subtypesAndSuperTypes/subtypesOfTypeParameterWithRecursiveConstraints.ts(66,14): error TS2313: Constraint of a type parameter cannot reference any type parameter from the same type parameter list. -tests/cases/conformance/types/typeRelationships/subtypesAndSuperTypes/subtypesOfTypeParameterWithRecursiveConstraints.ts(66,32): error TS2313: Constraint of a type parameter cannot reference any type parameter from the same type parameter list. -tests/cases/conformance/types/typeRelationships/subtypesAndSuperTypes/subtypesOfTypeParameterWithRecursiveConstraints.ts(66,50): error TS2313: Constraint of a type parameter cannot reference any type parameter from the same type parameter list. + Type 'Foo' is not assignable to type 'T'. tests/cases/conformance/types/typeRelationships/subtypesAndSuperTypes/subtypesOfTypeParameterWithRecursiveConstraints.ts(68,9): error TS2411: Property 'foo' of type 'U' is not assignable to string index type 'T'. tests/cases/conformance/types/typeRelationships/subtypesAndSuperTypes/subtypesOfTypeParameterWithRecursiveConstraints.ts(71,11): error TS2415: Class 'D3' incorrectly extends base class 'Base'. Types of property 'foo' are incompatible. Type 'V' is not assignable to type 'T'. - Type 'Foo' is not assignable to type 'T'. -tests/cases/conformance/types/typeRelationships/subtypesAndSuperTypes/subtypesOfTypeParameterWithRecursiveConstraints.ts(71,14): error TS2313: Constraint of a type parameter cannot reference any type parameter from the same type parameter list. -tests/cases/conformance/types/typeRelationships/subtypesAndSuperTypes/subtypesOfTypeParameterWithRecursiveConstraints.ts(71,32): error TS2313: Constraint of a type parameter cannot reference any type parameter from the same type parameter list. -tests/cases/conformance/types/typeRelationships/subtypesAndSuperTypes/subtypesOfTypeParameterWithRecursiveConstraints.ts(71,50): error TS2313: Constraint of a type parameter cannot reference any type parameter from the same type parameter list. + Type 'Foo' is not assignable to type 'T'. tests/cases/conformance/types/typeRelationships/subtypesAndSuperTypes/subtypesOfTypeParameterWithRecursiveConstraints.ts(73,9): error TS2411: Property 'foo' of type 'V' is not assignable to string index type 'T'. tests/cases/conformance/types/typeRelationships/subtypesAndSuperTypes/subtypesOfTypeParameterWithRecursiveConstraints.ts(76,11): error TS2415: Class 'D4' incorrectly extends base class 'Base'. Types of property 'foo' are incompatible. Type 'T' is not assignable to type 'U'. - Type 'Foo' is not assignable to type 'U'. -tests/cases/conformance/types/typeRelationships/subtypesAndSuperTypes/subtypesOfTypeParameterWithRecursiveConstraints.ts(76,14): error TS2313: Constraint of a type parameter cannot reference any type parameter from the same type parameter list. -tests/cases/conformance/types/typeRelationships/subtypesAndSuperTypes/subtypesOfTypeParameterWithRecursiveConstraints.ts(76,32): error TS2313: Constraint of a type parameter cannot reference any type parameter from the same type parameter list. -tests/cases/conformance/types/typeRelationships/subtypesAndSuperTypes/subtypesOfTypeParameterWithRecursiveConstraints.ts(76,50): error TS2313: Constraint of a type parameter cannot reference any type parameter from the same type parameter list. + Type 'Foo' is not assignable to type 'U'. tests/cases/conformance/types/typeRelationships/subtypesAndSuperTypes/subtypesOfTypeParameterWithRecursiveConstraints.ts(78,9): error TS2411: Property 'foo' of type 'T' is not assignable to string index type 'U'. -tests/cases/conformance/types/typeRelationships/subtypesAndSuperTypes/subtypesOfTypeParameterWithRecursiveConstraints.ts(81,14): error TS2313: Constraint of a type parameter cannot reference any type parameter from the same type parameter list. -tests/cases/conformance/types/typeRelationships/subtypesAndSuperTypes/subtypesOfTypeParameterWithRecursiveConstraints.ts(81,32): error TS2313: Constraint of a type parameter cannot reference any type parameter from the same type parameter list. -tests/cases/conformance/types/typeRelationships/subtypesAndSuperTypes/subtypesOfTypeParameterWithRecursiveConstraints.ts(81,50): error TS2313: Constraint of a type parameter cannot reference any type parameter from the same type parameter list. tests/cases/conformance/types/typeRelationships/subtypesAndSuperTypes/subtypesOfTypeParameterWithRecursiveConstraints.ts(86,11): error TS2415: Class 'D6' incorrectly extends base class 'Base'. Types of property 'foo' are incompatible. Type 'V' is not assignable to type 'U'. - Type 'Foo' is not assignable to type 'U'. -tests/cases/conformance/types/typeRelationships/subtypesAndSuperTypes/subtypesOfTypeParameterWithRecursiveConstraints.ts(86,14): error TS2313: Constraint of a type parameter cannot reference any type parameter from the same type parameter list. -tests/cases/conformance/types/typeRelationships/subtypesAndSuperTypes/subtypesOfTypeParameterWithRecursiveConstraints.ts(86,32): error TS2313: Constraint of a type parameter cannot reference any type parameter from the same type parameter list. -tests/cases/conformance/types/typeRelationships/subtypesAndSuperTypes/subtypesOfTypeParameterWithRecursiveConstraints.ts(86,50): error TS2313: Constraint of a type parameter cannot reference any type parameter from the same type parameter list. + Type 'Foo' is not assignable to type 'U'. tests/cases/conformance/types/typeRelationships/subtypesAndSuperTypes/subtypesOfTypeParameterWithRecursiveConstraints.ts(88,9): error TS2411: Property 'foo' of type 'V' is not assignable to string index type 'U'. tests/cases/conformance/types/typeRelationships/subtypesAndSuperTypes/subtypesOfTypeParameterWithRecursiveConstraints.ts(91,11): error TS2415: Class 'D7' incorrectly extends base class 'Base'. Types of property 'foo' are incompatible. Type 'T' is not assignable to type 'V'. - Type 'Foo' is not assignable to type 'V'. -tests/cases/conformance/types/typeRelationships/subtypesAndSuperTypes/subtypesOfTypeParameterWithRecursiveConstraints.ts(91,14): error TS2313: Constraint of a type parameter cannot reference any type parameter from the same type parameter list. -tests/cases/conformance/types/typeRelationships/subtypesAndSuperTypes/subtypesOfTypeParameterWithRecursiveConstraints.ts(91,32): error TS2313: Constraint of a type parameter cannot reference any type parameter from the same type parameter list. -tests/cases/conformance/types/typeRelationships/subtypesAndSuperTypes/subtypesOfTypeParameterWithRecursiveConstraints.ts(91,50): error TS2313: Constraint of a type parameter cannot reference any type parameter from the same type parameter list. + Type 'Foo' is not assignable to type 'V'. tests/cases/conformance/types/typeRelationships/subtypesAndSuperTypes/subtypesOfTypeParameterWithRecursiveConstraints.ts(93,9): error TS2411: Property 'foo' of type 'T' is not assignable to string index type 'V'. tests/cases/conformance/types/typeRelationships/subtypesAndSuperTypes/subtypesOfTypeParameterWithRecursiveConstraints.ts(96,11): error TS2415: Class 'D8' incorrectly extends base class 'Base'. Types of property 'foo' are incompatible. Type 'U' is not assignable to type 'V'. - Type 'Foo' is not assignable to type 'V'. -tests/cases/conformance/types/typeRelationships/subtypesAndSuperTypes/subtypesOfTypeParameterWithRecursiveConstraints.ts(96,14): error TS2313: Constraint of a type parameter cannot reference any type parameter from the same type parameter list. -tests/cases/conformance/types/typeRelationships/subtypesAndSuperTypes/subtypesOfTypeParameterWithRecursiveConstraints.ts(96,32): error TS2313: Constraint of a type parameter cannot reference any type parameter from the same type parameter list. -tests/cases/conformance/types/typeRelationships/subtypesAndSuperTypes/subtypesOfTypeParameterWithRecursiveConstraints.ts(96,50): error TS2313: Constraint of a type parameter cannot reference any type parameter from the same type parameter list. + Type 'Foo' is not assignable to type 'V'. tests/cases/conformance/types/typeRelationships/subtypesAndSuperTypes/subtypesOfTypeParameterWithRecursiveConstraints.ts(98,9): error TS2411: Property 'foo' of type 'U' is not assignable to string index type 'V'. -tests/cases/conformance/types/typeRelationships/subtypesAndSuperTypes/subtypesOfTypeParameterWithRecursiveConstraints.ts(101,14): error TS2313: Constraint of a type parameter cannot reference any type parameter from the same type parameter list. -tests/cases/conformance/types/typeRelationships/subtypesAndSuperTypes/subtypesOfTypeParameterWithRecursiveConstraints.ts(101,32): error TS2313: Constraint of a type parameter cannot reference any type parameter from the same type parameter list. -tests/cases/conformance/types/typeRelationships/subtypesAndSuperTypes/subtypesOfTypeParameterWithRecursiveConstraints.ts(101,50): error TS2313: Constraint of a type parameter cannot reference any type parameter from the same type parameter list. -tests/cases/conformance/types/typeRelationships/subtypesAndSuperTypes/subtypesOfTypeParameterWithRecursiveConstraints.ts(113,14): error TS2313: Constraint of a type parameter cannot reference any type parameter from the same type parameter list. -tests/cases/conformance/types/typeRelationships/subtypesAndSuperTypes/subtypesOfTypeParameterWithRecursiveConstraints.ts(113,32): error TS2313: Constraint of a type parameter cannot reference any type parameter from the same type parameter list. -tests/cases/conformance/types/typeRelationships/subtypesAndSuperTypes/subtypesOfTypeParameterWithRecursiveConstraints.ts(113,50): error TS2313: Constraint of a type parameter cannot reference any type parameter from the same type parameter list. -tests/cases/conformance/types/typeRelationships/subtypesAndSuperTypes/subtypesOfTypeParameterWithRecursiveConstraints.ts(118,14): error TS2313: Constraint of a type parameter cannot reference any type parameter from the same type parameter list. -tests/cases/conformance/types/typeRelationships/subtypesAndSuperTypes/subtypesOfTypeParameterWithRecursiveConstraints.ts(118,32): error TS2313: Constraint of a type parameter cannot reference any type parameter from the same type parameter list. -tests/cases/conformance/types/typeRelationships/subtypesAndSuperTypes/subtypesOfTypeParameterWithRecursiveConstraints.ts(118,50): error TS2313: Constraint of a type parameter cannot reference any type parameter from the same type parameter list. +tests/cases/conformance/types/typeRelationships/subtypesAndSuperTypes/subtypesOfTypeParameterWithRecursiveConstraints.ts(113,11): error TS2415: Class 'D1' incorrectly extends base class 'Base2'. + Types of property 'foo' are incompatible. + Type 'T' is not assignable to type 'Foo'. + Type 'Foo' is not assignable to type 'Foo'. + Type 'U' is not assignable to type 'T'. + Type 'Foo' is not assignable to type 'T'. tests/cases/conformance/types/typeRelationships/subtypesAndSuperTypes/subtypesOfTypeParameterWithRecursiveConstraints.ts(120,9): error TS2411: Property 'foo' of type 'U' is not assignable to string index type 'T'. -tests/cases/conformance/types/typeRelationships/subtypesAndSuperTypes/subtypesOfTypeParameterWithRecursiveConstraints.ts(123,14): error TS2313: Constraint of a type parameter cannot reference any type parameter from the same type parameter list. -tests/cases/conformance/types/typeRelationships/subtypesAndSuperTypes/subtypesOfTypeParameterWithRecursiveConstraints.ts(123,32): error TS2313: Constraint of a type parameter cannot reference any type parameter from the same type parameter list. -tests/cases/conformance/types/typeRelationships/subtypesAndSuperTypes/subtypesOfTypeParameterWithRecursiveConstraints.ts(123,50): error TS2313: Constraint of a type parameter cannot reference any type parameter from the same type parameter list. +tests/cases/conformance/types/typeRelationships/subtypesAndSuperTypes/subtypesOfTypeParameterWithRecursiveConstraints.ts(123,11): error TS2415: Class 'D3' incorrectly extends base class 'Base2'. + Types of property 'foo' are incompatible. + Type 'V' is not assignable to type 'Foo'. + Type 'Foo' is not assignable to type 'Foo'. + Type 'V' is not assignable to type 'T'. + Type 'Foo' is not assignable to type 'T'. tests/cases/conformance/types/typeRelationships/subtypesAndSuperTypes/subtypesOfTypeParameterWithRecursiveConstraints.ts(125,9): error TS2411: Property 'foo' of type 'V' is not assignable to string index type 'T'. -tests/cases/conformance/types/typeRelationships/subtypesAndSuperTypes/subtypesOfTypeParameterWithRecursiveConstraints.ts(128,14): error TS2313: Constraint of a type parameter cannot reference any type parameter from the same type parameter list. -tests/cases/conformance/types/typeRelationships/subtypesAndSuperTypes/subtypesOfTypeParameterWithRecursiveConstraints.ts(128,32): error TS2313: Constraint of a type parameter cannot reference any type parameter from the same type parameter list. -tests/cases/conformance/types/typeRelationships/subtypesAndSuperTypes/subtypesOfTypeParameterWithRecursiveConstraints.ts(128,50): error TS2313: Constraint of a type parameter cannot reference any type parameter from the same type parameter list. tests/cases/conformance/types/typeRelationships/subtypesAndSuperTypes/subtypesOfTypeParameterWithRecursiveConstraints.ts(130,9): error TS2411: Property 'foo' of type 'T' is not assignable to string index type 'U'. -tests/cases/conformance/types/typeRelationships/subtypesAndSuperTypes/subtypesOfTypeParameterWithRecursiveConstraints.ts(133,14): error TS2313: Constraint of a type parameter cannot reference any type parameter from the same type parameter list. -tests/cases/conformance/types/typeRelationships/subtypesAndSuperTypes/subtypesOfTypeParameterWithRecursiveConstraints.ts(133,32): error TS2313: Constraint of a type parameter cannot reference any type parameter from the same type parameter list. -tests/cases/conformance/types/typeRelationships/subtypesAndSuperTypes/subtypesOfTypeParameterWithRecursiveConstraints.ts(133,50): error TS2313: Constraint of a type parameter cannot reference any type parameter from the same type parameter list. -tests/cases/conformance/types/typeRelationships/subtypesAndSuperTypes/subtypesOfTypeParameterWithRecursiveConstraints.ts(138,14): error TS2313: Constraint of a type parameter cannot reference any type parameter from the same type parameter list. -tests/cases/conformance/types/typeRelationships/subtypesAndSuperTypes/subtypesOfTypeParameterWithRecursiveConstraints.ts(138,32): error TS2313: Constraint of a type parameter cannot reference any type parameter from the same type parameter list. -tests/cases/conformance/types/typeRelationships/subtypesAndSuperTypes/subtypesOfTypeParameterWithRecursiveConstraints.ts(138,50): error TS2313: Constraint of a type parameter cannot reference any type parameter from the same type parameter list. +tests/cases/conformance/types/typeRelationships/subtypesAndSuperTypes/subtypesOfTypeParameterWithRecursiveConstraints.ts(133,11): error TS2415: Class 'D5' incorrectly extends base class 'Base2'. + Types of property 'foo' are incompatible. + Type 'U' is not assignable to type 'Foo'. + Type 'Foo' is not assignable to type 'Foo'. + Type 'T' is not assignable to type 'U'. + Type 'Foo' is not assignable to type 'U'. +tests/cases/conformance/types/typeRelationships/subtypesAndSuperTypes/subtypesOfTypeParameterWithRecursiveConstraints.ts(138,11): error TS2415: Class 'D6' incorrectly extends base class 'Base2'. + Types of property 'foo' are incompatible. + Type 'V' is not assignable to type 'Foo'. + Type 'Foo' is not assignable to type 'Foo'. + Type 'V' is not assignable to type 'U'. + Type 'Foo' is not assignable to type 'U'. tests/cases/conformance/types/typeRelationships/subtypesAndSuperTypes/subtypesOfTypeParameterWithRecursiveConstraints.ts(140,9): error TS2411: Property 'foo' of type 'V' is not assignable to string index type 'U'. -tests/cases/conformance/types/typeRelationships/subtypesAndSuperTypes/subtypesOfTypeParameterWithRecursiveConstraints.ts(143,14): error TS2313: Constraint of a type parameter cannot reference any type parameter from the same type parameter list. -tests/cases/conformance/types/typeRelationships/subtypesAndSuperTypes/subtypesOfTypeParameterWithRecursiveConstraints.ts(143,32): error TS2313: Constraint of a type parameter cannot reference any type parameter from the same type parameter list. -tests/cases/conformance/types/typeRelationships/subtypesAndSuperTypes/subtypesOfTypeParameterWithRecursiveConstraints.ts(143,50): error TS2313: Constraint of a type parameter cannot reference any type parameter from the same type parameter list. +tests/cases/conformance/types/typeRelationships/subtypesAndSuperTypes/subtypesOfTypeParameterWithRecursiveConstraints.ts(143,11): error TS2415: Class 'D7' incorrectly extends base class 'Base2'. + Types of property 'foo' are incompatible. + Type 'T' is not assignable to type 'Foo'. + Type 'Foo' is not assignable to type 'Foo'. + Type 'U' is not assignable to type 'V'. + Type 'Foo' is not assignable to type 'V'. tests/cases/conformance/types/typeRelationships/subtypesAndSuperTypes/subtypesOfTypeParameterWithRecursiveConstraints.ts(145,9): error TS2411: Property 'foo' of type 'T' is not assignable to string index type 'V'. -tests/cases/conformance/types/typeRelationships/subtypesAndSuperTypes/subtypesOfTypeParameterWithRecursiveConstraints.ts(148,14): error TS2313: Constraint of a type parameter cannot reference any type parameter from the same type parameter list. -tests/cases/conformance/types/typeRelationships/subtypesAndSuperTypes/subtypesOfTypeParameterWithRecursiveConstraints.ts(148,32): error TS2313: Constraint of a type parameter cannot reference any type parameter from the same type parameter list. -tests/cases/conformance/types/typeRelationships/subtypesAndSuperTypes/subtypesOfTypeParameterWithRecursiveConstraints.ts(148,50): error TS2313: Constraint of a type parameter cannot reference any type parameter from the same type parameter list. +tests/cases/conformance/types/typeRelationships/subtypesAndSuperTypes/subtypesOfTypeParameterWithRecursiveConstraints.ts(148,11): error TS2415: Class 'D8' incorrectly extends base class 'Base2'. + Types of property 'foo' are incompatible. + Type 'U' is not assignable to type 'Foo'. + Type 'Foo' is not assignable to type 'Foo'. + Type 'T' is not assignable to type 'V'. + Type 'Foo' is not assignable to type 'V'. tests/cases/conformance/types/typeRelationships/subtypesAndSuperTypes/subtypesOfTypeParameterWithRecursiveConstraints.ts(150,9): error TS2411: Property 'foo' of type 'U' is not assignable to string index type 'V'. -tests/cases/conformance/types/typeRelationships/subtypesAndSuperTypes/subtypesOfTypeParameterWithRecursiveConstraints.ts(153,14): error TS2313: Constraint of a type parameter cannot reference any type parameter from the same type parameter list. -tests/cases/conformance/types/typeRelationships/subtypesAndSuperTypes/subtypesOfTypeParameterWithRecursiveConstraints.ts(153,32): error TS2313: Constraint of a type parameter cannot reference any type parameter from the same type parameter list. -tests/cases/conformance/types/typeRelationships/subtypesAndSuperTypes/subtypesOfTypeParameterWithRecursiveConstraints.ts(153,50): error TS2313: Constraint of a type parameter cannot reference any type parameter from the same type parameter list. -==== tests/cases/conformance/types/typeRelationships/subtypesAndSuperTypes/subtypesOfTypeParameterWithRecursiveConstraints.ts (75 errors) ==== +==== tests/cases/conformance/types/typeRelationships/subtypesAndSuperTypes/subtypesOfTypeParameterWithRecursiveConstraints.ts (24 errors) ==== // checking whether other types are subtypes of type parameters with constraints class Foo { foo: T; } function f, U extends Foo, V extends Foo>(t: T, u: U, v: V) { - ~~~~~~~~~~~~~~~~ -!!! error TS2313: Constraint of a type parameter cannot reference any type parameter from the same type parameter list. - ~~~~~~~~~~~~~~~~ -!!! error TS2313: Constraint of a type parameter cannot reference any type parameter from the same type parameter list. - ~~~~~~~~~~~~~~~~ -!!! error TS2313: Constraint of a type parameter cannot reference any type parameter from the same type parameter list. // ok var r1 = true ? t : u; var r1 = true ? u : t; @@ -161,12 +134,6 @@ tests/cases/conformance/types/typeRelationships/subtypesAndSuperTypes/subtypesOf } class D1, U extends Foo, V extends Foo> extends Base { - ~~~~~~~~~~~~~~~~ -!!! error TS2313: Constraint of a type parameter cannot reference any type parameter from the same type parameter list. - ~~~~~~~~~~~~~~~~ -!!! error TS2313: Constraint of a type parameter cannot reference any type parameter from the same type parameter list. - ~~~~~~~~~~~~~~~~ -!!! error TS2313: Constraint of a type parameter cannot reference any type parameter from the same type parameter list. [x: string]: T; foo: T } @@ -176,13 +143,7 @@ tests/cases/conformance/types/typeRelationships/subtypesAndSuperTypes/subtypesOf !!! error TS2415: Class 'D2' incorrectly extends base class 'Base'. !!! error TS2415: Types of property 'foo' are incompatible. !!! error TS2415: Type 'U' is not assignable to type 'T'. -!!! error TS2415: Type 'Foo' is not assignable to type 'T'. - ~~~~~~~~~~~~~~~~ -!!! error TS2313: Constraint of a type parameter cannot reference any type parameter from the same type parameter list. - ~~~~~~~~~~~~~~~~ -!!! error TS2313: Constraint of a type parameter cannot reference any type parameter from the same type parameter list. - ~~~~~~~~~~~~~~~~ -!!! error TS2313: Constraint of a type parameter cannot reference any type parameter from the same type parameter list. +!!! error TS2415: Type 'Foo' is not assignable to type 'T'. [x: string]: T; foo: U ~~~~~~ @@ -194,13 +155,7 @@ tests/cases/conformance/types/typeRelationships/subtypesAndSuperTypes/subtypesOf !!! error TS2415: Class 'D3' incorrectly extends base class 'Base'. !!! error TS2415: Types of property 'foo' are incompatible. !!! error TS2415: Type 'V' is not assignable to type 'T'. -!!! error TS2415: Type 'Foo' is not assignable to type 'T'. - ~~~~~~~~~~~~~~~~ -!!! error TS2313: Constraint of a type parameter cannot reference any type parameter from the same type parameter list. - ~~~~~~~~~~~~~~~~ -!!! error TS2313: Constraint of a type parameter cannot reference any type parameter from the same type parameter list. - ~~~~~~~~~~~~~~~~ -!!! error TS2313: Constraint of a type parameter cannot reference any type parameter from the same type parameter list. +!!! error TS2415: Type 'Foo' is not assignable to type 'T'. [x: string]: T; foo: V ~~~~~~ @@ -212,13 +167,7 @@ tests/cases/conformance/types/typeRelationships/subtypesAndSuperTypes/subtypesOf !!! error TS2415: Class 'D4' incorrectly extends base class 'Base'. !!! error TS2415: Types of property 'foo' are incompatible. !!! error TS2415: Type 'T' is not assignable to type 'U'. -!!! error TS2415: Type 'Foo' is not assignable to type 'U'. - ~~~~~~~~~~~~~~~~ -!!! error TS2313: Constraint of a type parameter cannot reference any type parameter from the same type parameter list. - ~~~~~~~~~~~~~~~~ -!!! error TS2313: Constraint of a type parameter cannot reference any type parameter from the same type parameter list. - ~~~~~~~~~~~~~~~~ -!!! error TS2313: Constraint of a type parameter cannot reference any type parameter from the same type parameter list. +!!! error TS2415: Type 'Foo' is not assignable to type 'U'. [x: string]: U; foo: T ~~~~~~ @@ -226,12 +175,6 @@ tests/cases/conformance/types/typeRelationships/subtypesAndSuperTypes/subtypesOf } class D5, U extends Foo, V extends Foo> extends Base { - ~~~~~~~~~~~~~~~~ -!!! error TS2313: Constraint of a type parameter cannot reference any type parameter from the same type parameter list. - ~~~~~~~~~~~~~~~~ -!!! error TS2313: Constraint of a type parameter cannot reference any type parameter from the same type parameter list. - ~~~~~~~~~~~~~~~~ -!!! error TS2313: Constraint of a type parameter cannot reference any type parameter from the same type parameter list. [x: string]: U; foo: U } @@ -241,13 +184,7 @@ tests/cases/conformance/types/typeRelationships/subtypesAndSuperTypes/subtypesOf !!! error TS2415: Class 'D6' incorrectly extends base class 'Base'. !!! error TS2415: Types of property 'foo' are incompatible. !!! error TS2415: Type 'V' is not assignable to type 'U'. -!!! error TS2415: Type 'Foo' is not assignable to type 'U'. - ~~~~~~~~~~~~~~~~ -!!! error TS2313: Constraint of a type parameter cannot reference any type parameter from the same type parameter list. - ~~~~~~~~~~~~~~~~ -!!! error TS2313: Constraint of a type parameter cannot reference any type parameter from the same type parameter list. - ~~~~~~~~~~~~~~~~ -!!! error TS2313: Constraint of a type parameter cannot reference any type parameter from the same type parameter list. +!!! error TS2415: Type 'Foo' is not assignable to type 'U'. [x: string]: U; foo: V ~~~~~~ @@ -259,13 +196,7 @@ tests/cases/conformance/types/typeRelationships/subtypesAndSuperTypes/subtypesOf !!! error TS2415: Class 'D7' incorrectly extends base class 'Base'. !!! error TS2415: Types of property 'foo' are incompatible. !!! error TS2415: Type 'T' is not assignable to type 'V'. -!!! error TS2415: Type 'Foo' is not assignable to type 'V'. - ~~~~~~~~~~~~~~~~ -!!! error TS2313: Constraint of a type parameter cannot reference any type parameter from the same type parameter list. - ~~~~~~~~~~~~~~~~ -!!! error TS2313: Constraint of a type parameter cannot reference any type parameter from the same type parameter list. - ~~~~~~~~~~~~~~~~ -!!! error TS2313: Constraint of a type parameter cannot reference any type parameter from the same type parameter list. +!!! error TS2415: Type 'Foo' is not assignable to type 'V'. [x: string]: V; foo: T ~~~~~~ @@ -277,13 +208,7 @@ tests/cases/conformance/types/typeRelationships/subtypesAndSuperTypes/subtypesOf !!! error TS2415: Class 'D8' incorrectly extends base class 'Base'. !!! error TS2415: Types of property 'foo' are incompatible. !!! error TS2415: Type 'U' is not assignable to type 'V'. -!!! error TS2415: Type 'Foo' is not assignable to type 'V'. - ~~~~~~~~~~~~~~~~ -!!! error TS2313: Constraint of a type parameter cannot reference any type parameter from the same type parameter list. - ~~~~~~~~~~~~~~~~ -!!! error TS2313: Constraint of a type parameter cannot reference any type parameter from the same type parameter list. - ~~~~~~~~~~~~~~~~ -!!! error TS2313: Constraint of a type parameter cannot reference any type parameter from the same type parameter list. +!!! error TS2415: Type 'Foo' is not assignable to type 'V'. [x: string]: V; foo: U ~~~~~~ @@ -291,12 +216,6 @@ tests/cases/conformance/types/typeRelationships/subtypesAndSuperTypes/subtypesOf } class D9, U extends Foo, V extends Foo> extends Base { - ~~~~~~~~~~~~~~~~ -!!! error TS2313: Constraint of a type parameter cannot reference any type parameter from the same type parameter list. - ~~~~~~~~~~~~~~~~ -!!! error TS2313: Constraint of a type parameter cannot reference any type parameter from the same type parameter list. - ~~~~~~~~~~~~~~~~ -!!! error TS2313: Constraint of a type parameter cannot reference any type parameter from the same type parameter list. [x: string]: V; foo: V } @@ -309,23 +228,18 @@ tests/cases/conformance/types/typeRelationships/subtypesAndSuperTypes/subtypesOf } class D1, U extends Foo, V extends Foo> extends Base2 { - ~~~~~~~~~~~~~~~~ -!!! error TS2313: Constraint of a type parameter cannot reference any type parameter from the same type parameter list. - ~~~~~~~~~~~~~~~~ -!!! error TS2313: Constraint of a type parameter cannot reference any type parameter from the same type parameter list. - ~~~~~~~~~~~~~~~~ -!!! error TS2313: Constraint of a type parameter cannot reference any type parameter from the same type parameter list. + ~~ +!!! error TS2415: Class 'D1' incorrectly extends base class 'Base2'. +!!! error TS2415: Types of property 'foo' are incompatible. +!!! error TS2415: Type 'T' is not assignable to type 'Foo'. +!!! error TS2415: Type 'Foo' is not assignable to type 'Foo'. +!!! error TS2415: Type 'U' is not assignable to type 'T'. +!!! error TS2415: Type 'Foo' is not assignable to type 'T'. [x: string]: T; foo: T } class D2, U extends Foo, V extends Foo> extends Base2 { - ~~~~~~~~~~~~~~~~ -!!! error TS2313: Constraint of a type parameter cannot reference any type parameter from the same type parameter list. - ~~~~~~~~~~~~~~~~ -!!! error TS2313: Constraint of a type parameter cannot reference any type parameter from the same type parameter list. - ~~~~~~~~~~~~~~~~ -!!! error TS2313: Constraint of a type parameter cannot reference any type parameter from the same type parameter list. [x: string]: T; foo: U ~~~~~~ @@ -333,12 +247,13 @@ tests/cases/conformance/types/typeRelationships/subtypesAndSuperTypes/subtypesOf } class D3, U extends Foo, V extends Foo> extends Base2 { - ~~~~~~~~~~~~~~~~ -!!! error TS2313: Constraint of a type parameter cannot reference any type parameter from the same type parameter list. - ~~~~~~~~~~~~~~~~ -!!! error TS2313: Constraint of a type parameter cannot reference any type parameter from the same type parameter list. - ~~~~~~~~~~~~~~~~ -!!! error TS2313: Constraint of a type parameter cannot reference any type parameter from the same type parameter list. + ~~ +!!! error TS2415: Class 'D3' incorrectly extends base class 'Base2'. +!!! error TS2415: Types of property 'foo' are incompatible. +!!! error TS2415: Type 'V' is not assignable to type 'Foo'. +!!! error TS2415: Type 'Foo' is not assignable to type 'Foo'. +!!! error TS2415: Type 'V' is not assignable to type 'T'. +!!! error TS2415: Type 'Foo' is not assignable to type 'T'. [x: string]: T; foo: V ~~~~~~ @@ -346,12 +261,6 @@ tests/cases/conformance/types/typeRelationships/subtypesAndSuperTypes/subtypesOf } class D4, U extends Foo, V extends Foo> extends Base2 { - ~~~~~~~~~~~~~~~~ -!!! error TS2313: Constraint of a type parameter cannot reference any type parameter from the same type parameter list. - ~~~~~~~~~~~~~~~~ -!!! error TS2313: Constraint of a type parameter cannot reference any type parameter from the same type parameter list. - ~~~~~~~~~~~~~~~~ -!!! error TS2313: Constraint of a type parameter cannot reference any type parameter from the same type parameter list. [x: string]: U; foo: T ~~~~~~ @@ -359,23 +268,25 @@ tests/cases/conformance/types/typeRelationships/subtypesAndSuperTypes/subtypesOf } class D5, U extends Foo, V extends Foo> extends Base2 { - ~~~~~~~~~~~~~~~~ -!!! error TS2313: Constraint of a type parameter cannot reference any type parameter from the same type parameter list. - ~~~~~~~~~~~~~~~~ -!!! error TS2313: Constraint of a type parameter cannot reference any type parameter from the same type parameter list. - ~~~~~~~~~~~~~~~~ -!!! error TS2313: Constraint of a type parameter cannot reference any type parameter from the same type parameter list. + ~~ +!!! error TS2415: Class 'D5' incorrectly extends base class 'Base2'. +!!! error TS2415: Types of property 'foo' are incompatible. +!!! error TS2415: Type 'U' is not assignable to type 'Foo'. +!!! error TS2415: Type 'Foo' is not assignable to type 'Foo'. +!!! error TS2415: Type 'T' is not assignable to type 'U'. +!!! error TS2415: Type 'Foo' is not assignable to type 'U'. [x: string]: U; foo: U } class D6, U extends Foo, V extends Foo> extends Base2 { - ~~~~~~~~~~~~~~~~ -!!! error TS2313: Constraint of a type parameter cannot reference any type parameter from the same type parameter list. - ~~~~~~~~~~~~~~~~ -!!! error TS2313: Constraint of a type parameter cannot reference any type parameter from the same type parameter list. - ~~~~~~~~~~~~~~~~ -!!! error TS2313: Constraint of a type parameter cannot reference any type parameter from the same type parameter list. + ~~ +!!! error TS2415: Class 'D6' incorrectly extends base class 'Base2'. +!!! error TS2415: Types of property 'foo' are incompatible. +!!! error TS2415: Type 'V' is not assignable to type 'Foo'. +!!! error TS2415: Type 'Foo' is not assignable to type 'Foo'. +!!! error TS2415: Type 'V' is not assignable to type 'U'. +!!! error TS2415: Type 'Foo' is not assignable to type 'U'. [x: string]: U; foo: V ~~~~~~ @@ -383,12 +294,13 @@ tests/cases/conformance/types/typeRelationships/subtypesAndSuperTypes/subtypesOf } class D7, U extends Foo, V extends Foo> extends Base2 { - ~~~~~~~~~~~~~~~~ -!!! error TS2313: Constraint of a type parameter cannot reference any type parameter from the same type parameter list. - ~~~~~~~~~~~~~~~~ -!!! error TS2313: Constraint of a type parameter cannot reference any type parameter from the same type parameter list. - ~~~~~~~~~~~~~~~~ -!!! error TS2313: Constraint of a type parameter cannot reference any type parameter from the same type parameter list. + ~~ +!!! error TS2415: Class 'D7' incorrectly extends base class 'Base2'. +!!! error TS2415: Types of property 'foo' are incompatible. +!!! error TS2415: Type 'T' is not assignable to type 'Foo'. +!!! error TS2415: Type 'Foo' is not assignable to type 'Foo'. +!!! error TS2415: Type 'U' is not assignable to type 'V'. +!!! error TS2415: Type 'Foo' is not assignable to type 'V'. [x: string]: V; foo: T ~~~~~~ @@ -396,12 +308,13 @@ tests/cases/conformance/types/typeRelationships/subtypesAndSuperTypes/subtypesOf } class D8, U extends Foo, V extends Foo> extends Base2 { - ~~~~~~~~~~~~~~~~ -!!! error TS2313: Constraint of a type parameter cannot reference any type parameter from the same type parameter list. - ~~~~~~~~~~~~~~~~ -!!! error TS2313: Constraint of a type parameter cannot reference any type parameter from the same type parameter list. - ~~~~~~~~~~~~~~~~ -!!! error TS2313: Constraint of a type parameter cannot reference any type parameter from the same type parameter list. + ~~ +!!! error TS2415: Class 'D8' incorrectly extends base class 'Base2'. +!!! error TS2415: Types of property 'foo' are incompatible. +!!! error TS2415: Type 'U' is not assignable to type 'Foo'. +!!! error TS2415: Type 'Foo' is not assignable to type 'Foo'. +!!! error TS2415: Type 'T' is not assignable to type 'V'. +!!! error TS2415: Type 'Foo' is not assignable to type 'V'. [x: string]: V; foo: U ~~~~~~ @@ -409,12 +322,6 @@ tests/cases/conformance/types/typeRelationships/subtypesAndSuperTypes/subtypesOf } class D9, U extends Foo, V extends Foo> extends Base2 { - ~~~~~~~~~~~~~~~~ -!!! error TS2313: Constraint of a type parameter cannot reference any type parameter from the same type parameter list. - ~~~~~~~~~~~~~~~~ -!!! error TS2313: Constraint of a type parameter cannot reference any type parameter from the same type parameter list. - ~~~~~~~~~~~~~~~~ -!!! error TS2313: Constraint of a type parameter cannot reference any type parameter from the same type parameter list. [x: string]: V; foo: V } diff --git a/tests/baselines/reference/testTypings.errors.txt b/tests/baselines/reference/testTypings.errors.txt deleted file mode 100644 index 44480aa09fe..00000000000 --- a/tests/baselines/reference/testTypings.errors.txt +++ /dev/null @@ -1,19 +0,0 @@ -tests/cases/compiler/testTypings.ts(5,23): error TS2313: Constraint of a type parameter cannot reference any type parameter from the same type parameter list. - - -==== tests/cases/compiler/testTypings.ts (1 errors) ==== - interface IComparable { - compareTo(other: T); - } - - declare function sort>(items: U[]): U[]; - ~~~~~~~~~~~~~~~~~~~~~~~~ -!!! error TS2313: Constraint of a type parameter cannot reference any type parameter from the same type parameter list. - - - - - - - - \ No newline at end of file diff --git a/tests/baselines/reference/testTypings.symbols b/tests/baselines/reference/testTypings.symbols new file mode 100644 index 00000000000..5e3074a9585 --- /dev/null +++ b/tests/baselines/reference/testTypings.symbols @@ -0,0 +1,27 @@ +=== tests/cases/compiler/testTypings.ts === +interface IComparable { +>IComparable : Symbol(IComparable, Decl(testTypings.ts, 0, 0)) +>T : Symbol(T, Decl(testTypings.ts, 0, 22)) + + compareTo(other: T); +>compareTo : Symbol(compareTo, Decl(testTypings.ts, 0, 26)) +>other : Symbol(other, Decl(testTypings.ts, 1, 13)) +>T : Symbol(T, Decl(testTypings.ts, 0, 22)) +} + +declare function sort>(items: U[]): U[]; +>sort : Symbol(sort, Decl(testTypings.ts, 2, 1)) +>U : Symbol(U, Decl(testTypings.ts, 4, 22)) +>IComparable : Symbol(IComparable, Decl(testTypings.ts, 0, 0)) +>U : Symbol(U, Decl(testTypings.ts, 4, 22)) +>items : Symbol(items, Decl(testTypings.ts, 4, 48)) +>U : Symbol(U, Decl(testTypings.ts, 4, 22)) +>U : Symbol(U, Decl(testTypings.ts, 4, 22)) + + + + + + + + diff --git a/tests/baselines/reference/testTypings.types b/tests/baselines/reference/testTypings.types new file mode 100644 index 00000000000..5883db8b8bb --- /dev/null +++ b/tests/baselines/reference/testTypings.types @@ -0,0 +1,27 @@ +=== tests/cases/compiler/testTypings.ts === +interface IComparable { +>IComparable : IComparable +>T : T + + compareTo(other: T); +>compareTo : (other: T) => any +>other : T +>T : T +} + +declare function sort>(items: U[]): U[]; +>sort : >(items: U[]) => U[] +>U : U +>IComparable : IComparable +>U : U +>items : U[] +>U : U +>U : U + + + + + + + + diff --git a/tests/baselines/reference/typeArgumentInferenceTransitiveConstraints.errors.txt b/tests/baselines/reference/typeArgumentInferenceTransitiveConstraints.errors.txt deleted file mode 100644 index 08cb5348c27..00000000000 --- a/tests/baselines/reference/typeArgumentInferenceTransitiveConstraints.errors.txt +++ /dev/null @@ -1,17 +0,0 @@ -tests/cases/conformance/expressions/functionCalls/typeArgumentInferenceTransitiveConstraints.ts(2,29): error TS2313: Constraint of a type parameter cannot reference any type parameter from the same type parameter list. -tests/cases/conformance/expressions/functionCalls/typeArgumentInferenceTransitiveConstraints.ts(2,42): error TS2313: Constraint of a type parameter cannot reference any type parameter from the same type parameter list. - - -==== tests/cases/conformance/expressions/functionCalls/typeArgumentInferenceTransitiveConstraints.ts (2 errors) ==== - - function fn(a: A, b: B, c: C) { - ~~~~~~~~~~~ -!!! error TS2313: Constraint of a type parameter cannot reference any type parameter from the same type parameter list. - ~~~~~~~~~~~ -!!! error TS2313: Constraint of a type parameter cannot reference any type parameter from the same type parameter list. - return [a, b, c]; - } - - var d = fn(new Date(), new Date(), new Date()); - var d: Date[]; // Should be OK (d should be Date[]) - \ No newline at end of file diff --git a/tests/baselines/reference/typeArgumentInferenceTransitiveConstraints.symbols b/tests/baselines/reference/typeArgumentInferenceTransitiveConstraints.symbols new file mode 100644 index 00000000000..2d6270bbf5c --- /dev/null +++ b/tests/baselines/reference/typeArgumentInferenceTransitiveConstraints.symbols @@ -0,0 +1,34 @@ +=== tests/cases/conformance/expressions/functionCalls/typeArgumentInferenceTransitiveConstraints.ts === + +function fn(a: A, b: B, c: C) { +>fn : Symbol(fn, Decl(typeArgumentInferenceTransitiveConstraints.ts, 0, 0)) +>A : Symbol(A, Decl(typeArgumentInferenceTransitiveConstraints.ts, 1, 12)) +>Date : Symbol(Date, Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --)) +>B : Symbol(B, Decl(typeArgumentInferenceTransitiveConstraints.ts, 1, 27)) +>A : Symbol(A, Decl(typeArgumentInferenceTransitiveConstraints.ts, 1, 12)) +>C : Symbol(C, Decl(typeArgumentInferenceTransitiveConstraints.ts, 1, 40)) +>B : Symbol(B, Decl(typeArgumentInferenceTransitiveConstraints.ts, 1, 27)) +>a : Symbol(a, Decl(typeArgumentInferenceTransitiveConstraints.ts, 1, 54)) +>A : Symbol(A, Decl(typeArgumentInferenceTransitiveConstraints.ts, 1, 12)) +>b : Symbol(b, Decl(typeArgumentInferenceTransitiveConstraints.ts, 1, 59)) +>B : Symbol(B, Decl(typeArgumentInferenceTransitiveConstraints.ts, 1, 27)) +>c : Symbol(c, Decl(typeArgumentInferenceTransitiveConstraints.ts, 1, 65)) +>C : Symbol(C, Decl(typeArgumentInferenceTransitiveConstraints.ts, 1, 40)) + + return [a, b, c]; +>a : Symbol(a, Decl(typeArgumentInferenceTransitiveConstraints.ts, 1, 54)) +>b : Symbol(b, Decl(typeArgumentInferenceTransitiveConstraints.ts, 1, 59)) +>c : Symbol(c, Decl(typeArgumentInferenceTransitiveConstraints.ts, 1, 65)) +} + +var d = fn(new Date(), new Date(), new Date()); +>d : Symbol(d, Decl(typeArgumentInferenceTransitiveConstraints.ts, 5, 3), Decl(typeArgumentInferenceTransitiveConstraints.ts, 6, 3)) +>fn : Symbol(fn, Decl(typeArgumentInferenceTransitiveConstraints.ts, 0, 0)) +>Date : Symbol(Date, Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --)) +>Date : Symbol(Date, Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --)) +>Date : Symbol(Date, Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --)) + +var d: Date[]; // Should be OK (d should be Date[]) +>d : Symbol(d, Decl(typeArgumentInferenceTransitiveConstraints.ts, 5, 3), Decl(typeArgumentInferenceTransitiveConstraints.ts, 6, 3)) +>Date : Symbol(Date, Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --)) + diff --git a/tests/baselines/reference/typeArgumentInferenceTransitiveConstraints.types b/tests/baselines/reference/typeArgumentInferenceTransitiveConstraints.types new file mode 100644 index 00000000000..6f772f10766 --- /dev/null +++ b/tests/baselines/reference/typeArgumentInferenceTransitiveConstraints.types @@ -0,0 +1,39 @@ +=== tests/cases/conformance/expressions/functionCalls/typeArgumentInferenceTransitiveConstraints.ts === + +function fn(a: A, b: B, c: C) { +>fn : (a: A, b: B, c: C) => A[] +>A : A +>Date : Date +>B : B +>A : A +>C : C +>B : B +>a : A +>A : A +>b : B +>B : B +>c : C +>C : C + + return [a, b, c]; +>[a, b, c] : A[] +>a : A +>b : B +>c : C +} + +var d = fn(new Date(), new Date(), new Date()); +>d : Date[] +>fn(new Date(), new Date(), new Date()) : Date[] +>fn : (a: A, b: B, c: C) => A[] +>new Date() : Date +>Date : DateConstructor +>new Date() : Date +>Date : DateConstructor +>new Date() : Date +>Date : DateConstructor + +var d: Date[]; // Should be OK (d should be Date[]) +>d : Date[] +>Date : Date + diff --git a/tests/baselines/reference/typeArgumentInferenceWithConstraints.errors.txt b/tests/baselines/reference/typeArgumentInferenceWithConstraints.errors.txt index 0c1e8cc4e97..e6de840ec54 100644 --- a/tests/baselines/reference/typeArgumentInferenceWithConstraints.errors.txt +++ b/tests/baselines/reference/typeArgumentInferenceWithConstraints.errors.txt @@ -1,6 +1,6 @@ tests/cases/conformance/expressions/functionCalls/typeArgumentInferenceWithConstraints.ts(11,17): error TS2344: Type '{}' does not satisfy the constraint 'number'. -tests/cases/conformance/expressions/functionCalls/typeArgumentInferenceWithConstraints.ts(14,27): error TS2313: Constraint of a type parameter cannot reference any type parameter from the same type parameter list. -tests/cases/conformance/expressions/functionCalls/typeArgumentInferenceWithConstraints.ts(16,31): error TS2345: Argument of type 'number' is not assignable to parameter of type 'string'. +tests/cases/conformance/expressions/functionCalls/typeArgumentInferenceWithConstraints.ts(16,23): error TS2344: Type 'number' does not satisfy the constraint 'string'. +tests/cases/conformance/expressions/functionCalls/typeArgumentInferenceWithConstraints.ts(17,23): error TS2344: Type '{}' does not satisfy the constraint 'number'. tests/cases/conformance/expressions/functionCalls/typeArgumentInferenceWithConstraints.ts(32,34): error TS2304: Cannot find name 'Window'. tests/cases/conformance/expressions/functionCalls/typeArgumentInferenceWithConstraints.ts(34,15): error TS2304: Cannot find name 'Window'. tests/cases/conformance/expressions/functionCalls/typeArgumentInferenceWithConstraints.ts(41,35): error TS2345: Argument of type '(x: string) => string' is not assignable to parameter of type '(x: number) => void'. @@ -43,13 +43,13 @@ tests/cases/conformance/expressions/functionCalls/typeArgumentInferenceWithConst // Generic call with multiple type parameters and only one used in parameter type annotation function someGenerics1(n: T, m: number) { } - ~~~~~~~~~~~ -!!! error TS2313: Constraint of a type parameter cannot reference any type parameter from the same type parameter list. someGenerics1(3, 4); // Valid someGenerics1(3, 4); // Error - ~ -!!! error TS2345: Argument of type 'number' is not assignable to parameter of type 'string'. + ~~~~~~ +!!! error TS2344: Type 'number' does not satisfy the constraint 'string'. someGenerics1(3, 4); // Error + ~~ +!!! error TS2344: Type '{}' does not satisfy the constraint 'number'. someGenerics1(3, 4); // Generic call with argument of function type whose parameter is of type parameter type diff --git a/tests/baselines/reference/typeParamExtendsOtherTypeParam.errors.txt b/tests/baselines/reference/typeParamExtendsOtherTypeParam.errors.txt index f943eaf5fa5..9b385964c71 100644 --- a/tests/baselines/reference/typeParamExtendsOtherTypeParam.errors.txt +++ b/tests/baselines/reference/typeParamExtendsOtherTypeParam.errors.txt @@ -1,14 +1,25 @@ -tests/cases/compiler/typeParamExtendsOtherTypeParam.ts(1,12): error TS2313: Constraint of a type parameter cannot reference any type parameter from the same type parameter list. -tests/cases/compiler/typeParamExtendsOtherTypeParam.ts(2,27): error TS2313: Constraint of a type parameter cannot reference any type parameter from the same type parameter list. +tests/cases/compiler/typeParamExtendsOtherTypeParam.ts(12,26): error TS2344: Type '{ b: string; }' does not satisfy the constraint '{ a: string; }'. + Property 'a' is missing in type '{ b: string; }'. +tests/cases/compiler/typeParamExtendsOtherTypeParam.ts(13,26): error TS2344: Type '{ a: number; }' does not satisfy the constraint '{ a: string; }'. + Types of property 'a' are incompatible. + Type 'number' is not assignable to type 'string'. +tests/cases/compiler/typeParamExtendsOtherTypeParam.ts(14,26): error TS2344: Type '{ b: string; }' does not satisfy the constraint '{ a: string; }'. + Property 'a' is missing in type '{ b: string; }'. +tests/cases/compiler/typeParamExtendsOtherTypeParam.ts(15,26): error TS2344: Type '{ a: number; }' does not satisfy the constraint '{ a: string; }'. + Types of property 'a' are incompatible. + Type 'number' is not assignable to type 'string'. +tests/cases/compiler/typeParamExtendsOtherTypeParam.ts(16,37): error TS2344: Type '{ a: string; }' does not satisfy the constraint '{ a: string; b: number; }'. + Property 'b' is missing in type '{ a: string; }'. +tests/cases/compiler/typeParamExtendsOtherTypeParam.ts(17,37): error TS2344: Type '{ a: string; }' does not satisfy the constraint '{ a: string; b: number; }'. + Property 'b' is missing in type '{ a: string; }'. +tests/cases/compiler/typeParamExtendsOtherTypeParam.ts(28,15): error TS2344: Type 'I1' does not satisfy the constraint 'I2'. + Property 'b' is missing in type 'I1'. +tests/cases/compiler/typeParamExtendsOtherTypeParam.ts(29,15): error TS2344: Type 'I1' does not satisfy the constraint 'I2'. -==== tests/cases/compiler/typeParamExtendsOtherTypeParam.ts (2 errors) ==== +==== tests/cases/compiler/typeParamExtendsOtherTypeParam.ts (8 errors) ==== class A { } - ~~~~~~~~~~~ -!!! error TS2313: Constraint of a type parameter cannot reference any type parameter from the same type parameter list. class B { - ~~~~~~~~~~~ -!!! error TS2313: Constraint of a type parameter cannot reference any type parameter from the same type parameter list. data: A; } @@ -19,11 +30,31 @@ tests/cases/compiler/typeParamExtendsOtherTypeParam.ts(2,27): error TS2313: Cons // Below should be in error var x1: A<{ a: string;}, { b: string }>; + ~~~~~~~~~~~~~ +!!! error TS2344: Type '{ b: string; }' does not satisfy the constraint '{ a: string; }'. +!!! error TS2344: Property 'a' is missing in type '{ b: string; }'. var x2: A<{ a: string;}, { a: number }>; + ~~~~~~~~~~~~~ +!!! error TS2344: Type '{ a: number; }' does not satisfy the constraint '{ a: string; }'. +!!! error TS2344: Types of property 'a' are incompatible. +!!! error TS2344: Type 'number' is not assignable to type 'string'. var x3: B<{ a: string;}, { b: string }>; + ~~~~~~~~~~~~~ +!!! error TS2344: Type '{ b: string; }' does not satisfy the constraint '{ a: string; }'. +!!! error TS2344: Property 'a' is missing in type '{ b: string; }'. var x4: B<{ a: string;}, { a: number }>; + ~~~~~~~~~~~~~ +!!! error TS2344: Type '{ a: number; }' does not satisfy the constraint '{ a: string; }'. +!!! error TS2344: Types of property 'a' are incompatible. +!!! error TS2344: Type 'number' is not assignable to type 'string'. var x5: A<{ a: string; b: number }, { a: string }>; + ~~~~~~~~~~~~~ +!!! error TS2344: Type '{ a: string; }' does not satisfy the constraint '{ a: string; b: number; }'. +!!! error TS2344: Property 'b' is missing in type '{ a: string; }'. var x6: B<{ a: string; b: number }, { a: string }>; + ~~~~~~~~~~~~~ +!!! error TS2344: Type '{ a: string; }' does not satisfy the constraint '{ a: string; b: number; }'. +!!! error TS2344: Property 'b' is missing in type '{ a: string; }'. interface I1 { a: string; @@ -35,5 +66,10 @@ tests/cases/compiler/typeParamExtendsOtherTypeParam.ts(2,27): error TS2313: Cons } var x7: A; + ~~ +!!! error TS2344: Type 'I1' does not satisfy the constraint 'I2'. +!!! error TS2344: Property 'b' is missing in type 'I1'. var x8: B; + ~~ +!!! error TS2344: Type 'I1' does not satisfy the constraint 'I2'. \ No newline at end of file diff --git a/tests/baselines/reference/typeParameterAsTypeParameterConstraint.errors.txt b/tests/baselines/reference/typeParameterAsTypeParameterConstraint.errors.txt deleted file mode 100644 index b4f8e7544ff..00000000000 --- a/tests/baselines/reference/typeParameterAsTypeParameterConstraint.errors.txt +++ /dev/null @@ -1,35 +0,0 @@ -tests/cases/conformance/types/typeParameters/typeArgumentLists/typeParameterAsTypeParameterConstraint.ts(4,17): error TS2313: Constraint of a type parameter cannot reference any type parameter from the same type parameter list. -tests/cases/conformance/types/typeParameters/typeArgumentLists/typeParameterAsTypeParameterConstraint.ts(21,18): error TS2313: Constraint of a type parameter cannot reference any type parameter from the same type parameter list. - - -==== tests/cases/conformance/types/typeParameters/typeArgumentLists/typeParameterAsTypeParameterConstraint.ts (2 errors) ==== - // using a type parameter as a constraint for a type parameter is valid - // no errors expected except illegal constraints - - function foo(x: T, y: U): U { return y; } - ~~~~~~~~~~~ -!!! error TS2313: Constraint of a type parameter cannot reference any type parameter from the same type parameter list. - - var r = foo(1, 2); - var r = foo({}, 1); - - interface A { - foo: string; - } - interface B extends A { - bar: number; - } - var a: A; - var b: B; - - var r2 = foo(a, b); - var r3 = foo({ x: 1 }, { x: 2, y: 3 }); - - function foo2(x: T, y: U) { return y; } - ~~~~~~~~~~~~~~~~~~~~~~~ -!!! error TS2313: Constraint of a type parameter cannot reference any type parameter from the same type parameter list. - foo2(1, ''); - foo2({}, { length: 2 }); - foo2(1, { width: 3, length: 2 }); - foo2(1, []); - foo2(1, ['']); \ No newline at end of file diff --git a/tests/baselines/reference/typeParameterAsTypeParameterConstraint.symbols b/tests/baselines/reference/typeParameterAsTypeParameterConstraint.symbols new file mode 100644 index 00000000000..569b37e64d1 --- /dev/null +++ b/tests/baselines/reference/typeParameterAsTypeParameterConstraint.symbols @@ -0,0 +1,88 @@ +=== tests/cases/conformance/types/typeParameters/typeArgumentLists/typeParameterAsTypeParameterConstraint.ts === +// using a type parameter as a constraint for a type parameter is valid +// no errors expected except illegal constraints + +function foo(x: T, y: U): U { return y; } +>foo : Symbol(foo, Decl(typeParameterAsTypeParameterConstraint.ts, 0, 0)) +>T : Symbol(T, Decl(typeParameterAsTypeParameterConstraint.ts, 3, 13)) +>U : Symbol(U, Decl(typeParameterAsTypeParameterConstraint.ts, 3, 15)) +>T : Symbol(T, Decl(typeParameterAsTypeParameterConstraint.ts, 3, 13)) +>x : Symbol(x, Decl(typeParameterAsTypeParameterConstraint.ts, 3, 29)) +>T : Symbol(T, Decl(typeParameterAsTypeParameterConstraint.ts, 3, 13)) +>y : Symbol(y, Decl(typeParameterAsTypeParameterConstraint.ts, 3, 34)) +>U : Symbol(U, Decl(typeParameterAsTypeParameterConstraint.ts, 3, 15)) +>U : Symbol(U, Decl(typeParameterAsTypeParameterConstraint.ts, 3, 15)) +>y : Symbol(y, Decl(typeParameterAsTypeParameterConstraint.ts, 3, 34)) + +var r = foo(1, 2); +>r : Symbol(r, Decl(typeParameterAsTypeParameterConstraint.ts, 5, 3), Decl(typeParameterAsTypeParameterConstraint.ts, 6, 3)) +>foo : Symbol(foo, Decl(typeParameterAsTypeParameterConstraint.ts, 0, 0)) + +var r = foo({}, 1); +>r : Symbol(r, Decl(typeParameterAsTypeParameterConstraint.ts, 5, 3), Decl(typeParameterAsTypeParameterConstraint.ts, 6, 3)) +>foo : Symbol(foo, Decl(typeParameterAsTypeParameterConstraint.ts, 0, 0)) + +interface A { +>A : Symbol(A, Decl(typeParameterAsTypeParameterConstraint.ts, 6, 19)) + + foo: string; +>foo : Symbol(foo, Decl(typeParameterAsTypeParameterConstraint.ts, 8, 13)) +} +interface B extends A { +>B : Symbol(B, Decl(typeParameterAsTypeParameterConstraint.ts, 10, 1)) +>A : Symbol(A, Decl(typeParameterAsTypeParameterConstraint.ts, 6, 19)) + + bar: number; +>bar : Symbol(bar, Decl(typeParameterAsTypeParameterConstraint.ts, 11, 23)) +} +var a: A; +>a : Symbol(a, Decl(typeParameterAsTypeParameterConstraint.ts, 14, 3)) +>A : Symbol(A, Decl(typeParameterAsTypeParameterConstraint.ts, 6, 19)) + +var b: B; +>b : Symbol(b, Decl(typeParameterAsTypeParameterConstraint.ts, 15, 3)) +>B : Symbol(B, Decl(typeParameterAsTypeParameterConstraint.ts, 10, 1)) + +var r2 = foo(a, b); +>r2 : Symbol(r2, Decl(typeParameterAsTypeParameterConstraint.ts, 17, 3)) +>foo : Symbol(foo, Decl(typeParameterAsTypeParameterConstraint.ts, 0, 0)) +>a : Symbol(a, Decl(typeParameterAsTypeParameterConstraint.ts, 14, 3)) +>b : Symbol(b, Decl(typeParameterAsTypeParameterConstraint.ts, 15, 3)) + +var r3 = foo({ x: 1 }, { x: 2, y: 3 }); +>r3 : Symbol(r3, Decl(typeParameterAsTypeParameterConstraint.ts, 18, 3)) +>foo : Symbol(foo, Decl(typeParameterAsTypeParameterConstraint.ts, 0, 0)) +>x : Symbol(x, Decl(typeParameterAsTypeParameterConstraint.ts, 18, 14)) +>x : Symbol(x, Decl(typeParameterAsTypeParameterConstraint.ts, 18, 24)) +>y : Symbol(y, Decl(typeParameterAsTypeParameterConstraint.ts, 18, 30)) + +function foo2(x: T, y: U) { return y; } +>foo2 : Symbol(foo2, Decl(typeParameterAsTypeParameterConstraint.ts, 18, 39)) +>T : Symbol(T, Decl(typeParameterAsTypeParameterConstraint.ts, 20, 14)) +>U : Symbol(U, Decl(typeParameterAsTypeParameterConstraint.ts, 20, 16)) +>length : Symbol(length, Decl(typeParameterAsTypeParameterConstraint.ts, 20, 28)) +>T : Symbol(T, Decl(typeParameterAsTypeParameterConstraint.ts, 20, 14)) +>x : Symbol(x, Decl(typeParameterAsTypeParameterConstraint.ts, 20, 42)) +>T : Symbol(T, Decl(typeParameterAsTypeParameterConstraint.ts, 20, 14)) +>y : Symbol(y, Decl(typeParameterAsTypeParameterConstraint.ts, 20, 47)) +>U : Symbol(U, Decl(typeParameterAsTypeParameterConstraint.ts, 20, 16)) +>y : Symbol(y, Decl(typeParameterAsTypeParameterConstraint.ts, 20, 47)) + +foo2(1, ''); +>foo2 : Symbol(foo2, Decl(typeParameterAsTypeParameterConstraint.ts, 18, 39)) + +foo2({}, { length: 2 }); +>foo2 : Symbol(foo2, Decl(typeParameterAsTypeParameterConstraint.ts, 18, 39)) +>length : Symbol(length, Decl(typeParameterAsTypeParameterConstraint.ts, 22, 10)) + +foo2(1, { width: 3, length: 2 }); +>foo2 : Symbol(foo2, Decl(typeParameterAsTypeParameterConstraint.ts, 18, 39)) +>width : Symbol(width, Decl(typeParameterAsTypeParameterConstraint.ts, 23, 9)) +>length : Symbol(length, Decl(typeParameterAsTypeParameterConstraint.ts, 23, 19)) + +foo2(1, []); +>foo2 : Symbol(foo2, Decl(typeParameterAsTypeParameterConstraint.ts, 18, 39)) + +foo2(1, ['']); +>foo2 : Symbol(foo2, Decl(typeParameterAsTypeParameterConstraint.ts, 18, 39)) + diff --git a/tests/baselines/reference/typeParameterAsTypeParameterConstraint.types b/tests/baselines/reference/typeParameterAsTypeParameterConstraint.types new file mode 100644 index 00000000000..c5f15f1ba55 --- /dev/null +++ b/tests/baselines/reference/typeParameterAsTypeParameterConstraint.types @@ -0,0 +1,120 @@ +=== tests/cases/conformance/types/typeParameters/typeArgumentLists/typeParameterAsTypeParameterConstraint.ts === +// using a type parameter as a constraint for a type parameter is valid +// no errors expected except illegal constraints + +function foo(x: T, y: U): U { return y; } +>foo : (x: T, y: U) => U +>T : T +>U : U +>T : T +>x : T +>T : T +>y : U +>U : U +>U : U +>y : U + +var r = foo(1, 2); +>r : number +>foo(1, 2) : number +>foo : (x: T, y: U) => U +>1 : number +>2 : number + +var r = foo({}, 1); +>r : number +>foo({}, 1) : number +>foo : (x: T, y: U) => U +>{} : {} +>1 : number + +interface A { +>A : A + + foo: string; +>foo : string +} +interface B extends A { +>B : B +>A : A + + bar: number; +>bar : number +} +var a: A; +>a : A +>A : A + +var b: B; +>b : B +>B : B + +var r2 = foo(a, b); +>r2 : B +>foo(a, b) : B +>foo : (x: T, y: U) => U +>a : A +>b : B + +var r3 = foo({ x: 1 }, { x: 2, y: 3 }); +>r3 : { x: number; y: number; } +>foo({ x: 1 }, { x: 2, y: 3 }) : { x: number; y: number; } +>foo : (x: T, y: U) => U +>{ x: 1 } : { x: number; } +>x : number +>1 : number +>{ x: 2, y: 3 } : { x: number; y: number; } +>x : number +>2 : number +>y : number +>3 : number + +function foo2(x: T, y: U) { return y; } +>foo2 : (x: T, y: U) => U +>T : T +>U : U +>length : T +>T : T +>x : T +>T : T +>y : U +>U : U +>y : U + +foo2(1, ''); +>foo2(1, '') : string +>foo2 : (x: T, y: U) => U +>1 : number +>'' : string + +foo2({}, { length: 2 }); +>foo2({}, { length: 2 }) : { length: number; } +>foo2 : (x: T, y: U) => U +>{} : {} +>{ length: 2 } : { length: number; } +>length : number +>2 : number + +foo2(1, { width: 3, length: 2 }); +>foo2(1, { width: 3, length: 2 }) : { width: number; length: number; } +>foo2 : (x: T, y: U) => U +>1 : number +>{ width: 3, length: 2 } : { width: number; length: number; } +>width : number +>3 : number +>length : number +>2 : number + +foo2(1, []); +>foo2(1, []) : any[] +>foo2 : (x: T, y: U) => U +>1 : number +>[] : undefined[] + +foo2(1, ['']); +>foo2(1, ['']) : string[] +>foo2 : (x: T, y: U) => U +>1 : number +>[''] : string[] +>'' : string + diff --git a/tests/baselines/reference/typeParameterAsTypeParameterConstraint2.errors.txt b/tests/baselines/reference/typeParameterAsTypeParameterConstraint2.errors.txt deleted file mode 100644 index 8652bb7aee5..00000000000 --- a/tests/baselines/reference/typeParameterAsTypeParameterConstraint2.errors.txt +++ /dev/null @@ -1,27 +0,0 @@ -tests/cases/conformance/types/typeParameters/typeArgumentLists/typeParameterAsTypeParameterConstraint2.ts(4,17): error TS2313: Constraint of a type parameter cannot reference any type parameter from the same type parameter list. -tests/cases/conformance/types/typeParameters/typeArgumentLists/typeParameterAsTypeParameterConstraint2.ts(15,18): error TS2313: Constraint of a type parameter cannot reference any type parameter from the same type parameter list. - - -==== tests/cases/conformance/types/typeParameters/typeArgumentLists/typeParameterAsTypeParameterConstraint2.ts (2 errors) ==== - // using a type parameter as a constraint for a type parameter is invalid - // these should be errors unless otherwise noted - - function foo(x: T, y: U): U { return y; } // this is now an error - ~~~~~~~~~~~ -!!! error TS2313: Constraint of a type parameter cannot reference any type parameter from the same type parameter list. - - foo(1, ''); - foo(1, {}); - - interface NumberVariant extends Number { - x: number; - } - var n: NumberVariant; - var r3 = foo(1, n); - - function foo2(x: T, y: U) { return y; } // this is now an error - ~~~~~~~~~~~~~~~~~~~~~~~ -!!! error TS2313: Constraint of a type parameter cannot reference any type parameter from the same type parameter list. - foo2(1, { length: '' }); - foo2(1, { length: {} }); - foo2([], ['']); \ No newline at end of file diff --git a/tests/baselines/reference/typeParameterAsTypeParameterConstraint2.symbols b/tests/baselines/reference/typeParameterAsTypeParameterConstraint2.symbols new file mode 100644 index 00000000000..b6fde452280 --- /dev/null +++ b/tests/baselines/reference/typeParameterAsTypeParameterConstraint2.symbols @@ -0,0 +1,61 @@ +=== tests/cases/conformance/types/typeParameters/typeArgumentLists/typeParameterAsTypeParameterConstraint2.ts === +// using a type parameter as a constraint for a type parameter is invalid +// these should be errors unless otherwise noted + +function foo(x: T, y: U): U { return y; } // this is now an error +>foo : Symbol(foo, Decl(typeParameterAsTypeParameterConstraint2.ts, 0, 0)) +>T : Symbol(T, Decl(typeParameterAsTypeParameterConstraint2.ts, 3, 13)) +>U : Symbol(U, Decl(typeParameterAsTypeParameterConstraint2.ts, 3, 15)) +>T : Symbol(T, Decl(typeParameterAsTypeParameterConstraint2.ts, 3, 13)) +>x : Symbol(x, Decl(typeParameterAsTypeParameterConstraint2.ts, 3, 29)) +>T : Symbol(T, Decl(typeParameterAsTypeParameterConstraint2.ts, 3, 13)) +>y : Symbol(y, Decl(typeParameterAsTypeParameterConstraint2.ts, 3, 34)) +>U : Symbol(U, Decl(typeParameterAsTypeParameterConstraint2.ts, 3, 15)) +>U : Symbol(U, Decl(typeParameterAsTypeParameterConstraint2.ts, 3, 15)) +>y : Symbol(y, Decl(typeParameterAsTypeParameterConstraint2.ts, 3, 34)) + +foo(1, ''); +>foo : Symbol(foo, Decl(typeParameterAsTypeParameterConstraint2.ts, 0, 0)) + +foo(1, {}); +>foo : Symbol(foo, Decl(typeParameterAsTypeParameterConstraint2.ts, 0, 0)) + +interface NumberVariant extends Number { +>NumberVariant : Symbol(NumberVariant, Decl(typeParameterAsTypeParameterConstraint2.ts, 6, 11)) +>Number : Symbol(Number, Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --)) + + x: number; +>x : Symbol(x, Decl(typeParameterAsTypeParameterConstraint2.ts, 8, 40)) +} +var n: NumberVariant; +>n : Symbol(n, Decl(typeParameterAsTypeParameterConstraint2.ts, 11, 3)) +>NumberVariant : Symbol(NumberVariant, Decl(typeParameterAsTypeParameterConstraint2.ts, 6, 11)) + +var r3 = foo(1, n); +>r3 : Symbol(r3, Decl(typeParameterAsTypeParameterConstraint2.ts, 12, 3)) +>foo : Symbol(foo, Decl(typeParameterAsTypeParameterConstraint2.ts, 0, 0)) +>n : Symbol(n, Decl(typeParameterAsTypeParameterConstraint2.ts, 11, 3)) + +function foo2(x: T, y: U) { return y; } // this is now an error +>foo2 : Symbol(foo2, Decl(typeParameterAsTypeParameterConstraint2.ts, 12, 19)) +>T : Symbol(T, Decl(typeParameterAsTypeParameterConstraint2.ts, 14, 14)) +>U : Symbol(U, Decl(typeParameterAsTypeParameterConstraint2.ts, 14, 16)) +>length : Symbol(length, Decl(typeParameterAsTypeParameterConstraint2.ts, 14, 28)) +>T : Symbol(T, Decl(typeParameterAsTypeParameterConstraint2.ts, 14, 14)) +>x : Symbol(x, Decl(typeParameterAsTypeParameterConstraint2.ts, 14, 42)) +>T : Symbol(T, Decl(typeParameterAsTypeParameterConstraint2.ts, 14, 14)) +>y : Symbol(y, Decl(typeParameterAsTypeParameterConstraint2.ts, 14, 47)) +>U : Symbol(U, Decl(typeParameterAsTypeParameterConstraint2.ts, 14, 16)) +>y : Symbol(y, Decl(typeParameterAsTypeParameterConstraint2.ts, 14, 47)) + +foo2(1, { length: '' }); +>foo2 : Symbol(foo2, Decl(typeParameterAsTypeParameterConstraint2.ts, 12, 19)) +>length : Symbol(length, Decl(typeParameterAsTypeParameterConstraint2.ts, 15, 9)) + +foo2(1, { length: {} }); +>foo2 : Symbol(foo2, Decl(typeParameterAsTypeParameterConstraint2.ts, 12, 19)) +>length : Symbol(length, Decl(typeParameterAsTypeParameterConstraint2.ts, 16, 9)) + +foo2([], ['']); +>foo2 : Symbol(foo2, Decl(typeParameterAsTypeParameterConstraint2.ts, 12, 19)) + diff --git a/tests/baselines/reference/typeParameterAsTypeParameterConstraint2.types b/tests/baselines/reference/typeParameterAsTypeParameterConstraint2.types new file mode 100644 index 00000000000..e73cdaeda53 --- /dev/null +++ b/tests/baselines/reference/typeParameterAsTypeParameterConstraint2.types @@ -0,0 +1,81 @@ +=== tests/cases/conformance/types/typeParameters/typeArgumentLists/typeParameterAsTypeParameterConstraint2.ts === +// using a type parameter as a constraint for a type parameter is invalid +// these should be errors unless otherwise noted + +function foo(x: T, y: U): U { return y; } // this is now an error +>foo : (x: T, y: U) => U +>T : T +>U : U +>T : T +>x : T +>T : T +>y : U +>U : U +>U : U +>y : U + +foo(1, ''); +>foo(1, '') : any +>foo : (x: T, y: U) => U +>1 : number +>'' : string + +foo(1, {}); +>foo(1, {}) : any +>foo : (x: T, y: U) => U +>1 : number +>{} : {} + +interface NumberVariant extends Number { +>NumberVariant : NumberVariant +>Number : Number + + x: number; +>x : number +} +var n: NumberVariant; +>n : NumberVariant +>NumberVariant : NumberVariant + +var r3 = foo(1, n); +>r3 : any +>foo(1, n) : any +>foo : (x: T, y: U) => U +>1 : number +>n : NumberVariant + +function foo2(x: T, y: U) { return y; } // this is now an error +>foo2 : (x: T, y: U) => U +>T : T +>U : U +>length : T +>T : T +>x : T +>T : T +>y : U +>U : U +>y : U + +foo2(1, { length: '' }); +>foo2(1, { length: '' }) : { length: any; } +>foo2 : (x: T, y: U) => U +>1 : number +>{ length: '' } : { length: string; } +>length : string +>'' : string + +foo2(1, { length: {} }); +>foo2(1, { length: {} }) : { length: any; } +>foo2 : (x: T, y: U) => U +>1 : number +>{ length: {} } : { length: {}; } +>length : {} +>{} : {} + +foo2([], ['']); +>foo2([], ['']) : { length: any; } +>foo2 : (x: T, y: U) => U +>[] : undefined[] +>[''] : string[] +>'' : string + diff --git a/tests/baselines/reference/typeParameterAssignability2.errors.txt b/tests/baselines/reference/typeParameterAssignability2.errors.txt index ab8803e0478..e6159fd7135 100644 --- a/tests/baselines/reference/typeParameterAssignability2.errors.txt +++ b/tests/baselines/reference/typeParameterAssignability2.errors.txt @@ -1,116 +1,78 @@ -tests/cases/conformance/types/typeRelationships/assignmentCompatibility/typeParameterAssignability2.ts(3,17): error TS2313: Constraint of a type parameter cannot reference any type parameter from the same type parameter list. -tests/cases/conformance/types/typeRelationships/assignmentCompatibility/typeParameterAssignability2.ts(4,5): error TS2322: Type 'U' is not assignable to type 'T'. tests/cases/conformance/types/typeRelationships/assignmentCompatibility/typeParameterAssignability2.ts(5,5): error TS2322: Type 'T' is not assignable to type 'U'. -tests/cases/conformance/types/typeRelationships/assignmentCompatibility/typeParameterAssignability2.ts(8,15): error TS2313: Constraint of a type parameter cannot reference any type parameter from the same type parameter list. tests/cases/conformance/types/typeRelationships/assignmentCompatibility/typeParameterAssignability2.ts(9,5): error TS2322: Type 'U' is not assignable to type 'T'. -tests/cases/conformance/types/typeRelationships/assignmentCompatibility/typeParameterAssignability2.ts(10,5): error TS2322: Type 'T' is not assignable to type 'U'. -tests/cases/conformance/types/typeRelationships/assignmentCompatibility/typeParameterAssignability2.ts(13,15): error TS2313: Constraint of a type parameter cannot reference any type parameter from the same type parameter list. -tests/cases/conformance/types/typeRelationships/assignmentCompatibility/typeParameterAssignability2.ts(13,28): error TS2313: Constraint of a type parameter cannot reference any type parameter from the same type parameter list. tests/cases/conformance/types/typeRelationships/assignmentCompatibility/typeParameterAssignability2.ts(14,5): error TS2322: Type 'U' is not assignable to type 'T'. -tests/cases/conformance/types/typeRelationships/assignmentCompatibility/typeParameterAssignability2.ts(15,5): error TS2322: Type 'T' is not assignable to type 'U'. + Type 'V' is not assignable to type 'T'. tests/cases/conformance/types/typeRelationships/assignmentCompatibility/typeParameterAssignability2.ts(17,5): error TS2322: Type 'V' is not assignable to type 'T'. -tests/cases/conformance/types/typeRelationships/assignmentCompatibility/typeParameterAssignability2.ts(18,5): error TS2322: Type 'T' is not assignable to type 'V'. tests/cases/conformance/types/typeRelationships/assignmentCompatibility/typeParameterAssignability2.ts(20,5): error TS2322: Type 'V' is not assignable to type 'U'. -tests/cases/conformance/types/typeRelationships/assignmentCompatibility/typeParameterAssignability2.ts(21,5): error TS2322: Type 'U' is not assignable to type 'V'. -tests/cases/conformance/types/typeRelationships/assignmentCompatibility/typeParameterAssignability2.ts(24,15): error TS2313: Constraint of a type parameter cannot reference any type parameter from the same type parameter list. -tests/cases/conformance/types/typeRelationships/assignmentCompatibility/typeParameterAssignability2.ts(24,28): error TS2313: Constraint of a type parameter cannot reference any type parameter from the same type parameter list. tests/cases/conformance/types/typeRelationships/assignmentCompatibility/typeParameterAssignability2.ts(25,5): error TS2322: Type 'U' is not assignable to type 'T'. + Type 'V' is not assignable to type 'T'. + Type 'Date' is not assignable to type 'T'. tests/cases/conformance/types/typeRelationships/assignmentCompatibility/typeParameterAssignability2.ts(26,5): error TS2322: Type 'V' is not assignable to type 'T'. Type 'Date' is not assignable to type 'T'. tests/cases/conformance/types/typeRelationships/assignmentCompatibility/typeParameterAssignability2.ts(27,5): error TS2322: Type 'Date' is not assignable to type 'T'. -tests/cases/conformance/types/typeRelationships/assignmentCompatibility/typeParameterAssignability2.ts(29,5): error TS2322: Type 'T' is not assignable to type 'U'. tests/cases/conformance/types/typeRelationships/assignmentCompatibility/typeParameterAssignability2.ts(30,5): error TS2322: Type 'V' is not assignable to type 'U'. Type 'Date' is not assignable to type 'U'. tests/cases/conformance/types/typeRelationships/assignmentCompatibility/typeParameterAssignability2.ts(31,5): error TS2322: Type 'Date' is not assignable to type 'U'. -tests/cases/conformance/types/typeRelationships/assignmentCompatibility/typeParameterAssignability2.ts(33,5): error TS2322: Type 'T' is not assignable to type 'V'. -tests/cases/conformance/types/typeRelationships/assignmentCompatibility/typeParameterAssignability2.ts(34,5): error TS2322: Type 'U' is not assignable to type 'V'. tests/cases/conformance/types/typeRelationships/assignmentCompatibility/typeParameterAssignability2.ts(35,5): error TS2322: Type 'Date' is not assignable to type 'V'. -tests/cases/conformance/types/typeRelationships/assignmentCompatibility/typeParameterAssignability2.ts(38,5): error TS2322: Type 'T' is not assignable to type 'Date'. -tests/cases/conformance/types/typeRelationships/assignmentCompatibility/typeParameterAssignability2.ts(39,5): error TS2322: Type 'U' is not assignable to type 'Date'. -tests/cases/conformance/types/typeRelationships/assignmentCompatibility/typeParameterAssignability2.ts(44,31): error TS2313: Constraint of a type parameter cannot reference any type parameter from the same type parameter list. -tests/cases/conformance/types/typeRelationships/assignmentCompatibility/typeParameterAssignability2.ts(44,44): error TS2313: Constraint of a type parameter cannot reference any type parameter from the same type parameter list. tests/cases/conformance/types/typeRelationships/assignmentCompatibility/typeParameterAssignability2.ts(45,5): error TS2322: Type 'U' is not assignable to type 'T'. + Type 'V' is not assignable to type 'T'. + Type 'Date' is not assignable to type 'T'. tests/cases/conformance/types/typeRelationships/assignmentCompatibility/typeParameterAssignability2.ts(46,5): error TS2322: Type 'V' is not assignable to type 'T'. Type 'Date' is not assignable to type 'T'. tests/cases/conformance/types/typeRelationships/assignmentCompatibility/typeParameterAssignability2.ts(47,5): error TS2322: Type 'Date' is not assignable to type 'T'. -tests/cases/conformance/types/typeRelationships/assignmentCompatibility/typeParameterAssignability2.ts(49,5): error TS2322: Type 'T' is not assignable to type 'U'. tests/cases/conformance/types/typeRelationships/assignmentCompatibility/typeParameterAssignability2.ts(50,5): error TS2322: Type 'V' is not assignable to type 'U'. Type 'Date' is not assignable to type 'U'. tests/cases/conformance/types/typeRelationships/assignmentCompatibility/typeParameterAssignability2.ts(51,5): error TS2322: Type 'Date' is not assignable to type 'U'. -tests/cases/conformance/types/typeRelationships/assignmentCompatibility/typeParameterAssignability2.ts(53,5): error TS2322: Type 'T' is not assignable to type 'V'. -tests/cases/conformance/types/typeRelationships/assignmentCompatibility/typeParameterAssignability2.ts(54,5): error TS2322: Type 'U' is not assignable to type 'V'. tests/cases/conformance/types/typeRelationships/assignmentCompatibility/typeParameterAssignability2.ts(55,5): error TS2322: Type 'Date' is not assignable to type 'V'. -tests/cases/conformance/types/typeRelationships/assignmentCompatibility/typeParameterAssignability2.ts(58,5): error TS2322: Type 'T' is not assignable to type 'Date'. -tests/cases/conformance/types/typeRelationships/assignmentCompatibility/typeParameterAssignability2.ts(59,5): error TS2322: Type 'U' is not assignable to type 'Date'. -tests/cases/conformance/types/typeRelationships/assignmentCompatibility/typeParameterAssignability2.ts(63,15): error TS2313: Constraint of a type parameter cannot reference any type parameter from the same type parameter list. tests/cases/conformance/types/typeRelationships/assignmentCompatibility/typeParameterAssignability2.ts(64,5): error TS2322: Type 'U' is not assignable to type 'T'. tests/cases/conformance/types/typeRelationships/assignmentCompatibility/typeParameterAssignability2.ts(65,5): error TS2322: Type 'V' is not assignable to type 'T'. -tests/cases/conformance/types/typeRelationships/assignmentCompatibility/typeParameterAssignability2.ts(67,5): error TS2322: Type 'T' is not assignable to type 'U'. tests/cases/conformance/types/typeRelationships/assignmentCompatibility/typeParameterAssignability2.ts(68,5): error TS2322: Type 'V' is not assignable to type 'U'. tests/cases/conformance/types/typeRelationships/assignmentCompatibility/typeParameterAssignability2.ts(70,5): error TS2322: Type 'T' is not assignable to type 'V'. + Type 'U' is not assignable to type 'V'. tests/cases/conformance/types/typeRelationships/assignmentCompatibility/typeParameterAssignability2.ts(71,5): error TS2322: Type 'U' is not assignable to type 'V'. -==== tests/cases/conformance/types/typeRelationships/assignmentCompatibility/typeParameterAssignability2.ts (47 errors) ==== +==== tests/cases/conformance/types/typeRelationships/assignmentCompatibility/typeParameterAssignability2.ts (22 errors) ==== // type parameters are not assignable to one another unless directly or indirectly constrained to one another function foo(t: T, u: U) { - ~~~~~~~~~~~ -!!! error TS2313: Constraint of a type parameter cannot reference any type parameter from the same type parameter list. t = u; // error - ~ -!!! error TS2322: Type 'U' is not assignable to type 'T'. u = t; // ok ~ !!! error TS2322: Type 'T' is not assignable to type 'U'. } function foo2(t: T, u: U) { - ~~~~~~~~~~~ -!!! error TS2313: Constraint of a type parameter cannot reference any type parameter from the same type parameter list. t = u; // error ~ !!! error TS2322: Type 'U' is not assignable to type 'T'. u = t; // ok - ~ -!!! error TS2322: Type 'T' is not assignable to type 'U'. } function foo3(t: T, u: U, v: V) { - ~~~~~~~~~~~ -!!! error TS2313: Constraint of a type parameter cannot reference any type parameter from the same type parameter list. - ~~~~~~~~~~~ -!!! error TS2313: Constraint of a type parameter cannot reference any type parameter from the same type parameter list. t = u; // error ~ !!! error TS2322: Type 'U' is not assignable to type 'T'. +!!! error TS2322: Type 'V' is not assignable to type 'T'. u = t; - ~ -!!! error TS2322: Type 'T' is not assignable to type 'U'. t = v; // error ~ !!! error TS2322: Type 'V' is not assignable to type 'T'. v = t; // ok - ~ -!!! error TS2322: Type 'T' is not assignable to type 'V'. u = v; // error ~ !!! error TS2322: Type 'V' is not assignable to type 'U'. v = u; // ok - ~ -!!! error TS2322: Type 'U' is not assignable to type 'V'. } function foo4(t: T, u: U, v: V) { - ~~~~~~~~~~~ -!!! error TS2313: Constraint of a type parameter cannot reference any type parameter from the same type parameter list. - ~~~~~~~~~~~ -!!! error TS2313: Constraint of a type parameter cannot reference any type parameter from the same type parameter list. t = u; // error ~ !!! error TS2322: Type 'U' is not assignable to type 'T'. +!!! error TS2322: Type 'V' is not assignable to type 'T'. +!!! error TS2322: Type 'Date' is not assignable to type 'T'. t = v; // error ~ !!! error TS2322: Type 'V' is not assignable to type 'T'. @@ -120,8 +82,6 @@ tests/cases/conformance/types/typeRelationships/assignmentCompatibility/typePara !!! error TS2322: Type 'Date' is not assignable to type 'T'. u = t; - ~ -!!! error TS2322: Type 'T' is not assignable to type 'U'. u = v; // error ~ !!! error TS2322: Type 'V' is not assignable to type 'U'. @@ -131,34 +91,24 @@ tests/cases/conformance/types/typeRelationships/assignmentCompatibility/typePara !!! error TS2322: Type 'Date' is not assignable to type 'U'. v = t; - ~ -!!! error TS2322: Type 'T' is not assignable to type 'V'. v = u; - ~ -!!! error TS2322: Type 'U' is not assignable to type 'V'. v = new Date(); // ok ~ !!! error TS2322: Type 'Date' is not assignable to type 'V'. var d: Date; d = t; // ok - ~ -!!! error TS2322: Type 'T' is not assignable to type 'Date'. d = u; // ok - ~ -!!! error TS2322: Type 'U' is not assignable to type 'Date'. d = v; // ok } // same as foo4 with different type parameter ordering function foo5(t: T, u: U, v: V) { - ~~~~~~~~~~~ -!!! error TS2313: Constraint of a type parameter cannot reference any type parameter from the same type parameter list. - ~~~~~~~~~~~ -!!! error TS2313: Constraint of a type parameter cannot reference any type parameter from the same type parameter list. t = u; // error ~ !!! error TS2322: Type 'U' is not assignable to type 'T'. +!!! error TS2322: Type 'V' is not assignable to type 'T'. +!!! error TS2322: Type 'Date' is not assignable to type 'T'. t = v; // error ~ !!! error TS2322: Type 'V' is not assignable to type 'T'. @@ -168,8 +118,6 @@ tests/cases/conformance/types/typeRelationships/assignmentCompatibility/typePara !!! error TS2322: Type 'Date' is not assignable to type 'T'. u = t; - ~ -!!! error TS2322: Type 'T' is not assignable to type 'U'. u = v; // error ~ !!! error TS2322: Type 'V' is not assignable to type 'U'. @@ -179,28 +127,18 @@ tests/cases/conformance/types/typeRelationships/assignmentCompatibility/typePara !!! error TS2322: Type 'Date' is not assignable to type 'U'. v = t; - ~ -!!! error TS2322: Type 'T' is not assignable to type 'V'. v = u; - ~ -!!! error TS2322: Type 'U' is not assignable to type 'V'. v = new Date(); // ok ~ !!! error TS2322: Type 'Date' is not assignable to type 'V'. var d: Date; d = t; // ok - ~ -!!! error TS2322: Type 'T' is not assignable to type 'Date'. d = u; // ok - ~ -!!! error TS2322: Type 'U' is not assignable to type 'Date'. d = v; // ok } function foo6(t: T, u: U, v: V) { - ~~~~~~~~~~~ -!!! error TS2313: Constraint of a type parameter cannot reference any type parameter from the same type parameter list. t = u; // error ~ !!! error TS2322: Type 'U' is not assignable to type 'T'. @@ -209,8 +147,6 @@ tests/cases/conformance/types/typeRelationships/assignmentCompatibility/typePara !!! error TS2322: Type 'V' is not assignable to type 'T'. u = t; // ok - ~ -!!! error TS2322: Type 'T' is not assignable to type 'U'. u = v; // error ~ !!! error TS2322: Type 'V' is not assignable to type 'U'. @@ -218,6 +154,7 @@ tests/cases/conformance/types/typeRelationships/assignmentCompatibility/typePara v = t; // error ~ !!! error TS2322: Type 'T' is not assignable to type 'V'. +!!! error TS2322: Type 'U' is not assignable to type 'V'. v = u; // error ~ !!! error TS2322: Type 'U' is not assignable to type 'V'. diff --git a/tests/baselines/reference/typeParameterAssignmentWithConstraints.errors.txt b/tests/baselines/reference/typeParameterAssignmentWithConstraints.errors.txt deleted file mode 100644 index 3ada2e3c375..00000000000 --- a/tests/baselines/reference/typeParameterAssignmentWithConstraints.errors.txt +++ /dev/null @@ -1,14 +0,0 @@ -tests/cases/compiler/typeParameterAssignmentWithConstraints.ts(1,15): error TS2313: Constraint of a type parameter cannot reference any type parameter from the same type parameter list. -tests/cases/compiler/typeParameterAssignmentWithConstraints.ts(4,5): error TS2322: Type 'B' is not assignable to type 'A'. - - -==== tests/cases/compiler/typeParameterAssignmentWithConstraints.ts (2 errors) ==== - function f() { - ~~~~~~~~~~~ -!!! error TS2313: Constraint of a type parameter cannot reference any type parameter from the same type parameter list. - var a: A; - var b: B; - a = b; // Error: Can't convert B to A - ~ -!!! error TS2322: Type 'B' is not assignable to type 'A'. - } \ No newline at end of file diff --git a/tests/baselines/reference/typeParameterAssignmentWithConstraints.symbols b/tests/baselines/reference/typeParameterAssignmentWithConstraints.symbols new file mode 100644 index 00000000000..c5372354532 --- /dev/null +++ b/tests/baselines/reference/typeParameterAssignmentWithConstraints.symbols @@ -0,0 +1,19 @@ +=== tests/cases/compiler/typeParameterAssignmentWithConstraints.ts === +function f() { +>f : Symbol(f, Decl(typeParameterAssignmentWithConstraints.ts, 0, 0)) +>A : Symbol(A, Decl(typeParameterAssignmentWithConstraints.ts, 0, 11)) +>B : Symbol(B, Decl(typeParameterAssignmentWithConstraints.ts, 0, 13)) +>A : Symbol(A, Decl(typeParameterAssignmentWithConstraints.ts, 0, 11)) + + var a: A; +>a : Symbol(a, Decl(typeParameterAssignmentWithConstraints.ts, 1, 7)) +>A : Symbol(A, Decl(typeParameterAssignmentWithConstraints.ts, 0, 11)) + + var b: B; +>b : Symbol(b, Decl(typeParameterAssignmentWithConstraints.ts, 2, 7)) +>B : Symbol(B, Decl(typeParameterAssignmentWithConstraints.ts, 0, 13)) + + a = b; // Error: Can't convert B to A +>a : Symbol(a, Decl(typeParameterAssignmentWithConstraints.ts, 1, 7)) +>b : Symbol(b, Decl(typeParameterAssignmentWithConstraints.ts, 2, 7)) +} diff --git a/tests/baselines/reference/typeParameterAssignmentWithConstraints.types b/tests/baselines/reference/typeParameterAssignmentWithConstraints.types new file mode 100644 index 00000000000..fc7f7e31830 --- /dev/null +++ b/tests/baselines/reference/typeParameterAssignmentWithConstraints.types @@ -0,0 +1,20 @@ +=== tests/cases/compiler/typeParameterAssignmentWithConstraints.ts === +function f() { +>f : () => void +>A : A +>B : B +>A : A + + var a: A; +>a : A +>A : A + + var b: B; +>b : B +>B : B + + a = b; // Error: Can't convert B to A +>a = b : B +>a : A +>b : B +} diff --git a/tests/baselines/reference/typeParameterDirectlyConstrainedToItself.errors.txt b/tests/baselines/reference/typeParameterDirectlyConstrainedToItself.errors.txt index 496d0f3f55a..540ad8346a1 100644 --- a/tests/baselines/reference/typeParameterDirectlyConstrainedToItself.errors.txt +++ b/tests/baselines/reference/typeParameterDirectlyConstrainedToItself.errors.txt @@ -1,51 +1,51 @@ -tests/cases/conformance/types/typeParameters/typeParameterLists/typeParameterDirectlyConstrainedToItself.ts(3,9): error TS2313: Constraint of a type parameter cannot reference any type parameter from the same type parameter list. -tests/cases/conformance/types/typeParameters/typeParameterLists/typeParameterDirectlyConstrainedToItself.ts(4,13): error TS2313: Constraint of a type parameter cannot reference any type parameter from the same type parameter list. -tests/cases/conformance/types/typeParameters/typeParameterLists/typeParameterDirectlyConstrainedToItself.ts(6,13): error TS2313: Constraint of a type parameter cannot reference any type parameter from the same type parameter list. -tests/cases/conformance/types/typeParameters/typeParameterLists/typeParameterDirectlyConstrainedToItself.ts(7,17): error TS2313: Constraint of a type parameter cannot reference any type parameter from the same type parameter list. -tests/cases/conformance/types/typeParameters/typeParameterLists/typeParameterDirectlyConstrainedToItself.ts(9,12): error TS2313: Constraint of a type parameter cannot reference any type parameter from the same type parameter list. -tests/cases/conformance/types/typeParameters/typeParameterLists/typeParameterDirectlyConstrainedToItself.ts(10,16): error TS2313: Constraint of a type parameter cannot reference any type parameter from the same type parameter list. -tests/cases/conformance/types/typeParameters/typeParameterLists/typeParameterDirectlyConstrainedToItself.ts(13,6): error TS2313: Constraint of a type parameter cannot reference any type parameter from the same type parameter list. -tests/cases/conformance/types/typeParameters/typeParameterLists/typeParameterDirectlyConstrainedToItself.ts(14,9): error TS2313: Constraint of a type parameter cannot reference any type parameter from the same type parameter list. -tests/cases/conformance/types/typeParameters/typeParameterLists/typeParameterDirectlyConstrainedToItself.ts(17,10): error TS2313: Constraint of a type parameter cannot reference any type parameter from the same type parameter list. -tests/cases/conformance/types/typeParameters/typeParameterLists/typeParameterDirectlyConstrainedToItself.ts(18,14): error TS2313: Constraint of a type parameter cannot reference any type parameter from the same type parameter list. +tests/cases/conformance/types/typeParameters/typeParameterLists/typeParameterDirectlyConstrainedToItself.ts(3,19): error TS2313: Type parameter 'T' has a circular constraint. +tests/cases/conformance/types/typeParameters/typeParameterLists/typeParameterDirectlyConstrainedToItself.ts(4,23): error TS2313: Type parameter 'U' has a circular constraint. +tests/cases/conformance/types/typeParameters/typeParameterLists/typeParameterDirectlyConstrainedToItself.ts(6,23): error TS2313: Type parameter 'T' has a circular constraint. +tests/cases/conformance/types/typeParameters/typeParameterLists/typeParameterDirectlyConstrainedToItself.ts(7,27): error TS2313: Type parameter 'U' has a circular constraint. +tests/cases/conformance/types/typeParameters/typeParameterLists/typeParameterDirectlyConstrainedToItself.ts(9,22): error TS2313: Type parameter 'T' has a circular constraint. +tests/cases/conformance/types/typeParameters/typeParameterLists/typeParameterDirectlyConstrainedToItself.ts(10,26): error TS2313: Type parameter 'U' has a circular constraint. +tests/cases/conformance/types/typeParameters/typeParameterLists/typeParameterDirectlyConstrainedToItself.ts(13,16): error TS2313: Type parameter 'T' has a circular constraint. +tests/cases/conformance/types/typeParameters/typeParameterLists/typeParameterDirectlyConstrainedToItself.ts(14,19): error TS2313: Type parameter 'U' has a circular constraint. +tests/cases/conformance/types/typeParameters/typeParameterLists/typeParameterDirectlyConstrainedToItself.ts(17,20): error TS2313: Type parameter 'T' has a circular constraint. +tests/cases/conformance/types/typeParameters/typeParameterLists/typeParameterDirectlyConstrainedToItself.ts(18,24): error TS2313: Type parameter 'U' has a circular constraint. ==== tests/cases/conformance/types/typeParameters/typeParameterLists/typeParameterDirectlyConstrainedToItself.ts (10 errors) ==== // all of the below should be errors class C { } - ~~~~~~~~~~~ -!!! error TS2313: Constraint of a type parameter cannot reference any type parameter from the same type parameter list. + ~ +!!! error TS2313: Type parameter 'T' has a circular constraint. class C2 { } - ~~~~~~~~~~~ -!!! error TS2313: Constraint of a type parameter cannot reference any type parameter from the same type parameter list. + ~ +!!! error TS2313: Type parameter 'U' has a circular constraint. interface I { } - ~~~~~~~~~~~ -!!! error TS2313: Constraint of a type parameter cannot reference any type parameter from the same type parameter list. + ~ +!!! error TS2313: Type parameter 'T' has a circular constraint. interface I2 { } - ~~~~~~~~~~~ -!!! error TS2313: Constraint of a type parameter cannot reference any type parameter from the same type parameter list. + ~ +!!! error TS2313: Type parameter 'U' has a circular constraint. function f() { } - ~~~~~~~~~~~ -!!! error TS2313: Constraint of a type parameter cannot reference any type parameter from the same type parameter list. + ~ +!!! error TS2313: Type parameter 'T' has a circular constraint. function f2() { } - ~~~~~~~~~~~ -!!! error TS2313: Constraint of a type parameter cannot reference any type parameter from the same type parameter list. + ~ +!!! error TS2313: Type parameter 'U' has a circular constraint. var a: { (): void; - ~~~~~~~~~~~ -!!! error TS2313: Constraint of a type parameter cannot reference any type parameter from the same type parameter list. + ~ +!!! error TS2313: Type parameter 'T' has a circular constraint. (): void; - ~~~~~~~~~~~ -!!! error TS2313: Constraint of a type parameter cannot reference any type parameter from the same type parameter list. + ~ +!!! error TS2313: Type parameter 'U' has a circular constraint. } var b = () => { } - ~~~~~~~~~~~ -!!! error TS2313: Constraint of a type parameter cannot reference any type parameter from the same type parameter list. + ~ +!!! error TS2313: Type parameter 'T' has a circular constraint. var b2 = () => { } - ~~~~~~~~~~~ -!!! error TS2313: Constraint of a type parameter cannot reference any type parameter from the same type parameter list. \ No newline at end of file + ~ +!!! error TS2313: Type parameter 'U' has a circular constraint. \ No newline at end of file diff --git a/tests/baselines/reference/typeParameterHasSelfAsConstraint.errors.txt b/tests/baselines/reference/typeParameterHasSelfAsConstraint.errors.txt index 409aa5ebfb6..b459534080f 100644 --- a/tests/baselines/reference/typeParameterHasSelfAsConstraint.errors.txt +++ b/tests/baselines/reference/typeParameterHasSelfAsConstraint.errors.txt @@ -1,11 +1,11 @@ -tests/cases/compiler/typeParameterHasSelfAsConstraint.ts(1,14): error TS2313: Constraint of a type parameter cannot reference any type parameter from the same type parameter list. +tests/cases/compiler/typeParameterHasSelfAsConstraint.ts(1,24): error TS2313: Type parameter 'T' has a circular constraint. tests/cases/compiler/typeParameterHasSelfAsConstraint.ts(2,12): error TS2322: Type 'T' is not assignable to type 'number'. ==== tests/cases/compiler/typeParameterHasSelfAsConstraint.ts (2 errors) ==== function foo(x: T): number { - ~~~~~~~~~~~ -!!! error TS2313: Constraint of a type parameter cannot reference any type parameter from the same type parameter list. + ~ +!!! error TS2313: Type parameter 'T' has a circular constraint. return x; ~ !!! error TS2322: Type 'T' is not assignable to type 'number'. diff --git a/tests/baselines/reference/typeParameterInConstraint1.errors.txt b/tests/baselines/reference/typeParameterInConstraint1.errors.txt deleted file mode 100644 index ee8e9dcf37f..00000000000 --- a/tests/baselines/reference/typeParameterInConstraint1.errors.txt +++ /dev/null @@ -1,8 +0,0 @@ -tests/cases/compiler/typeParameterInConstraint1.ts(1,12): error TS2313: Constraint of a type parameter cannot reference any type parameter from the same type parameter list. - - -==== tests/cases/compiler/typeParameterInConstraint1.ts (1 errors) ==== - class C { - ~~~~~~~~~~~ -!!! error TS2313: Constraint of a type parameter cannot reference any type parameter from the same type parameter list. - } \ No newline at end of file diff --git a/tests/baselines/reference/typeParameterInConstraint1.symbols b/tests/baselines/reference/typeParameterInConstraint1.symbols new file mode 100644 index 00000000000..284e73911cf --- /dev/null +++ b/tests/baselines/reference/typeParameterInConstraint1.symbols @@ -0,0 +1,7 @@ +=== tests/cases/compiler/typeParameterInConstraint1.ts === +class C { +>C : Symbol(C, Decl(typeParameterInConstraint1.ts, 0, 0)) +>T : Symbol(T, Decl(typeParameterInConstraint1.ts, 0, 8)) +>U : Symbol(U, Decl(typeParameterInConstraint1.ts, 0, 10)) +>T : Symbol(T, Decl(typeParameterInConstraint1.ts, 0, 8)) +} diff --git a/tests/baselines/reference/typeParameterInConstraint1.types b/tests/baselines/reference/typeParameterInConstraint1.types new file mode 100644 index 00000000000..5163f4a053c --- /dev/null +++ b/tests/baselines/reference/typeParameterInConstraint1.types @@ -0,0 +1,7 @@ +=== tests/cases/compiler/typeParameterInConstraint1.ts === +class C { +>C : C +>T : T +>U : U +>T : T +} diff --git a/tests/baselines/reference/typeParameterIndirectlyConstrainedToItself.errors.txt b/tests/baselines/reference/typeParameterIndirectlyConstrainedToItself.errors.txt index 2b969daf7ee..4cfa9da2133 100644 --- a/tests/baselines/reference/typeParameterIndirectlyConstrainedToItself.errors.txt +++ b/tests/baselines/reference/typeParameterIndirectlyConstrainedToItself.errors.txt @@ -1,105 +1,102 @@ -tests/cases/conformance/types/typeParameters/typeParameterLists/typeParameterIndirectlyConstrainedToItself.ts(1,9): error TS2313: Constraint of a type parameter cannot reference any type parameter from the same type parameter list. -tests/cases/conformance/types/typeParameters/typeParameterLists/typeParameterIndirectlyConstrainedToItself.ts(1,22): error TS2313: Constraint of a type parameter cannot reference any type parameter from the same type parameter list. -tests/cases/conformance/types/typeParameters/typeParameterLists/typeParameterIndirectlyConstrainedToItself.ts(2,10): error TS2313: Constraint of a type parameter cannot reference any type parameter from the same type parameter list. -tests/cases/conformance/types/typeParameters/typeParameterLists/typeParameterIndirectlyConstrainedToItself.ts(2,23): error TS2313: Constraint of a type parameter cannot reference any type parameter from the same type parameter list. -tests/cases/conformance/types/typeParameters/typeParameterLists/typeParameterIndirectlyConstrainedToItself.ts(2,36): error TS2313: Constraint of a type parameter cannot reference any type parameter from the same type parameter list. -tests/cases/conformance/types/typeParameters/typeParameterLists/typeParameterIndirectlyConstrainedToItself.ts(4,13): error TS2313: Constraint of a type parameter cannot reference any type parameter from the same type parameter list. -tests/cases/conformance/types/typeParameters/typeParameterLists/typeParameterIndirectlyConstrainedToItself.ts(4,26): error TS2313: Constraint of a type parameter cannot reference any type parameter from the same type parameter list. -tests/cases/conformance/types/typeParameters/typeParameterLists/typeParameterIndirectlyConstrainedToItself.ts(5,14): error TS2313: Constraint of a type parameter cannot reference any type parameter from the same type parameter list. -tests/cases/conformance/types/typeParameters/typeParameterLists/typeParameterIndirectlyConstrainedToItself.ts(5,27): error TS2313: Constraint of a type parameter cannot reference any type parameter from the same type parameter list. -tests/cases/conformance/types/typeParameters/typeParameterLists/typeParameterIndirectlyConstrainedToItself.ts(5,40): error TS2313: Constraint of a type parameter cannot reference any type parameter from the same type parameter list. -tests/cases/conformance/types/typeParameters/typeParameterLists/typeParameterIndirectlyConstrainedToItself.ts(7,12): error TS2313: Constraint of a type parameter cannot reference any type parameter from the same type parameter list. -tests/cases/conformance/types/typeParameters/typeParameterLists/typeParameterIndirectlyConstrainedToItself.ts(7,25): error TS2313: Constraint of a type parameter cannot reference any type parameter from the same type parameter list. -tests/cases/conformance/types/typeParameters/typeParameterLists/typeParameterIndirectlyConstrainedToItself.ts(8,13): error TS2313: Constraint of a type parameter cannot reference any type parameter from the same type parameter list. -tests/cases/conformance/types/typeParameters/typeParameterLists/typeParameterIndirectlyConstrainedToItself.ts(8,26): error TS2313: Constraint of a type parameter cannot reference any type parameter from the same type parameter list. -tests/cases/conformance/types/typeParameters/typeParameterLists/typeParameterIndirectlyConstrainedToItself.ts(8,39): error TS2313: Constraint of a type parameter cannot reference any type parameter from the same type parameter list. -tests/cases/conformance/types/typeParameters/typeParameterLists/typeParameterIndirectlyConstrainedToItself.ts(11,6): error TS2313: Constraint of a type parameter cannot reference any type parameter from the same type parameter list. -tests/cases/conformance/types/typeParameters/typeParameterLists/typeParameterIndirectlyConstrainedToItself.ts(11,19): error TS2313: Constraint of a type parameter cannot reference any type parameter from the same type parameter list. -tests/cases/conformance/types/typeParameters/typeParameterLists/typeParameterIndirectlyConstrainedToItself.ts(12,6): error TS2313: Constraint of a type parameter cannot reference any type parameter from the same type parameter list. -tests/cases/conformance/types/typeParameters/typeParameterLists/typeParameterIndirectlyConstrainedToItself.ts(12,19): error TS2313: Constraint of a type parameter cannot reference any type parameter from the same type parameter list. -tests/cases/conformance/types/typeParameters/typeParameterLists/typeParameterIndirectlyConstrainedToItself.ts(12,32): error TS2313: Constraint of a type parameter cannot reference any type parameter from the same type parameter list. -tests/cases/conformance/types/typeParameters/typeParameterLists/typeParameterIndirectlyConstrainedToItself.ts(15,10): error TS2313: Constraint of a type parameter cannot reference any type parameter from the same type parameter list. -tests/cases/conformance/types/typeParameters/typeParameterLists/typeParameterIndirectlyConstrainedToItself.ts(15,23): error TS2313: Constraint of a type parameter cannot reference any type parameter from the same type parameter list. -tests/cases/conformance/types/typeParameters/typeParameterLists/typeParameterIndirectlyConstrainedToItself.ts(16,11): error TS2313: Constraint of a type parameter cannot reference any type parameter from the same type parameter list. -tests/cases/conformance/types/typeParameters/typeParameterLists/typeParameterIndirectlyConstrainedToItself.ts(16,24): error TS2313: Constraint of a type parameter cannot reference any type parameter from the same type parameter list. -tests/cases/conformance/types/typeParameters/typeParameterLists/typeParameterIndirectlyConstrainedToItself.ts(16,37): error TS2313: Constraint of a type parameter cannot reference any type parameter from the same type parameter list. -tests/cases/conformance/types/typeParameters/typeParameterLists/typeParameterIndirectlyConstrainedToItself.ts(18,9): error TS2313: Constraint of a type parameter cannot reference any type parameter from the same type parameter list. -tests/cases/conformance/types/typeParameters/typeParameterLists/typeParameterIndirectlyConstrainedToItself.ts(18,22): error TS2313: Constraint of a type parameter cannot reference any type parameter from the same type parameter list. -tests/cases/conformance/types/typeParameters/typeParameterLists/typeParameterIndirectlyConstrainedToItself.ts(18,35): error TS2313: Constraint of a type parameter cannot reference any type parameter from the same type parameter list. +tests/cases/conformance/types/typeParameters/typeParameterLists/typeParameterIndirectlyConstrainedToItself.ts(1,19): error TS2313: Type parameter 'U' has a circular constraint. +tests/cases/conformance/types/typeParameters/typeParameterLists/typeParameterIndirectlyConstrainedToItself.ts(1,32): error TS2313: Type parameter 'T' has a circular constraint. +tests/cases/conformance/types/typeParameters/typeParameterLists/typeParameterIndirectlyConstrainedToItself.ts(2,20): error TS2313: Type parameter 'T' has a circular constraint. +tests/cases/conformance/types/typeParameters/typeParameterLists/typeParameterIndirectlyConstrainedToItself.ts(2,33): error TS2313: Type parameter 'U' has a circular constraint. +tests/cases/conformance/types/typeParameters/typeParameterLists/typeParameterIndirectlyConstrainedToItself.ts(2,46): error TS2313: Type parameter 'V' has a circular constraint. +tests/cases/conformance/types/typeParameters/typeParameterLists/typeParameterIndirectlyConstrainedToItself.ts(4,23): error TS2313: Type parameter 'U' has a circular constraint. +tests/cases/conformance/types/typeParameters/typeParameterLists/typeParameterIndirectlyConstrainedToItself.ts(4,36): error TS2313: Type parameter 'T' has a circular constraint. +tests/cases/conformance/types/typeParameters/typeParameterLists/typeParameterIndirectlyConstrainedToItself.ts(5,24): error TS2313: Type parameter 'T' has a circular constraint. +tests/cases/conformance/types/typeParameters/typeParameterLists/typeParameterIndirectlyConstrainedToItself.ts(5,37): error TS2313: Type parameter 'U' has a circular constraint. +tests/cases/conformance/types/typeParameters/typeParameterLists/typeParameterIndirectlyConstrainedToItself.ts(5,50): error TS2313: Type parameter 'V' has a circular constraint. +tests/cases/conformance/types/typeParameters/typeParameterLists/typeParameterIndirectlyConstrainedToItself.ts(7,22): error TS2313: Type parameter 'U' has a circular constraint. +tests/cases/conformance/types/typeParameters/typeParameterLists/typeParameterIndirectlyConstrainedToItself.ts(7,35): error TS2313: Type parameter 'T' has a circular constraint. +tests/cases/conformance/types/typeParameters/typeParameterLists/typeParameterIndirectlyConstrainedToItself.ts(8,23): error TS2313: Type parameter 'T' has a circular constraint. +tests/cases/conformance/types/typeParameters/typeParameterLists/typeParameterIndirectlyConstrainedToItself.ts(8,36): error TS2313: Type parameter 'U' has a circular constraint. +tests/cases/conformance/types/typeParameters/typeParameterLists/typeParameterIndirectlyConstrainedToItself.ts(8,49): error TS2313: Type parameter 'V' has a circular constraint. +tests/cases/conformance/types/typeParameters/typeParameterLists/typeParameterIndirectlyConstrainedToItself.ts(11,16): error TS2313: Type parameter 'U' has a circular constraint. +tests/cases/conformance/types/typeParameters/typeParameterLists/typeParameterIndirectlyConstrainedToItself.ts(11,29): error TS2313: Type parameter 'T' has a circular constraint. +tests/cases/conformance/types/typeParameters/typeParameterLists/typeParameterIndirectlyConstrainedToItself.ts(12,16): error TS2313: Type parameter 'T' has a circular constraint. +tests/cases/conformance/types/typeParameters/typeParameterLists/typeParameterIndirectlyConstrainedToItself.ts(12,29): error TS2313: Type parameter 'U' has a circular constraint. +tests/cases/conformance/types/typeParameters/typeParameterLists/typeParameterIndirectlyConstrainedToItself.ts(12,42): error TS2313: Type parameter 'V' has a circular constraint. +tests/cases/conformance/types/typeParameters/typeParameterLists/typeParameterIndirectlyConstrainedToItself.ts(15,20): error TS2313: Type parameter 'U' has a circular constraint. +tests/cases/conformance/types/typeParameters/typeParameterLists/typeParameterIndirectlyConstrainedToItself.ts(15,33): error TS2313: Type parameter 'T' has a circular constraint. +tests/cases/conformance/types/typeParameters/typeParameterLists/typeParameterIndirectlyConstrainedToItself.ts(16,21): error TS2313: Type parameter 'T' has a circular constraint. +tests/cases/conformance/types/typeParameters/typeParameterLists/typeParameterIndirectlyConstrainedToItself.ts(16,34): error TS2313: Type parameter 'U' has a circular constraint. +tests/cases/conformance/types/typeParameters/typeParameterLists/typeParameterIndirectlyConstrainedToItself.ts(16,47): error TS2313: Type parameter 'V' has a circular constraint. +tests/cases/conformance/types/typeParameters/typeParameterLists/typeParameterIndirectlyConstrainedToItself.ts(18,32): error TS2313: Type parameter 'T' has a circular constraint. +tests/cases/conformance/types/typeParameters/typeParameterLists/typeParameterIndirectlyConstrainedToItself.ts(18,45): error TS2313: Type parameter 'V' has a circular constraint. -==== tests/cases/conformance/types/typeParameters/typeParameterLists/typeParameterIndirectlyConstrainedToItself.ts (28 errors) ==== +==== tests/cases/conformance/types/typeParameters/typeParameterLists/typeParameterIndirectlyConstrainedToItself.ts (27 errors) ==== class C { } - ~~~~~~~~~~~ -!!! error TS2313: Constraint of a type parameter cannot reference any type parameter from the same type parameter list. - ~~~~~~~~~~~ -!!! error TS2313: Constraint of a type parameter cannot reference any type parameter from the same type parameter list. + ~ +!!! error TS2313: Type parameter 'U' has a circular constraint. + ~ +!!! error TS2313: Type parameter 'T' has a circular constraint. class C2 { } - ~~~~~~~~~~~ -!!! error TS2313: Constraint of a type parameter cannot reference any type parameter from the same type parameter list. - ~~~~~~~~~~~ -!!! error TS2313: Constraint of a type parameter cannot reference any type parameter from the same type parameter list. - ~~~~~~~~~~~ -!!! error TS2313: Constraint of a type parameter cannot reference any type parameter from the same type parameter list. + ~ +!!! error TS2313: Type parameter 'T' has a circular constraint. + ~ +!!! error TS2313: Type parameter 'U' has a circular constraint. + ~ +!!! error TS2313: Type parameter 'V' has a circular constraint. interface I { } - ~~~~~~~~~~~ -!!! error TS2313: Constraint of a type parameter cannot reference any type parameter from the same type parameter list. - ~~~~~~~~~~~ -!!! error TS2313: Constraint of a type parameter cannot reference any type parameter from the same type parameter list. + ~ +!!! error TS2313: Type parameter 'U' has a circular constraint. + ~ +!!! error TS2313: Type parameter 'T' has a circular constraint. interface I2 { } - ~~~~~~~~~~~ -!!! error TS2313: Constraint of a type parameter cannot reference any type parameter from the same type parameter list. - ~~~~~~~~~~~ -!!! error TS2313: Constraint of a type parameter cannot reference any type parameter from the same type parameter list. - ~~~~~~~~~~~ -!!! error TS2313: Constraint of a type parameter cannot reference any type parameter from the same type parameter list. + ~ +!!! error TS2313: Type parameter 'T' has a circular constraint. + ~ +!!! error TS2313: Type parameter 'U' has a circular constraint. + ~ +!!! error TS2313: Type parameter 'V' has a circular constraint. function f() { } - ~~~~~~~~~~~ -!!! error TS2313: Constraint of a type parameter cannot reference any type parameter from the same type parameter list. - ~~~~~~~~~~~ -!!! error TS2313: Constraint of a type parameter cannot reference any type parameter from the same type parameter list. + ~ +!!! error TS2313: Type parameter 'U' has a circular constraint. + ~ +!!! error TS2313: Type parameter 'T' has a circular constraint. function f2() { } - ~~~~~~~~~~~ -!!! error TS2313: Constraint of a type parameter cannot reference any type parameter from the same type parameter list. - ~~~~~~~~~~~ -!!! error TS2313: Constraint of a type parameter cannot reference any type parameter from the same type parameter list. - ~~~~~~~~~~~ -!!! error TS2313: Constraint of a type parameter cannot reference any type parameter from the same type parameter list. + ~ +!!! error TS2313: Type parameter 'T' has a circular constraint. + ~ +!!! error TS2313: Type parameter 'U' has a circular constraint. + ~ +!!! error TS2313: Type parameter 'V' has a circular constraint. var a: { (): void; - ~~~~~~~~~~~ -!!! error TS2313: Constraint of a type parameter cannot reference any type parameter from the same type parameter list. - ~~~~~~~~~~~ -!!! error TS2313: Constraint of a type parameter cannot reference any type parameter from the same type parameter list. + ~ +!!! error TS2313: Type parameter 'U' has a circular constraint. + ~ +!!! error TS2313: Type parameter 'T' has a circular constraint. (): void; - ~~~~~~~~~~~ -!!! error TS2313: Constraint of a type parameter cannot reference any type parameter from the same type parameter list. - ~~~~~~~~~~~ -!!! error TS2313: Constraint of a type parameter cannot reference any type parameter from the same type parameter list. - ~~~~~~~~~~~ -!!! error TS2313: Constraint of a type parameter cannot reference any type parameter from the same type parameter list. + ~ +!!! error TS2313: Type parameter 'T' has a circular constraint. + ~ +!!! error TS2313: Type parameter 'U' has a circular constraint. + ~ +!!! error TS2313: Type parameter 'V' has a circular constraint. } var b = () => { } - ~~~~~~~~~~~ -!!! error TS2313: Constraint of a type parameter cannot reference any type parameter from the same type parameter list. - ~~~~~~~~~~~ -!!! error TS2313: Constraint of a type parameter cannot reference any type parameter from the same type parameter list. + ~ +!!! error TS2313: Type parameter 'U' has a circular constraint. + ~ +!!! error TS2313: Type parameter 'T' has a circular constraint. var b2 = () => { } - ~~~~~~~~~~~ -!!! error TS2313: Constraint of a type parameter cannot reference any type parameter from the same type parameter list. - ~~~~~~~~~~~ -!!! error TS2313: Constraint of a type parameter cannot reference any type parameter from the same type parameter list. - ~~~~~~~~~~~ -!!! error TS2313: Constraint of a type parameter cannot reference any type parameter from the same type parameter list. + ~ +!!! error TS2313: Type parameter 'T' has a circular constraint. + ~ +!!! error TS2313: Type parameter 'U' has a circular constraint. + ~ +!!! error TS2313: Type parameter 'V' has a circular constraint. class D { } - ~~~~~~~~~~~ -!!! error TS2313: Constraint of a type parameter cannot reference any type parameter from the same type parameter list. - ~~~~~~~~~~~ -!!! error TS2313: Constraint of a type parameter cannot reference any type parameter from the same type parameter list. - ~~~~~~~~~~~ -!!! error TS2313: Constraint of a type parameter cannot reference any type parameter from the same type parameter list. \ No newline at end of file + ~ +!!! error TS2313: Type parameter 'T' has a circular constraint. + ~ +!!! error TS2313: Type parameter 'V' has a circular constraint. \ No newline at end of file diff --git a/tests/baselines/reference/typeParameterOrderReversal.errors.txt b/tests/baselines/reference/typeParameterOrderReversal.errors.txt deleted file mode 100644 index cb404c8e713..00000000000 --- a/tests/baselines/reference/typeParameterOrderReversal.errors.txt +++ /dev/null @@ -1,22 +0,0 @@ -tests/cases/compiler/typeParameterOrderReversal.ts(6,17): error TS2313: Constraint of a type parameter cannot reference any type parameter from the same type parameter list. -tests/cases/compiler/typeParameterOrderReversal.ts(7,20): error TS2313: Constraint of a type parameter cannot reference any type parameter from the same type parameter list. - - -==== tests/cases/compiler/typeParameterOrderReversal.ts (2 errors) ==== - interface X { - n: T; - } - - // Only difference here is order of type parameters - function uFirst, T>(x: U) { } - ~~~~~~~~~~~~~~ -!!! error TS2313: Constraint of a type parameter cannot reference any type parameter from the same type parameter list. - function tFirst>(x: U) { } - ~~~~~~~~~~~~~~ -!!! error TS2313: Constraint of a type parameter cannot reference any type parameter from the same type parameter list. - var z: X = null; - - // Both of these should be allowed - uFirst(z); - tFirst(z); - \ No newline at end of file diff --git a/tests/baselines/reference/typeParameterOrderReversal.symbols b/tests/baselines/reference/typeParameterOrderReversal.symbols new file mode 100644 index 00000000000..6b17ac1da55 --- /dev/null +++ b/tests/baselines/reference/typeParameterOrderReversal.symbols @@ -0,0 +1,42 @@ +=== tests/cases/compiler/typeParameterOrderReversal.ts === +interface X { +>X : Symbol(X, Decl(typeParameterOrderReversal.ts, 0, 0)) +>T : Symbol(T, Decl(typeParameterOrderReversal.ts, 0, 12)) + + n: T; +>n : Symbol(n, Decl(typeParameterOrderReversal.ts, 0, 16)) +>T : Symbol(T, Decl(typeParameterOrderReversal.ts, 0, 12)) +} + +// Only difference here is order of type parameters +function uFirst, T>(x: U) { } +>uFirst : Symbol(uFirst, Decl(typeParameterOrderReversal.ts, 2, 1)) +>U : Symbol(U, Decl(typeParameterOrderReversal.ts, 5, 16)) +>X : Symbol(X, Decl(typeParameterOrderReversal.ts, 0, 0)) +>T : Symbol(T, Decl(typeParameterOrderReversal.ts, 5, 31)) +>T : Symbol(T, Decl(typeParameterOrderReversal.ts, 5, 31)) +>x : Symbol(x, Decl(typeParameterOrderReversal.ts, 5, 35)) +>U : Symbol(U, Decl(typeParameterOrderReversal.ts, 5, 16)) + +function tFirst>(x: U) { } +>tFirst : Symbol(tFirst, Decl(typeParameterOrderReversal.ts, 5, 44)) +>T : Symbol(T, Decl(typeParameterOrderReversal.ts, 6, 16)) +>U : Symbol(U, Decl(typeParameterOrderReversal.ts, 6, 18)) +>X : Symbol(X, Decl(typeParameterOrderReversal.ts, 0, 0)) +>T : Symbol(T, Decl(typeParameterOrderReversal.ts, 6, 16)) +>x : Symbol(x, Decl(typeParameterOrderReversal.ts, 6, 35)) +>U : Symbol(U, Decl(typeParameterOrderReversal.ts, 6, 18)) + +var z: X = null; +>z : Symbol(z, Decl(typeParameterOrderReversal.ts, 7, 3)) +>X : Symbol(X, Decl(typeParameterOrderReversal.ts, 0, 0)) + +// Both of these should be allowed +uFirst(z); +>uFirst : Symbol(uFirst, Decl(typeParameterOrderReversal.ts, 2, 1)) +>z : Symbol(z, Decl(typeParameterOrderReversal.ts, 7, 3)) + +tFirst(z); +>tFirst : Symbol(tFirst, Decl(typeParameterOrderReversal.ts, 5, 44)) +>z : Symbol(z, Decl(typeParameterOrderReversal.ts, 7, 3)) + diff --git a/tests/baselines/reference/typeParameterOrderReversal.types b/tests/baselines/reference/typeParameterOrderReversal.types new file mode 100644 index 00000000000..9b09ea5d6c9 --- /dev/null +++ b/tests/baselines/reference/typeParameterOrderReversal.types @@ -0,0 +1,45 @@ +=== tests/cases/compiler/typeParameterOrderReversal.ts === +interface X { +>X : X +>T : T + + n: T; +>n : T +>T : T +} + +// Only difference here is order of type parameters +function uFirst, T>(x: U) { } +>uFirst : , T>(x: U) => void +>U : U +>X : X +>T : T +>T : T +>x : U +>U : U + +function tFirst>(x: U) { } +>tFirst : >(x: U) => void +>T : T +>U : U +>X : X +>T : T +>x : U +>U : U + +var z: X = null; +>z : X +>X : X +>null : null + +// Both of these should be allowed +uFirst(z); +>uFirst(z) : void +>uFirst : , T>(x: U) => void +>z : X + +tFirst(z); +>tFirst(z) : void +>tFirst : >(x: U) => void +>z : X + diff --git a/tests/baselines/reference/typeParameterUsedAsConstraint.errors.txt b/tests/baselines/reference/typeParameterUsedAsConstraint.errors.txt deleted file mode 100644 index c38900ca00c..00000000000 --- a/tests/baselines/reference/typeParameterUsedAsConstraint.errors.txt +++ /dev/null @@ -1,158 +0,0 @@ -tests/cases/conformance/types/typeParameters/typeParameterLists/typeParameterUsedAsConstraint.ts(1,12): error TS2313: Constraint of a type parameter cannot reference any type parameter from the same type parameter list. -tests/cases/conformance/types/typeParameters/typeParameterLists/typeParameterUsedAsConstraint.ts(2,10): error TS2313: Constraint of a type parameter cannot reference any type parameter from the same type parameter list. -tests/cases/conformance/types/typeParameters/typeParameterLists/typeParameterUsedAsConstraint.ts(3,26): error TS2313: Constraint of a type parameter cannot reference any type parameter from the same type parameter list. -tests/cases/conformance/types/typeParameters/typeParameterLists/typeParameterUsedAsConstraint.ts(4,10): error TS2313: Constraint of a type parameter cannot reference any type parameter from the same type parameter list. -tests/cases/conformance/types/typeParameters/typeParameterLists/typeParameterUsedAsConstraint.ts(5,10): error TS2313: Constraint of a type parameter cannot reference any type parameter from the same type parameter list. -tests/cases/conformance/types/typeParameters/typeParameterLists/typeParameterUsedAsConstraint.ts(5,23): error TS2313: Constraint of a type parameter cannot reference any type parameter from the same type parameter list. -tests/cases/conformance/types/typeParameters/typeParameterLists/typeParameterUsedAsConstraint.ts(6,13): error TS2313: Constraint of a type parameter cannot reference any type parameter from the same type parameter list. -tests/cases/conformance/types/typeParameters/typeParameterLists/typeParameterUsedAsConstraint.ts(6,26): error TS2313: Constraint of a type parameter cannot reference any type parameter from the same type parameter list. -tests/cases/conformance/types/typeParameters/typeParameterLists/typeParameterUsedAsConstraint.ts(8,16): error TS2313: Constraint of a type parameter cannot reference any type parameter from the same type parameter list. -tests/cases/conformance/types/typeParameters/typeParameterLists/typeParameterUsedAsConstraint.ts(9,14): error TS2313: Constraint of a type parameter cannot reference any type parameter from the same type parameter list. -tests/cases/conformance/types/typeParameters/typeParameterLists/typeParameterUsedAsConstraint.ts(10,30): error TS2313: Constraint of a type parameter cannot reference any type parameter from the same type parameter list. -tests/cases/conformance/types/typeParameters/typeParameterLists/typeParameterUsedAsConstraint.ts(11,14): error TS2313: Constraint of a type parameter cannot reference any type parameter from the same type parameter list. -tests/cases/conformance/types/typeParameters/typeParameterLists/typeParameterUsedAsConstraint.ts(12,14): error TS2313: Constraint of a type parameter cannot reference any type parameter from the same type parameter list. -tests/cases/conformance/types/typeParameters/typeParameterLists/typeParameterUsedAsConstraint.ts(12,27): error TS2313: Constraint of a type parameter cannot reference any type parameter from the same type parameter list. -tests/cases/conformance/types/typeParameters/typeParameterLists/typeParameterUsedAsConstraint.ts(13,17): error TS2313: Constraint of a type parameter cannot reference any type parameter from the same type parameter list. -tests/cases/conformance/types/typeParameters/typeParameterLists/typeParameterUsedAsConstraint.ts(13,30): error TS2313: Constraint of a type parameter cannot reference any type parameter from the same type parameter list. -tests/cases/conformance/types/typeParameters/typeParameterLists/typeParameterUsedAsConstraint.ts(15,15): error TS2313: Constraint of a type parameter cannot reference any type parameter from the same type parameter list. -tests/cases/conformance/types/typeParameters/typeParameterLists/typeParameterUsedAsConstraint.ts(16,13): error TS2313: Constraint of a type parameter cannot reference any type parameter from the same type parameter list. -tests/cases/conformance/types/typeParameters/typeParameterLists/typeParameterUsedAsConstraint.ts(17,29): error TS2313: Constraint of a type parameter cannot reference any type parameter from the same type parameter list. -tests/cases/conformance/types/typeParameters/typeParameterLists/typeParameterUsedAsConstraint.ts(18,13): error TS2313: Constraint of a type parameter cannot reference any type parameter from the same type parameter list. -tests/cases/conformance/types/typeParameters/typeParameterLists/typeParameterUsedAsConstraint.ts(19,13): error TS2313: Constraint of a type parameter cannot reference any type parameter from the same type parameter list. -tests/cases/conformance/types/typeParameters/typeParameterLists/typeParameterUsedAsConstraint.ts(19,26): error TS2313: Constraint of a type parameter cannot reference any type parameter from the same type parameter list. -tests/cases/conformance/types/typeParameters/typeParameterLists/typeParameterUsedAsConstraint.ts(20,16): error TS2313: Constraint of a type parameter cannot reference any type parameter from the same type parameter list. -tests/cases/conformance/types/typeParameters/typeParameterLists/typeParameterUsedAsConstraint.ts(20,29): error TS2313: Constraint of a type parameter cannot reference any type parameter from the same type parameter list. -tests/cases/conformance/types/typeParameters/typeParameterLists/typeParameterUsedAsConstraint.ts(22,13): error TS2313: Constraint of a type parameter cannot reference any type parameter from the same type parameter list. -tests/cases/conformance/types/typeParameters/typeParameterLists/typeParameterUsedAsConstraint.ts(23,11): error TS2313: Constraint of a type parameter cannot reference any type parameter from the same type parameter list. -tests/cases/conformance/types/typeParameters/typeParameterLists/typeParameterUsedAsConstraint.ts(24,27): error TS2313: Constraint of a type parameter cannot reference any type parameter from the same type parameter list. -tests/cases/conformance/types/typeParameters/typeParameterLists/typeParameterUsedAsConstraint.ts(25,11): error TS2313: Constraint of a type parameter cannot reference any type parameter from the same type parameter list. -tests/cases/conformance/types/typeParameters/typeParameterLists/typeParameterUsedAsConstraint.ts(26,11): error TS2313: Constraint of a type parameter cannot reference any type parameter from the same type parameter list. -tests/cases/conformance/types/typeParameters/typeParameterLists/typeParameterUsedAsConstraint.ts(26,24): error TS2313: Constraint of a type parameter cannot reference any type parameter from the same type parameter list. -tests/cases/conformance/types/typeParameters/typeParameterLists/typeParameterUsedAsConstraint.ts(27,14): error TS2313: Constraint of a type parameter cannot reference any type parameter from the same type parameter list. -tests/cases/conformance/types/typeParameters/typeParameterLists/typeParameterUsedAsConstraint.ts(27,27): error TS2313: Constraint of a type parameter cannot reference any type parameter from the same type parameter list. -tests/cases/conformance/types/typeParameters/typeParameterLists/typeParameterUsedAsConstraint.ts(29,14): error TS2313: Constraint of a type parameter cannot reference any type parameter from the same type parameter list. -tests/cases/conformance/types/typeParameters/typeParameterLists/typeParameterUsedAsConstraint.ts(30,12): error TS2313: Constraint of a type parameter cannot reference any type parameter from the same type parameter list. -tests/cases/conformance/types/typeParameters/typeParameterLists/typeParameterUsedAsConstraint.ts(31,28): error TS2313: Constraint of a type parameter cannot reference any type parameter from the same type parameter list. -tests/cases/conformance/types/typeParameters/typeParameterLists/typeParameterUsedAsConstraint.ts(32,12): error TS2313: Constraint of a type parameter cannot reference any type parameter from the same type parameter list. -tests/cases/conformance/types/typeParameters/typeParameterLists/typeParameterUsedAsConstraint.ts(33,12): error TS2313: Constraint of a type parameter cannot reference any type parameter from the same type parameter list. -tests/cases/conformance/types/typeParameters/typeParameterLists/typeParameterUsedAsConstraint.ts(33,25): error TS2313: Constraint of a type parameter cannot reference any type parameter from the same type parameter list. -tests/cases/conformance/types/typeParameters/typeParameterLists/typeParameterUsedAsConstraint.ts(34,15): error TS2313: Constraint of a type parameter cannot reference any type parameter from the same type parameter list. -tests/cases/conformance/types/typeParameters/typeParameterLists/typeParameterUsedAsConstraint.ts(34,28): error TS2313: Constraint of a type parameter cannot reference any type parameter from the same type parameter list. - - -==== tests/cases/conformance/types/typeParameters/typeParameterLists/typeParameterUsedAsConstraint.ts (40 errors) ==== - class C { } - ~~~~~~~~~~~ -!!! error TS2313: Constraint of a type parameter cannot reference any type parameter from the same type parameter list. - class C2 { } - ~~~~~~~~~~~ -!!! error TS2313: Constraint of a type parameter cannot reference any type parameter from the same type parameter list. - class C3 { } - ~~~~~~~~~~~ -!!! error TS2313: Constraint of a type parameter cannot reference any type parameter from the same type parameter list. - class C4 { } - ~~~~~~~~~~~ -!!! error TS2313: Constraint of a type parameter cannot reference any type parameter from the same type parameter list. - class C5 { } - ~~~~~~~~~~~ -!!! error TS2313: Constraint of a type parameter cannot reference any type parameter from the same type parameter list. - ~~~~~~~~~~~ -!!! error TS2313: Constraint of a type parameter cannot reference any type parameter from the same type parameter list. - class C6 { } - ~~~~~~~~~~~ -!!! error TS2313: Constraint of a type parameter cannot reference any type parameter from the same type parameter list. - ~~~~~~~~~~~ -!!! error TS2313: Constraint of a type parameter cannot reference any type parameter from the same type parameter list. - - interface I { } - ~~~~~~~~~~~ -!!! error TS2313: Constraint of a type parameter cannot reference any type parameter from the same type parameter list. - interface I2 { } - ~~~~~~~~~~~ -!!! error TS2313: Constraint of a type parameter cannot reference any type parameter from the same type parameter list. - interface I3 { } - ~~~~~~~~~~~ -!!! error TS2313: Constraint of a type parameter cannot reference any type parameter from the same type parameter list. - interface I4 { } - ~~~~~~~~~~~ -!!! error TS2313: Constraint of a type parameter cannot reference any type parameter from the same type parameter list. - interface I5 { } - ~~~~~~~~~~~ -!!! error TS2313: Constraint of a type parameter cannot reference any type parameter from the same type parameter list. - ~~~~~~~~~~~ -!!! error TS2313: Constraint of a type parameter cannot reference any type parameter from the same type parameter list. - interface I6 { } - ~~~~~~~~~~~ -!!! error TS2313: Constraint of a type parameter cannot reference any type parameter from the same type parameter list. - ~~~~~~~~~~~ -!!! error TS2313: Constraint of a type parameter cannot reference any type parameter from the same type parameter list. - - function f() { } - ~~~~~~~~~~~ -!!! error TS2313: Constraint of a type parameter cannot reference any type parameter from the same type parameter list. - function f2() { } - ~~~~~~~~~~~ -!!! error TS2313: Constraint of a type parameter cannot reference any type parameter from the same type parameter list. - function f3() { } - ~~~~~~~~~~~ -!!! error TS2313: Constraint of a type parameter cannot reference any type parameter from the same type parameter list. - function f4() { } - ~~~~~~~~~~~ -!!! error TS2313: Constraint of a type parameter cannot reference any type parameter from the same type parameter list. - function f5() { } - ~~~~~~~~~~~ -!!! error TS2313: Constraint of a type parameter cannot reference any type parameter from the same type parameter list. - ~~~~~~~~~~~ -!!! error TS2313: Constraint of a type parameter cannot reference any type parameter from the same type parameter list. - function f6() { } - ~~~~~~~~~~~ -!!! error TS2313: Constraint of a type parameter cannot reference any type parameter from the same type parameter list. - ~~~~~~~~~~~ -!!! error TS2313: Constraint of a type parameter cannot reference any type parameter from the same type parameter list. - - var e = () => { } - ~~~~~~~~~~~ -!!! error TS2313: Constraint of a type parameter cannot reference any type parameter from the same type parameter list. - var e2 = () => { } - ~~~~~~~~~~~ -!!! error TS2313: Constraint of a type parameter cannot reference any type parameter from the same type parameter list. - var e3 = () => { } - ~~~~~~~~~~~ -!!! error TS2313: Constraint of a type parameter cannot reference any type parameter from the same type parameter list. - var e4 = () => { } - ~~~~~~~~~~~ -!!! error TS2313: Constraint of a type parameter cannot reference any type parameter from the same type parameter list. - var e5 = () => { } - ~~~~~~~~~~~ -!!! error TS2313: Constraint of a type parameter cannot reference any type parameter from the same type parameter list. - ~~~~~~~~~~~ -!!! error TS2313: Constraint of a type parameter cannot reference any type parameter from the same type parameter list. - var e6 = () => { } - ~~~~~~~~~~~ -!!! error TS2313: Constraint of a type parameter cannot reference any type parameter from the same type parameter list. - ~~~~~~~~~~~ -!!! error TS2313: Constraint of a type parameter cannot reference any type parameter from the same type parameter list. - - var a: { (): void } - ~~~~~~~~~~~ -!!! error TS2313: Constraint of a type parameter cannot reference any type parameter from the same type parameter list. - var a2: { (): void } - ~~~~~~~~~~~ -!!! error TS2313: Constraint of a type parameter cannot reference any type parameter from the same type parameter list. - var a3: { (): void } - ~~~~~~~~~~~ -!!! error TS2313: Constraint of a type parameter cannot reference any type parameter from the same type parameter list. - var a4: { (): void } - ~~~~~~~~~~~ -!!! error TS2313: Constraint of a type parameter cannot reference any type parameter from the same type parameter list. - var a5: { (): void } - ~~~~~~~~~~~ -!!! error TS2313: Constraint of a type parameter cannot reference any type parameter from the same type parameter list. - ~~~~~~~~~~~ -!!! error TS2313: Constraint of a type parameter cannot reference any type parameter from the same type parameter list. - var a6: { (): void } - ~~~~~~~~~~~ -!!! error TS2313: Constraint of a type parameter cannot reference any type parameter from the same type parameter list. - ~~~~~~~~~~~ -!!! error TS2313: Constraint of a type parameter cannot reference any type parameter from the same type parameter list. - \ No newline at end of file diff --git a/tests/baselines/reference/typeParameterUsedAsConstraint.symbols b/tests/baselines/reference/typeParameterUsedAsConstraint.symbols new file mode 100644 index 00000000000..0b031742e75 --- /dev/null +++ b/tests/baselines/reference/typeParameterUsedAsConstraint.symbols @@ -0,0 +1,211 @@ +=== tests/cases/conformance/types/typeParameters/typeParameterLists/typeParameterUsedAsConstraint.ts === +class C { } +>C : Symbol(C, Decl(typeParameterUsedAsConstraint.ts, 0, 0)) +>T : Symbol(T, Decl(typeParameterUsedAsConstraint.ts, 0, 8)) +>U : Symbol(U, Decl(typeParameterUsedAsConstraint.ts, 0, 10)) +>T : Symbol(T, Decl(typeParameterUsedAsConstraint.ts, 0, 8)) + +class C2 { } +>C2 : Symbol(C2, Decl(typeParameterUsedAsConstraint.ts, 0, 27)) +>T : Symbol(T, Decl(typeParameterUsedAsConstraint.ts, 1, 9)) +>U : Symbol(U, Decl(typeParameterUsedAsConstraint.ts, 1, 21)) +>U : Symbol(U, Decl(typeParameterUsedAsConstraint.ts, 1, 21)) + +class C3 { } +>C3 : Symbol(C3, Decl(typeParameterUsedAsConstraint.ts, 1, 28)) +>T : Symbol(T, Decl(typeParameterUsedAsConstraint.ts, 2, 9)) +>Date : Symbol(Date, Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --)) +>U : Symbol(U, Decl(typeParameterUsedAsConstraint.ts, 2, 24)) +>T : Symbol(T, Decl(typeParameterUsedAsConstraint.ts, 2, 9)) + +class C4 { } +>C4 : Symbol(C4, Decl(typeParameterUsedAsConstraint.ts, 2, 41)) +>T : Symbol(T, Decl(typeParameterUsedAsConstraint.ts, 3, 9)) +>U : Symbol(U, Decl(typeParameterUsedAsConstraint.ts, 3, 21)) +>U : Symbol(U, Decl(typeParameterUsedAsConstraint.ts, 3, 21)) +>Date : Symbol(Date, Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --)) + +class C5 { } +>C5 : Symbol(C5, Decl(typeParameterUsedAsConstraint.ts, 3, 41)) +>T : Symbol(T, Decl(typeParameterUsedAsConstraint.ts, 4, 9)) +>U : Symbol(U, Decl(typeParameterUsedAsConstraint.ts, 4, 21)) +>U : Symbol(U, Decl(typeParameterUsedAsConstraint.ts, 4, 21)) +>V : Symbol(V, Decl(typeParameterUsedAsConstraint.ts, 4, 34)) +>V : Symbol(V, Decl(typeParameterUsedAsConstraint.ts, 4, 34)) + +class C6 { } +>C6 : Symbol(C6, Decl(typeParameterUsedAsConstraint.ts, 4, 41)) +>T : Symbol(T, Decl(typeParameterUsedAsConstraint.ts, 5, 9)) +>U : Symbol(U, Decl(typeParameterUsedAsConstraint.ts, 5, 11)) +>T : Symbol(T, Decl(typeParameterUsedAsConstraint.ts, 5, 9)) +>V : Symbol(V, Decl(typeParameterUsedAsConstraint.ts, 5, 24)) +>U : Symbol(U, Decl(typeParameterUsedAsConstraint.ts, 5, 11)) + +interface I { } +>I : Symbol(I, Decl(typeParameterUsedAsConstraint.ts, 5, 41)) +>T : Symbol(T, Decl(typeParameterUsedAsConstraint.ts, 7, 12)) +>U : Symbol(U, Decl(typeParameterUsedAsConstraint.ts, 7, 14)) +>T : Symbol(T, Decl(typeParameterUsedAsConstraint.ts, 7, 12)) + +interface I2 { } +>I2 : Symbol(I2, Decl(typeParameterUsedAsConstraint.ts, 7, 31)) +>T : Symbol(T, Decl(typeParameterUsedAsConstraint.ts, 8, 13)) +>U : Symbol(U, Decl(typeParameterUsedAsConstraint.ts, 8, 25)) +>U : Symbol(U, Decl(typeParameterUsedAsConstraint.ts, 8, 25)) + +interface I3 { } +>I3 : Symbol(I3, Decl(typeParameterUsedAsConstraint.ts, 8, 32)) +>T : Symbol(T, Decl(typeParameterUsedAsConstraint.ts, 9, 13)) +>Date : Symbol(Date, Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --)) +>U : Symbol(U, Decl(typeParameterUsedAsConstraint.ts, 9, 28)) +>T : Symbol(T, Decl(typeParameterUsedAsConstraint.ts, 9, 13)) + +interface I4 { } +>I4 : Symbol(I4, Decl(typeParameterUsedAsConstraint.ts, 9, 45)) +>T : Symbol(T, Decl(typeParameterUsedAsConstraint.ts, 10, 13)) +>U : Symbol(U, Decl(typeParameterUsedAsConstraint.ts, 10, 25)) +>U : Symbol(U, Decl(typeParameterUsedAsConstraint.ts, 10, 25)) +>Date : Symbol(Date, Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --)) + +interface I5 { } +>I5 : Symbol(I5, Decl(typeParameterUsedAsConstraint.ts, 10, 45)) +>T : Symbol(T, Decl(typeParameterUsedAsConstraint.ts, 11, 13)) +>U : Symbol(U, Decl(typeParameterUsedAsConstraint.ts, 11, 25)) +>U : Symbol(U, Decl(typeParameterUsedAsConstraint.ts, 11, 25)) +>V : Symbol(V, Decl(typeParameterUsedAsConstraint.ts, 11, 38)) +>V : Symbol(V, Decl(typeParameterUsedAsConstraint.ts, 11, 38)) + +interface I6 { } +>I6 : Symbol(I6, Decl(typeParameterUsedAsConstraint.ts, 11, 45)) +>T : Symbol(T, Decl(typeParameterUsedAsConstraint.ts, 12, 13)) +>U : Symbol(U, Decl(typeParameterUsedAsConstraint.ts, 12, 15)) +>T : Symbol(T, Decl(typeParameterUsedAsConstraint.ts, 12, 13)) +>V : Symbol(V, Decl(typeParameterUsedAsConstraint.ts, 12, 28)) +>U : Symbol(U, Decl(typeParameterUsedAsConstraint.ts, 12, 15)) + +function f() { } +>f : Symbol(f, Decl(typeParameterUsedAsConstraint.ts, 12, 45)) +>T : Symbol(T, Decl(typeParameterUsedAsConstraint.ts, 14, 11)) +>U : Symbol(U, Decl(typeParameterUsedAsConstraint.ts, 14, 13)) +>T : Symbol(T, Decl(typeParameterUsedAsConstraint.ts, 14, 11)) + +function f2() { } +>f2 : Symbol(f2, Decl(typeParameterUsedAsConstraint.ts, 14, 32)) +>T : Symbol(T, Decl(typeParameterUsedAsConstraint.ts, 15, 12)) +>U : Symbol(U, Decl(typeParameterUsedAsConstraint.ts, 15, 24)) +>U : Symbol(U, Decl(typeParameterUsedAsConstraint.ts, 15, 24)) + +function f3() { } +>f3 : Symbol(f3, Decl(typeParameterUsedAsConstraint.ts, 15, 33)) +>T : Symbol(T, Decl(typeParameterUsedAsConstraint.ts, 16, 12)) +>Date : Symbol(Date, Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --)) +>U : Symbol(U, Decl(typeParameterUsedAsConstraint.ts, 16, 27)) +>T : Symbol(T, Decl(typeParameterUsedAsConstraint.ts, 16, 12)) + +function f4() { } +>f4 : Symbol(f4, Decl(typeParameterUsedAsConstraint.ts, 16, 46)) +>T : Symbol(T, Decl(typeParameterUsedAsConstraint.ts, 17, 12)) +>U : Symbol(U, Decl(typeParameterUsedAsConstraint.ts, 17, 24)) +>U : Symbol(U, Decl(typeParameterUsedAsConstraint.ts, 17, 24)) +>Date : Symbol(Date, Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --)) + +function f5() { } +>f5 : Symbol(f5, Decl(typeParameterUsedAsConstraint.ts, 17, 46)) +>T : Symbol(T, Decl(typeParameterUsedAsConstraint.ts, 18, 12)) +>U : Symbol(U, Decl(typeParameterUsedAsConstraint.ts, 18, 24)) +>U : Symbol(U, Decl(typeParameterUsedAsConstraint.ts, 18, 24)) +>V : Symbol(V, Decl(typeParameterUsedAsConstraint.ts, 18, 37)) +>V : Symbol(V, Decl(typeParameterUsedAsConstraint.ts, 18, 37)) + +function f6() { } +>f6 : Symbol(f6, Decl(typeParameterUsedAsConstraint.ts, 18, 46)) +>T : Symbol(T, Decl(typeParameterUsedAsConstraint.ts, 19, 12)) +>U : Symbol(U, Decl(typeParameterUsedAsConstraint.ts, 19, 14)) +>T : Symbol(T, Decl(typeParameterUsedAsConstraint.ts, 19, 12)) +>V : Symbol(V, Decl(typeParameterUsedAsConstraint.ts, 19, 27)) +>U : Symbol(U, Decl(typeParameterUsedAsConstraint.ts, 19, 14)) + +var e = () => { } +>e : Symbol(e, Decl(typeParameterUsedAsConstraint.ts, 21, 3)) +>T : Symbol(T, Decl(typeParameterUsedAsConstraint.ts, 21, 9)) +>U : Symbol(U, Decl(typeParameterUsedAsConstraint.ts, 21, 11)) +>T : Symbol(T, Decl(typeParameterUsedAsConstraint.ts, 21, 9)) + +var e2 = () => { } +>e2 : Symbol(e2, Decl(typeParameterUsedAsConstraint.ts, 22, 3)) +>T : Symbol(T, Decl(typeParameterUsedAsConstraint.ts, 22, 10)) +>U : Symbol(U, Decl(typeParameterUsedAsConstraint.ts, 22, 22)) +>U : Symbol(U, Decl(typeParameterUsedAsConstraint.ts, 22, 22)) + +var e3 = () => { } +>e3 : Symbol(e3, Decl(typeParameterUsedAsConstraint.ts, 23, 3)) +>T : Symbol(T, Decl(typeParameterUsedAsConstraint.ts, 23, 10)) +>Date : Symbol(Date, Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --)) +>U : Symbol(U, Decl(typeParameterUsedAsConstraint.ts, 23, 25)) +>T : Symbol(T, Decl(typeParameterUsedAsConstraint.ts, 23, 10)) + +var e4 = () => { } +>e4 : Symbol(e4, Decl(typeParameterUsedAsConstraint.ts, 24, 3)) +>T : Symbol(T, Decl(typeParameterUsedAsConstraint.ts, 24, 10)) +>U : Symbol(U, Decl(typeParameterUsedAsConstraint.ts, 24, 22)) +>U : Symbol(U, Decl(typeParameterUsedAsConstraint.ts, 24, 22)) +>Date : Symbol(Date, Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --)) + +var e5 = () => { } +>e5 : Symbol(e5, Decl(typeParameterUsedAsConstraint.ts, 25, 3)) +>T : Symbol(T, Decl(typeParameterUsedAsConstraint.ts, 25, 10)) +>U : Symbol(U, Decl(typeParameterUsedAsConstraint.ts, 25, 22)) +>U : Symbol(U, Decl(typeParameterUsedAsConstraint.ts, 25, 22)) +>V : Symbol(V, Decl(typeParameterUsedAsConstraint.ts, 25, 35)) +>V : Symbol(V, Decl(typeParameterUsedAsConstraint.ts, 25, 35)) + +var e6 = () => { } +>e6 : Symbol(e6, Decl(typeParameterUsedAsConstraint.ts, 26, 3)) +>T : Symbol(T, Decl(typeParameterUsedAsConstraint.ts, 26, 10)) +>U : Symbol(U, Decl(typeParameterUsedAsConstraint.ts, 26, 12)) +>T : Symbol(T, Decl(typeParameterUsedAsConstraint.ts, 26, 10)) +>V : Symbol(V, Decl(typeParameterUsedAsConstraint.ts, 26, 25)) +>U : Symbol(U, Decl(typeParameterUsedAsConstraint.ts, 26, 12)) + +var a: { (): void } +>a : Symbol(a, Decl(typeParameterUsedAsConstraint.ts, 28, 3)) +>T : Symbol(T, Decl(typeParameterUsedAsConstraint.ts, 28, 10)) +>U : Symbol(U, Decl(typeParameterUsedAsConstraint.ts, 28, 12)) +>T : Symbol(T, Decl(typeParameterUsedAsConstraint.ts, 28, 10)) + +var a2: { (): void } +>a2 : Symbol(a2, Decl(typeParameterUsedAsConstraint.ts, 29, 3)) +>T : Symbol(T, Decl(typeParameterUsedAsConstraint.ts, 29, 11)) +>U : Symbol(U, Decl(typeParameterUsedAsConstraint.ts, 29, 23)) +>U : Symbol(U, Decl(typeParameterUsedAsConstraint.ts, 29, 23)) + +var a3: { (): void } +>a3 : Symbol(a3, Decl(typeParameterUsedAsConstraint.ts, 30, 3)) +>T : Symbol(T, Decl(typeParameterUsedAsConstraint.ts, 30, 11)) +>Date : Symbol(Date, Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --)) +>U : Symbol(U, Decl(typeParameterUsedAsConstraint.ts, 30, 26)) +>T : Symbol(T, Decl(typeParameterUsedAsConstraint.ts, 30, 11)) + +var a4: { (): void } +>a4 : Symbol(a4, Decl(typeParameterUsedAsConstraint.ts, 31, 3)) +>T : Symbol(T, Decl(typeParameterUsedAsConstraint.ts, 31, 11)) +>U : Symbol(U, Decl(typeParameterUsedAsConstraint.ts, 31, 23)) +>U : Symbol(U, Decl(typeParameterUsedAsConstraint.ts, 31, 23)) +>Date : Symbol(Date, Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --)) + +var a5: { (): void } +>a5 : Symbol(a5, Decl(typeParameterUsedAsConstraint.ts, 32, 3)) +>T : Symbol(T, Decl(typeParameterUsedAsConstraint.ts, 32, 11)) +>U : Symbol(U, Decl(typeParameterUsedAsConstraint.ts, 32, 23)) +>U : Symbol(U, Decl(typeParameterUsedAsConstraint.ts, 32, 23)) +>V : Symbol(V, Decl(typeParameterUsedAsConstraint.ts, 32, 36)) +>V : Symbol(V, Decl(typeParameterUsedAsConstraint.ts, 32, 36)) + +var a6: { (): void } +>a6 : Symbol(a6, Decl(typeParameterUsedAsConstraint.ts, 33, 3)) +>T : Symbol(T, Decl(typeParameterUsedAsConstraint.ts, 33, 11)) +>U : Symbol(U, Decl(typeParameterUsedAsConstraint.ts, 33, 13)) +>T : Symbol(T, Decl(typeParameterUsedAsConstraint.ts, 33, 11)) +>V : Symbol(V, Decl(typeParameterUsedAsConstraint.ts, 33, 26)) +>U : Symbol(U, Decl(typeParameterUsedAsConstraint.ts, 33, 13)) + diff --git a/tests/baselines/reference/typeParameterUsedAsConstraint.types b/tests/baselines/reference/typeParameterUsedAsConstraint.types new file mode 100644 index 00000000000..347eeed9009 --- /dev/null +++ b/tests/baselines/reference/typeParameterUsedAsConstraint.types @@ -0,0 +1,217 @@ +=== tests/cases/conformance/types/typeParameters/typeParameterLists/typeParameterUsedAsConstraint.ts === +class C { } +>C : C +>T : T +>U : U +>T : T + +class C2 { } +>C2 : C2 +>T : T +>U : U +>U : U + +class C3 { } +>C3 : C3 +>T : T +>Date : Date +>U : U +>T : T + +class C4 { } +>C4 : C4 +>T : T +>U : U +>U : U +>Date : Date + +class C5 { } +>C5 : C5 +>T : T +>U : U +>U : U +>V : V +>V : V + +class C6 { } +>C6 : C6 +>T : T +>U : U +>T : T +>V : V +>U : U + +interface I { } +>I : I +>T : T +>U : U +>T : T + +interface I2 { } +>I2 : I2 +>T : T +>U : U +>U : U + +interface I3 { } +>I3 : I3 +>T : T +>Date : Date +>U : U +>T : T + +interface I4 { } +>I4 : I4 +>T : T +>U : U +>U : U +>Date : Date + +interface I5 { } +>I5 : I5 +>T : T +>U : U +>U : U +>V : V +>V : V + +interface I6 { } +>I6 : I6 +>T : T +>U : U +>T : T +>V : V +>U : U + +function f() { } +>f : () => void +>T : T +>U : U +>T : T + +function f2() { } +>f2 : () => void +>T : T +>U : U +>U : U + +function f3() { } +>f3 : () => void +>T : T +>Date : Date +>U : U +>T : T + +function f4() { } +>f4 : () => void +>T : T +>U : U +>U : U +>Date : Date + +function f5() { } +>f5 : () => void +>T : T +>U : U +>U : U +>V : V +>V : V + +function f6() { } +>f6 : () => void +>T : T +>U : U +>T : T +>V : V +>U : U + +var e = () => { } +>e : () => void +>() => { } : () => void +>T : T +>U : U +>T : T + +var e2 = () => { } +>e2 : () => void +>() => { } : () => void +>T : T +>U : U +>U : U + +var e3 = () => { } +>e3 : () => void +>() => { } : () => void +>T : T +>Date : Date +>U : U +>T : T + +var e4 = () => { } +>e4 : () => void +>() => { } : () => void +>T : T +>U : U +>U : U +>Date : Date + +var e5 = () => { } +>e5 : () => void +>() => { } : () => void +>T : T +>U : U +>U : U +>V : V +>V : V + +var e6 = () => { } +>e6 : () => void +>() => { } : () => void +>T : T +>U : U +>T : T +>V : V +>U : U + +var a: { (): void } +>a : () => void +>T : T +>U : U +>T : T + +var a2: { (): void } +>a2 : () => void +>T : T +>U : U +>U : U + +var a3: { (): void } +>a3 : () => void +>T : T +>Date : Date +>U : U +>T : T + +var a4: { (): void } +>a4 : () => void +>T : T +>U : U +>U : U +>Date : Date + +var a5: { (): void } +>a5 : () => void +>T : T +>U : U +>U : U +>V : V +>V : V + +var a6: { (): void } +>a6 : () => void +>T : T +>U : U +>T : T +>V : V +>U : U + diff --git a/tests/baselines/reference/typeParameterUsedAsTypeParameterConstraint.errors.txt b/tests/baselines/reference/typeParameterUsedAsTypeParameterConstraint.errors.txt deleted file mode 100644 index 9860b9ac59f..00000000000 --- a/tests/baselines/reference/typeParameterUsedAsTypeParameterConstraint.errors.txt +++ /dev/null @@ -1,88 +0,0 @@ -tests/cases/conformance/types/objectTypeLiteral/callSignatures/typeParameterUsedAsTypeParameterConstraint.ts(3,17): error TS2313: Constraint of a type parameter cannot reference any type parameter from the same type parameter list. -tests/cases/conformance/types/objectTypeLiteral/callSignatures/typeParameterUsedAsTypeParameterConstraint.ts(4,5): error TS2322: Type 'U' is not assignable to type 'T'. -tests/cases/conformance/types/objectTypeLiteral/callSignatures/typeParameterUsedAsTypeParameterConstraint.ts(5,12): error TS2322: Type 'U' is not assignable to type 'T'. -tests/cases/conformance/types/objectTypeLiteral/callSignatures/typeParameterUsedAsTypeParameterConstraint.ts(8,15): error TS2313: Constraint of a type parameter cannot reference any type parameter from the same type parameter list. -tests/cases/conformance/types/objectTypeLiteral/callSignatures/typeParameterUsedAsTypeParameterConstraint.ts(9,5): error TS2322: Type 'U' is not assignable to type 'T'. -tests/cases/conformance/types/objectTypeLiteral/callSignatures/typeParameterUsedAsTypeParameterConstraint.ts(10,12): error TS2322: Type 'U' is not assignable to type 'T'. -tests/cases/conformance/types/objectTypeLiteral/callSignatures/typeParameterUsedAsTypeParameterConstraint.ts(13,22): error TS2313: Constraint of a type parameter cannot reference any type parameter from the same type parameter list. -tests/cases/conformance/types/objectTypeLiteral/callSignatures/typeParameterUsedAsTypeParameterConstraint.ts(14,5): error TS2322: Type 'U' is not assignable to type 'T'. -tests/cases/conformance/types/objectTypeLiteral/callSignatures/typeParameterUsedAsTypeParameterConstraint.ts(15,12): error TS2322: Type 'U' is not assignable to type 'T'. -tests/cases/conformance/types/objectTypeLiteral/callSignatures/typeParameterUsedAsTypeParameterConstraint.ts(18,20): error TS2313: Constraint of a type parameter cannot reference any type parameter from the same type parameter list. -tests/cases/conformance/types/objectTypeLiteral/callSignatures/typeParameterUsedAsTypeParameterConstraint.ts(19,5): error TS2322: Type 'U' is not assignable to type 'T'. -tests/cases/conformance/types/objectTypeLiteral/callSignatures/typeParameterUsedAsTypeParameterConstraint.ts(20,12): error TS2322: Type 'U' is not assignable to type 'T'. -tests/cases/conformance/types/objectTypeLiteral/callSignatures/typeParameterUsedAsTypeParameterConstraint.ts(23,14): error TS2313: Constraint of a type parameter cannot reference any type parameter from the same type parameter list. -tests/cases/conformance/types/objectTypeLiteral/callSignatures/typeParameterUsedAsTypeParameterConstraint.ts(24,5): error TS2322: Type 'U' is not assignable to type 'T'. -tests/cases/conformance/types/objectTypeLiteral/callSignatures/typeParameterUsedAsTypeParameterConstraint.ts(25,12): error TS2322: Type 'U' is not assignable to type 'T'. -tests/cases/conformance/types/objectTypeLiteral/callSignatures/typeParameterUsedAsTypeParameterConstraint.ts(28,11): error TS2313: Constraint of a type parameter cannot reference any type parameter from the same type parameter list. -tests/cases/conformance/types/objectTypeLiteral/callSignatures/typeParameterUsedAsTypeParameterConstraint.ts(29,5): error TS2322: Type 'U' is not assignable to type 'T'. -tests/cases/conformance/types/objectTypeLiteral/callSignatures/typeParameterUsedAsTypeParameterConstraint.ts(30,12): error TS2322: Type 'U' is not assignable to type 'T'. - - -==== tests/cases/conformance/types/objectTypeLiteral/callSignatures/typeParameterUsedAsTypeParameterConstraint.ts (18 errors) ==== - // Type parameters are in scope in their own and other type parameter lists - - function foo(x: T, y: U): T { - ~~~~~~~~~~~ -!!! error TS2313: Constraint of a type parameter cannot reference any type parameter from the same type parameter list. - x = y; - ~ -!!! error TS2322: Type 'U' is not assignable to type 'T'. - return y; - ~ -!!! error TS2322: Type 'U' is not assignable to type 'T'. - } - - function foo2(x: T, y: U): T { - ~~~~~~~~~~~ -!!! error TS2313: Constraint of a type parameter cannot reference any type parameter from the same type parameter list. - x = y; - ~ -!!! error TS2322: Type 'U' is not assignable to type 'T'. - return y; - ~ -!!! error TS2322: Type 'U' is not assignable to type 'T'. - } - - var f = function (x: T, y: U): T { - ~~~~~~~~~~~ -!!! error TS2313: Constraint of a type parameter cannot reference any type parameter from the same type parameter list. - x = y; - ~ -!!! error TS2322: Type 'U' is not assignable to type 'T'. - return y; - ~ -!!! error TS2322: Type 'U' is not assignable to type 'T'. - } - - var f2 = function (x: T, y: U): T { - ~~~~~~~~~~~ -!!! error TS2313: Constraint of a type parameter cannot reference any type parameter from the same type parameter list. - x = y; - ~ -!!! error TS2322: Type 'U' is not assignable to type 'T'. - return y; - ~ -!!! error TS2322: Type 'U' is not assignable to type 'T'. - } - - var f3 = (x: T, y: U): T => { - ~~~~~~~~~~~ -!!! error TS2313: Constraint of a type parameter cannot reference any type parameter from the same type parameter list. - x = y; - ~ -!!! error TS2322: Type 'U' is not assignable to type 'T'. - return y; - ~ -!!! error TS2322: Type 'U' is not assignable to type 'T'. - } - - var f4 = (x: T, y: U): T => { - ~~~~~~~~~~~ -!!! error TS2313: Constraint of a type parameter cannot reference any type parameter from the same type parameter list. - x = y; - ~ -!!! error TS2322: Type 'U' is not assignable to type 'T'. - return y; - ~ -!!! error TS2322: Type 'U' is not assignable to type 'T'. - } \ No newline at end of file diff --git a/tests/baselines/reference/typeParameterUsedAsTypeParameterConstraint.symbols b/tests/baselines/reference/typeParameterUsedAsTypeParameterConstraint.symbols new file mode 100644 index 00000000000..52ec3d2e29d --- /dev/null +++ b/tests/baselines/reference/typeParameterUsedAsTypeParameterConstraint.symbols @@ -0,0 +1,116 @@ +=== tests/cases/conformance/types/objectTypeLiteral/callSignatures/typeParameterUsedAsTypeParameterConstraint.ts === +// Type parameters are in scope in their own and other type parameter lists + +function foo(x: T, y: U): T { +>foo : Symbol(foo, Decl(typeParameterUsedAsTypeParameterConstraint.ts, 0, 0)) +>T : Symbol(T, Decl(typeParameterUsedAsTypeParameterConstraint.ts, 2, 13)) +>U : Symbol(U, Decl(typeParameterUsedAsTypeParameterConstraint.ts, 2, 15)) +>T : Symbol(T, Decl(typeParameterUsedAsTypeParameterConstraint.ts, 2, 13)) +>x : Symbol(x, Decl(typeParameterUsedAsTypeParameterConstraint.ts, 2, 29)) +>T : Symbol(T, Decl(typeParameterUsedAsTypeParameterConstraint.ts, 2, 13)) +>y : Symbol(y, Decl(typeParameterUsedAsTypeParameterConstraint.ts, 2, 34)) +>U : Symbol(U, Decl(typeParameterUsedAsTypeParameterConstraint.ts, 2, 15)) +>T : Symbol(T, Decl(typeParameterUsedAsTypeParameterConstraint.ts, 2, 13)) + + x = y; +>x : Symbol(x, Decl(typeParameterUsedAsTypeParameterConstraint.ts, 2, 29)) +>y : Symbol(y, Decl(typeParameterUsedAsTypeParameterConstraint.ts, 2, 34)) + + return y; +>y : Symbol(y, Decl(typeParameterUsedAsTypeParameterConstraint.ts, 2, 34)) +} + +function foo2(x: T, y: U): T { +>foo2 : Symbol(foo2, Decl(typeParameterUsedAsTypeParameterConstraint.ts, 5, 1)) +>U : Symbol(U, Decl(typeParameterUsedAsTypeParameterConstraint.ts, 7, 14)) +>T : Symbol(T, Decl(typeParameterUsedAsTypeParameterConstraint.ts, 7, 26)) +>T : Symbol(T, Decl(typeParameterUsedAsTypeParameterConstraint.ts, 7, 26)) +>x : Symbol(x, Decl(typeParameterUsedAsTypeParameterConstraint.ts, 7, 30)) +>T : Symbol(T, Decl(typeParameterUsedAsTypeParameterConstraint.ts, 7, 26)) +>y : Symbol(y, Decl(typeParameterUsedAsTypeParameterConstraint.ts, 7, 35)) +>U : Symbol(U, Decl(typeParameterUsedAsTypeParameterConstraint.ts, 7, 14)) +>T : Symbol(T, Decl(typeParameterUsedAsTypeParameterConstraint.ts, 7, 26)) + + x = y; +>x : Symbol(x, Decl(typeParameterUsedAsTypeParameterConstraint.ts, 7, 30)) +>y : Symbol(y, Decl(typeParameterUsedAsTypeParameterConstraint.ts, 7, 35)) + + return y; +>y : Symbol(y, Decl(typeParameterUsedAsTypeParameterConstraint.ts, 7, 35)) +} + +var f = function (x: T, y: U): T { +>f : Symbol(f, Decl(typeParameterUsedAsTypeParameterConstraint.ts, 12, 3)) +>T : Symbol(T, Decl(typeParameterUsedAsTypeParameterConstraint.ts, 12, 18)) +>U : Symbol(U, Decl(typeParameterUsedAsTypeParameterConstraint.ts, 12, 20)) +>T : Symbol(T, Decl(typeParameterUsedAsTypeParameterConstraint.ts, 12, 18)) +>x : Symbol(x, Decl(typeParameterUsedAsTypeParameterConstraint.ts, 12, 34)) +>T : Symbol(T, Decl(typeParameterUsedAsTypeParameterConstraint.ts, 12, 18)) +>y : Symbol(y, Decl(typeParameterUsedAsTypeParameterConstraint.ts, 12, 39)) +>U : Symbol(U, Decl(typeParameterUsedAsTypeParameterConstraint.ts, 12, 20)) +>T : Symbol(T, Decl(typeParameterUsedAsTypeParameterConstraint.ts, 12, 18)) + + x = y; +>x : Symbol(x, Decl(typeParameterUsedAsTypeParameterConstraint.ts, 12, 34)) +>y : Symbol(y, Decl(typeParameterUsedAsTypeParameterConstraint.ts, 12, 39)) + + return y; +>y : Symbol(y, Decl(typeParameterUsedAsTypeParameterConstraint.ts, 12, 39)) +} + +var f2 = function (x: T, y: U): T { +>f2 : Symbol(f2, Decl(typeParameterUsedAsTypeParameterConstraint.ts, 17, 3)) +>U : Symbol(U, Decl(typeParameterUsedAsTypeParameterConstraint.ts, 17, 19)) +>T : Symbol(T, Decl(typeParameterUsedAsTypeParameterConstraint.ts, 17, 31)) +>T : Symbol(T, Decl(typeParameterUsedAsTypeParameterConstraint.ts, 17, 31)) +>x : Symbol(x, Decl(typeParameterUsedAsTypeParameterConstraint.ts, 17, 35)) +>T : Symbol(T, Decl(typeParameterUsedAsTypeParameterConstraint.ts, 17, 31)) +>y : Symbol(y, Decl(typeParameterUsedAsTypeParameterConstraint.ts, 17, 40)) +>U : Symbol(U, Decl(typeParameterUsedAsTypeParameterConstraint.ts, 17, 19)) +>T : Symbol(T, Decl(typeParameterUsedAsTypeParameterConstraint.ts, 17, 31)) + + x = y; +>x : Symbol(x, Decl(typeParameterUsedAsTypeParameterConstraint.ts, 17, 35)) +>y : Symbol(y, Decl(typeParameterUsedAsTypeParameterConstraint.ts, 17, 40)) + + return y; +>y : Symbol(y, Decl(typeParameterUsedAsTypeParameterConstraint.ts, 17, 40)) +} + +var f3 = (x: T, y: U): T => { +>f3 : Symbol(f3, Decl(typeParameterUsedAsTypeParameterConstraint.ts, 22, 3)) +>T : Symbol(T, Decl(typeParameterUsedAsTypeParameterConstraint.ts, 22, 10)) +>U : Symbol(U, Decl(typeParameterUsedAsTypeParameterConstraint.ts, 22, 12)) +>T : Symbol(T, Decl(typeParameterUsedAsTypeParameterConstraint.ts, 22, 10)) +>x : Symbol(x, Decl(typeParameterUsedAsTypeParameterConstraint.ts, 22, 26)) +>T : Symbol(T, Decl(typeParameterUsedAsTypeParameterConstraint.ts, 22, 10)) +>y : Symbol(y, Decl(typeParameterUsedAsTypeParameterConstraint.ts, 22, 31)) +>U : Symbol(U, Decl(typeParameterUsedAsTypeParameterConstraint.ts, 22, 12)) +>T : Symbol(T, Decl(typeParameterUsedAsTypeParameterConstraint.ts, 22, 10)) + + x = y; +>x : Symbol(x, Decl(typeParameterUsedAsTypeParameterConstraint.ts, 22, 26)) +>y : Symbol(y, Decl(typeParameterUsedAsTypeParameterConstraint.ts, 22, 31)) + + return y; +>y : Symbol(y, Decl(typeParameterUsedAsTypeParameterConstraint.ts, 22, 31)) +} + +var f4 = (x: T, y: U): T => { +>f4 : Symbol(f4, Decl(typeParameterUsedAsTypeParameterConstraint.ts, 27, 3)) +>U : Symbol(U, Decl(typeParameterUsedAsTypeParameterConstraint.ts, 27, 10)) +>T : Symbol(T, Decl(typeParameterUsedAsTypeParameterConstraint.ts, 27, 22)) +>T : Symbol(T, Decl(typeParameterUsedAsTypeParameterConstraint.ts, 27, 22)) +>x : Symbol(x, Decl(typeParameterUsedAsTypeParameterConstraint.ts, 27, 26)) +>T : Symbol(T, Decl(typeParameterUsedAsTypeParameterConstraint.ts, 27, 22)) +>y : Symbol(y, Decl(typeParameterUsedAsTypeParameterConstraint.ts, 27, 31)) +>U : Symbol(U, Decl(typeParameterUsedAsTypeParameterConstraint.ts, 27, 10)) +>T : Symbol(T, Decl(typeParameterUsedAsTypeParameterConstraint.ts, 27, 22)) + + x = y; +>x : Symbol(x, Decl(typeParameterUsedAsTypeParameterConstraint.ts, 27, 26)) +>y : Symbol(y, Decl(typeParameterUsedAsTypeParameterConstraint.ts, 27, 31)) + + return y; +>y : Symbol(y, Decl(typeParameterUsedAsTypeParameterConstraint.ts, 27, 31)) +} diff --git a/tests/baselines/reference/typeParameterUsedAsTypeParameterConstraint.types b/tests/baselines/reference/typeParameterUsedAsTypeParameterConstraint.types new file mode 100644 index 00000000000..4b4a05c9e02 --- /dev/null +++ b/tests/baselines/reference/typeParameterUsedAsTypeParameterConstraint.types @@ -0,0 +1,126 @@ +=== tests/cases/conformance/types/objectTypeLiteral/callSignatures/typeParameterUsedAsTypeParameterConstraint.ts === +// Type parameters are in scope in their own and other type parameter lists + +function foo(x: T, y: U): T { +>foo : (x: T, y: U) => T +>T : T +>U : U +>T : T +>x : T +>T : T +>y : U +>U : U +>T : T + + x = y; +>x = y : U +>x : T +>y : U + + return y; +>y : U +} + +function foo2(x: T, y: U): T { +>foo2 : (x: T, y: U) => T +>U : U +>T : T +>T : T +>x : T +>T : T +>y : U +>U : U +>T : T + + x = y; +>x = y : U +>x : T +>y : U + + return y; +>y : U +} + +var f = function (x: T, y: U): T { +>f : (x: T, y: U) => T +>function (x: T, y: U): T { x = y; return y;} : (x: T, y: U) => T +>T : T +>U : U +>T : T +>x : T +>T : T +>y : U +>U : U +>T : T + + x = y; +>x = y : U +>x : T +>y : U + + return y; +>y : U +} + +var f2 = function (x: T, y: U): T { +>f2 : (x: T, y: U) => T +>function (x: T, y: U): T { x = y; return y;} : (x: T, y: U) => T +>U : U +>T : T +>T : T +>x : T +>T : T +>y : U +>U : U +>T : T + + x = y; +>x = y : U +>x : T +>y : U + + return y; +>y : U +} + +var f3 = (x: T, y: U): T => { +>f3 : (x: T, y: U) => T +>(x: T, y: U): T => { x = y; return y;} : (x: T, y: U) => T +>T : T +>U : U +>T : T +>x : T +>T : T +>y : U +>U : U +>T : T + + x = y; +>x = y : U +>x : T +>y : U + + return y; +>y : U +} + +var f4 = (x: T, y: U): T => { +>f4 : (x: T, y: U) => T +>(x: T, y: U): T => { x = y; return y;} : (x: T, y: U) => T +>U : U +>T : T +>T : T +>x : T +>T : T +>y : U +>U : U +>T : T + + x = y; +>x = y : U +>x : T +>y : U + + return y; +>y : U +} diff --git a/tests/baselines/reference/typeParameterUsedAsTypeParameterConstraint2.errors.txt b/tests/baselines/reference/typeParameterUsedAsTypeParameterConstraint2.errors.txt deleted file mode 100644 index 12b90ac8525..00000000000 --- a/tests/baselines/reference/typeParameterUsedAsTypeParameterConstraint2.errors.txt +++ /dev/null @@ -1,113 +0,0 @@ -tests/cases/conformance/types/objectTypeLiteral/callSignatures/typeParameterUsedAsTypeParameterConstraint2.ts(4,17): error TS2313: Constraint of a type parameter cannot reference any type parameter from the same type parameter list. -tests/cases/conformance/types/objectTypeLiteral/callSignatures/typeParameterUsedAsTypeParameterConstraint2.ts(7,13): error TS2322: Type 'U' is not assignable to type 'T'. -tests/cases/conformance/types/objectTypeLiteral/callSignatures/typeParameterUsedAsTypeParameterConstraint2.ts(8,20): error TS2322: Type 'U' is not assignable to type 'T'. -tests/cases/conformance/types/objectTypeLiteral/callSignatures/typeParameterUsedAsTypeParameterConstraint2.ts(13,15): error TS2313: Constraint of a type parameter cannot reference any type parameter from the same type parameter list. -tests/cases/conformance/types/objectTypeLiteral/callSignatures/typeParameterUsedAsTypeParameterConstraint2.ts(16,13): error TS2322: Type 'U' is not assignable to type 'T'. -tests/cases/conformance/types/objectTypeLiteral/callSignatures/typeParameterUsedAsTypeParameterConstraint2.ts(17,20): error TS2322: Type 'U' is not assignable to type 'T'. -tests/cases/conformance/types/objectTypeLiteral/callSignatures/typeParameterUsedAsTypeParameterConstraint2.ts(22,22): error TS2313: Constraint of a type parameter cannot reference any type parameter from the same type parameter list. -tests/cases/conformance/types/objectTypeLiteral/callSignatures/typeParameterUsedAsTypeParameterConstraint2.ts(25,13): error TS2322: Type 'U' is not assignable to type 'T'. -tests/cases/conformance/types/objectTypeLiteral/callSignatures/typeParameterUsedAsTypeParameterConstraint2.ts(26,20): error TS2322: Type 'U' is not assignable to type 'T'. -tests/cases/conformance/types/objectTypeLiteral/callSignatures/typeParameterUsedAsTypeParameterConstraint2.ts(31,20): error TS2313: Constraint of a type parameter cannot reference any type parameter from the same type parameter list. -tests/cases/conformance/types/objectTypeLiteral/callSignatures/typeParameterUsedAsTypeParameterConstraint2.ts(34,13): error TS2322: Type 'U' is not assignable to type 'T'. -tests/cases/conformance/types/objectTypeLiteral/callSignatures/typeParameterUsedAsTypeParameterConstraint2.ts(35,20): error TS2322: Type 'U' is not assignable to type 'T'. -tests/cases/conformance/types/objectTypeLiteral/callSignatures/typeParameterUsedAsTypeParameterConstraint2.ts(40,14): error TS2313: Constraint of a type parameter cannot reference any type parameter from the same type parameter list. -tests/cases/conformance/types/objectTypeLiteral/callSignatures/typeParameterUsedAsTypeParameterConstraint2.ts(43,13): error TS2322: Type 'U' is not assignable to type 'T'. -tests/cases/conformance/types/objectTypeLiteral/callSignatures/typeParameterUsedAsTypeParameterConstraint2.ts(44,20): error TS2322: Type 'U' is not assignable to type 'T'. -tests/cases/conformance/types/objectTypeLiteral/callSignatures/typeParameterUsedAsTypeParameterConstraint2.ts(49,11): error TS2313: Constraint of a type parameter cannot reference any type parameter from the same type parameter list. -tests/cases/conformance/types/objectTypeLiteral/callSignatures/typeParameterUsedAsTypeParameterConstraint2.ts(52,13): error TS2322: Type 'U' is not assignable to type 'T'. -tests/cases/conformance/types/objectTypeLiteral/callSignatures/typeParameterUsedAsTypeParameterConstraint2.ts(53,20): error TS2322: Type 'U' is not assignable to type 'T'. - - -==== tests/cases/conformance/types/objectTypeLiteral/callSignatures/typeParameterUsedAsTypeParameterConstraint2.ts (18 errors) ==== - // Type parameters are in scope in their own and other type parameter lists - // Nested local functions - - function foo(x: T, y: U) { - ~~~~~~~~~~~ -!!! error TS2313: Constraint of a type parameter cannot reference any type parameter from the same type parameter list. - function bar() { - function baz(a: X, b: Y): T { - x = y; - ~ -!!! error TS2322: Type 'U' is not assignable to type 'T'. - return y; - ~ -!!! error TS2322: Type 'U' is not assignable to type 'T'. - } - } - } - - function foo2(x: T, y: U) { - ~~~~~~~~~~~ -!!! error TS2313: Constraint of a type parameter cannot reference any type parameter from the same type parameter list. - function bar() { - function baz(a: X, b: Y): T { - x = y; - ~ -!!! error TS2322: Type 'U' is not assignable to type 'T'. - return y; - ~ -!!! error TS2322: Type 'U' is not assignable to type 'T'. - } - } - } - - var f = function (x: T, y: U) { - ~~~~~~~~~~~ -!!! error TS2313: Constraint of a type parameter cannot reference any type parameter from the same type parameter list. - function bar() { - var g = function (a: X, b: Y): T { - x = y; - ~ -!!! error TS2322: Type 'U' is not assignable to type 'T'. - return y; - ~ -!!! error TS2322: Type 'U' is not assignable to type 'T'. - } - } - } - - var f2 = function (x: T, y: U) { - ~~~~~~~~~~~ -!!! error TS2313: Constraint of a type parameter cannot reference any type parameter from the same type parameter list. - function bar() { - var g = function baz(a: X, b: Y): T { - x = y; - ~ -!!! error TS2322: Type 'U' is not assignable to type 'T'. - return y; - ~ -!!! error TS2322: Type 'U' is not assignable to type 'T'. - } - } - } - - var f3 = (x: T, y: U) => { - ~~~~~~~~~~~ -!!! error TS2313: Constraint of a type parameter cannot reference any type parameter from the same type parameter list. - function bar() { - var g = (a: X, b: Y): T => { - x = y; - ~ -!!! error TS2322: Type 'U' is not assignable to type 'T'. - return y; - ~ -!!! error TS2322: Type 'U' is not assignable to type 'T'. - } - } - } - - var f4 = (x: T, y: U) => { - ~~~~~~~~~~~ -!!! error TS2313: Constraint of a type parameter cannot reference any type parameter from the same type parameter list. - function bar() { - var g = (a: X, b: Y): T => { - x = y; - ~ -!!! error TS2322: Type 'U' is not assignable to type 'T'. - return y; - ~ -!!! error TS2322: Type 'U' is not assignable to type 'T'. - } - } - } \ No newline at end of file diff --git a/tests/baselines/reference/typeParameterUsedAsTypeParameterConstraint2.symbols b/tests/baselines/reference/typeParameterUsedAsTypeParameterConstraint2.symbols new file mode 100644 index 00000000000..3f19ef8c5f1 --- /dev/null +++ b/tests/baselines/reference/typeParameterUsedAsTypeParameterConstraint2.symbols @@ -0,0 +1,238 @@ +=== tests/cases/conformance/types/objectTypeLiteral/callSignatures/typeParameterUsedAsTypeParameterConstraint2.ts === +// Type parameters are in scope in their own and other type parameter lists +// Nested local functions + +function foo(x: T, y: U) { +>foo : Symbol(foo, Decl(typeParameterUsedAsTypeParameterConstraint2.ts, 0, 0)) +>T : Symbol(T, Decl(typeParameterUsedAsTypeParameterConstraint2.ts, 3, 13)) +>U : Symbol(U, Decl(typeParameterUsedAsTypeParameterConstraint2.ts, 3, 15)) +>T : Symbol(T, Decl(typeParameterUsedAsTypeParameterConstraint2.ts, 3, 13)) +>x : Symbol(x, Decl(typeParameterUsedAsTypeParameterConstraint2.ts, 3, 29)) +>T : Symbol(T, Decl(typeParameterUsedAsTypeParameterConstraint2.ts, 3, 13)) +>y : Symbol(y, Decl(typeParameterUsedAsTypeParameterConstraint2.ts, 3, 34)) +>U : Symbol(U, Decl(typeParameterUsedAsTypeParameterConstraint2.ts, 3, 15)) + + function bar() { +>bar : Symbol(bar, Decl(typeParameterUsedAsTypeParameterConstraint2.ts, 3, 42)) +>V : Symbol(V, Decl(typeParameterUsedAsTypeParameterConstraint2.ts, 4, 17)) +>T : Symbol(T, Decl(typeParameterUsedAsTypeParameterConstraint2.ts, 3, 13)) +>W : Symbol(W, Decl(typeParameterUsedAsTypeParameterConstraint2.ts, 4, 29)) +>U : Symbol(U, Decl(typeParameterUsedAsTypeParameterConstraint2.ts, 3, 15)) + + function baz(a: X, b: Y): T { +>baz : Symbol(baz, Decl(typeParameterUsedAsTypeParameterConstraint2.ts, 4, 46)) +>X : Symbol(X, Decl(typeParameterUsedAsTypeParameterConstraint2.ts, 5, 21)) +>W : Symbol(W, Decl(typeParameterUsedAsTypeParameterConstraint2.ts, 4, 29)) +>Y : Symbol(Y, Decl(typeParameterUsedAsTypeParameterConstraint2.ts, 5, 33)) +>V : Symbol(V, Decl(typeParameterUsedAsTypeParameterConstraint2.ts, 4, 17)) +>a : Symbol(a, Decl(typeParameterUsedAsTypeParameterConstraint2.ts, 5, 47)) +>X : Symbol(X, Decl(typeParameterUsedAsTypeParameterConstraint2.ts, 5, 21)) +>b : Symbol(b, Decl(typeParameterUsedAsTypeParameterConstraint2.ts, 5, 52)) +>Y : Symbol(Y, Decl(typeParameterUsedAsTypeParameterConstraint2.ts, 5, 33)) +>T : Symbol(T, Decl(typeParameterUsedAsTypeParameterConstraint2.ts, 3, 13)) + + x = y; +>x : Symbol(x, Decl(typeParameterUsedAsTypeParameterConstraint2.ts, 3, 29)) +>y : Symbol(y, Decl(typeParameterUsedAsTypeParameterConstraint2.ts, 3, 34)) + + return y; +>y : Symbol(y, Decl(typeParameterUsedAsTypeParameterConstraint2.ts, 3, 34)) + } + } +} + +function foo2(x: T, y: U) { +>foo2 : Symbol(foo2, Decl(typeParameterUsedAsTypeParameterConstraint2.ts, 10, 1)) +>U : Symbol(U, Decl(typeParameterUsedAsTypeParameterConstraint2.ts, 12, 14)) +>T : Symbol(T, Decl(typeParameterUsedAsTypeParameterConstraint2.ts, 12, 26)) +>T : Symbol(T, Decl(typeParameterUsedAsTypeParameterConstraint2.ts, 12, 26)) +>x : Symbol(x, Decl(typeParameterUsedAsTypeParameterConstraint2.ts, 12, 30)) +>T : Symbol(T, Decl(typeParameterUsedAsTypeParameterConstraint2.ts, 12, 26)) +>y : Symbol(y, Decl(typeParameterUsedAsTypeParameterConstraint2.ts, 12, 35)) +>U : Symbol(U, Decl(typeParameterUsedAsTypeParameterConstraint2.ts, 12, 14)) + + function bar() { +>bar : Symbol(bar, Decl(typeParameterUsedAsTypeParameterConstraint2.ts, 12, 43)) +>V : Symbol(V, Decl(typeParameterUsedAsTypeParameterConstraint2.ts, 13, 17)) +>T : Symbol(T, Decl(typeParameterUsedAsTypeParameterConstraint2.ts, 12, 26)) +>W : Symbol(W, Decl(typeParameterUsedAsTypeParameterConstraint2.ts, 13, 29)) +>U : Symbol(U, Decl(typeParameterUsedAsTypeParameterConstraint2.ts, 12, 14)) + + function baz(a: X, b: Y): T { +>baz : Symbol(baz, Decl(typeParameterUsedAsTypeParameterConstraint2.ts, 13, 46)) +>X : Symbol(X, Decl(typeParameterUsedAsTypeParameterConstraint2.ts, 14, 21)) +>W : Symbol(W, Decl(typeParameterUsedAsTypeParameterConstraint2.ts, 13, 29)) +>Y : Symbol(Y, Decl(typeParameterUsedAsTypeParameterConstraint2.ts, 14, 33)) +>V : Symbol(V, Decl(typeParameterUsedAsTypeParameterConstraint2.ts, 13, 17)) +>a : Symbol(a, Decl(typeParameterUsedAsTypeParameterConstraint2.ts, 14, 47)) +>X : Symbol(X, Decl(typeParameterUsedAsTypeParameterConstraint2.ts, 14, 21)) +>b : Symbol(b, Decl(typeParameterUsedAsTypeParameterConstraint2.ts, 14, 52)) +>Y : Symbol(Y, Decl(typeParameterUsedAsTypeParameterConstraint2.ts, 14, 33)) +>T : Symbol(T, Decl(typeParameterUsedAsTypeParameterConstraint2.ts, 12, 26)) + + x = y; +>x : Symbol(x, Decl(typeParameterUsedAsTypeParameterConstraint2.ts, 12, 30)) +>y : Symbol(y, Decl(typeParameterUsedAsTypeParameterConstraint2.ts, 12, 35)) + + return y; +>y : Symbol(y, Decl(typeParameterUsedAsTypeParameterConstraint2.ts, 12, 35)) + } + } +} + +var f = function (x: T, y: U) { +>f : Symbol(f, Decl(typeParameterUsedAsTypeParameterConstraint2.ts, 21, 3)) +>T : Symbol(T, Decl(typeParameterUsedAsTypeParameterConstraint2.ts, 21, 18)) +>U : Symbol(U, Decl(typeParameterUsedAsTypeParameterConstraint2.ts, 21, 20)) +>T : Symbol(T, Decl(typeParameterUsedAsTypeParameterConstraint2.ts, 21, 18)) +>x : Symbol(x, Decl(typeParameterUsedAsTypeParameterConstraint2.ts, 21, 34)) +>T : Symbol(T, Decl(typeParameterUsedAsTypeParameterConstraint2.ts, 21, 18)) +>y : Symbol(y, Decl(typeParameterUsedAsTypeParameterConstraint2.ts, 21, 39)) +>U : Symbol(U, Decl(typeParameterUsedAsTypeParameterConstraint2.ts, 21, 20)) + + function bar() { +>bar : Symbol(bar, Decl(typeParameterUsedAsTypeParameterConstraint2.ts, 21, 47)) +>V : Symbol(V, Decl(typeParameterUsedAsTypeParameterConstraint2.ts, 22, 17)) +>T : Symbol(T, Decl(typeParameterUsedAsTypeParameterConstraint2.ts, 21, 18)) +>W : Symbol(W, Decl(typeParameterUsedAsTypeParameterConstraint2.ts, 22, 29)) +>U : Symbol(U, Decl(typeParameterUsedAsTypeParameterConstraint2.ts, 21, 20)) + + var g = function (a: X, b: Y): T { +>g : Symbol(g, Decl(typeParameterUsedAsTypeParameterConstraint2.ts, 23, 11)) +>X : Symbol(X, Decl(typeParameterUsedAsTypeParameterConstraint2.ts, 23, 26)) +>W : Symbol(W, Decl(typeParameterUsedAsTypeParameterConstraint2.ts, 22, 29)) +>Y : Symbol(Y, Decl(typeParameterUsedAsTypeParameterConstraint2.ts, 23, 38)) +>V : Symbol(V, Decl(typeParameterUsedAsTypeParameterConstraint2.ts, 22, 17)) +>a : Symbol(a, Decl(typeParameterUsedAsTypeParameterConstraint2.ts, 23, 52)) +>X : Symbol(X, Decl(typeParameterUsedAsTypeParameterConstraint2.ts, 23, 26)) +>b : Symbol(b, Decl(typeParameterUsedAsTypeParameterConstraint2.ts, 23, 57)) +>Y : Symbol(Y, Decl(typeParameterUsedAsTypeParameterConstraint2.ts, 23, 38)) +>T : Symbol(T, Decl(typeParameterUsedAsTypeParameterConstraint2.ts, 21, 18)) + + x = y; +>x : Symbol(x, Decl(typeParameterUsedAsTypeParameterConstraint2.ts, 21, 34)) +>y : Symbol(y, Decl(typeParameterUsedAsTypeParameterConstraint2.ts, 21, 39)) + + return y; +>y : Symbol(y, Decl(typeParameterUsedAsTypeParameterConstraint2.ts, 21, 39)) + } + } +} + +var f2 = function (x: T, y: U) { +>f2 : Symbol(f2, Decl(typeParameterUsedAsTypeParameterConstraint2.ts, 30, 3)) +>U : Symbol(U, Decl(typeParameterUsedAsTypeParameterConstraint2.ts, 30, 19)) +>T : Symbol(T, Decl(typeParameterUsedAsTypeParameterConstraint2.ts, 30, 31)) +>T : Symbol(T, Decl(typeParameterUsedAsTypeParameterConstraint2.ts, 30, 31)) +>x : Symbol(x, Decl(typeParameterUsedAsTypeParameterConstraint2.ts, 30, 35)) +>T : Symbol(T, Decl(typeParameterUsedAsTypeParameterConstraint2.ts, 30, 31)) +>y : Symbol(y, Decl(typeParameterUsedAsTypeParameterConstraint2.ts, 30, 40)) +>U : Symbol(U, Decl(typeParameterUsedAsTypeParameterConstraint2.ts, 30, 19)) + + function bar() { +>bar : Symbol(bar, Decl(typeParameterUsedAsTypeParameterConstraint2.ts, 30, 48)) +>V : Symbol(V, Decl(typeParameterUsedAsTypeParameterConstraint2.ts, 31, 17)) +>T : Symbol(T, Decl(typeParameterUsedAsTypeParameterConstraint2.ts, 30, 31)) +>W : Symbol(W, Decl(typeParameterUsedAsTypeParameterConstraint2.ts, 31, 29)) +>U : Symbol(U, Decl(typeParameterUsedAsTypeParameterConstraint2.ts, 30, 19)) + + var g = function baz(a: X, b: Y): T { +>g : Symbol(g, Decl(typeParameterUsedAsTypeParameterConstraint2.ts, 32, 11)) +>baz : Symbol(baz, Decl(typeParameterUsedAsTypeParameterConstraint2.ts, 32, 15)) +>X : Symbol(X, Decl(typeParameterUsedAsTypeParameterConstraint2.ts, 32, 29)) +>W : Symbol(W, Decl(typeParameterUsedAsTypeParameterConstraint2.ts, 31, 29)) +>Y : Symbol(Y, Decl(typeParameterUsedAsTypeParameterConstraint2.ts, 32, 41)) +>V : Symbol(V, Decl(typeParameterUsedAsTypeParameterConstraint2.ts, 31, 17)) +>a : Symbol(a, Decl(typeParameterUsedAsTypeParameterConstraint2.ts, 32, 55)) +>X : Symbol(X, Decl(typeParameterUsedAsTypeParameterConstraint2.ts, 32, 29)) +>b : Symbol(b, Decl(typeParameterUsedAsTypeParameterConstraint2.ts, 32, 60)) +>Y : Symbol(Y, Decl(typeParameterUsedAsTypeParameterConstraint2.ts, 32, 41)) +>T : Symbol(T, Decl(typeParameterUsedAsTypeParameterConstraint2.ts, 30, 31)) + + x = y; +>x : Symbol(x, Decl(typeParameterUsedAsTypeParameterConstraint2.ts, 30, 35)) +>y : Symbol(y, Decl(typeParameterUsedAsTypeParameterConstraint2.ts, 30, 40)) + + return y; +>y : Symbol(y, Decl(typeParameterUsedAsTypeParameterConstraint2.ts, 30, 40)) + } + } +} + +var f3 = (x: T, y: U) => { +>f3 : Symbol(f3, Decl(typeParameterUsedAsTypeParameterConstraint2.ts, 39, 3)) +>T : Symbol(T, Decl(typeParameterUsedAsTypeParameterConstraint2.ts, 39, 10)) +>U : Symbol(U, Decl(typeParameterUsedAsTypeParameterConstraint2.ts, 39, 12)) +>T : Symbol(T, Decl(typeParameterUsedAsTypeParameterConstraint2.ts, 39, 10)) +>x : Symbol(x, Decl(typeParameterUsedAsTypeParameterConstraint2.ts, 39, 26)) +>T : Symbol(T, Decl(typeParameterUsedAsTypeParameterConstraint2.ts, 39, 10)) +>y : Symbol(y, Decl(typeParameterUsedAsTypeParameterConstraint2.ts, 39, 31)) +>U : Symbol(U, Decl(typeParameterUsedAsTypeParameterConstraint2.ts, 39, 12)) + + function bar() { +>bar : Symbol(bar, Decl(typeParameterUsedAsTypeParameterConstraint2.ts, 39, 42)) +>V : Symbol(V, Decl(typeParameterUsedAsTypeParameterConstraint2.ts, 40, 17)) +>T : Symbol(T, Decl(typeParameterUsedAsTypeParameterConstraint2.ts, 39, 10)) +>W : Symbol(W, Decl(typeParameterUsedAsTypeParameterConstraint2.ts, 40, 29)) +>U : Symbol(U, Decl(typeParameterUsedAsTypeParameterConstraint2.ts, 39, 12)) + + var g = (a: X, b: Y): T => { +>g : Symbol(g, Decl(typeParameterUsedAsTypeParameterConstraint2.ts, 41, 11)) +>X : Symbol(X, Decl(typeParameterUsedAsTypeParameterConstraint2.ts, 41, 17)) +>W : Symbol(W, Decl(typeParameterUsedAsTypeParameterConstraint2.ts, 40, 29)) +>Y : Symbol(Y, Decl(typeParameterUsedAsTypeParameterConstraint2.ts, 41, 29)) +>V : Symbol(V, Decl(typeParameterUsedAsTypeParameterConstraint2.ts, 40, 17)) +>a : Symbol(a, Decl(typeParameterUsedAsTypeParameterConstraint2.ts, 41, 43)) +>X : Symbol(X, Decl(typeParameterUsedAsTypeParameterConstraint2.ts, 41, 17)) +>b : Symbol(b, Decl(typeParameterUsedAsTypeParameterConstraint2.ts, 41, 48)) +>Y : Symbol(Y, Decl(typeParameterUsedAsTypeParameterConstraint2.ts, 41, 29)) +>T : Symbol(T, Decl(typeParameterUsedAsTypeParameterConstraint2.ts, 39, 10)) + + x = y; +>x : Symbol(x, Decl(typeParameterUsedAsTypeParameterConstraint2.ts, 39, 26)) +>y : Symbol(y, Decl(typeParameterUsedAsTypeParameterConstraint2.ts, 39, 31)) + + return y; +>y : Symbol(y, Decl(typeParameterUsedAsTypeParameterConstraint2.ts, 39, 31)) + } + } +} + +var f4 = (x: T, y: U) => { +>f4 : Symbol(f4, Decl(typeParameterUsedAsTypeParameterConstraint2.ts, 48, 3)) +>U : Symbol(U, Decl(typeParameterUsedAsTypeParameterConstraint2.ts, 48, 10)) +>T : Symbol(T, Decl(typeParameterUsedAsTypeParameterConstraint2.ts, 48, 22)) +>T : Symbol(T, Decl(typeParameterUsedAsTypeParameterConstraint2.ts, 48, 22)) +>x : Symbol(x, Decl(typeParameterUsedAsTypeParameterConstraint2.ts, 48, 26)) +>T : Symbol(T, Decl(typeParameterUsedAsTypeParameterConstraint2.ts, 48, 22)) +>y : Symbol(y, Decl(typeParameterUsedAsTypeParameterConstraint2.ts, 48, 31)) +>U : Symbol(U, Decl(typeParameterUsedAsTypeParameterConstraint2.ts, 48, 10)) + + function bar() { +>bar : Symbol(bar, Decl(typeParameterUsedAsTypeParameterConstraint2.ts, 48, 42)) +>V : Symbol(V, Decl(typeParameterUsedAsTypeParameterConstraint2.ts, 49, 17)) +>T : Symbol(T, Decl(typeParameterUsedAsTypeParameterConstraint2.ts, 48, 22)) +>W : Symbol(W, Decl(typeParameterUsedAsTypeParameterConstraint2.ts, 49, 29)) +>U : Symbol(U, Decl(typeParameterUsedAsTypeParameterConstraint2.ts, 48, 10)) + + var g = (a: X, b: Y): T => { +>g : Symbol(g, Decl(typeParameterUsedAsTypeParameterConstraint2.ts, 50, 11)) +>X : Symbol(X, Decl(typeParameterUsedAsTypeParameterConstraint2.ts, 50, 17)) +>W : Symbol(W, Decl(typeParameterUsedAsTypeParameterConstraint2.ts, 49, 29)) +>Y : Symbol(Y, Decl(typeParameterUsedAsTypeParameterConstraint2.ts, 50, 29)) +>V : Symbol(V, Decl(typeParameterUsedAsTypeParameterConstraint2.ts, 49, 17)) +>a : Symbol(a, Decl(typeParameterUsedAsTypeParameterConstraint2.ts, 50, 43)) +>X : Symbol(X, Decl(typeParameterUsedAsTypeParameterConstraint2.ts, 50, 17)) +>b : Symbol(b, Decl(typeParameterUsedAsTypeParameterConstraint2.ts, 50, 48)) +>Y : Symbol(Y, Decl(typeParameterUsedAsTypeParameterConstraint2.ts, 50, 29)) +>T : Symbol(T, Decl(typeParameterUsedAsTypeParameterConstraint2.ts, 48, 22)) + + x = y; +>x : Symbol(x, Decl(typeParameterUsedAsTypeParameterConstraint2.ts, 48, 26)) +>y : Symbol(y, Decl(typeParameterUsedAsTypeParameterConstraint2.ts, 48, 31)) + + return y; +>y : Symbol(y, Decl(typeParameterUsedAsTypeParameterConstraint2.ts, 48, 31)) + } + } +} diff --git a/tests/baselines/reference/typeParameterUsedAsTypeParameterConstraint2.types b/tests/baselines/reference/typeParameterUsedAsTypeParameterConstraint2.types new file mode 100644 index 00000000000..d1e3828a2e1 --- /dev/null +++ b/tests/baselines/reference/typeParameterUsedAsTypeParameterConstraint2.types @@ -0,0 +1,252 @@ +=== tests/cases/conformance/types/objectTypeLiteral/callSignatures/typeParameterUsedAsTypeParameterConstraint2.ts === +// Type parameters are in scope in their own and other type parameter lists +// Nested local functions + +function foo(x: T, y: U) { +>foo : (x: T, y: U) => void +>T : T +>U : U +>T : T +>x : T +>T : T +>y : U +>U : U + + function bar() { +>bar : () => void +>V : V +>T : T +>W : W +>U : U + + function baz(a: X, b: Y): T { +>baz : (a: X, b: Y) => T +>X : X +>W : W +>Y : Y +>V : V +>a : X +>X : X +>b : Y +>Y : Y +>T : T + + x = y; +>x = y : U +>x : T +>y : U + + return y; +>y : U + } + } +} + +function foo2(x: T, y: U) { +>foo2 : (x: T, y: U) => void +>U : U +>T : T +>T : T +>x : T +>T : T +>y : U +>U : U + + function bar() { +>bar : () => void +>V : V +>T : T +>W : W +>U : U + + function baz(a: X, b: Y): T { +>baz : (a: X, b: Y) => T +>X : X +>W : W +>Y : Y +>V : V +>a : X +>X : X +>b : Y +>Y : Y +>T : T + + x = y; +>x = y : U +>x : T +>y : U + + return y; +>y : U + } + } +} + +var f = function (x: T, y: U) { +>f : (x: T, y: U) => void +>function (x: T, y: U) { function bar() { var g = function (a: X, b: Y): T { x = y; return y; } }} : (x: T, y: U) => void +>T : T +>U : U +>T : T +>x : T +>T : T +>y : U +>U : U + + function bar() { +>bar : () => void +>V : V +>T : T +>W : W +>U : U + + var g = function (a: X, b: Y): T { +>g : (a: X, b: Y) => T +>function (a: X, b: Y): T { x = y; return y; } : (a: X, b: Y) => T +>X : X +>W : W +>Y : Y +>V : V +>a : X +>X : X +>b : Y +>Y : Y +>T : T + + x = y; +>x = y : U +>x : T +>y : U + + return y; +>y : U + } + } +} + +var f2 = function (x: T, y: U) { +>f2 : (x: T, y: U) => void +>function (x: T, y: U) { function bar() { var g = function baz(a: X, b: Y): T { x = y; return y; } }} : (x: T, y: U) => void +>U : U +>T : T +>T : T +>x : T +>T : T +>y : U +>U : U + + function bar() { +>bar : () => void +>V : V +>T : T +>W : W +>U : U + + var g = function baz(a: X, b: Y): T { +>g : (a: X, b: Y) => T +>function baz(a: X, b: Y): T { x = y; return y; } : (a: X, b: Y) => T +>baz : (a: X, b: Y) => T +>X : X +>W : W +>Y : Y +>V : V +>a : X +>X : X +>b : Y +>Y : Y +>T : T + + x = y; +>x = y : U +>x : T +>y : U + + return y; +>y : U + } + } +} + +var f3 = (x: T, y: U) => { +>f3 : (x: T, y: U) => void +>(x: T, y: U) => { function bar() { var g = (a: X, b: Y): T => { x = y; return y; } }} : (x: T, y: U) => void +>T : T +>U : U +>T : T +>x : T +>T : T +>y : U +>U : U + + function bar() { +>bar : () => void +>V : V +>T : T +>W : W +>U : U + + var g = (a: X, b: Y): T => { +>g : (a: X, b: Y) => T +>(a: X, b: Y): T => { x = y; return y; } : (a: X, b: Y) => T +>X : X +>W : W +>Y : Y +>V : V +>a : X +>X : X +>b : Y +>Y : Y +>T : T + + x = y; +>x = y : U +>x : T +>y : U + + return y; +>y : U + } + } +} + +var f4 = (x: T, y: U) => { +>f4 : (x: T, y: U) => void +>(x: T, y: U) => { function bar() { var g = (a: X, b: Y): T => { x = y; return y; } }} : (x: T, y: U) => void +>U : U +>T : T +>T : T +>x : T +>T : T +>y : U +>U : U + + function bar() { +>bar : () => void +>V : V +>T : T +>W : W +>U : U + + var g = (a: X, b: Y): T => { +>g : (a: X, b: Y) => T +>(a: X, b: Y): T => { x = y; return y; } : (a: X, b: Y) => T +>X : X +>W : W +>Y : Y +>V : V +>a : X +>X : X +>b : Y +>Y : Y +>T : T + + x = y; +>x = y : U +>x : T +>y : U + + return y; +>y : U + } + } +} diff --git a/tests/baselines/reference/typeParameterUsedAsTypeParameterConstraint4.errors.txt b/tests/baselines/reference/typeParameterUsedAsTypeParameterConstraint4.errors.txt index d78faf74fab..18983107757 100644 --- a/tests/baselines/reference/typeParameterUsedAsTypeParameterConstraint4.errors.txt +++ b/tests/baselines/reference/typeParameterUsedAsTypeParameterConstraint4.errors.txt @@ -1,57 +1,30 @@ -tests/cases/conformance/types/objectTypeLiteral/callSignatures/typeParameterUsedAsTypeParameterConstraint4.ts(4,12): error TS2313: Constraint of a type parameter cannot reference any type parameter from the same type parameter list. -tests/cases/conformance/types/objectTypeLiteral/callSignatures/typeParameterUsedAsTypeParameterConstraint4.ts(4,25): error TS2313: Constraint of a type parameter cannot reference any type parameter from the same type parameter list. tests/cases/conformance/types/objectTypeLiteral/callSignatures/typeParameterUsedAsTypeParameterConstraint4.ts(5,8): error TS2304: Cannot find name 'W'. -tests/cases/conformance/types/objectTypeLiteral/callSignatures/typeParameterUsedAsTypeParameterConstraint4.ts(8,16): error TS2322: Type 'W' is not assignable to type 'T'. - Type 'V' is not assignable to type 'T'. -tests/cases/conformance/types/objectTypeLiteral/callSignatures/typeParameterUsedAsTypeParameterConstraint4.ts(12,16): error TS2313: Constraint of a type parameter cannot reference any type parameter from the same type parameter list. -tests/cases/conformance/types/objectTypeLiteral/callSignatures/typeParameterUsedAsTypeParameterConstraint4.ts(12,29): error TS2313: Constraint of a type parameter cannot reference any type parameter from the same type parameter list. tests/cases/conformance/types/objectTypeLiteral/callSignatures/typeParameterUsedAsTypeParameterConstraint4.ts(15,8): error TS2304: Cannot find name 'W'. -tests/cases/conformance/types/objectTypeLiteral/callSignatures/typeParameterUsedAsTypeParameterConstraint4.ts(19,17): error TS2313: Constraint of a type parameter cannot reference any type parameter from the same type parameter list. tests/cases/conformance/types/objectTypeLiteral/callSignatures/typeParameterUsedAsTypeParameterConstraint4.ts(19,43): error TS2304: Cannot find name 'V'. tests/cases/conformance/types/objectTypeLiteral/callSignatures/typeParameterUsedAsTypeParameterConstraint4.ts(20,47): error TS2304: Cannot find name 'X'. -tests/cases/conformance/types/objectTypeLiteral/callSignatures/typeParameterUsedAsTypeParameterConstraint4.ts(22,13): error TS2322: Type 'U' is not assignable to type 'T'. -tests/cases/conformance/types/objectTypeLiteral/callSignatures/typeParameterUsedAsTypeParameterConstraint4.ts(23,20): error TS2322: Type 'U' is not assignable to type 'T'. -tests/cases/conformance/types/objectTypeLiteral/callSignatures/typeParameterUsedAsTypeParameterConstraint4.ts(28,15): error TS2313: Constraint of a type parameter cannot reference any type parameter from the same type parameter list. tests/cases/conformance/types/objectTypeLiteral/callSignatures/typeParameterUsedAsTypeParameterConstraint4.ts(28,44): error TS2304: Cannot find name 'W'. tests/cases/conformance/types/objectTypeLiteral/callSignatures/typeParameterUsedAsTypeParameterConstraint4.ts(29,47): error TS2304: Cannot find name 'Y'. -tests/cases/conformance/types/objectTypeLiteral/callSignatures/typeParameterUsedAsTypeParameterConstraint4.ts(31,13): error TS2322: Type 'U' is not assignable to type 'T'. -tests/cases/conformance/types/objectTypeLiteral/callSignatures/typeParameterUsedAsTypeParameterConstraint4.ts(32,20): error TS2322: Type 'U' is not assignable to type 'T'. -tests/cases/conformance/types/objectTypeLiteral/callSignatures/typeParameterUsedAsTypeParameterConstraint4.ts(37,14): error TS2313: Constraint of a type parameter cannot reference any type parameter from the same type parameter list. tests/cases/conformance/types/objectTypeLiteral/callSignatures/typeParameterUsedAsTypeParameterConstraint4.ts(38,47): error TS2304: Cannot find name 'X'. tests/cases/conformance/types/objectTypeLiteral/callSignatures/typeParameterUsedAsTypeParameterConstraint4.ts(38,53): error TS2304: Cannot find name 'Y'. -tests/cases/conformance/types/objectTypeLiteral/callSignatures/typeParameterUsedAsTypeParameterConstraint4.ts(40,13): error TS2322: Type 'U' is not assignable to type 'T'. -tests/cases/conformance/types/objectTypeLiteral/callSignatures/typeParameterUsedAsTypeParameterConstraint4.ts(41,20): error TS2322: Type 'U' is not assignable to type 'T'. -tests/cases/conformance/types/objectTypeLiteral/callSignatures/typeParameterUsedAsTypeParameterConstraint4.ts(46,11): error TS2313: Constraint of a type parameter cannot reference any type parameter from the same type parameter list. tests/cases/conformance/types/objectTypeLiteral/callSignatures/typeParameterUsedAsTypeParameterConstraint4.ts(46,30): error TS2304: Cannot find name 'V'. tests/cases/conformance/types/objectTypeLiteral/callSignatures/typeParameterUsedAsTypeParameterConstraint4.ts(46,36): error TS2304: Cannot find name 'X'. -==== tests/cases/conformance/types/objectTypeLiteral/callSignatures/typeParameterUsedAsTypeParameterConstraint4.ts (25 errors) ==== +==== tests/cases/conformance/types/objectTypeLiteral/callSignatures/typeParameterUsedAsTypeParameterConstraint4.ts (10 errors) ==== // Type parameters are in scope in their own and other type parameter lists // Some negative cases class C { - ~~~~~~~~~~~ -!!! error TS2313: Constraint of a type parameter cannot reference any type parameter from the same type parameter list. - ~~~~~~~~~~~ -!!! error TS2313: Constraint of a type parameter cannot reference any type parameter from the same type parameter list. z: W; // error ~ !!! error TS2304: Cannot find name 'W'. foo(x: W): T { var r: T; return x; - ~ -!!! error TS2322: Type 'W' is not assignable to type 'T'. -!!! error TS2322: Type 'V' is not assignable to type 'T'. } } interface I { - ~~~~~~~~~~~ -!!! error TS2313: Constraint of a type parameter cannot reference any type parameter from the same type parameter list. - ~~~~~~~~~~~ -!!! error TS2313: Constraint of a type parameter cannot reference any type parameter from the same type parameter list. x: T; y: U; z: W; // error @@ -61,8 +34,6 @@ tests/cases/conformance/types/objectTypeLiteral/callSignatures/typeParameterUsed } function foo(x: T, y: U): V { // error - ~~~~~~~~~~~ -!!! error TS2313: Constraint of a type parameter cannot reference any type parameter from the same type parameter list. ~ !!! error TS2304: Cannot find name 'V'. function bar(): X { // error @@ -70,18 +41,12 @@ tests/cases/conformance/types/objectTypeLiteral/callSignatures/typeParameterUsed !!! error TS2304: Cannot find name 'X'. function baz(a: X, b: Y): T { x = y; - ~ -!!! error TS2322: Type 'U' is not assignable to type 'T'. return y; - ~ -!!! error TS2322: Type 'U' is not assignable to type 'T'. } } } function foo2(x: T, y: U): W { // error - ~~~~~~~~~~~ -!!! error TS2313: Constraint of a type parameter cannot reference any type parameter from the same type parameter list. ~ !!! error TS2304: Cannot find name 'W'. function bar(): Y { // error @@ -89,18 +54,12 @@ tests/cases/conformance/types/objectTypeLiteral/callSignatures/typeParameterUsed !!! error TS2304: Cannot find name 'Y'. function baz(a: X, b: Y): T { x = y; - ~ -!!! error TS2322: Type 'U' is not assignable to type 'T'. return y; - ~ -!!! error TS2322: Type 'U' is not assignable to type 'T'. } } } var f3 = (x: T, y: U) => { - ~~~~~~~~~~~ -!!! error TS2313: Constraint of a type parameter cannot reference any type parameter from the same type parameter list. function bar(r: X, s: Y) { // error ~ !!! error TS2304: Cannot find name 'X'. @@ -108,18 +67,12 @@ tests/cases/conformance/types/objectTypeLiteral/callSignatures/typeParameterUsed !!! error TS2304: Cannot find name 'Y'. var g = (a: X, b: Y): T => { x = y; - ~ -!!! error TS2322: Type 'U' is not assignable to type 'T'. return y; - ~ -!!! error TS2322: Type 'U' is not assignable to type 'T'. } } } var f4 = (x: V, y: X) => { // error - ~~~~~~~~~~~ -!!! error TS2313: Constraint of a type parameter cannot reference any type parameter from the same type parameter list. ~ !!! error TS2304: Cannot find name 'V'. ~ diff --git a/tests/baselines/reference/typeParameterWithInvalidConstraintType.errors.txt b/tests/baselines/reference/typeParameterWithInvalidConstraintType.errors.txt index 8201f752e51..79af423f917 100644 --- a/tests/baselines/reference/typeParameterWithInvalidConstraintType.errors.txt +++ b/tests/baselines/reference/typeParameterWithInvalidConstraintType.errors.txt @@ -1,10 +1,10 @@ -tests/cases/compiler/typeParameterWithInvalidConstraintType.ts(1,9): error TS2313: Constraint of a type parameter cannot reference any type parameter from the same type parameter list. +tests/cases/compiler/typeParameterWithInvalidConstraintType.ts(1,19): error TS2313: Type parameter 'T' has a circular constraint. ==== tests/cases/compiler/typeParameterWithInvalidConstraintType.ts (1 errors) ==== class A { - ~~~~~~~~~~~ -!!! error TS2313: Constraint of a type parameter cannot reference any type parameter from the same type parameter list. + ~ +!!! error TS2313: Type parameter 'T' has a circular constraint. foo() { var x: T; // no error expected below this line diff --git a/tests/baselines/reference/unspecializedConstraints.errors.txt b/tests/baselines/reference/unspecializedConstraints.errors.txt index fc840f328df..a049e508f80 100644 --- a/tests/baselines/reference/unspecializedConstraints.errors.txt +++ b/tests/baselines/reference/unspecializedConstraints.errors.txt @@ -1,10 +1,7 @@ tests/cases/compiler/unspecializedConstraints.ts(84,44): error TS2304: Cannot find name 'TypeParameter'. -tests/cases/compiler/unspecializedConstraints.ts(127,28): error TS2313: Constraint of a type parameter cannot reference any type parameter from the same type parameter list. -tests/cases/compiler/unspecializedConstraints.ts(135,26): error TS2313: Constraint of a type parameter cannot reference any type parameter from the same type parameter list. -tests/cases/compiler/unspecializedConstraints.ts(144,24): error TS2313: Constraint of a type parameter cannot reference any type parameter from the same type parameter list. -==== tests/cases/compiler/unspecializedConstraints.ts (4 errors) ==== +==== tests/cases/compiler/unspecializedConstraints.ts (1 errors) ==== module ts { interface Map { [index: string]: T; @@ -134,8 +131,6 @@ tests/cases/compiler/unspecializedConstraints.ts(144,24): error TS2313: Constrai } function arrayContains>(a: T[], item: T): boolean { - ~~~~~~~~~~~~~~~~~~~ -!!! error TS2313: Constraint of a type parameter cannot reference any type parameter from the same type parameter list. var len = a.length; for (var i = 0; i < len; i++) { if (item.equals(a[i])) return true; @@ -144,8 +139,6 @@ tests/cases/compiler/unspecializedConstraints.ts(144,24): error TS2313: Constrai } function arrayEquals>(a: T[], b: T[]): boolean { - ~~~~~~~~~~~~~~~~~~~ -!!! error TS2313: Constraint of a type parameter cannot reference any type parameter from the same type parameter list. var len = a.length; if (b.length !== len) return false; for (var i = 0; i < len; i++) { @@ -155,8 +148,6 @@ tests/cases/compiler/unspecializedConstraints.ts(144,24): error TS2313: Constrai } function setEquals>(a: T[], b: T[]): boolean { - ~~~~~~~~~~~~~~~~~~~ -!!! error TS2313: Constraint of a type parameter cannot reference any type parameter from the same type parameter list. var len = a.length; if (b.length !== len) return false; for (var i = 0; i < len; i++) { diff --git a/tests/baselines/reference/wrappedAndRecursiveConstraints2.errors.txt b/tests/baselines/reference/wrappedAndRecursiveConstraints2.errors.txt deleted file mode 100644 index 0a7bc52f9d2..00000000000 --- a/tests/baselines/reference/wrappedAndRecursiveConstraints2.errors.txt +++ /dev/null @@ -1,12 +0,0 @@ -tests/cases/conformance/types/typeParameters/typeArgumentLists/wrappedAndRecursiveConstraints2.ts(1,9): error TS2313: Constraint of a type parameter cannot reference any type parameter from the same type parameter list. - - -==== tests/cases/conformance/types/typeParameters/typeArgumentLists/wrappedAndRecursiveConstraints2.ts (1 errors) ==== - class C> { // error - ~~~~~~~~~~~~~~ -!!! error TS2313: Constraint of a type parameter cannot reference any type parameter from the same type parameter list. - constructor(x: T) { } - } - - var c = new C(1); - var c = new C(new C('')); // error \ No newline at end of file diff --git a/tests/baselines/reference/wrappedAndRecursiveConstraints2.symbols b/tests/baselines/reference/wrappedAndRecursiveConstraints2.symbols new file mode 100644 index 00000000000..c359e5b0c4a --- /dev/null +++ b/tests/baselines/reference/wrappedAndRecursiveConstraints2.symbols @@ -0,0 +1,21 @@ +=== tests/cases/conformance/types/typeParameters/typeArgumentLists/wrappedAndRecursiveConstraints2.ts === +class C> { // error +>C : Symbol(C, Decl(wrappedAndRecursiveConstraints2.ts, 0, 0)) +>T : Symbol(T, Decl(wrappedAndRecursiveConstraints2.ts, 0, 8)) +>C : Symbol(C, Decl(wrappedAndRecursiveConstraints2.ts, 0, 0)) +>T : Symbol(T, Decl(wrappedAndRecursiveConstraints2.ts, 0, 8)) + + constructor(x: T) { } +>x : Symbol(x, Decl(wrappedAndRecursiveConstraints2.ts, 1, 16)) +>T : Symbol(T, Decl(wrappedAndRecursiveConstraints2.ts, 0, 8)) +} + +var c = new C(1); +>c : Symbol(c, Decl(wrappedAndRecursiveConstraints2.ts, 4, 3), Decl(wrappedAndRecursiveConstraints2.ts, 5, 3)) +>C : Symbol(C, Decl(wrappedAndRecursiveConstraints2.ts, 0, 0)) + +var c = new C(new C('')); // error +>c : Symbol(c, Decl(wrappedAndRecursiveConstraints2.ts, 4, 3), Decl(wrappedAndRecursiveConstraints2.ts, 5, 3)) +>C : Symbol(C, Decl(wrappedAndRecursiveConstraints2.ts, 0, 0)) +>C : Symbol(C, Decl(wrappedAndRecursiveConstraints2.ts, 0, 0)) + diff --git a/tests/baselines/reference/wrappedAndRecursiveConstraints2.types b/tests/baselines/reference/wrappedAndRecursiveConstraints2.types new file mode 100644 index 00000000000..479cac1d184 --- /dev/null +++ b/tests/baselines/reference/wrappedAndRecursiveConstraints2.types @@ -0,0 +1,26 @@ +=== tests/cases/conformance/types/typeParameters/typeArgumentLists/wrappedAndRecursiveConstraints2.ts === +class C> { // error +>C : C +>T : T +>C : C +>T : T + + constructor(x: T) { } +>x : T +>T : T +} + +var c = new C(1); +>c : C +>new C(1) : C +>C : typeof C +>1 : number + +var c = new C(new C('')); // error +>c : C +>new C(new C('')) : C> +>C : typeof C +>new C('') : C +>C : typeof C +>'' : string + From 94129a50470dac34324f1acb926ab0bf0a16cd16 Mon Sep 17 00:00:00 2001 From: Anders Hejlsberg Date: Wed, 2 Dec 2015 09:45:34 -0800 Subject: [PATCH 024/177] Propagate 'this' type in constraint checking --- src/compiler/checker.ts | 21 ++++++++++++++------- 1 file changed, 14 insertions(+), 7 deletions(-) diff --git a/src/compiler/checker.ts b/src/compiler/checker.ts index dfd108cf713..5d94a51098e 100644 --- a/src/compiler/checker.ts +++ b/src/compiler/checker.ts @@ -6270,9 +6270,8 @@ namespace ts { const constraint = getConstraintOfTypeParameter(context.typeParameters[index]); if (constraint) { const instantiatedConstraint = instantiateType(constraint, getInferenceMapper(context)); - if (!isTypeAssignableTo(inferredType, instantiatedConstraint)) { - inferredType = instantiateType(constraint, createTypeEraser(context.typeParameters)); - context.inferredTypes[index] = inferredType; + if (!isTypeAssignableTo(inferredType, getTypeWithThisArgument(instantiatedConstraint, inferredType))) { + context.inferredTypes[index] = inferredType = instantiatedConstraint; } } } @@ -8716,9 +8715,13 @@ namespace ts { errorInfo = chainDiagnosticMessages(errorInfo, typeArgumentHeadMessage); typeArgumentHeadMessage = headMessage; } + if (!mapper) { + mapper = createTypeMapper(typeParameters, typeArgumentTypes); + } + const typeArgument = typeArgumentTypes[i]; typeArgumentsAreAssignable = checkTypeAssignableTo( - typeArgumentTypes[i], - instantiateType(constraint, mapper || (mapper = createTypeMapper(typeParameters, typeArgumentTypes))), + typeArgument, + getTypeWithThisArgument(instantiateType(constraint, mapper), typeArgument), reportErrors ? typeArgumentNodes[i] : undefined, typeArgumentHeadMessage, errorInfo); @@ -11197,8 +11200,12 @@ namespace ts { typeArguments = map(typeArgumentNodes, getTypeFromTypeNode); mapper = createTypeMapper(typeParameters, typeArguments); } - result = result && checkTypeAssignableTo(typeArguments[i], instantiateType(constraint, mapper), - typeArgumentNodes[i], Diagnostics.Type_0_does_not_satisfy_the_constraint_1); + const typeArgument = typeArguments[i]; + result = result && checkTypeAssignableTo( + typeArgument, + getTypeWithThisArgument(instantiateType(constraint, mapper), typeArgument), + typeArgumentNodes[i], + Diagnostics.Type_0_does_not_satisfy_the_constraint_1); } } return result; From c4cff9833df7a90868473d1461a38dbc7be49896 Mon Sep 17 00:00:00 2001 From: Wesley Wigham Date: Wed, 2 Dec 2015 18:35:49 -0800 Subject: [PATCH 025/177] first pass at this type predicates --- src/compiler/checker.ts | 275 +++++++++++++++++---------- src/compiler/diagnosticMessages.json | 4 + src/compiler/parser.ts | 29 ++- src/compiler/types.ts | 28 ++- src/compiler/utilities.ts | 4 + 5 files changed, 228 insertions(+), 112 deletions(-) diff --git a/src/compiler/checker.ts b/src/compiler/checker.ts index e737cd58bd5..a5a904ab3a9 100644 --- a/src/compiler/checker.ts +++ b/src/compiler/checker.ts @@ -2058,7 +2058,12 @@ namespace ts { let returnType: Type; if (signature.typePredicate) { - writer.writeParameter(signature.typePredicate.parameterName); + if (signature.typePredicate.kind === TypePredicateKind.Identifier) { + writer.writeParameter((signature.typePredicate as IdentifierTypePredicate).parameterName); + } + else { + writeKeyword(writer, SyntaxKind.ThisKeyword); + } writeSpace(writer); writeKeyword(writer, SyntaxKind.IsKeyword); writeSpace(writer); @@ -3356,7 +3361,7 @@ namespace ts { } function createSignature(declaration: SignatureDeclaration, typeParameters: TypeParameter[], parameters: Symbol[], - resolvedReturnType: Type, typePredicate: TypePredicate, minArgumentCount: number, hasRestParameter: boolean, hasStringLiterals: boolean): Signature { + resolvedReturnType: Type, typePredicate: IdentifierTypePredicate | ThisTypePredicate, minArgumentCount: number, hasRestParameter: boolean, hasStringLiterals: boolean): Signature { const sig = new Signature(checker); sig.declaration = declaration; sig.typeParameters = typeParameters; @@ -3884,19 +3889,29 @@ namespace ts { } let returnType: Type; - let typePredicate: TypePredicate; + let typePredicate: IdentifierTypePredicate | ThisTypePredicate; if (classType) { returnType = classType; } else if (declaration.type) { returnType = getTypeFromTypeNode(declaration.type); if (declaration.type.kind === SyntaxKind.TypePredicate) { - const typePredicateNode = declaration.type; - typePredicate = { - parameterName: typePredicateNode.parameterName ? typePredicateNode.parameterName.text : undefined, - parameterIndex: typePredicateNode.parameterName ? getTypePredicateParameterIndex(declaration.parameters, typePredicateNode.parameterName) : undefined, - type: getTypeFromTypeNode(typePredicateNode.type) - }; + const typePredicateNode = declaration.type as TypePredicateNode; + if (typePredicateNode.parameterName.kind === SyntaxKind.Identifier) { + const parameterName = typePredicateNode.parameterName as Identifier; + typePredicate = { + kind: TypePredicateKind.Identifier, + parameterName: parameterName ? parameterName.text : undefined, + parameterIndex: parameterName ? getTypePredicateParameterIndex(declaration.parameters, parameterName) : undefined, + type: getTypeFromTypeNode(typePredicateNode.type) + }; + } + else { + typePredicate = { + kind: TypePredicateKind.This, + type: getTypeFromTypeNode(typePredicateNode.type) + } as ThisTypePredicate; + } } } else { @@ -4716,19 +4731,33 @@ namespace ts { return result; } + function cloneTypePredicate(predicate: TypePredicate, mapper: TypeMapper): ThisTypePredicate | IdentifierTypePredicate { + if (predicate.kind === TypePredicateKind.Identifier) { + const identifierPredicate = predicate as IdentifierTypePredicate; + return { + kind: TypePredicateKind.Identifier, + parameterName: identifierPredicate.parameterName, + parameterIndex: identifierPredicate.parameterIndex, + type: instantiateType(predicate.type, mapper) + } as IdentifierTypePredicate; + } + else { + return { + kind: TypePredicateKind.This, + type: instantiateType(predicate.type, mapper) + } as ThisTypePredicate; + } + } + function instantiateSignature(signature: Signature, mapper: TypeMapper, eraseTypeParameters?: boolean): Signature { let freshTypeParameters: TypeParameter[]; - let freshTypePredicate: TypePredicate; + let freshTypePredicate: ThisTypePredicate | IdentifierTypePredicate; if (signature.typeParameters && !eraseTypeParameters) { freshTypeParameters = instantiateList(signature.typeParameters, mapper, instantiateTypeParameter); mapper = combineTypeMappers(createTypeMapper(signature.typeParameters, freshTypeParameters), mapper); } if (signature.typePredicate) { - freshTypePredicate = { - parameterName: signature.typePredicate.parameterName, - parameterIndex: signature.typePredicate.parameterIndex, - type: instantiateType(signature.typePredicate.type, mapper) - }; + freshTypePredicate = cloneTypePredicate(signature.typePredicate, mapper); } const result = createSignature(signature.declaration, freshTypeParameters, instantiateList(signature.parameters, mapper, instantiateSymbol), @@ -5548,33 +5577,55 @@ namespace ts { } if (source.typePredicate && target.typePredicate) { - const hasDifferentParameterIndex = source.typePredicate.parameterIndex !== target.typePredicate.parameterIndex; - let hasDifferentTypes: boolean; - if (hasDifferentParameterIndex || - (hasDifferentTypes = !isTypeIdenticalTo(source.typePredicate.type, target.typePredicate.type))) { - + if (source.typePredicate.kind !== target.typePredicate.kind) { if (reportErrors) { - const sourceParamText = source.typePredicate.parameterName; - const targetParamText = target.typePredicate.parameterName; - const sourceTypeText = typeToString(source.typePredicate.type); - const targetTypeText = typeToString(target.typePredicate.type); - - if (hasDifferentParameterIndex) { - reportError(Diagnostics.Parameter_0_is_not_in_the_same_position_as_parameter_1, - sourceParamText, - targetParamText); - } - else if (hasDifferentTypes) { + reportError(Diagnostics.A_this_based_type_guard_is_not_assignable_to_a_parameter_based_type_guard); + } + return Ternary.False; + } + if (source.typePredicate.kind === TypePredicateKind.This) { + if (!isTypeIdenticalTo(source.typePredicate.type, target.typePredicate.type)) { + if (reportErrors) { + const sourceTypeText = typeToString(source.typePredicate.type); + const targetTypeText = typeToString(target.typePredicate.type); reportError(Diagnostics.Type_0_is_not_assignable_to_type_1, sourceTypeText, targetTypeText); } + return Ternary.False; + } + } + else { + const sourcePredicate = source.typePredicate as IdentifierTypePredicate; + const targetPredicate = target.typePredicate as IdentifierTypePredicate; + const hasDifferentParameterIndex = sourcePredicate.parameterIndex !== targetPredicate.parameterIndex; + let hasDifferentTypes: boolean; + if (hasDifferentParameterIndex || + (hasDifferentTypes = !isTypeIdenticalTo(sourcePredicate.type, targetPredicate.type))) { - reportError(Diagnostics.Type_predicate_0_is_not_assignable_to_1, - `${sourceParamText} is ${sourceTypeText}`, - `${targetParamText} is ${targetTypeText}`); + if (reportErrors) { + const sourceParamText = sourcePredicate.parameterName; + const targetParamText = targetPredicate.parameterName; + const sourceTypeText = typeToString(sourcePredicate.type); + const targetTypeText = typeToString(targetPredicate.type); + + if (hasDifferentParameterIndex) { + reportError(Diagnostics.Parameter_0_is_not_in_the_same_position_as_parameter_1, + sourceParamText, + targetParamText); + } + else if (hasDifferentTypes) { + reportError(Diagnostics.Type_0_is_not_assignable_to_type_1, + sourceTypeText, + targetTypeText); + } + + reportError(Diagnostics.Type_predicate_0_is_not_assignable_to_1, + `${sourceParamText} is ${sourceTypeText}`, + `${targetParamText} is ${targetTypeText}`); + } + return Ternary.False; } - return Ternary.False; } } else if (!source.typePredicate && target.typePredicate) { @@ -6235,11 +6286,15 @@ namespace ts { function inferFromSignature(source: Signature, target: Signature) { forEachMatchingParameterType(source, target, inferFromTypes); if (source.typePredicate && target.typePredicate) { - if (target.typePredicate.parameterIndex === source.typePredicate.parameterIndex) { - // Return types from type predicates are treated as booleans. In order to infer types - // from type predicates we would need to infer using the type within the type predicate - // (i.e. 'Foo' from 'x is Foo'). - inferFromTypes(source.typePredicate.type, target.typePredicate.type); + if (target.typePredicate.kind === source.typePredicate.kind) { + if ((target.typePredicate.kind === TypePredicateKind.Identifier + && (target.typePredicate as IdentifierTypePredicate).parameterIndex === (source.typePredicate as IdentifierTypePredicate).parameterIndex) + || target.typePredicate.kind === TypePredicateKind.This) { + // Return types from type predicates are treated as booleans. In order to infer types + // from type predicates we would need to infer using the type within the type predicate + // (i.e. 'Foo' from 'x is Foo'). + inferFromTypes(source.typePredicate.type, target.typePredicate.type); + } } } else { @@ -6654,20 +6709,20 @@ namespace ts { } if (targetType) { - if (!assumeTrue) { - if (type.flags & TypeFlags.Union) { - return getUnionType(filter((type).types, t => !isTypeSubtypeOf(t, targetType))); - } - return type; - } - - return getNarrowedType(type, targetType); + return getNarrowedType(type, targetType, assumeTrue); } return type; } - function getNarrowedType(originalType: Type, narrowedTypeCandidate: Type) { + function getNarrowedType(originalType: Type, narrowedTypeCandidate: Type, assumeTrue: boolean) { + if (!assumeTrue) { + if (originalType.flags & TypeFlags.Union) { + return getUnionType(filter((originalType).types, t => !isTypeSubtypeOf(t, narrowedTypeCandidate))); + } + return originalType; + } + // If the current type is a union type, remove all constituents that aren't assignable to target. If that produces // 0 candidates, fall back to the assignability check if (originalType.flags & TypeFlags.Union) { @@ -6691,19 +6746,35 @@ namespace ts { } const signature = getResolvedSignature(expr); - if (signature.typePredicate && - expr.arguments[signature.typePredicate.parameterIndex] && - getSymbolAtLocation(expr.arguments[signature.typePredicate.parameterIndex]) === symbol) { + if (!signature.typePredicate) { + return type; + } + const predicate = signature.typePredicate; + if (isIdentifierTypePredicate(predicate)) { + if (expr.arguments[predicate.parameterIndex] && + getSymbolAtLocation(expr.arguments[predicate.parameterIndex]) === symbol) { + return getNarrowedType(type, predicate.type, assumeTrue); + } + } + else { + const expression = skipParenthesizedNodes(expr.expression); - if (!assumeTrue) { - if (type.flags & TypeFlags.Union) { - return getUnionType(filter((type).types, t => !isTypeSubtypeOf(t, signature.typePredicate.type))); + if (expression.kind === SyntaxKind.ElementAccessExpression || expression.kind === SyntaxKind.PropertyAccessExpression) { + const accessExpression = expression as ElementAccessExpression | PropertyAccessExpression; + const possibleIdentifier = skipParenthesizedNodes(accessExpression.expression); + if (possibleIdentifier.kind === SyntaxKind.Identifier && getSymbolAtLocation(possibleIdentifier) === symbol) { + return getNarrowedType(type, predicate.type, assumeTrue); } - return type; } - return getNarrowedType(type, signature.typePredicate.type); } return type; + + function skipParenthesizedNodes(expression: Expression): Expression { + while (expression.kind === SyntaxKind.ParenthesizedExpression) { + expression = (expression as ParenthesizedExpression).expression; + } + return expression; + } } // Narrow the given type based on the given expression having the assumed boolean value. The returned type @@ -10962,51 +11033,57 @@ namespace ts { const typePredicate = getSignatureFromDeclaration(node).typePredicate; const typePredicateNode = node.type; if (isInLegalTypePredicatePosition(typePredicateNode)) { - if (typePredicate.parameterIndex >= 0) { - if (node.parameters[typePredicate.parameterIndex].dotDotDotToken) { - error(typePredicateNode.parameterName, - Diagnostics.A_type_predicate_cannot_reference_a_rest_parameter); + if (isIdentifierTypePredicate(typePredicate)) { + if (typePredicate.parameterIndex >= 0) { + if (node.parameters[typePredicate.parameterIndex].dotDotDotToken) { + error(typePredicateNode.parameterName, + Diagnostics.A_type_predicate_cannot_reference_a_rest_parameter); + } + else { + checkTypeAssignableTo(typePredicate.type, + getTypeOfNode(node.parameters[typePredicate.parameterIndex]), + typePredicateNode.type); + } } - else { - checkTypeAssignableTo(typePredicate.type, - getTypeOfNode(node.parameters[typePredicate.parameterIndex]), - typePredicateNode.type); + else if (typePredicateNode.parameterName) { + let hasReportedError = false; + for (var param of node.parameters) { + if (hasReportedError) { + break; + } + if (param.name.kind === SyntaxKind.ObjectBindingPattern || + param.name.kind === SyntaxKind.ArrayBindingPattern) { + + (function checkBindingPattern(pattern: BindingPattern) { + for (const element of pattern.elements) { + if (element.name.kind === SyntaxKind.Identifier && + (element.name).text === typePredicate.parameterName) { + + error(typePredicateNode.parameterName, + Diagnostics.A_type_predicate_cannot_reference_element_0_in_a_binding_pattern, + typePredicate.parameterName); + hasReportedError = true; + break; + } + else if (element.name.kind === SyntaxKind.ArrayBindingPattern || + element.name.kind === SyntaxKind.ObjectBindingPattern) { + + checkBindingPattern(element.name); + } + } + })(param.name); + } + } + if (!hasReportedError) { + error(typePredicateNode.parameterName, + Diagnostics.Cannot_find_parameter_0, + typePredicate.parameterName); + } } } - else if (typePredicateNode.parameterName) { - let hasReportedError = false; - for (var param of node.parameters) { - if (hasReportedError) { - break; - } - if (param.name.kind === SyntaxKind.ObjectBindingPattern || - param.name.kind === SyntaxKind.ArrayBindingPattern) { - - (function checkBindingPattern(pattern: BindingPattern) { - for (const element of pattern.elements) { - if (element.name.kind === SyntaxKind.Identifier && - (element.name).text === typePredicate.parameterName) { - - error(typePredicateNode.parameterName, - Diagnostics.A_type_predicate_cannot_reference_element_0_in_a_binding_pattern, - typePredicate.parameterName); - hasReportedError = true; - break; - } - else if (element.name.kind === SyntaxKind.ArrayBindingPattern || - element.name.kind === SyntaxKind.ObjectBindingPattern) { - - checkBindingPattern(element.name); - } - } - })(param.name); - } - } - if (!hasReportedError) { - error(typePredicateNode.parameterName, - Diagnostics.Cannot_find_parameter_0, - typePredicate.parameterName); - } + else { + // Reuse this type diagnostics on the this type node to determine if a this type predicate is valid + getTypeFromThisTypeNode(typePredicateNode.parameterName as ThisTypeNode); } } else { diff --git a/src/compiler/diagnosticMessages.json b/src/compiler/diagnosticMessages.json index 0c19f6d8247..f48a37968ca 100644 --- a/src/compiler/diagnosticMessages.json +++ b/src/compiler/diagnosticMessages.json @@ -1632,6 +1632,10 @@ "category": "Error", "code": 2517 }, + "A this based type guard is not assignable to a parameter based type guard": { + "category": "Error", + "code": 2518 + }, "Duplicate identifier '{0}'. Compiler uses declaration '{1}' to support async functions.": { "category": "Error", "code": 2520 diff --git a/src/compiler/parser.ts b/src/compiler/parser.ts index 3a3350f2166..8b735ad0aa3 100644 --- a/src/compiler/parser.ts +++ b/src/compiler/parser.ts @@ -1959,11 +1959,7 @@ namespace ts { function parseTypeReferenceOrTypePredicate(): TypeReferenceNode | TypePredicateNode { const typeName = parseEntityName(/*allowReservedWords*/ false, Diagnostics.Type_expected); if (typeName.kind === SyntaxKind.Identifier && token === SyntaxKind.IsKeyword && !scanner.hasPrecedingLineBreak()) { - nextToken(); - const node = createNode(SyntaxKind.TypePredicate, typeName.pos); - node.parameterName = typeName; - node.type = parseType(); - return finishNode(node); + return parseTypePredicate(typeName as Identifier); } const node = createNode(SyntaxKind.TypeReference, typeName.pos); node.typeName = typeName; @@ -1973,8 +1969,16 @@ namespace ts { return finishNode(node); } - function parseThisTypeNode(): TypeNode { - const node = createNode(SyntaxKind.ThisType); + function parseTypePredicate(lhs: Identifier | ThisTypeNode): TypePredicateNode { + nextToken(); + const node = createNode(SyntaxKind.TypePredicate, lhs.pos) as TypePredicateNode; + node.parameterName = lhs; + node.type = parseType(); + return finishNode(node); + } + + function parseThisTypeNode(): ThisTypeNode { + const node = createNode(SyntaxKind.ThisType) as ThisTypeNode; nextToken(); return finishNode(node); } @@ -2420,8 +2424,15 @@ namespace ts { return parseStringLiteralTypeNode(); case SyntaxKind.VoidKeyword: return parseTokenNode(); - case SyntaxKind.ThisKeyword: - return parseThisTypeNode(); + case SyntaxKind.ThisKeyword: { + const thisKeyword = parseThisTypeNode(); + if (token === SyntaxKind.IsKeyword && !scanner.hasPrecedingLineBreak()) { + return parseTypePredicate(thisKeyword); + } + else { + return thisKeyword; + } + } case SyntaxKind.TypeOfKeyword: return parseTypeQuery(); case SyntaxKind.OpenBraceToken: diff --git a/src/compiler/types.ts b/src/compiler/types.ts index dbd0322aa18..a55373224b9 100644 --- a/src/compiler/types.ts +++ b/src/compiler/types.ts @@ -733,11 +733,15 @@ namespace ts { // @kind(SyntaxKind.StringKeyword) // @kind(SyntaxKind.SymbolKeyword) // @kind(SyntaxKind.VoidKeyword) - // @kind(SyntaxKind.ThisType) export interface TypeNode extends Node { _typeNodeBrand: any; } + // @kind(SyntaxKind.ThisType) + export interface ThisTypeNode extends TypeNode { + _thisTypeNodeBrand: any; + } + export interface FunctionOrConstructorTypeNode extends TypeNode, SignatureDeclaration { _functionOrConstructorTypeNodeBrand: any; } @@ -756,7 +760,7 @@ namespace ts { // @kind(SyntaxKind.TypePredicate) export interface TypePredicateNode extends TypeNode { - parameterName: Identifier; + parameterName: Identifier | ThisTypeNode; type: TypeNode; } @@ -1820,10 +1824,26 @@ namespace ts { CannotBeNamed } + /* @internal */ + export const enum TypePredicateKind { + This, + Identifier + } + export interface TypePredicate { + kind: TypePredicateKind; + type: Type; + } + + // @kind (TypePredicateKind.This) + export interface ThisTypePredicate extends TypePredicate { + _thisTypePredicateBrand: any; + } + + // @kind (TypePredicateKind.Identifier) + export interface IdentifierTypePredicate extends TypePredicate { parameterName: string; parameterIndex: number; - type: Type; } /* @internal */ @@ -2237,7 +2257,7 @@ namespace ts { declaration: SignatureDeclaration; // Originating declaration typeParameters: TypeParameter[]; // Type parameters (undefined if non-generic) parameters: Symbol[]; // Parameters - typePredicate?: TypePredicate; // Type predicate + typePredicate?: ThisTypePredicate | IdentifierTypePredicate; // Type predicate /* @internal */ resolvedReturnType: Type; // Resolved return type /* @internal */ diff --git a/src/compiler/utilities.ts b/src/compiler/utilities.ts index 280b8203ff4..5a35bcbdee1 100644 --- a/src/compiler/utilities.ts +++ b/src/compiler/utilities.ts @@ -692,6 +692,10 @@ namespace ts { return node && node.kind === SyntaxKind.MethodDeclaration && node.parent.kind === SyntaxKind.ObjectLiteralExpression; } + export function isIdentifierTypePredicate(predicate: TypePredicate): predicate is IdentifierTypePredicate { + return predicate.kind === TypePredicateKind.Identifier; + } + export function getContainingFunction(node: Node): FunctionLikeDeclaration { while (true) { node = node.parent; From 859cc53c1105be721e66d4811430604d342931c7 Mon Sep 17 00:00:00 2001 From: Wesley Wigham Date: Wed, 2 Dec 2015 19:49:43 -0800 Subject: [PATCH 026/177] Add tests, remove internal annotation form enum --- src/compiler/types.ts | 1 - .../reference/typeGuardFunctionOfFormThis.js | 281 ++++++++++++ .../typeGuardFunctionOfFormThis.symbols | 371 +++++++++++++++ .../typeGuardFunctionOfFormThis.types | 427 ++++++++++++++++++ ...peGuardFunctionOfFormThisErrors.errors.txt | 76 ++++ .../typeGuardFunctionOfFormThisErrors.js | 113 +++++ .../typeGuards/typeGuardFunctionOfFormThis.ts | 134 ++++++ .../typeGuardFunctionOfFormThisErrors.ts | 50 ++ 8 files changed, 1452 insertions(+), 1 deletion(-) create mode 100644 tests/baselines/reference/typeGuardFunctionOfFormThis.js create mode 100644 tests/baselines/reference/typeGuardFunctionOfFormThis.symbols create mode 100644 tests/baselines/reference/typeGuardFunctionOfFormThis.types create mode 100644 tests/baselines/reference/typeGuardFunctionOfFormThisErrors.errors.txt create mode 100644 tests/baselines/reference/typeGuardFunctionOfFormThisErrors.js create mode 100644 tests/cases/conformance/expressions/typeGuards/typeGuardFunctionOfFormThis.ts create mode 100644 tests/cases/conformance/expressions/typeGuards/typeGuardFunctionOfFormThisErrors.ts diff --git a/src/compiler/types.ts b/src/compiler/types.ts index a55373224b9..4bde87d0ff5 100644 --- a/src/compiler/types.ts +++ b/src/compiler/types.ts @@ -1824,7 +1824,6 @@ namespace ts { CannotBeNamed } - /* @internal */ export const enum TypePredicateKind { This, Identifier diff --git a/tests/baselines/reference/typeGuardFunctionOfFormThis.js b/tests/baselines/reference/typeGuardFunctionOfFormThis.js new file mode 100644 index 00000000000..16ac876be8c --- /dev/null +++ b/tests/baselines/reference/typeGuardFunctionOfFormThis.js @@ -0,0 +1,281 @@ +//// [typeGuardFunctionOfFormThis.ts] +class RoyalGuard { + isLeader(): this is LeadGuard { + return this instanceof LeadGuard; + } + isFollower(): this is FollowerGuard { + return this instanceof FollowerGuard; + } +} + +class LeadGuard extends RoyalGuard { + lead(): void {}; +} + +class FollowerGuard extends RoyalGuard { + follow(): void {}; +} + +let a: RoyalGuard = new FollowerGuard(); +if (a.isLeader()) { + a.lead(); +} +else if (a.isFollower()) { + a.follow(); +} + +interface GuardInterface extends RoyalGuard {} + +let b: GuardInterface; +if (b.isLeader()) { + b.lead(); +} +else if (b.isFollower()) { + b.follow(); +} + +if (((a.isLeader)())) { + a.lead(); +} +else if (((a).isFollower())) { + a.follow(); +} + +if (((a["isLeader"])())) { + a.lead(); +} +else if (((a)["isFollower"]())) { + a.follow(); +} + +var holder2 = {a}; + +if (holder2.a.isLeader()) { + holder2.a; +} +else { + holder2.a; +} + +class ArrowGuard { + isElite = (): this is ArrowElite => { + return this instanceof ArrowElite; + } + isMedic = (): this is ArrowMedic => { + return this instanceof ArrowMedic; + } +} + +class ArrowElite extends ArrowGuard { + defend(): void {} +} + +class ArrowMedic extends ArrowGuard { + heal(): void {} +} + +let guard = new ArrowGuard(); +if (guard.isElite()) { + guard.defend(); +} +else if (guard.isMedic()) { + guard.heal(); +} + +interface Supplies { + spoiled: boolean; +} + +interface Sundries { + broken: boolean; +} + +interface Crate { + contents: T; + volume: number; + isSupplies(): this is Crate; + isSundries(): this is Crate; +} + +let crate: Crate<{}>; + +if (crate.isSundries()) { + crate.contents.broken = true; +} +else if (crate.isSupplies()) { + crate.contents.spoiled = true; +} + +// Matching guards should be assignable + +a.isFollower = b.isFollower; +a.isLeader = b.isLeader; + +class MimicGuard { + isLeader(): this is MimicLeader { return this instanceof MimicLeader; }; + isFollower(): this is MimicFollower { return this instanceof MimicFollower; }; +} + +class MimicLeader extends MimicGuard { + lead(): void {} +} + +class MimicFollower extends MimicGuard { + follow(): void {} +} + +let mimic = new MimicGuard(); + +a.isLeader = mimic.isLeader; +a.isFollower = mimic.isFollower; + +if (mimic.isFollower()) { + mimic.follow(); + mimic.isFollower = a.isFollower; +} + +//// [typeGuardFunctionOfFormThis.js] +var __extends = (this && this.__extends) || function (d, b) { + for (var p in b) if (b.hasOwnProperty(p)) d[p] = b[p]; + function __() { this.constructor = d; } + d.prototype = b === null ? Object.create(b) : (__.prototype = b.prototype, new __()); +}; +var RoyalGuard = (function () { + function RoyalGuard() { + } + RoyalGuard.prototype.isLeader = function () { + return this instanceof LeadGuard; + }; + RoyalGuard.prototype.isFollower = function () { + return this instanceof FollowerGuard; + }; + return RoyalGuard; +})(); +var LeadGuard = (function (_super) { + __extends(LeadGuard, _super); + function LeadGuard() { + _super.apply(this, arguments); + } + LeadGuard.prototype.lead = function () { }; + ; + return LeadGuard; +})(RoyalGuard); +var FollowerGuard = (function (_super) { + __extends(FollowerGuard, _super); + function FollowerGuard() { + _super.apply(this, arguments); + } + FollowerGuard.prototype.follow = function () { }; + ; + return FollowerGuard; +})(RoyalGuard); +var a = new FollowerGuard(); +if (a.isLeader()) { + a.lead(); +} +else if (a.isFollower()) { + a.follow(); +} +var b; +if (b.isLeader()) { + b.lead(); +} +else if (b.isFollower()) { + b.follow(); +} +if (((a.isLeader)())) { + a.lead(); +} +else if (((a).isFollower())) { + a.follow(); +} +if (((a["isLeader"])())) { + a.lead(); +} +else if (((a)["isFollower"]())) { + a.follow(); +} +var holder2 = { a: a }; +if (holder2.a.isLeader()) { + holder2.a; +} +else { + holder2.a; +} +var ArrowGuard = (function () { + function ArrowGuard() { + var _this = this; + this.isElite = function () { + return _this instanceof ArrowElite; + }; + this.isMedic = function () { + return _this instanceof ArrowMedic; + }; + } + return ArrowGuard; +})(); +var ArrowElite = (function (_super) { + __extends(ArrowElite, _super); + function ArrowElite() { + _super.apply(this, arguments); + } + ArrowElite.prototype.defend = function () { }; + return ArrowElite; +})(ArrowGuard); +var ArrowMedic = (function (_super) { + __extends(ArrowMedic, _super); + function ArrowMedic() { + _super.apply(this, arguments); + } + ArrowMedic.prototype.heal = function () { }; + return ArrowMedic; +})(ArrowGuard); +var guard = new ArrowGuard(); +if (guard.isElite()) { + guard.defend(); +} +else if (guard.isMedic()) { + guard.heal(); +} +var crate; +if (crate.isSundries()) { + crate.contents.broken = true; +} +else if (crate.isSupplies()) { + crate.contents.spoiled = true; +} +// Matching guards should be assignable +a.isFollower = b.isFollower; +a.isLeader = b.isLeader; +var MimicGuard = (function () { + function MimicGuard() { + } + MimicGuard.prototype.isLeader = function () { return this instanceof MimicLeader; }; + ; + MimicGuard.prototype.isFollower = function () { return this instanceof MimicFollower; }; + ; + return MimicGuard; +})(); +var MimicLeader = (function (_super) { + __extends(MimicLeader, _super); + function MimicLeader() { + _super.apply(this, arguments); + } + MimicLeader.prototype.lead = function () { }; + return MimicLeader; +})(MimicGuard); +var MimicFollower = (function (_super) { + __extends(MimicFollower, _super); + function MimicFollower() { + _super.apply(this, arguments); + } + MimicFollower.prototype.follow = function () { }; + return MimicFollower; +})(MimicGuard); +var mimic = new MimicGuard(); +a.isLeader = mimic.isLeader; +a.isFollower = mimic.isFollower; +if (mimic.isFollower()) { + mimic.follow(); + mimic.isFollower = a.isFollower; +} diff --git a/tests/baselines/reference/typeGuardFunctionOfFormThis.symbols b/tests/baselines/reference/typeGuardFunctionOfFormThis.symbols new file mode 100644 index 00000000000..9bda32c4557 --- /dev/null +++ b/tests/baselines/reference/typeGuardFunctionOfFormThis.symbols @@ -0,0 +1,371 @@ +=== tests/cases/conformance/expressions/typeGuards/typeGuardFunctionOfFormThis.ts === +class RoyalGuard { +>RoyalGuard : Symbol(RoyalGuard, Decl(typeGuardFunctionOfFormThis.ts, 0, 0)) + + isLeader(): this is LeadGuard { +>isLeader : Symbol(isLeader, Decl(typeGuardFunctionOfFormThis.ts, 0, 18)) +>LeadGuard : Symbol(LeadGuard, Decl(typeGuardFunctionOfFormThis.ts, 7, 1)) + + return this instanceof LeadGuard; +>this : Symbol(RoyalGuard, Decl(typeGuardFunctionOfFormThis.ts, 0, 0)) +>LeadGuard : Symbol(LeadGuard, Decl(typeGuardFunctionOfFormThis.ts, 7, 1)) + } + isFollower(): this is FollowerGuard { +>isFollower : Symbol(isFollower, Decl(typeGuardFunctionOfFormThis.ts, 3, 5)) +>FollowerGuard : Symbol(FollowerGuard, Decl(typeGuardFunctionOfFormThis.ts, 11, 1)) + + return this instanceof FollowerGuard; +>this : Symbol(RoyalGuard, Decl(typeGuardFunctionOfFormThis.ts, 0, 0)) +>FollowerGuard : Symbol(FollowerGuard, Decl(typeGuardFunctionOfFormThis.ts, 11, 1)) + } +} + +class LeadGuard extends RoyalGuard { +>LeadGuard : Symbol(LeadGuard, Decl(typeGuardFunctionOfFormThis.ts, 7, 1)) +>RoyalGuard : Symbol(RoyalGuard, Decl(typeGuardFunctionOfFormThis.ts, 0, 0)) + + lead(): void {}; +>lead : Symbol(lead, Decl(typeGuardFunctionOfFormThis.ts, 9, 36)) +} + +class FollowerGuard extends RoyalGuard { +>FollowerGuard : Symbol(FollowerGuard, Decl(typeGuardFunctionOfFormThis.ts, 11, 1)) +>RoyalGuard : Symbol(RoyalGuard, Decl(typeGuardFunctionOfFormThis.ts, 0, 0)) + + follow(): void {}; +>follow : Symbol(follow, Decl(typeGuardFunctionOfFormThis.ts, 13, 40)) +} + +let a: RoyalGuard = new FollowerGuard(); +>a : Symbol(a, Decl(typeGuardFunctionOfFormThis.ts, 17, 3)) +>RoyalGuard : Symbol(RoyalGuard, Decl(typeGuardFunctionOfFormThis.ts, 0, 0)) +>FollowerGuard : Symbol(FollowerGuard, Decl(typeGuardFunctionOfFormThis.ts, 11, 1)) + +if (a.isLeader()) { +>a.isLeader : Symbol(RoyalGuard.isLeader, Decl(typeGuardFunctionOfFormThis.ts, 0, 18)) +>a : Symbol(a, Decl(typeGuardFunctionOfFormThis.ts, 17, 3)) +>isLeader : Symbol(RoyalGuard.isLeader, Decl(typeGuardFunctionOfFormThis.ts, 0, 18)) + + a.lead(); +>a.lead : Symbol(LeadGuard.lead, Decl(typeGuardFunctionOfFormThis.ts, 9, 36)) +>a : Symbol(a, Decl(typeGuardFunctionOfFormThis.ts, 17, 3)) +>lead : Symbol(LeadGuard.lead, Decl(typeGuardFunctionOfFormThis.ts, 9, 36)) +} +else if (a.isFollower()) { +>a.isFollower : Symbol(RoyalGuard.isFollower, Decl(typeGuardFunctionOfFormThis.ts, 3, 5)) +>a : Symbol(a, Decl(typeGuardFunctionOfFormThis.ts, 17, 3)) +>isFollower : Symbol(RoyalGuard.isFollower, Decl(typeGuardFunctionOfFormThis.ts, 3, 5)) + + a.follow(); +>a.follow : Symbol(FollowerGuard.follow, Decl(typeGuardFunctionOfFormThis.ts, 13, 40)) +>a : Symbol(a, Decl(typeGuardFunctionOfFormThis.ts, 17, 3)) +>follow : Symbol(FollowerGuard.follow, Decl(typeGuardFunctionOfFormThis.ts, 13, 40)) +} + +interface GuardInterface extends RoyalGuard {} +>GuardInterface : Symbol(GuardInterface, Decl(typeGuardFunctionOfFormThis.ts, 23, 1)) +>RoyalGuard : Symbol(RoyalGuard, Decl(typeGuardFunctionOfFormThis.ts, 0, 0)) + +let b: GuardInterface; +>b : Symbol(b, Decl(typeGuardFunctionOfFormThis.ts, 27, 3)) +>GuardInterface : Symbol(GuardInterface, Decl(typeGuardFunctionOfFormThis.ts, 23, 1)) + +if (b.isLeader()) { +>b.isLeader : Symbol(RoyalGuard.isLeader, Decl(typeGuardFunctionOfFormThis.ts, 0, 18)) +>b : Symbol(b, Decl(typeGuardFunctionOfFormThis.ts, 27, 3)) +>isLeader : Symbol(RoyalGuard.isLeader, Decl(typeGuardFunctionOfFormThis.ts, 0, 18)) + + b.lead(); +>b.lead : Symbol(LeadGuard.lead, Decl(typeGuardFunctionOfFormThis.ts, 9, 36)) +>b : Symbol(b, Decl(typeGuardFunctionOfFormThis.ts, 27, 3)) +>lead : Symbol(LeadGuard.lead, Decl(typeGuardFunctionOfFormThis.ts, 9, 36)) +} +else if (b.isFollower()) { +>b.isFollower : Symbol(RoyalGuard.isFollower, Decl(typeGuardFunctionOfFormThis.ts, 3, 5)) +>b : Symbol(b, Decl(typeGuardFunctionOfFormThis.ts, 27, 3)) +>isFollower : Symbol(RoyalGuard.isFollower, Decl(typeGuardFunctionOfFormThis.ts, 3, 5)) + + b.follow(); +>b.follow : Symbol(FollowerGuard.follow, Decl(typeGuardFunctionOfFormThis.ts, 13, 40)) +>b : Symbol(b, Decl(typeGuardFunctionOfFormThis.ts, 27, 3)) +>follow : Symbol(FollowerGuard.follow, Decl(typeGuardFunctionOfFormThis.ts, 13, 40)) +} + +if (((a.isLeader)())) { +>a.isLeader : Symbol(RoyalGuard.isLeader, Decl(typeGuardFunctionOfFormThis.ts, 0, 18)) +>a : Symbol(a, Decl(typeGuardFunctionOfFormThis.ts, 17, 3)) +>isLeader : Symbol(RoyalGuard.isLeader, Decl(typeGuardFunctionOfFormThis.ts, 0, 18)) + + a.lead(); +>a.lead : Symbol(LeadGuard.lead, Decl(typeGuardFunctionOfFormThis.ts, 9, 36)) +>a : Symbol(a, Decl(typeGuardFunctionOfFormThis.ts, 17, 3)) +>lead : Symbol(LeadGuard.lead, Decl(typeGuardFunctionOfFormThis.ts, 9, 36)) +} +else if (((a).isFollower())) { +>(a).isFollower : Symbol(RoyalGuard.isFollower, Decl(typeGuardFunctionOfFormThis.ts, 3, 5)) +>a : Symbol(a, Decl(typeGuardFunctionOfFormThis.ts, 17, 3)) +>isFollower : Symbol(RoyalGuard.isFollower, Decl(typeGuardFunctionOfFormThis.ts, 3, 5)) + + a.follow(); +>a.follow : Symbol(FollowerGuard.follow, Decl(typeGuardFunctionOfFormThis.ts, 13, 40)) +>a : Symbol(a, Decl(typeGuardFunctionOfFormThis.ts, 17, 3)) +>follow : Symbol(FollowerGuard.follow, Decl(typeGuardFunctionOfFormThis.ts, 13, 40)) +} + +if (((a["isLeader"])())) { +>a : Symbol(a, Decl(typeGuardFunctionOfFormThis.ts, 17, 3)) +>"isLeader" : Symbol(RoyalGuard.isLeader, Decl(typeGuardFunctionOfFormThis.ts, 0, 18)) + + a.lead(); +>a.lead : Symbol(LeadGuard.lead, Decl(typeGuardFunctionOfFormThis.ts, 9, 36)) +>a : Symbol(a, Decl(typeGuardFunctionOfFormThis.ts, 17, 3)) +>lead : Symbol(LeadGuard.lead, Decl(typeGuardFunctionOfFormThis.ts, 9, 36)) +} +else if (((a)["isFollower"]())) { +>a : Symbol(a, Decl(typeGuardFunctionOfFormThis.ts, 17, 3)) +>"isFollower" : Symbol(RoyalGuard.isFollower, Decl(typeGuardFunctionOfFormThis.ts, 3, 5)) + + a.follow(); +>a.follow : Symbol(FollowerGuard.follow, Decl(typeGuardFunctionOfFormThis.ts, 13, 40)) +>a : Symbol(a, Decl(typeGuardFunctionOfFormThis.ts, 17, 3)) +>follow : Symbol(FollowerGuard.follow, Decl(typeGuardFunctionOfFormThis.ts, 13, 40)) +} + +var holder2 = {a}; +>holder2 : Symbol(holder2, Decl(typeGuardFunctionOfFormThis.ts, 49, 3)) +>a : Symbol(a, Decl(typeGuardFunctionOfFormThis.ts, 49, 15)) + +if (holder2.a.isLeader()) { +>holder2.a.isLeader : Symbol(RoyalGuard.isLeader, Decl(typeGuardFunctionOfFormThis.ts, 0, 18)) +>holder2.a : Symbol(a, Decl(typeGuardFunctionOfFormThis.ts, 49, 15)) +>holder2 : Symbol(holder2, Decl(typeGuardFunctionOfFormThis.ts, 49, 3)) +>a : Symbol(a, Decl(typeGuardFunctionOfFormThis.ts, 49, 15)) +>isLeader : Symbol(RoyalGuard.isLeader, Decl(typeGuardFunctionOfFormThis.ts, 0, 18)) + + holder2.a; +>holder2.a : Symbol(a, Decl(typeGuardFunctionOfFormThis.ts, 49, 15)) +>holder2 : Symbol(holder2, Decl(typeGuardFunctionOfFormThis.ts, 49, 3)) +>a : Symbol(a, Decl(typeGuardFunctionOfFormThis.ts, 49, 15)) +} +else { + holder2.a; +>holder2.a : Symbol(a, Decl(typeGuardFunctionOfFormThis.ts, 49, 15)) +>holder2 : Symbol(holder2, Decl(typeGuardFunctionOfFormThis.ts, 49, 3)) +>a : Symbol(a, Decl(typeGuardFunctionOfFormThis.ts, 49, 15)) +} + +class ArrowGuard { +>ArrowGuard : Symbol(ArrowGuard, Decl(typeGuardFunctionOfFormThis.ts, 56, 1)) + + isElite = (): this is ArrowElite => { +>isElite : Symbol(isElite, Decl(typeGuardFunctionOfFormThis.ts, 58, 18)) +>ArrowElite : Symbol(ArrowElite, Decl(typeGuardFunctionOfFormThis.ts, 65, 1)) + + return this instanceof ArrowElite; +>this : Symbol(ArrowGuard, Decl(typeGuardFunctionOfFormThis.ts, 56, 1)) +>ArrowElite : Symbol(ArrowElite, Decl(typeGuardFunctionOfFormThis.ts, 65, 1)) + } + isMedic = (): this is ArrowMedic => { +>isMedic : Symbol(isMedic, Decl(typeGuardFunctionOfFormThis.ts, 61, 5)) +>ArrowMedic : Symbol(ArrowMedic, Decl(typeGuardFunctionOfFormThis.ts, 69, 1)) + + return this instanceof ArrowMedic; +>this : Symbol(ArrowGuard, Decl(typeGuardFunctionOfFormThis.ts, 56, 1)) +>ArrowMedic : Symbol(ArrowMedic, Decl(typeGuardFunctionOfFormThis.ts, 69, 1)) + } +} + +class ArrowElite extends ArrowGuard { +>ArrowElite : Symbol(ArrowElite, Decl(typeGuardFunctionOfFormThis.ts, 65, 1)) +>ArrowGuard : Symbol(ArrowGuard, Decl(typeGuardFunctionOfFormThis.ts, 56, 1)) + + defend(): void {} +>defend : Symbol(defend, Decl(typeGuardFunctionOfFormThis.ts, 67, 37)) +} + +class ArrowMedic extends ArrowGuard { +>ArrowMedic : Symbol(ArrowMedic, Decl(typeGuardFunctionOfFormThis.ts, 69, 1)) +>ArrowGuard : Symbol(ArrowGuard, Decl(typeGuardFunctionOfFormThis.ts, 56, 1)) + + heal(): void {} +>heal : Symbol(heal, Decl(typeGuardFunctionOfFormThis.ts, 71, 37)) +} + +let guard = new ArrowGuard(); +>guard : Symbol(guard, Decl(typeGuardFunctionOfFormThis.ts, 75, 3)) +>ArrowGuard : Symbol(ArrowGuard, Decl(typeGuardFunctionOfFormThis.ts, 56, 1)) + +if (guard.isElite()) { +>guard.isElite : Symbol(ArrowGuard.isElite, Decl(typeGuardFunctionOfFormThis.ts, 58, 18)) +>guard : Symbol(guard, Decl(typeGuardFunctionOfFormThis.ts, 75, 3)) +>isElite : Symbol(ArrowGuard.isElite, Decl(typeGuardFunctionOfFormThis.ts, 58, 18)) + + guard.defend(); +>guard.defend : Symbol(ArrowElite.defend, Decl(typeGuardFunctionOfFormThis.ts, 67, 37)) +>guard : Symbol(guard, Decl(typeGuardFunctionOfFormThis.ts, 75, 3)) +>defend : Symbol(ArrowElite.defend, Decl(typeGuardFunctionOfFormThis.ts, 67, 37)) +} +else if (guard.isMedic()) { +>guard.isMedic : Symbol(ArrowGuard.isMedic, Decl(typeGuardFunctionOfFormThis.ts, 61, 5)) +>guard : Symbol(guard, Decl(typeGuardFunctionOfFormThis.ts, 75, 3)) +>isMedic : Symbol(ArrowGuard.isMedic, Decl(typeGuardFunctionOfFormThis.ts, 61, 5)) + + guard.heal(); +>guard.heal : Symbol(ArrowMedic.heal, Decl(typeGuardFunctionOfFormThis.ts, 71, 37)) +>guard : Symbol(guard, Decl(typeGuardFunctionOfFormThis.ts, 75, 3)) +>heal : Symbol(ArrowMedic.heal, Decl(typeGuardFunctionOfFormThis.ts, 71, 37)) +} + +interface Supplies { +>Supplies : Symbol(Supplies, Decl(typeGuardFunctionOfFormThis.ts, 81, 1)) + + spoiled: boolean; +>spoiled : Symbol(spoiled, Decl(typeGuardFunctionOfFormThis.ts, 83, 20)) +} + +interface Sundries { +>Sundries : Symbol(Sundries, Decl(typeGuardFunctionOfFormThis.ts, 85, 1)) + + broken: boolean; +>broken : Symbol(broken, Decl(typeGuardFunctionOfFormThis.ts, 87, 20)) +} + +interface Crate { +>Crate : Symbol(Crate, Decl(typeGuardFunctionOfFormThis.ts, 89, 1)) +>T : Symbol(T, Decl(typeGuardFunctionOfFormThis.ts, 91, 16)) + + contents: T; +>contents : Symbol(contents, Decl(typeGuardFunctionOfFormThis.ts, 91, 20)) +>T : Symbol(T, Decl(typeGuardFunctionOfFormThis.ts, 91, 16)) + + volume: number; +>volume : Symbol(volume, Decl(typeGuardFunctionOfFormThis.ts, 92, 16)) + + isSupplies(): this is Crate; +>isSupplies : Symbol(isSupplies, Decl(typeGuardFunctionOfFormThis.ts, 93, 19)) +>Crate : Symbol(Crate, Decl(typeGuardFunctionOfFormThis.ts, 89, 1)) +>Supplies : Symbol(Supplies, Decl(typeGuardFunctionOfFormThis.ts, 81, 1)) + + isSundries(): this is Crate; +>isSundries : Symbol(isSundries, Decl(typeGuardFunctionOfFormThis.ts, 94, 42)) +>Crate : Symbol(Crate, Decl(typeGuardFunctionOfFormThis.ts, 89, 1)) +>Sundries : Symbol(Sundries, Decl(typeGuardFunctionOfFormThis.ts, 85, 1)) +} + +let crate: Crate<{}>; +>crate : Symbol(crate, Decl(typeGuardFunctionOfFormThis.ts, 98, 3)) +>Crate : Symbol(Crate, Decl(typeGuardFunctionOfFormThis.ts, 89, 1)) + +if (crate.isSundries()) { +>crate.isSundries : Symbol(Crate.isSundries, Decl(typeGuardFunctionOfFormThis.ts, 94, 42)) +>crate : Symbol(crate, Decl(typeGuardFunctionOfFormThis.ts, 98, 3)) +>isSundries : Symbol(Crate.isSundries, Decl(typeGuardFunctionOfFormThis.ts, 94, 42)) + + crate.contents.broken = true; +>crate.contents.broken : Symbol(Sundries.broken, Decl(typeGuardFunctionOfFormThis.ts, 87, 20)) +>crate.contents : Symbol(Crate.contents, Decl(typeGuardFunctionOfFormThis.ts, 91, 20)) +>crate : Symbol(crate, Decl(typeGuardFunctionOfFormThis.ts, 98, 3)) +>contents : Symbol(Crate.contents, Decl(typeGuardFunctionOfFormThis.ts, 91, 20)) +>broken : Symbol(Sundries.broken, Decl(typeGuardFunctionOfFormThis.ts, 87, 20)) +} +else if (crate.isSupplies()) { +>crate.isSupplies : Symbol(Crate.isSupplies, Decl(typeGuardFunctionOfFormThis.ts, 93, 19)) +>crate : Symbol(crate, Decl(typeGuardFunctionOfFormThis.ts, 98, 3)) +>isSupplies : Symbol(Crate.isSupplies, Decl(typeGuardFunctionOfFormThis.ts, 93, 19)) + + crate.contents.spoiled = true; +>crate.contents.spoiled : Symbol(Supplies.spoiled, Decl(typeGuardFunctionOfFormThis.ts, 83, 20)) +>crate.contents : Symbol(Crate.contents, Decl(typeGuardFunctionOfFormThis.ts, 91, 20)) +>crate : Symbol(crate, Decl(typeGuardFunctionOfFormThis.ts, 98, 3)) +>contents : Symbol(Crate.contents, Decl(typeGuardFunctionOfFormThis.ts, 91, 20)) +>spoiled : Symbol(Supplies.spoiled, Decl(typeGuardFunctionOfFormThis.ts, 83, 20)) +} + +// Matching guards should be assignable + +a.isFollower = b.isFollower; +>a.isFollower : Symbol(RoyalGuard.isFollower, Decl(typeGuardFunctionOfFormThis.ts, 3, 5)) +>a : Symbol(a, Decl(typeGuardFunctionOfFormThis.ts, 17, 3)) +>isFollower : Symbol(RoyalGuard.isFollower, Decl(typeGuardFunctionOfFormThis.ts, 3, 5)) +>b.isFollower : Symbol(RoyalGuard.isFollower, Decl(typeGuardFunctionOfFormThis.ts, 3, 5)) +>b : Symbol(b, Decl(typeGuardFunctionOfFormThis.ts, 27, 3)) +>isFollower : Symbol(RoyalGuard.isFollower, Decl(typeGuardFunctionOfFormThis.ts, 3, 5)) + +a.isLeader = b.isLeader; +>a.isLeader : Symbol(RoyalGuard.isLeader, Decl(typeGuardFunctionOfFormThis.ts, 0, 18)) +>a : Symbol(a, Decl(typeGuardFunctionOfFormThis.ts, 17, 3)) +>isLeader : Symbol(RoyalGuard.isLeader, Decl(typeGuardFunctionOfFormThis.ts, 0, 18)) +>b.isLeader : Symbol(RoyalGuard.isLeader, Decl(typeGuardFunctionOfFormThis.ts, 0, 18)) +>b : Symbol(b, Decl(typeGuardFunctionOfFormThis.ts, 27, 3)) +>isLeader : Symbol(RoyalGuard.isLeader, Decl(typeGuardFunctionOfFormThis.ts, 0, 18)) + +class MimicGuard { +>MimicGuard : Symbol(MimicGuard, Decl(typeGuardFunctionOfFormThis.ts, 110, 24)) + + isLeader(): this is MimicLeader { return this instanceof MimicLeader; }; +>isLeader : Symbol(isLeader, Decl(typeGuardFunctionOfFormThis.ts, 112, 18)) +>MimicLeader : Symbol(MimicLeader, Decl(typeGuardFunctionOfFormThis.ts, 115, 1)) +>this : Symbol(MimicGuard, Decl(typeGuardFunctionOfFormThis.ts, 110, 24)) +>MimicLeader : Symbol(MimicLeader, Decl(typeGuardFunctionOfFormThis.ts, 115, 1)) + + isFollower(): this is MimicFollower { return this instanceof MimicFollower; }; +>isFollower : Symbol(isFollower, Decl(typeGuardFunctionOfFormThis.ts, 113, 76)) +>MimicFollower : Symbol(MimicFollower, Decl(typeGuardFunctionOfFormThis.ts, 119, 1)) +>this : Symbol(MimicGuard, Decl(typeGuardFunctionOfFormThis.ts, 110, 24)) +>MimicFollower : Symbol(MimicFollower, Decl(typeGuardFunctionOfFormThis.ts, 119, 1)) +} + +class MimicLeader extends MimicGuard { +>MimicLeader : Symbol(MimicLeader, Decl(typeGuardFunctionOfFormThis.ts, 115, 1)) +>MimicGuard : Symbol(MimicGuard, Decl(typeGuardFunctionOfFormThis.ts, 110, 24)) + + lead(): void {} +>lead : Symbol(lead, Decl(typeGuardFunctionOfFormThis.ts, 117, 38)) +} + +class MimicFollower extends MimicGuard { +>MimicFollower : Symbol(MimicFollower, Decl(typeGuardFunctionOfFormThis.ts, 119, 1)) +>MimicGuard : Symbol(MimicGuard, Decl(typeGuardFunctionOfFormThis.ts, 110, 24)) + + follow(): void {} +>follow : Symbol(follow, Decl(typeGuardFunctionOfFormThis.ts, 121, 40)) +} + +let mimic = new MimicGuard(); +>mimic : Symbol(mimic, Decl(typeGuardFunctionOfFormThis.ts, 125, 3)) +>MimicGuard : Symbol(MimicGuard, Decl(typeGuardFunctionOfFormThis.ts, 110, 24)) + +a.isLeader = mimic.isLeader; +>a.isLeader : Symbol(RoyalGuard.isLeader, Decl(typeGuardFunctionOfFormThis.ts, 0, 18)) +>a : Symbol(a, Decl(typeGuardFunctionOfFormThis.ts, 17, 3)) +>isLeader : Symbol(RoyalGuard.isLeader, Decl(typeGuardFunctionOfFormThis.ts, 0, 18)) +>mimic.isLeader : Symbol(MimicGuard.isLeader, Decl(typeGuardFunctionOfFormThis.ts, 112, 18)) +>mimic : Symbol(mimic, Decl(typeGuardFunctionOfFormThis.ts, 125, 3)) +>isLeader : Symbol(MimicGuard.isLeader, Decl(typeGuardFunctionOfFormThis.ts, 112, 18)) + +a.isFollower = mimic.isFollower; +>a.isFollower : Symbol(RoyalGuard.isFollower, Decl(typeGuardFunctionOfFormThis.ts, 3, 5)) +>a : Symbol(a, Decl(typeGuardFunctionOfFormThis.ts, 17, 3)) +>isFollower : Symbol(RoyalGuard.isFollower, Decl(typeGuardFunctionOfFormThis.ts, 3, 5)) +>mimic.isFollower : Symbol(MimicGuard.isFollower, Decl(typeGuardFunctionOfFormThis.ts, 113, 76)) +>mimic : Symbol(mimic, Decl(typeGuardFunctionOfFormThis.ts, 125, 3)) +>isFollower : Symbol(MimicGuard.isFollower, Decl(typeGuardFunctionOfFormThis.ts, 113, 76)) + +if (mimic.isFollower()) { +>mimic.isFollower : Symbol(MimicGuard.isFollower, Decl(typeGuardFunctionOfFormThis.ts, 113, 76)) +>mimic : Symbol(mimic, Decl(typeGuardFunctionOfFormThis.ts, 125, 3)) +>isFollower : Symbol(MimicGuard.isFollower, Decl(typeGuardFunctionOfFormThis.ts, 113, 76)) + + mimic.follow(); +>mimic.follow : Symbol(MimicFollower.follow, Decl(typeGuardFunctionOfFormThis.ts, 121, 40)) +>mimic : Symbol(mimic, Decl(typeGuardFunctionOfFormThis.ts, 125, 3)) +>follow : Symbol(MimicFollower.follow, Decl(typeGuardFunctionOfFormThis.ts, 121, 40)) + + mimic.isFollower = a.isFollower; +>mimic.isFollower : Symbol(MimicGuard.isFollower, Decl(typeGuardFunctionOfFormThis.ts, 113, 76)) +>mimic : Symbol(mimic, Decl(typeGuardFunctionOfFormThis.ts, 125, 3)) +>isFollower : Symbol(MimicGuard.isFollower, Decl(typeGuardFunctionOfFormThis.ts, 113, 76)) +>a.isFollower : Symbol(RoyalGuard.isFollower, Decl(typeGuardFunctionOfFormThis.ts, 3, 5)) +>a : Symbol(a, Decl(typeGuardFunctionOfFormThis.ts, 17, 3)) +>isFollower : Symbol(RoyalGuard.isFollower, Decl(typeGuardFunctionOfFormThis.ts, 3, 5)) +} diff --git a/tests/baselines/reference/typeGuardFunctionOfFormThis.types b/tests/baselines/reference/typeGuardFunctionOfFormThis.types new file mode 100644 index 00000000000..fbe862ab98b --- /dev/null +++ b/tests/baselines/reference/typeGuardFunctionOfFormThis.types @@ -0,0 +1,427 @@ +=== tests/cases/conformance/expressions/typeGuards/typeGuardFunctionOfFormThis.ts === +class RoyalGuard { +>RoyalGuard : RoyalGuard + + isLeader(): this is LeadGuard { +>isLeader : () => this is LeadGuard +>LeadGuard : LeadGuard + + return this instanceof LeadGuard; +>this instanceof LeadGuard : boolean +>this : this +>LeadGuard : typeof LeadGuard + } + isFollower(): this is FollowerGuard { +>isFollower : () => this is FollowerGuard +>FollowerGuard : FollowerGuard + + return this instanceof FollowerGuard; +>this instanceof FollowerGuard : boolean +>this : this +>FollowerGuard : typeof FollowerGuard + } +} + +class LeadGuard extends RoyalGuard { +>LeadGuard : LeadGuard +>RoyalGuard : RoyalGuard + + lead(): void {}; +>lead : () => void +} + +class FollowerGuard extends RoyalGuard { +>FollowerGuard : FollowerGuard +>RoyalGuard : RoyalGuard + + follow(): void {}; +>follow : () => void +} + +let a: RoyalGuard = new FollowerGuard(); +>a : RoyalGuard +>RoyalGuard : RoyalGuard +>new FollowerGuard() : FollowerGuard +>FollowerGuard : typeof FollowerGuard + +if (a.isLeader()) { +>a.isLeader() : boolean +>a.isLeader : () => this is LeadGuard +>a : RoyalGuard +>isLeader : () => this is LeadGuard + + a.lead(); +>a.lead() : void +>a.lead : () => void +>a : LeadGuard +>lead : () => void +} +else if (a.isFollower()) { +>a.isFollower() : boolean +>a.isFollower : () => this is FollowerGuard +>a : RoyalGuard +>isFollower : () => this is FollowerGuard + + a.follow(); +>a.follow() : void +>a.follow : () => void +>a : FollowerGuard +>follow : () => void +} + +interface GuardInterface extends RoyalGuard {} +>GuardInterface : GuardInterface +>RoyalGuard : RoyalGuard + +let b: GuardInterface; +>b : GuardInterface +>GuardInterface : GuardInterface + +if (b.isLeader()) { +>b.isLeader() : boolean +>b.isLeader : () => this is LeadGuard +>b : GuardInterface +>isLeader : () => this is LeadGuard + + b.lead(); +>b.lead() : void +>b.lead : () => void +>b : LeadGuard +>lead : () => void +} +else if (b.isFollower()) { +>b.isFollower() : boolean +>b.isFollower : () => this is FollowerGuard +>b : GuardInterface +>isFollower : () => this is FollowerGuard + + b.follow(); +>b.follow() : void +>b.follow : () => void +>b : FollowerGuard +>follow : () => void +} + +if (((a.isLeader)())) { +>((a.isLeader)()) : boolean +>(a.isLeader)() : boolean +>(a.isLeader) : () => this is LeadGuard +>a.isLeader : () => this is LeadGuard +>a : RoyalGuard +>isLeader : () => this is LeadGuard + + a.lead(); +>a.lead() : void +>a.lead : () => void +>a : LeadGuard +>lead : () => void +} +else if (((a).isFollower())) { +>((a).isFollower()) : boolean +>(a).isFollower() : boolean +>(a).isFollower : () => this is FollowerGuard +>(a) : RoyalGuard +>a : RoyalGuard +>isFollower : () => this is FollowerGuard + + a.follow(); +>a.follow() : void +>a.follow : () => void +>a : FollowerGuard +>follow : () => void +} + +if (((a["isLeader"])())) { +>((a["isLeader"])()) : boolean +>(a["isLeader"])() : boolean +>(a["isLeader"]) : () => this is LeadGuard +>a["isLeader"] : () => this is LeadGuard +>a : RoyalGuard +>"isLeader" : string + + a.lead(); +>a.lead() : void +>a.lead : () => void +>a : LeadGuard +>lead : () => void +} +else if (((a)["isFollower"]())) { +>((a)["isFollower"]()) : boolean +>(a)["isFollower"]() : boolean +>(a)["isFollower"] : () => this is FollowerGuard +>(a) : RoyalGuard +>a : RoyalGuard +>"isFollower" : string + + a.follow(); +>a.follow() : void +>a.follow : () => void +>a : FollowerGuard +>follow : () => void +} + +var holder2 = {a}; +>holder2 : { a: RoyalGuard; } +>{a} : { a: RoyalGuard; } +>a : RoyalGuard + +if (holder2.a.isLeader()) { +>holder2.a.isLeader() : boolean +>holder2.a.isLeader : () => this is LeadGuard +>holder2.a : RoyalGuard +>holder2 : { a: RoyalGuard; } +>a : RoyalGuard +>isLeader : () => this is LeadGuard + + holder2.a; +>holder2.a : RoyalGuard +>holder2 : { a: RoyalGuard; } +>a : RoyalGuard +} +else { + holder2.a; +>holder2.a : RoyalGuard +>holder2 : { a: RoyalGuard; } +>a : RoyalGuard +} + +class ArrowGuard { +>ArrowGuard : ArrowGuard + + isElite = (): this is ArrowElite => { +>isElite : () => this is ArrowElite +>(): this is ArrowElite => { return this instanceof ArrowElite; } : () => this is ArrowElite +>ArrowElite : ArrowElite + + return this instanceof ArrowElite; +>this instanceof ArrowElite : boolean +>this : this +>ArrowElite : typeof ArrowElite + } + isMedic = (): this is ArrowMedic => { +>isMedic : () => this is ArrowMedic +>(): this is ArrowMedic => { return this instanceof ArrowMedic; } : () => this is ArrowMedic +>ArrowMedic : ArrowMedic + + return this instanceof ArrowMedic; +>this instanceof ArrowMedic : boolean +>this : this +>ArrowMedic : typeof ArrowMedic + } +} + +class ArrowElite extends ArrowGuard { +>ArrowElite : ArrowElite +>ArrowGuard : ArrowGuard + + defend(): void {} +>defend : () => void +} + +class ArrowMedic extends ArrowGuard { +>ArrowMedic : ArrowMedic +>ArrowGuard : ArrowGuard + + heal(): void {} +>heal : () => void +} + +let guard = new ArrowGuard(); +>guard : ArrowGuard +>new ArrowGuard() : ArrowGuard +>ArrowGuard : typeof ArrowGuard + +if (guard.isElite()) { +>guard.isElite() : boolean +>guard.isElite : () => this is ArrowElite +>guard : ArrowGuard +>isElite : () => this is ArrowElite + + guard.defend(); +>guard.defend() : void +>guard.defend : () => void +>guard : ArrowElite +>defend : () => void +} +else if (guard.isMedic()) { +>guard.isMedic() : boolean +>guard.isMedic : () => this is ArrowMedic +>guard : ArrowGuard +>isMedic : () => this is ArrowMedic + + guard.heal(); +>guard.heal() : void +>guard.heal : () => void +>guard : ArrowMedic +>heal : () => void +} + +interface Supplies { +>Supplies : Supplies + + spoiled: boolean; +>spoiled : boolean +} + +interface Sundries { +>Sundries : Sundries + + broken: boolean; +>broken : boolean +} + +interface Crate { +>Crate : Crate +>T : T + + contents: T; +>contents : T +>T : T + + volume: number; +>volume : number + + isSupplies(): this is Crate; +>isSupplies : () => this is Crate +>Crate : Crate +>Supplies : Supplies + + isSundries(): this is Crate; +>isSundries : () => this is Crate +>Crate : Crate +>Sundries : Sundries +} + +let crate: Crate<{}>; +>crate : Crate<{}> +>Crate : Crate + +if (crate.isSundries()) { +>crate.isSundries() : boolean +>crate.isSundries : () => this is Crate +>crate : Crate<{}> +>isSundries : () => this is Crate + + crate.contents.broken = true; +>crate.contents.broken = true : boolean +>crate.contents.broken : boolean +>crate.contents : Sundries +>crate : Crate +>contents : Sundries +>broken : boolean +>true : boolean +} +else if (crate.isSupplies()) { +>crate.isSupplies() : boolean +>crate.isSupplies : () => this is Crate +>crate : Crate<{}> +>isSupplies : () => this is Crate + + crate.contents.spoiled = true; +>crate.contents.spoiled = true : boolean +>crate.contents.spoiled : boolean +>crate.contents : Supplies +>crate : Crate +>contents : Supplies +>spoiled : boolean +>true : boolean +} + +// Matching guards should be assignable + +a.isFollower = b.isFollower; +>a.isFollower = b.isFollower : () => this is FollowerGuard +>a.isFollower : () => this is FollowerGuard +>a : RoyalGuard +>isFollower : () => this is FollowerGuard +>b.isFollower : () => this is FollowerGuard +>b : GuardInterface +>isFollower : () => this is FollowerGuard + +a.isLeader = b.isLeader; +>a.isLeader = b.isLeader : () => this is LeadGuard +>a.isLeader : () => this is LeadGuard +>a : RoyalGuard +>isLeader : () => this is LeadGuard +>b.isLeader : () => this is LeadGuard +>b : GuardInterface +>isLeader : () => this is LeadGuard + +class MimicGuard { +>MimicGuard : MimicGuard + + isLeader(): this is MimicLeader { return this instanceof MimicLeader; }; +>isLeader : () => this is MimicLeader +>MimicLeader : MimicLeader +>this instanceof MimicLeader : boolean +>this : this +>MimicLeader : typeof MimicLeader + + isFollower(): this is MimicFollower { return this instanceof MimicFollower; }; +>isFollower : () => this is MimicFollower +>MimicFollower : MimicFollower +>this instanceof MimicFollower : boolean +>this : this +>MimicFollower : typeof MimicFollower +} + +class MimicLeader extends MimicGuard { +>MimicLeader : MimicLeader +>MimicGuard : MimicGuard + + lead(): void {} +>lead : () => void +} + +class MimicFollower extends MimicGuard { +>MimicFollower : MimicFollower +>MimicGuard : MimicGuard + + follow(): void {} +>follow : () => void +} + +let mimic = new MimicGuard(); +>mimic : MimicGuard +>new MimicGuard() : MimicGuard +>MimicGuard : typeof MimicGuard + +a.isLeader = mimic.isLeader; +>a.isLeader = mimic.isLeader : () => this is MimicLeader +>a.isLeader : () => this is LeadGuard +>a : RoyalGuard +>isLeader : () => this is LeadGuard +>mimic.isLeader : () => this is MimicLeader +>mimic : MimicGuard +>isLeader : () => this is MimicLeader + +a.isFollower = mimic.isFollower; +>a.isFollower = mimic.isFollower : () => this is MimicFollower +>a.isFollower : () => this is FollowerGuard +>a : RoyalGuard +>isFollower : () => this is FollowerGuard +>mimic.isFollower : () => this is MimicFollower +>mimic : MimicGuard +>isFollower : () => this is MimicFollower + +if (mimic.isFollower()) { +>mimic.isFollower() : boolean +>mimic.isFollower : () => this is MimicFollower +>mimic : MimicGuard +>isFollower : () => this is MimicFollower + + mimic.follow(); +>mimic.follow() : void +>mimic.follow : () => void +>mimic : MimicFollower +>follow : () => void + + mimic.isFollower = a.isFollower; +>mimic.isFollower = a.isFollower : () => this is FollowerGuard +>mimic.isFollower : () => this is MimicFollower +>mimic : MimicFollower +>isFollower : () => this is MimicFollower +>a.isFollower : () => this is FollowerGuard +>a : RoyalGuard +>isFollower : () => this is FollowerGuard +} diff --git a/tests/baselines/reference/typeGuardFunctionOfFormThisErrors.errors.txt b/tests/baselines/reference/typeGuardFunctionOfFormThisErrors.errors.txt new file mode 100644 index 00000000000..9d2e9fdd48e --- /dev/null +++ b/tests/baselines/reference/typeGuardFunctionOfFormThisErrors.errors.txt @@ -0,0 +1,76 @@ +tests/cases/conformance/expressions/typeGuards/typeGuardFunctionOfFormThisErrors.ts(23,1): error TS2322: Type '() => this is LeadGuard' is not assignable to type '() => this is FollowerGuard'. + Type 'LeadGuard' is not assignable to type 'FollowerGuard'. +tests/cases/conformance/expressions/typeGuards/typeGuardFunctionOfFormThisErrors.ts(24,1): error TS2322: Type '() => this is FollowerGuard' is not assignable to type '() => this is LeadGuard'. + Type 'FollowerGuard' is not assignable to type 'LeadGuard'. +tests/cases/conformance/expressions/typeGuards/typeGuardFunctionOfFormThisErrors.ts(26,1): error TS2322: Type '() => this is LeadGuard' is not assignable to type '() => this is FollowerGuard'. + Type 'LeadGuard' is not assignable to type 'FollowerGuard'. +tests/cases/conformance/expressions/typeGuards/typeGuardFunctionOfFormThisErrors.ts(27,1): error TS2322: Type '() => this is FollowerGuard' is not assignable to type '() => this is LeadGuard'. + Type 'FollowerGuard' is not assignable to type 'LeadGuard'. +tests/cases/conformance/expressions/typeGuards/typeGuardFunctionOfFormThisErrors.ts(29,32): error TS2526: A 'this' type is available only in a non-static member of a class or interface. + + +==== tests/cases/conformance/expressions/typeGuards/typeGuardFunctionOfFormThisErrors.ts (5 errors) ==== + class RoyalGuard { + isLeader(): this is LeadGuard { + return this instanceof LeadGuard; + } + isFollower(): this is FollowerGuard { + return this instanceof FollowerGuard; + } + } + + class LeadGuard extends RoyalGuard { + lead(): void {}; + } + + class FollowerGuard extends RoyalGuard { + follow(): void {}; + } + + interface GuardInterface extends RoyalGuard {} + let a: RoyalGuard = new FollowerGuard(); + let b: GuardInterface = new LeadGuard(); + + // Mismatched guards shouldn't be assignable + b.isFollower = b.isLeader; + ~~~~~~~~~~~~ +!!! error TS2322: Type '() => this is LeadGuard' is not assignable to type '() => this is FollowerGuard'. +!!! error TS2322: Type 'LeadGuard' is not assignable to type 'FollowerGuard'. + b.isLeader = b.isFollower; + ~~~~~~~~~~ +!!! error TS2322: Type '() => this is FollowerGuard' is not assignable to type '() => this is LeadGuard'. +!!! error TS2322: Type 'FollowerGuard' is not assignable to type 'LeadGuard'. + + a.isFollower = a.isLeader; + ~~~~~~~~~~~~ +!!! error TS2322: Type '() => this is LeadGuard' is not assignable to type '() => this is FollowerGuard'. +!!! error TS2322: Type 'LeadGuard' is not assignable to type 'FollowerGuard'. + a.isLeader = a.isFollower; + ~~~~~~~~~~ +!!! error TS2322: Type '() => this is FollowerGuard' is not assignable to type '() => this is LeadGuard'. +!!! error TS2322: Type 'FollowerGuard' is not assignable to type 'LeadGuard'. + + function invalidGuard(c: any): this is number { + ~~~~ +!!! error TS2526: A 'this' type is available only in a non-static member of a class or interface. + return false; + } + + let c: number | number[]; + if (invalidGuard(c)) { + c; + } + else { + c; + } + + let holder = {invalidGuard}; + + if (holder.invalidGuard(c)) { + c; + holder; + } + else { + c; + holder; + } \ No newline at end of file diff --git a/tests/baselines/reference/typeGuardFunctionOfFormThisErrors.js b/tests/baselines/reference/typeGuardFunctionOfFormThisErrors.js new file mode 100644 index 00000000000..f11716daebd --- /dev/null +++ b/tests/baselines/reference/typeGuardFunctionOfFormThisErrors.js @@ -0,0 +1,113 @@ +//// [typeGuardFunctionOfFormThisErrors.ts] +class RoyalGuard { + isLeader(): this is LeadGuard { + return this instanceof LeadGuard; + } + isFollower(): this is FollowerGuard { + return this instanceof FollowerGuard; + } +} + +class LeadGuard extends RoyalGuard { + lead(): void {}; +} + +class FollowerGuard extends RoyalGuard { + follow(): void {}; +} + +interface GuardInterface extends RoyalGuard {} +let a: RoyalGuard = new FollowerGuard(); +let b: GuardInterface = new LeadGuard(); + +// Mismatched guards shouldn't be assignable +b.isFollower = b.isLeader; +b.isLeader = b.isFollower; + +a.isFollower = a.isLeader; +a.isLeader = a.isFollower; + +function invalidGuard(c: any): this is number { + return false; +} + +let c: number | number[]; +if (invalidGuard(c)) { + c; +} +else { + c; +} + +let holder = {invalidGuard}; + +if (holder.invalidGuard(c)) { + c; + holder; +} +else { + c; + holder; +} + +//// [typeGuardFunctionOfFormThisErrors.js] +var __extends = (this && this.__extends) || function (d, b) { + for (var p in b) if (b.hasOwnProperty(p)) d[p] = b[p]; + function __() { this.constructor = d; } + d.prototype = b === null ? Object.create(b) : (__.prototype = b.prototype, new __()); +}; +var RoyalGuard = (function () { + function RoyalGuard() { + } + RoyalGuard.prototype.isLeader = function () { + return this instanceof LeadGuard; + }; + RoyalGuard.prototype.isFollower = function () { + return this instanceof FollowerGuard; + }; + return RoyalGuard; +})(); +var LeadGuard = (function (_super) { + __extends(LeadGuard, _super); + function LeadGuard() { + _super.apply(this, arguments); + } + LeadGuard.prototype.lead = function () { }; + ; + return LeadGuard; +})(RoyalGuard); +var FollowerGuard = (function (_super) { + __extends(FollowerGuard, _super); + function FollowerGuard() { + _super.apply(this, arguments); + } + FollowerGuard.prototype.follow = function () { }; + ; + return FollowerGuard; +})(RoyalGuard); +var a = new FollowerGuard(); +var b = new LeadGuard(); +// Mismatched guards shouldn't be assignable +b.isFollower = b.isLeader; +b.isLeader = b.isFollower; +a.isFollower = a.isLeader; +a.isLeader = a.isFollower; +function invalidGuard(c) { + return false; +} +var c; +if (invalidGuard(c)) { + c; +} +else { + c; +} +var holder = { invalidGuard: invalidGuard }; +if (holder.invalidGuard(c)) { + c; + holder; +} +else { + c; + holder; +} diff --git a/tests/cases/conformance/expressions/typeGuards/typeGuardFunctionOfFormThis.ts b/tests/cases/conformance/expressions/typeGuards/typeGuardFunctionOfFormThis.ts new file mode 100644 index 00000000000..bc7bbce3816 --- /dev/null +++ b/tests/cases/conformance/expressions/typeGuards/typeGuardFunctionOfFormThis.ts @@ -0,0 +1,134 @@ +class RoyalGuard { + isLeader(): this is LeadGuard { + return this instanceof LeadGuard; + } + isFollower(): this is FollowerGuard { + return this instanceof FollowerGuard; + } +} + +class LeadGuard extends RoyalGuard { + lead(): void {}; +} + +class FollowerGuard extends RoyalGuard { + follow(): void {}; +} + +let a: RoyalGuard = new FollowerGuard(); +if (a.isLeader()) { + a.lead(); +} +else if (a.isFollower()) { + a.follow(); +} + +interface GuardInterface extends RoyalGuard {} + +let b: GuardInterface; +if (b.isLeader()) { + b.lead(); +} +else if (b.isFollower()) { + b.follow(); +} + +if (((a.isLeader)())) { + a.lead(); +} +else if (((a).isFollower())) { + a.follow(); +} + +if (((a["isLeader"])())) { + a.lead(); +} +else if (((a)["isFollower"]())) { + a.follow(); +} + +var holder2 = {a}; + +if (holder2.a.isLeader()) { + holder2.a; +} +else { + holder2.a; +} + +class ArrowGuard { + isElite = (): this is ArrowElite => { + return this instanceof ArrowElite; + } + isMedic = (): this is ArrowMedic => { + return this instanceof ArrowMedic; + } +} + +class ArrowElite extends ArrowGuard { + defend(): void {} +} + +class ArrowMedic extends ArrowGuard { + heal(): void {} +} + +let guard = new ArrowGuard(); +if (guard.isElite()) { + guard.defend(); +} +else if (guard.isMedic()) { + guard.heal(); +} + +interface Supplies { + spoiled: boolean; +} + +interface Sundries { + broken: boolean; +} + +interface Crate { + contents: T; + volume: number; + isSupplies(): this is Crate; + isSundries(): this is Crate; +} + +let crate: Crate<{}>; + +if (crate.isSundries()) { + crate.contents.broken = true; +} +else if (crate.isSupplies()) { + crate.contents.spoiled = true; +} + +// Matching guards should be assignable + +a.isFollower = b.isFollower; +a.isLeader = b.isLeader; + +class MimicGuard { + isLeader(): this is MimicLeader { return this instanceof MimicLeader; }; + isFollower(): this is MimicFollower { return this instanceof MimicFollower; }; +} + +class MimicLeader extends MimicGuard { + lead(): void {} +} + +class MimicFollower extends MimicGuard { + follow(): void {} +} + +let mimic = new MimicGuard(); + +a.isLeader = mimic.isLeader; +a.isFollower = mimic.isFollower; + +if (mimic.isFollower()) { + mimic.follow(); + mimic.isFollower = a.isFollower; +} \ No newline at end of file diff --git a/tests/cases/conformance/expressions/typeGuards/typeGuardFunctionOfFormThisErrors.ts b/tests/cases/conformance/expressions/typeGuards/typeGuardFunctionOfFormThisErrors.ts new file mode 100644 index 00000000000..2e03781952d --- /dev/null +++ b/tests/cases/conformance/expressions/typeGuards/typeGuardFunctionOfFormThisErrors.ts @@ -0,0 +1,50 @@ +class RoyalGuard { + isLeader(): this is LeadGuard { + return this instanceof LeadGuard; + } + isFollower(): this is FollowerGuard { + return this instanceof FollowerGuard; + } +} + +class LeadGuard extends RoyalGuard { + lead(): void {}; +} + +class FollowerGuard extends RoyalGuard { + follow(): void {}; +} + +interface GuardInterface extends RoyalGuard {} +let a: RoyalGuard = new FollowerGuard(); +let b: GuardInterface = new LeadGuard(); + +// Mismatched guards shouldn't be assignable +b.isFollower = b.isLeader; +b.isLeader = b.isFollower; + +a.isFollower = a.isLeader; +a.isLeader = a.isFollower; + +function invalidGuard(c: any): this is number { + return false; +} + +let c: number | number[]; +if (invalidGuard(c)) { + c; +} +else { + c; +} + +let holder = {invalidGuard}; + +if (holder.invalidGuard(c)) { + c; + holder; +} +else { + c; + holder; +} \ No newline at end of file From d7208e81d61ec3c5154c766f594f8fa224f9627f Mon Sep 17 00:00:00 2001 From: Wesley Wigham Date: Thu, 3 Dec 2015 13:46:37 -0800 Subject: [PATCH 027/177] feedback from pr --- src/compiler/checker.ts | 37 +++++++----- src/compiler/diagnosticMessages.json | 2 +- .../reference/typeGuardFunctionOfFormThis.js | 58 ++++++++++++++++++- .../typeGuardFunctionOfFormThis.symbols | 1 + .../typeGuardFunctionOfFormThis.types | 1 + ...peGuardFunctionOfFormThisErrors.errors.txt | 17 +++++- .../typeGuardFunctionOfFormThisErrors.js | 39 +++++++++++++ .../typeGuards/typeGuardFunctionOfFormThis.ts | 3 +- .../typeGuardFunctionOfFormThisErrors.ts | 10 ++++ 9 files changed, 148 insertions(+), 20 deletions(-) diff --git a/src/compiler/checker.ts b/src/compiler/checker.ts index a5a904ab3a9..a447b67b336 100644 --- a/src/compiler/checker.ts +++ b/src/compiler/checker.ts @@ -4732,12 +4732,11 @@ namespace ts { } function cloneTypePredicate(predicate: TypePredicate, mapper: TypeMapper): ThisTypePredicate | IdentifierTypePredicate { - if (predicate.kind === TypePredicateKind.Identifier) { - const identifierPredicate = predicate as IdentifierTypePredicate; + if (isIdentifierTypePredicate(predicate)) { return { kind: TypePredicateKind.Identifier, - parameterName: identifierPredicate.parameterName, - parameterIndex: identifierPredicate.parameterIndex, + parameterName: predicate.parameterName, + parameterIndex: predicate.parameterIndex, type: instantiateType(predicate.type, mapper) } as IdentifierTypePredicate; } @@ -4751,18 +4750,14 @@ namespace ts { function instantiateSignature(signature: Signature, mapper: TypeMapper, eraseTypeParameters?: boolean): Signature { let freshTypeParameters: TypeParameter[]; - let freshTypePredicate: ThisTypePredicate | IdentifierTypePredicate; if (signature.typeParameters && !eraseTypeParameters) { freshTypeParameters = instantiateList(signature.typeParameters, mapper, instantiateTypeParameter); mapper = combineTypeMappers(createTypeMapper(signature.typeParameters, freshTypeParameters), mapper); } - if (signature.typePredicate) { - freshTypePredicate = cloneTypePredicate(signature.typePredicate, mapper); - } const result = createSignature(signature.declaration, freshTypeParameters, instantiateList(signature.parameters, mapper, instantiateSymbol), instantiateType(signature.resolvedReturnType, mapper), - freshTypePredicate, + signature.typePredicate && cloneTypePredicate(signature.typePredicate, mapper), signature.minArgumentCount, signature.hasRestParameter, signature.hasStringLiterals); result.target = signature; result.mapper = mapper; @@ -6752,7 +6747,7 @@ namespace ts { const predicate = signature.typePredicate; if (isIdentifierTypePredicate(predicate)) { if (expr.arguments[predicate.parameterIndex] && - getSymbolAtLocation(expr.arguments[predicate.parameterIndex]) === symbol) { + getSymbolAtTypePredicatePosition(expr.arguments[predicate.parameterIndex]) === symbol) { return getNarrowedType(type, predicate.type, assumeTrue); } } @@ -6762,18 +6757,28 @@ namespace ts { if (expression.kind === SyntaxKind.ElementAccessExpression || expression.kind === SyntaxKind.PropertyAccessExpression) { const accessExpression = expression as ElementAccessExpression | PropertyAccessExpression; const possibleIdentifier = skipParenthesizedNodes(accessExpression.expression); - if (possibleIdentifier.kind === SyntaxKind.Identifier && getSymbolAtLocation(possibleIdentifier) === symbol) { + if (possibleIdentifier.kind === SyntaxKind.Identifier && getSymbolAtTypePredicatePosition(possibleIdentifier) === symbol) { return getNarrowedType(type, predicate.type, assumeTrue); } } } return type; + } - function skipParenthesizedNodes(expression: Expression): Expression { - while (expression.kind === SyntaxKind.ParenthesizedExpression) { - expression = (expression as ParenthesizedExpression).expression; - } - return expression; + function skipParenthesizedNodes(expression: Expression): Expression { + while (expression.kind === SyntaxKind.ParenthesizedExpression) { + expression = (expression as ParenthesizedExpression).expression; + } + return expression; + } + + function getSymbolAtTypePredicatePosition(expr: Expression): Symbol { + expr = skipParenthesizedNodes(expr); + switch (expr.kind) { + case SyntaxKind.Identifier: + case SyntaxKind.PropertyAccessExpression: + case SyntaxKind.QualifiedName: + return getSymbolOfEntityNameOrPropertyAccessExpression(expr as Node as (EntityName | PropertyAccessExpression)); } } diff --git a/src/compiler/diagnosticMessages.json b/src/compiler/diagnosticMessages.json index f48a37968ca..081bfc2385d 100644 --- a/src/compiler/diagnosticMessages.json +++ b/src/compiler/diagnosticMessages.json @@ -1632,7 +1632,7 @@ "category": "Error", "code": 2517 }, - "A this based type guard is not assignable to a parameter based type guard": { + "A 'this'-based type guard is not assignable to a parameter-based type guard": { "category": "Error", "code": 2518 }, diff --git a/tests/baselines/reference/typeGuardFunctionOfFormThis.js b/tests/baselines/reference/typeGuardFunctionOfFormThis.js index 16ac876be8c..bc91defc244 100644 --- a/tests/baselines/reference/typeGuardFunctionOfFormThis.js +++ b/tests/baselines/reference/typeGuardFunctionOfFormThis.js @@ -132,7 +132,8 @@ a.isFollower = mimic.isFollower; if (mimic.isFollower()) { mimic.follow(); mimic.isFollower = a.isFollower; -} +} + //// [typeGuardFunctionOfFormThis.js] var __extends = (this && this.__extends) || function (d, b) { @@ -279,3 +280,58 @@ if (mimic.isFollower()) { mimic.follow(); mimic.isFollower = a.isFollower; } + + +//// [typeGuardFunctionOfFormThis.d.ts] +declare class RoyalGuard { + isLeader(): this is LeadGuard; + isFollower(): this is FollowerGuard; +} +declare class LeadGuard extends RoyalGuard { + lead(): void; +} +declare class FollowerGuard extends RoyalGuard { + follow(): void; +} +declare let a: RoyalGuard; +interface GuardInterface extends RoyalGuard { +} +declare let b: GuardInterface; +declare var holder2: { + a: RoyalGuard; +}; +declare class ArrowGuard { + isElite: () => this is ArrowElite; + isMedic: () => this is ArrowMedic; +} +declare class ArrowElite extends ArrowGuard { + defend(): void; +} +declare class ArrowMedic extends ArrowGuard { + heal(): void; +} +declare let guard: ArrowGuard; +interface Supplies { + spoiled: boolean; +} +interface Sundries { + broken: boolean; +} +interface Crate { + contents: T; + volume: number; + isSupplies(): this is Crate; + isSundries(): this is Crate; +} +declare let crate: Crate<{}>; +declare class MimicGuard { + isLeader(): this is MimicLeader; + isFollower(): this is MimicFollower; +} +declare class MimicLeader extends MimicGuard { + lead(): void; +} +declare class MimicFollower extends MimicGuard { + follow(): void; +} +declare let mimic: MimicGuard; diff --git a/tests/baselines/reference/typeGuardFunctionOfFormThis.symbols b/tests/baselines/reference/typeGuardFunctionOfFormThis.symbols index 9bda32c4557..84c07a17f0e 100644 --- a/tests/baselines/reference/typeGuardFunctionOfFormThis.symbols +++ b/tests/baselines/reference/typeGuardFunctionOfFormThis.symbols @@ -369,3 +369,4 @@ if (mimic.isFollower()) { >a : Symbol(a, Decl(typeGuardFunctionOfFormThis.ts, 17, 3)) >isFollower : Symbol(RoyalGuard.isFollower, Decl(typeGuardFunctionOfFormThis.ts, 3, 5)) } + diff --git a/tests/baselines/reference/typeGuardFunctionOfFormThis.types b/tests/baselines/reference/typeGuardFunctionOfFormThis.types index fbe862ab98b..fa5becc7790 100644 --- a/tests/baselines/reference/typeGuardFunctionOfFormThis.types +++ b/tests/baselines/reference/typeGuardFunctionOfFormThis.types @@ -425,3 +425,4 @@ if (mimic.isFollower()) { >a : RoyalGuard >isFollower : () => this is FollowerGuard } + diff --git a/tests/baselines/reference/typeGuardFunctionOfFormThisErrors.errors.txt b/tests/baselines/reference/typeGuardFunctionOfFormThisErrors.errors.txt index 9d2e9fdd48e..605282f19bb 100644 --- a/tests/baselines/reference/typeGuardFunctionOfFormThisErrors.errors.txt +++ b/tests/baselines/reference/typeGuardFunctionOfFormThisErrors.errors.txt @@ -7,9 +7,11 @@ tests/cases/conformance/expressions/typeGuards/typeGuardFunctionOfFormThisErrors tests/cases/conformance/expressions/typeGuards/typeGuardFunctionOfFormThisErrors.ts(27,1): error TS2322: Type '() => this is FollowerGuard' is not assignable to type '() => this is LeadGuard'. Type 'FollowerGuard' is not assignable to type 'LeadGuard'. tests/cases/conformance/expressions/typeGuards/typeGuardFunctionOfFormThisErrors.ts(29,32): error TS2526: A 'this' type is available only in a non-static member of a class or interface. +tests/cases/conformance/expressions/typeGuards/typeGuardFunctionOfFormThisErrors.ts(55,7): error TS2339: Property 'follow' does not exist on type 'RoyalGuard'. +tests/cases/conformance/expressions/typeGuards/typeGuardFunctionOfFormThisErrors.ts(58,7): error TS2339: Property 'lead' does not exist on type 'RoyalGuard'. -==== tests/cases/conformance/expressions/typeGuards/typeGuardFunctionOfFormThisErrors.ts (5 errors) ==== +==== tests/cases/conformance/expressions/typeGuards/typeGuardFunctionOfFormThisErrors.ts (7 errors) ==== class RoyalGuard { isLeader(): this is LeadGuard { return this instanceof LeadGuard; @@ -73,4 +75,17 @@ tests/cases/conformance/expressions/typeGuards/typeGuardFunctionOfFormThisErrors else { c; holder; + } + + let detached = a.isFollower; + + if (detached()) { + a.follow(); + ~~~~~~ +!!! error TS2339: Property 'follow' does not exist on type 'RoyalGuard'. + } + else { + a.lead(); + ~~~~ +!!! error TS2339: Property 'lead' does not exist on type 'RoyalGuard'. } \ No newline at end of file diff --git a/tests/baselines/reference/typeGuardFunctionOfFormThisErrors.js b/tests/baselines/reference/typeGuardFunctionOfFormThisErrors.js index f11716daebd..0495e3cd773 100644 --- a/tests/baselines/reference/typeGuardFunctionOfFormThisErrors.js +++ b/tests/baselines/reference/typeGuardFunctionOfFormThisErrors.js @@ -48,6 +48,15 @@ if (holder.invalidGuard(c)) { else { c; holder; +} + +let detached = a.isFollower; + +if (detached()) { + a.follow(); +} +else { + a.lead(); } //// [typeGuardFunctionOfFormThisErrors.js] @@ -111,3 +120,33 @@ else { c; holder; } +var detached = a.isFollower; +if (detached()) { + a.follow(); +} +else { + a.lead(); +} + + +//// [typeGuardFunctionOfFormThisErrors.d.ts] +declare class RoyalGuard { + isLeader(): this is LeadGuard; + isFollower(): this is FollowerGuard; +} +declare class LeadGuard extends RoyalGuard { + lead(): void; +} +declare class FollowerGuard extends RoyalGuard { + follow(): void; +} +interface GuardInterface extends RoyalGuard { +} +declare let a: RoyalGuard; +declare let b: GuardInterface; +declare function invalidGuard(c: any): this is number; +declare let c: number | number[]; +declare let holder: { + invalidGuard: (c: any) => this is number; +}; +declare let detached: () => this is FollowerGuard; diff --git a/tests/cases/conformance/expressions/typeGuards/typeGuardFunctionOfFormThis.ts b/tests/cases/conformance/expressions/typeGuards/typeGuardFunctionOfFormThis.ts index bc7bbce3816..c053ec55d07 100644 --- a/tests/cases/conformance/expressions/typeGuards/typeGuardFunctionOfFormThis.ts +++ b/tests/cases/conformance/expressions/typeGuards/typeGuardFunctionOfFormThis.ts @@ -1,3 +1,4 @@ +// @declaration: true class RoyalGuard { isLeader(): this is LeadGuard { return this instanceof LeadGuard; @@ -131,4 +132,4 @@ a.isFollower = mimic.isFollower; if (mimic.isFollower()) { mimic.follow(); mimic.isFollower = a.isFollower; -} \ No newline at end of file +} diff --git a/tests/cases/conformance/expressions/typeGuards/typeGuardFunctionOfFormThisErrors.ts b/tests/cases/conformance/expressions/typeGuards/typeGuardFunctionOfFormThisErrors.ts index 2e03781952d..1c449e624f1 100644 --- a/tests/cases/conformance/expressions/typeGuards/typeGuardFunctionOfFormThisErrors.ts +++ b/tests/cases/conformance/expressions/typeGuards/typeGuardFunctionOfFormThisErrors.ts @@ -1,3 +1,4 @@ +// @declaration: true class RoyalGuard { isLeader(): this is LeadGuard { return this instanceof LeadGuard; @@ -47,4 +48,13 @@ if (holder.invalidGuard(c)) { else { c; holder; +} + +let detached = a.isFollower; + +if (detached()) { + a.follow(); +} +else { + a.lead(); } \ No newline at end of file From cfe2cc36085dfaeeba230ea9f538c9ba04431e4b Mon Sep 17 00:00:00 2001 From: Wesley Wigham Date: Thu, 3 Dec 2015 14:10:22 -0800 Subject: [PATCH 028/177] utilize type guard on type guard logic more --- src/compiler/checker.ts | 21 +++++++++++---------- 1 file changed, 11 insertions(+), 10 deletions(-) diff --git a/src/compiler/checker.ts b/src/compiler/checker.ts index a447b67b336..ebfc29d9550 100644 --- a/src/compiler/checker.ts +++ b/src/compiler/checker.ts @@ -2057,9 +2057,10 @@ namespace ts { writeSpace(writer); let returnType: Type; - if (signature.typePredicate) { - if (signature.typePredicate.kind === TypePredicateKind.Identifier) { - writer.writeParameter((signature.typePredicate as IdentifierTypePredicate).parameterName); + const predicate = signature.typePredicate; + if (predicate) { + if (isIdentifierTypePredicate(predicate)) { + writer.writeParameter(predicate.parameterName); } else { writeKeyword(writer, SyntaxKind.ThisKeyword); @@ -2067,7 +2068,7 @@ namespace ts { writeSpace(writer); writeKeyword(writer, SyntaxKind.IsKeyword); writeSpace(writer); - returnType = signature.typePredicate.type; + returnType = predicate.type; } else { returnType = getReturnTypeOfSignature(signature); @@ -5572,17 +5573,19 @@ namespace ts { } if (source.typePredicate && target.typePredicate) { + const sourcePredicate = source.typePredicate as IdentifierTypePredicate; + const targetPredicate = target.typePredicate as IdentifierTypePredicate; if (source.typePredicate.kind !== target.typePredicate.kind) { if (reportErrors) { reportError(Diagnostics.A_this_based_type_guard_is_not_assignable_to_a_parameter_based_type_guard); } return Ternary.False; } - if (source.typePredicate.kind === TypePredicateKind.This) { - if (!isTypeIdenticalTo(source.typePredicate.type, target.typePredicate.type)) { + if (!(isIdentifierTypePredicate(sourcePredicate) && isIdentifierTypePredicate(targetPredicate))) { + if (!isTypeIdenticalTo(sourcePredicate.type, targetPredicate.type)) { if (reportErrors) { - const sourceTypeText = typeToString(source.typePredicate.type); - const targetTypeText = typeToString(target.typePredicate.type); + const sourceTypeText = typeToString(sourcePredicate.type); + const targetTypeText = typeToString(targetPredicate.type); reportError(Diagnostics.Type_0_is_not_assignable_to_type_1, sourceTypeText, targetTypeText); @@ -5591,8 +5594,6 @@ namespace ts { } } else { - const sourcePredicate = source.typePredicate as IdentifierTypePredicate; - const targetPredicate = target.typePredicate as IdentifierTypePredicate; const hasDifferentParameterIndex = sourcePredicate.parameterIndex !== targetPredicate.parameterIndex; let hasDifferentTypes: boolean; if (hasDifferentParameterIndex || From d51dd84f6c8a7e422b29c15dccbac7fef4e0d2f2 Mon Sep 17 00:00:00 2001 From: Wesley Wigham Date: Thu, 3 Dec 2015 14:18:44 -0800 Subject: [PATCH 029/177] remove unneeded cast --- src/compiler/checker.ts | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/compiler/checker.ts b/src/compiler/checker.ts index ebfc29d9550..9c9474eed4d 100644 --- a/src/compiler/checker.ts +++ b/src/compiler/checker.ts @@ -5573,8 +5573,8 @@ namespace ts { } if (source.typePredicate && target.typePredicate) { - const sourcePredicate = source.typePredicate as IdentifierTypePredicate; - const targetPredicate = target.typePredicate as IdentifierTypePredicate; + const sourcePredicate = source.typePredicate; + const targetPredicate = target.typePredicate; if (source.typePredicate.kind !== target.typePredicate.kind) { if (reportErrors) { reportError(Diagnostics.A_this_based_type_guard_is_not_assignable_to_a_parameter_based_type_guard); From b9f310d4f2eef0f0f494e2c742707fea8fce9c01 Mon Sep 17 00:00:00 2001 From: Wesley Wigham Date: Thu, 3 Dec 2015 18:21:36 -0800 Subject: [PATCH 030/177] first pass at this type predicate members --- src/compiler/checker.ts | 253 +++++++++++------- src/compiler/diagnosticMessages.json | 4 + src/compiler/types.ts | 6 + src/compiler/utilities.ts | 2 +- .../typeGuardFunctionErrors.errors.txt | 4 +- .../reference/typeGuardOfFormThisMember.js | 130 +++++++++ .../typeGuardOfFormThisMember.symbols | 126 +++++++++ .../reference/typeGuardOfFormThisMember.types | 136 ++++++++++ .../typeGuards/typeGuardOfFormThisMember.ts | 43 +++ 9 files changed, 611 insertions(+), 93 deletions(-) create mode 100644 tests/baselines/reference/typeGuardOfFormThisMember.js create mode 100644 tests/baselines/reference/typeGuardOfFormThisMember.symbols create mode 100644 tests/baselines/reference/typeGuardOfFormThisMember.types create mode 100644 tests/cases/conformance/expressions/typeGuards/typeGuardOfFormThisMember.ts diff --git a/src/compiler/checker.ts b/src/compiler/checker.ts index 9c9474eed4d..a1d13faff5a 100644 --- a/src/compiler/checker.ts +++ b/src/compiler/checker.ts @@ -1670,10 +1670,16 @@ namespace ts { function writeType(type: Type, flags: TypeFormatFlags) { // Write undefined/null type as any if (type.flags & TypeFlags.Intrinsic) { - // Special handling for unknown / resolving types, they should show up as any and not unknown or __resolving - writer.writeKeyword(!(globalFlags & TypeFormatFlags.WriteOwnNameForAnyLike) && isTypeAny(type) - ? "any" - : (type).intrinsicName); + if (type.flags & TypeFlags.PredicateType) { + buildTypePredicateDisplay(writer, (type as PredicateType).predicate); + buildTypeDisplay((type as PredicateType).predicate.type, writer, enclosingDeclaration, flags, symbolStack); + } + else { + // Special handling for unknown / resolving types, they should show up as any and not unknown or __resolving + writer.writeKeyword(!(globalFlags & TypeFormatFlags.WriteOwnNameForAnyLike) && isTypeAny(type) + ? "any" + : (type).intrinsicName); + } } else if (type.flags & TypeFlags.ThisType) { if (inObjectTypeLiteral) { @@ -2046,6 +2052,18 @@ namespace ts { writePunctuation(writer, SyntaxKind.CloseParenToken); } + function buildTypePredicateDisplay(writer: SymbolWriter, predicate: TypePredicate) { + if (isIdentifierTypePredicate(predicate)) { + writer.writeParameter(predicate.parameterName); + } + else { + writeKeyword(writer, SyntaxKind.ThisKeyword); + } + writeSpace(writer); + writeKeyword(writer, SyntaxKind.IsKeyword); + writeSpace(writer); + } + function buildReturnTypeDisplay(signature: Signature, writer: SymbolWriter, enclosingDeclaration?: Node, flags?: TypeFormatFlags, symbolStack?: Symbol[]) { if (flags & TypeFormatFlags.WriteArrowStyleSignature) { writeSpace(writer); @@ -2059,15 +2077,7 @@ namespace ts { let returnType: Type; const predicate = signature.typePredicate; if (predicate) { - if (isIdentifierTypePredicate(predicate)) { - writer.writeParameter(predicate.parameterName); - } - else { - writeKeyword(writer, SyntaxKind.ThisKeyword); - } - writeSpace(writer); - writeKeyword(writer, SyntaxKind.IsKeyword); - writeSpace(writer); + buildTypePredicateDisplay(writer, predicate); returnType = predicate.type; } else { @@ -3850,6 +3860,24 @@ namespace ts { return false; } + function createTypePredicateFromTypePredicateNode(node: TypePredicateNode): IdentifierTypePredicate | ThisTypePredicate { + if (node.parameterName.kind === SyntaxKind.Identifier) { + const parameterName = node.parameterName as Identifier; + return { + kind: TypePredicateKind.Identifier, + parameterName: parameterName ? parameterName.text : undefined, + parameterIndex: parameterName ? getTypePredicateParameterIndex((node.parent as SignatureDeclaration).parameters, parameterName) : undefined, + type: getTypeFromTypeNode(node.type) + } as IdentifierTypePredicate; + } + else { + return { + kind: TypePredicateKind.This, + type: getTypeFromTypeNode(node.type) + } as ThisTypePredicate; + } + } + function getSignatureFromDeclaration(declaration: SignatureDeclaration): Signature { const links = getNodeLinks(declaration); if (!links.resolvedSignature) { @@ -3897,22 +3925,7 @@ namespace ts { else if (declaration.type) { returnType = getTypeFromTypeNode(declaration.type); if (declaration.type.kind === SyntaxKind.TypePredicate) { - const typePredicateNode = declaration.type as TypePredicateNode; - if (typePredicateNode.parameterName.kind === SyntaxKind.Identifier) { - const parameterName = typePredicateNode.parameterName as Identifier; - typePredicate = { - kind: TypePredicateKind.Identifier, - parameterName: parameterName ? parameterName.text : undefined, - parameterIndex: parameterName ? getTypePredicateParameterIndex(declaration.parameters, parameterName) : undefined, - type: getTypeFromTypeNode(typePredicateNode.type) - }; - } - else { - typePredicate = { - kind: TypePredicateKind.This, - type: getTypeFromTypeNode(typePredicateNode.type) - } as ThisTypePredicate; - } + typePredicate = createTypePredicateFromTypePredicateNode(declaration.type as TypePredicateNode); } } else { @@ -4588,6 +4601,26 @@ namespace ts { return links.resolvedType; } + function getPredicateType(node: TypePredicateNode): Type { + if (!(node.parent.kind === SyntaxKind.PropertyDeclaration || node.parent.kind === SyntaxKind.GetAccessor)) { + return booleanType; + } + else { + const type = createType(TypeFlags.Boolean | TypeFlags.PredicateType) as PredicateType; + type.symbol = getSymbolOfNode(node); + type.predicate = createTypePredicateFromTypePredicateNode(node) as ThisTypePredicate; + return type; + } + } + + function getTypeFromPredicateTypeNode(node: TypePredicateNode): Type { + const links = getNodeLinks(node); + if (!links.resolvedType) { + links.resolvedType = getPredicateType(node); + } + return links.resolvedType; + } + function getTypeFromTypeNode(node: TypeNode): Type { switch (node.kind) { case SyntaxKind.AnyKeyword: @@ -4609,7 +4642,7 @@ namespace ts { case SyntaxKind.TypeReference: return getTypeFromTypeReference(node); case SyntaxKind.TypePredicate: - return booleanType; + return getTypeFromPredicateTypeNode(node); case SyntaxKind.ExpressionWithTypeArguments: return getTypeFromTypeReference(node); case SyntaxKind.TypeQuery: @@ -4998,6 +5031,7 @@ namespace ts { if (relation === assignableRelation) { if (isTypeAny(source)) return Ternary.True; if (source === numberType && target.flags & TypeFlags.Enum) return Ternary.True; + if (source.flags & TypeFlags.Boolean && target.flags & TypeFlags.Boolean && (source.flags & TypeFlags.PredicateType || target.flags & TypeFlags.PredicateType)) return Ternary.True; } if (source.flags & TypeFlags.FreshObjectLiteral) { @@ -6747,20 +6781,37 @@ namespace ts { } const predicate = signature.typePredicate; if (isIdentifierTypePredicate(predicate)) { - if (expr.arguments[predicate.parameterIndex] && - getSymbolAtTypePredicatePosition(expr.arguments[predicate.parameterIndex]) === symbol) { + const callExpression = expr as CallExpression; + if (callExpression.arguments[predicate.parameterIndex] && + getSymbolAtTypePredicatePosition(callExpression.arguments[predicate.parameterIndex]) === symbol) { return getNarrowedType(type, predicate.type, assumeTrue); } } else { const expression = skipParenthesizedNodes(expr.expression); + return narrowTypeByThisTypePredicate(type, predicate, expression, assumeTrue); + } + return type; + } - if (expression.kind === SyntaxKind.ElementAccessExpression || expression.kind === SyntaxKind.PropertyAccessExpression) { - const accessExpression = expression as ElementAccessExpression | PropertyAccessExpression; - const possibleIdentifier = skipParenthesizedNodes(accessExpression.expression); - if (possibleIdentifier.kind === SyntaxKind.Identifier && getSymbolAtTypePredicatePosition(possibleIdentifier) === symbol) { - return getNarrowedType(type, predicate.type, assumeTrue); - } + function narrowTypeByTypePredicateMember(type: Type, expr: ElementAccessExpression | PropertyAccessExpression, assumeTrue: boolean): Type { + if (type.flags & TypeFlags.Any) { + return type; + } + const memberType = getTypeOfExpression(expr); + if (!(memberType.flags & TypeFlags.PredicateType)) { + return type; + } + + return narrowTypeByThisTypePredicate(type, (memberType as PredicateType).predicate, expr, assumeTrue); + } + + function narrowTypeByThisTypePredicate(type: Type, predicate: ThisTypePredicate, expression: Expression, assumeTrue: boolean): Type { + if (expression.kind === SyntaxKind.ElementAccessExpression || expression.kind === SyntaxKind.PropertyAccessExpression) { + const accessExpression = expression as ElementAccessExpression | PropertyAccessExpression; + const possibleIdentifier = skipParenthesizedNodes(accessExpression.expression); + if (possibleIdentifier.kind === SyntaxKind.Identifier && getSymbolAtTypePredicatePosition(possibleIdentifier) === symbol) { + return getNarrowedType(type, predicate.type, assumeTrue); } } return type; @@ -6811,6 +6862,9 @@ namespace ts { return narrowType(type, (expr).operand, !assumeTrue); } break; + case SyntaxKind.ElementAccessExpression: + case SyntaxKind.PropertyAccessExpression: + return narrowTypeByTypePredicateMember(type, expr as (ElementAccessExpression | PropertyAccessExpression), assumeTrue); } return type; } @@ -11018,6 +11072,18 @@ namespace ts { return false; } + function isInLegalThisTypePredicatePosition(node: Node): boolean { + if (isInLegalTypePredicatePosition(node)) { + return true; + } + switch (node.parent.kind) { + case SyntaxKind.PropertyDeclaration: + case SyntaxKind.GetAccessor: + return node === (node.parent).type; + } + return false; + } + function checkSignatureDeclaration(node: SignatureDeclaration) { // Grammar checking if (node.kind === SyntaxKind.IndexSignature) { @@ -11038,63 +11104,67 @@ namespace ts { if (node.type.kind === SyntaxKind.TypePredicate) { const typePredicate = getSignatureFromDeclaration(node).typePredicate; const typePredicateNode = node.type; - if (isInLegalTypePredicatePosition(typePredicateNode)) { - if (isIdentifierTypePredicate(typePredicate)) { - if (typePredicate.parameterIndex >= 0) { - if (node.parameters[typePredicate.parameterIndex].dotDotDotToken) { - error(typePredicateNode.parameterName, - Diagnostics.A_type_predicate_cannot_reference_a_rest_parameter); - } - else { - checkTypeAssignableTo(typePredicate.type, - getTypeOfNode(node.parameters[typePredicate.parameterIndex]), - typePredicateNode.type); - } + if (isIdentifierTypePredicate(typePredicate)) { + if (!isInLegalTypePredicatePosition(typePredicateNode)) { + error(typePredicateNode, + Diagnostics.A_type_predicate_is_only_allowed_in_return_type_position_for_functions_and_methods); + return; + } + if (typePredicate.parameterIndex >= 0) { + if (node.parameters[typePredicate.parameterIndex].dotDotDotToken) { + error(typePredicateNode.parameterName, + Diagnostics.A_type_predicate_cannot_reference_a_rest_parameter); } - else if (typePredicateNode.parameterName) { - let hasReportedError = false; - for (var param of node.parameters) { - if (hasReportedError) { - break; - } - if (param.name.kind === SyntaxKind.ObjectBindingPattern || - param.name.kind === SyntaxKind.ArrayBindingPattern) { - - (function checkBindingPattern(pattern: BindingPattern) { - for (const element of pattern.elements) { - if (element.name.kind === SyntaxKind.Identifier && - (element.name).text === typePredicate.parameterName) { - - error(typePredicateNode.parameterName, - Diagnostics.A_type_predicate_cannot_reference_element_0_in_a_binding_pattern, - typePredicate.parameterName); - hasReportedError = true; - break; - } - else if (element.name.kind === SyntaxKind.ArrayBindingPattern || - element.name.kind === SyntaxKind.ObjectBindingPattern) { - - checkBindingPattern(element.name); - } - } - })(param.name); - } - } - if (!hasReportedError) { - error(typePredicateNode.parameterName, - Diagnostics.Cannot_find_parameter_0, - typePredicate.parameterName); - } + else { + checkTypeAssignableTo(typePredicate.type, + getTypeOfNode(node.parameters[typePredicate.parameterIndex]), + typePredicateNode.type); } } - else { - // Reuse this type diagnostics on the this type node to determine if a this type predicate is valid - getTypeFromThisTypeNode(typePredicateNode.parameterName as ThisTypeNode); + else if (typePredicateNode.parameterName) { + let hasReportedError = false; + for (var param of node.parameters) { + if (hasReportedError) { + break; + } + if (param.name.kind === SyntaxKind.ObjectBindingPattern || + param.name.kind === SyntaxKind.ArrayBindingPattern) { + + (function checkBindingPattern(pattern: BindingPattern) { + for (const element of pattern.elements) { + if (element.name.kind === SyntaxKind.Identifier && + (element.name).text === typePredicate.parameterName) { + + error(typePredicateNode.parameterName, + Diagnostics.A_type_predicate_cannot_reference_element_0_in_a_binding_pattern, + typePredicate.parameterName); + hasReportedError = true; + break; + } + else if (element.name.kind === SyntaxKind.ArrayBindingPattern || + element.name.kind === SyntaxKind.ObjectBindingPattern) { + + checkBindingPattern(element.name); + } + } + })(param.name); + } + } + if (!hasReportedError) { + error(typePredicateNode.parameterName, + Diagnostics.Cannot_find_parameter_0, + typePredicate.parameterName); + } } } else { - error(typePredicateNode, - Diagnostics.A_type_predicate_is_only_allowed_in_return_type_position_for_functions_and_methods); + if (!isInLegalThisTypePredicatePosition(typePredicateNode)) { + error(typePredicateNode, + Diagnostics.A_this_based_type_predicate_is_only_allowed_in_class_or_interface_members_get_accessors_or_return_type_positions_for_functions_and_methods); + return; + } + // Reuse this type diagnostics on the this type node to determine if a this type predicate is valid + getTypeFromThisTypeNode(typePredicateNode.parameterName as ThisTypeNode); } } else { @@ -14222,9 +14292,12 @@ namespace ts { } function checkTypePredicate(node: TypePredicateNode) { - if (!isInLegalTypePredicatePosition(node)) { + if (node.parameterName.kind === SyntaxKind.Identifier && !isInLegalTypePredicatePosition(node)) { error(node, Diagnostics.A_type_predicate_is_only_allowed_in_return_type_position_for_functions_and_methods); } + else if (node.parameterName.kind === SyntaxKind.ThisType && (!isInLegalThisTypePredicatePosition(node) || getTypeFromThisTypeNode(node.parameterName as ThisTypeNode) === unknownType)) { + error(node, Diagnostics.A_this_based_type_predicate_is_only_allowed_in_class_or_interface_members_get_accessors_or_return_type_positions_for_functions_and_methods); + } } function checkSourceElement(node: Node): void { diff --git a/src/compiler/diagnosticMessages.json b/src/compiler/diagnosticMessages.json index 081bfc2385d..0ca8a93d071 100644 --- a/src/compiler/diagnosticMessages.json +++ b/src/compiler/diagnosticMessages.json @@ -1636,6 +1636,10 @@ "category": "Error", "code": 2518 }, + "A 'this'-based type predicate is only allowed in class or interface members, get accessors, or return type positions for functions and methods": { + "category": "Error", + "code": 2519 + }, "Duplicate identifier '{0}'. Compiler uses declaration '{1}' to support async functions.": { "category": "Error", "code": 2520 diff --git a/src/compiler/types.ts b/src/compiler/types.ts index 4bde87d0ff5..d8e6291ac02 100644 --- a/src/compiler/types.ts +++ b/src/compiler/types.ts @@ -2108,6 +2108,7 @@ namespace ts { ESSymbol = 0x01000000, // Type of symbol primitive introduced in ES6 ThisType = 0x02000000, // This type ObjectLiteralPatternWithComputedProperties = 0x04000000, // Object literal type implied by binding pattern has computed properties + PredicateType = 0x08000000, /* @internal */ Intrinsic = Any | String | Number | Boolean | ESSymbol | Void | Undefined | Null, @@ -2140,6 +2141,11 @@ namespace ts { intrinsicName: string; // Name of intrinsic type } + // Predicate types (TypeFlags.Predicate) + export interface PredicateType extends Type { + predicate: ThisTypePredicate; + } + // String literal types (TypeFlags.StringLiteral) export interface StringLiteralType extends Type { text: string; // Text of string literal diff --git a/src/compiler/utilities.ts b/src/compiler/utilities.ts index 5a35bcbdee1..863fbcb23ef 100644 --- a/src/compiler/utilities.ts +++ b/src/compiler/utilities.ts @@ -693,7 +693,7 @@ namespace ts { } export function isIdentifierTypePredicate(predicate: TypePredicate): predicate is IdentifierTypePredicate { - return predicate.kind === TypePredicateKind.Identifier; + return predicate && predicate.kind === TypePredicateKind.Identifier; } export function getContainingFunction(node: Node): FunctionLikeDeclaration { diff --git a/tests/baselines/reference/typeGuardFunctionErrors.errors.txt b/tests/baselines/reference/typeGuardFunctionErrors.errors.txt index 92d9d21f0cc..9ad0ac6aa4a 100644 --- a/tests/baselines/reference/typeGuardFunctionErrors.errors.txt +++ b/tests/baselines/reference/typeGuardFunctionErrors.errors.txt @@ -25,7 +25,7 @@ tests/cases/conformance/expressions/typeGuards/typeGuardFunctionErrors.ts(91,1): tests/cases/conformance/expressions/typeGuards/typeGuardFunctionErrors.ts(96,9): error TS1228: A type predicate is only allowed in return type position for functions and methods. tests/cases/conformance/expressions/typeGuards/typeGuardFunctionErrors.ts(97,16): error TS1228: A type predicate is only allowed in return type position for functions and methods. tests/cases/conformance/expressions/typeGuards/typeGuardFunctionErrors.ts(98,20): error TS1228: A type predicate is only allowed in return type position for functions and methods. -tests/cases/conformance/expressions/typeGuards/typeGuardFunctionErrors.ts(104,25): error TS1228: A type predicate is only allowed in return type position for functions and methods. +tests/cases/conformance/expressions/typeGuards/typeGuardFunctionErrors.ts(104,25): error TS2519: A 'this'-based type predicate is only allowed in class or interface members, get accessors, or return type positions for functions and methods tests/cases/conformance/expressions/typeGuards/typeGuardFunctionErrors.ts(105,16): error TS2322: Type 'boolean' is not assignable to type 'D'. Property 'm1' is missing in type 'Boolean'. tests/cases/conformance/expressions/typeGuards/typeGuardFunctionErrors.ts(105,16): error TS2409: Return type of constructor signature must be assignable to the instance type of the class @@ -194,7 +194,7 @@ tests/cases/conformance/expressions/typeGuards/typeGuardFunctionErrors.ts(137,39 class D { constructor(p1: A): p1 is C { ~~~~~~~ -!!! error TS1228: A type predicate is only allowed in return type position for functions and methods. +!!! error TS2519: A 'this'-based type predicate is only allowed in class or interface members, get accessors, or return type positions for functions and methods return true; ~~~~ !!! error TS2322: Type 'boolean' is not assignable to type 'D'. diff --git a/tests/baselines/reference/typeGuardOfFormThisMember.js b/tests/baselines/reference/typeGuardOfFormThisMember.js new file mode 100644 index 00000000000..2a53be25ab1 --- /dev/null +++ b/tests/baselines/reference/typeGuardOfFormThisMember.js @@ -0,0 +1,130 @@ +//// [typeGuardOfFormThisMember.ts] +// There's a 'File' class in the stdlib, wrap with a namespace to avoid collision +namespace Test { + export class FileSystemObject { + get isFile(): this is File { + return this instanceof File; + } + set isFile(param) { + // noop + } + get isDirectory(): this is Directory { + return this instanceof Directory; + } + isNetworked: this is (Networked & this); + constructor(public path: string) {} + } + + export class File extends FileSystemObject { + constructor(path: string, public content: string) { super(path); } + } + export class Directory extends FileSystemObject { + children: FileSystemObject[]; + } + export interface Networked { + host: string; + } + + let file: FileSystemObject = new File("foo/bar.txt", "foo"); + file.isNetworked = false; + file.isNetworked = file.isDirectory; + file.isFile = file.isNetworked; + let x = file.isFile; + if (file.isFile) { + file.content; + } + else if (file.isDirectory) { + file.children; + } + else if (file.isNetworked) { + file.host; + } +} + +//// [typeGuardOfFormThisMember.js] +var __extends = (this && this.__extends) || function (d, b) { + for (var p in b) if (b.hasOwnProperty(p)) d[p] = b[p]; + function __() { this.constructor = d; } + d.prototype = b === null ? Object.create(b) : (__.prototype = b.prototype, new __()); +}; +// There's a 'File' class in the stdlib, wrap with a namespace to avoid collision +var Test; +(function (Test) { + var FileSystemObject = (function () { + function FileSystemObject(path) { + this.path = path; + } + Object.defineProperty(FileSystemObject.prototype, "isFile", { + get: function () { + return this instanceof File; + }, + set: function (param) { + // noop + }, + enumerable: true, + configurable: true + }); + Object.defineProperty(FileSystemObject.prototype, "isDirectory", { + get: function () { + return this instanceof Directory; + }, + enumerable: true, + configurable: true + }); + return FileSystemObject; + })(); + Test.FileSystemObject = FileSystemObject; + var File = (function (_super) { + __extends(File, _super); + function File(path, content) { + _super.call(this, path); + this.content = content; + } + return File; + })(FileSystemObject); + Test.File = File; + var Directory = (function (_super) { + __extends(Directory, _super); + function Directory() { + _super.apply(this, arguments); + } + return Directory; + })(FileSystemObject); + Test.Directory = Directory; + var file = new File("foo/bar.txt", "foo"); + file.isNetworked = false; + file.isNetworked = file.isDirectory; + file.isFile = file.isNetworked; + var x = file.isFile; + if (file.isFile) { + file.content; + } + else if (file.isDirectory) { + file.children; + } + else if (file.isNetworked) { + file.host; + } +})(Test || (Test = {})); + + +//// [typeGuardOfFormThisMember.d.ts] +declare namespace Test { + class FileSystemObject { + path: string; + isFile: this is File; + isDirectory: this is Directory; + isNetworked: this is (Networked & this); + constructor(path: string); + } + class File extends FileSystemObject { + content: string; + constructor(path: string, content: string); + } + class Directory extends FileSystemObject { + children: FileSystemObject[]; + } + interface Networked { + host: string; + } +} diff --git a/tests/baselines/reference/typeGuardOfFormThisMember.symbols b/tests/baselines/reference/typeGuardOfFormThisMember.symbols new file mode 100644 index 00000000000..fe78ed16507 --- /dev/null +++ b/tests/baselines/reference/typeGuardOfFormThisMember.symbols @@ -0,0 +1,126 @@ +=== tests/cases/conformance/expressions/typeGuards/typeGuardOfFormThisMember.ts === +// There's a 'File' class in the stdlib, wrap with a namespace to avoid collision +namespace Test { +>Test : Symbol(Test, Decl(typeGuardOfFormThisMember.ts, 0, 0)) + + export class FileSystemObject { +>FileSystemObject : Symbol(FileSystemObject, Decl(typeGuardOfFormThisMember.ts, 1, 16)) + + get isFile(): this is File { +>isFile : Symbol(isFile, Decl(typeGuardOfFormThisMember.ts, 2, 32), Decl(typeGuardOfFormThisMember.ts, 5, 3)) +>File : Symbol(File, Decl(typeGuardOfFormThisMember.ts, 14, 2)) + + return this instanceof File; +>this : Symbol(FileSystemObject, Decl(typeGuardOfFormThisMember.ts, 1, 16)) +>File : Symbol(File, Decl(typeGuardOfFormThisMember.ts, 14, 2)) + } + set isFile(param) { +>isFile : Symbol(isFile, Decl(typeGuardOfFormThisMember.ts, 2, 32), Decl(typeGuardOfFormThisMember.ts, 5, 3)) +>param : Symbol(param, Decl(typeGuardOfFormThisMember.ts, 6, 13)) + + // noop + } + get isDirectory(): this is Directory { +>isDirectory : Symbol(isDirectory, Decl(typeGuardOfFormThisMember.ts, 8, 3)) +>Directory : Symbol(Directory, Decl(typeGuardOfFormThisMember.ts, 18, 2)) + + return this instanceof Directory; +>this : Symbol(FileSystemObject, Decl(typeGuardOfFormThisMember.ts, 1, 16)) +>Directory : Symbol(Directory, Decl(typeGuardOfFormThisMember.ts, 18, 2)) + } + isNetworked: this is (Networked & this); +>isNetworked : Symbol(isNetworked, Decl(typeGuardOfFormThisMember.ts, 11, 3)) +>Networked : Symbol(Networked, Decl(typeGuardOfFormThisMember.ts, 21, 2)) + + constructor(public path: string) {} +>path : Symbol(path, Decl(typeGuardOfFormThisMember.ts, 13, 14)) + } + + export class File extends FileSystemObject { +>File : Symbol(File, Decl(typeGuardOfFormThisMember.ts, 14, 2)) +>FileSystemObject : Symbol(FileSystemObject, Decl(typeGuardOfFormThisMember.ts, 1, 16)) + + constructor(path: string, public content: string) { super(path); } +>path : Symbol(path, Decl(typeGuardOfFormThisMember.ts, 17, 14)) +>content : Symbol(content, Decl(typeGuardOfFormThisMember.ts, 17, 27)) +>super : Symbol(FileSystemObject, Decl(typeGuardOfFormThisMember.ts, 1, 16)) +>path : Symbol(path, Decl(typeGuardOfFormThisMember.ts, 17, 14)) + } + export class Directory extends FileSystemObject { +>Directory : Symbol(Directory, Decl(typeGuardOfFormThisMember.ts, 18, 2)) +>FileSystemObject : Symbol(FileSystemObject, Decl(typeGuardOfFormThisMember.ts, 1, 16)) + + children: FileSystemObject[]; +>children : Symbol(children, Decl(typeGuardOfFormThisMember.ts, 19, 50)) +>FileSystemObject : Symbol(FileSystemObject, Decl(typeGuardOfFormThisMember.ts, 1, 16)) + } + export interface Networked { +>Networked : Symbol(Networked, Decl(typeGuardOfFormThisMember.ts, 21, 2)) + + host: string; +>host : Symbol(host, Decl(typeGuardOfFormThisMember.ts, 22, 29)) + } + + let file: FileSystemObject = new File("foo/bar.txt", "foo"); +>file : Symbol(file, Decl(typeGuardOfFormThisMember.ts, 26, 4)) +>FileSystemObject : Symbol(FileSystemObject, Decl(typeGuardOfFormThisMember.ts, 1, 16)) +>File : Symbol(File, Decl(typeGuardOfFormThisMember.ts, 14, 2)) + + file.isNetworked = false; +>file.isNetworked : Symbol(FileSystemObject.isNetworked, Decl(typeGuardOfFormThisMember.ts, 11, 3)) +>file : Symbol(file, Decl(typeGuardOfFormThisMember.ts, 26, 4)) +>isNetworked : Symbol(FileSystemObject.isNetworked, Decl(typeGuardOfFormThisMember.ts, 11, 3)) + + file.isNetworked = file.isDirectory; +>file.isNetworked : Symbol(FileSystemObject.isNetworked, Decl(typeGuardOfFormThisMember.ts, 11, 3)) +>file : Symbol(file, Decl(typeGuardOfFormThisMember.ts, 26, 4)) +>isNetworked : Symbol(FileSystemObject.isNetworked, Decl(typeGuardOfFormThisMember.ts, 11, 3)) +>file.isDirectory : Symbol(FileSystemObject.isDirectory, Decl(typeGuardOfFormThisMember.ts, 8, 3)) +>file : Symbol(file, Decl(typeGuardOfFormThisMember.ts, 26, 4)) +>isDirectory : Symbol(FileSystemObject.isDirectory, Decl(typeGuardOfFormThisMember.ts, 8, 3)) + + file.isFile = file.isNetworked; +>file.isFile : Symbol(FileSystemObject.isFile, Decl(typeGuardOfFormThisMember.ts, 2, 32), Decl(typeGuardOfFormThisMember.ts, 5, 3)) +>file : Symbol(file, Decl(typeGuardOfFormThisMember.ts, 26, 4)) +>isFile : Symbol(FileSystemObject.isFile, Decl(typeGuardOfFormThisMember.ts, 2, 32), Decl(typeGuardOfFormThisMember.ts, 5, 3)) +>file.isNetworked : Symbol(FileSystemObject.isNetworked, Decl(typeGuardOfFormThisMember.ts, 11, 3)) +>file : Symbol(file, Decl(typeGuardOfFormThisMember.ts, 26, 4)) +>isNetworked : Symbol(FileSystemObject.isNetworked, Decl(typeGuardOfFormThisMember.ts, 11, 3)) + + let x = file.isFile; +>x : Symbol(x, Decl(typeGuardOfFormThisMember.ts, 30, 4)) +>file.isFile : Symbol(FileSystemObject.isFile, Decl(typeGuardOfFormThisMember.ts, 2, 32), Decl(typeGuardOfFormThisMember.ts, 5, 3)) +>file : Symbol(file, Decl(typeGuardOfFormThisMember.ts, 26, 4)) +>isFile : Symbol(FileSystemObject.isFile, Decl(typeGuardOfFormThisMember.ts, 2, 32), Decl(typeGuardOfFormThisMember.ts, 5, 3)) + + if (file.isFile) { +>file.isFile : Symbol(FileSystemObject.isFile, Decl(typeGuardOfFormThisMember.ts, 2, 32), Decl(typeGuardOfFormThisMember.ts, 5, 3)) +>file : Symbol(file, Decl(typeGuardOfFormThisMember.ts, 26, 4)) +>isFile : Symbol(FileSystemObject.isFile, Decl(typeGuardOfFormThisMember.ts, 2, 32), Decl(typeGuardOfFormThisMember.ts, 5, 3)) + + file.content; +>file.content : Symbol(File.content, Decl(typeGuardOfFormThisMember.ts, 17, 27)) +>file : Symbol(file, Decl(typeGuardOfFormThisMember.ts, 26, 4)) +>content : Symbol(File.content, Decl(typeGuardOfFormThisMember.ts, 17, 27)) + } + else if (file.isDirectory) { +>file.isDirectory : Symbol(FileSystemObject.isDirectory, Decl(typeGuardOfFormThisMember.ts, 8, 3)) +>file : Symbol(file, Decl(typeGuardOfFormThisMember.ts, 26, 4)) +>isDirectory : Symbol(FileSystemObject.isDirectory, Decl(typeGuardOfFormThisMember.ts, 8, 3)) + + file.children; +>file.children : Symbol(Directory.children, Decl(typeGuardOfFormThisMember.ts, 19, 50)) +>file : Symbol(file, Decl(typeGuardOfFormThisMember.ts, 26, 4)) +>children : Symbol(Directory.children, Decl(typeGuardOfFormThisMember.ts, 19, 50)) + } + else if (file.isNetworked) { +>file.isNetworked : Symbol(FileSystemObject.isNetworked, Decl(typeGuardOfFormThisMember.ts, 11, 3)) +>file : Symbol(file, Decl(typeGuardOfFormThisMember.ts, 26, 4)) +>isNetworked : Symbol(FileSystemObject.isNetworked, Decl(typeGuardOfFormThisMember.ts, 11, 3)) + + file.host; +>file.host : Symbol(Networked.host, Decl(typeGuardOfFormThisMember.ts, 22, 29)) +>file : Symbol(file, Decl(typeGuardOfFormThisMember.ts, 26, 4)) +>host : Symbol(Networked.host, Decl(typeGuardOfFormThisMember.ts, 22, 29)) + } +} diff --git a/tests/baselines/reference/typeGuardOfFormThisMember.types b/tests/baselines/reference/typeGuardOfFormThisMember.types new file mode 100644 index 00000000000..c379186fac7 --- /dev/null +++ b/tests/baselines/reference/typeGuardOfFormThisMember.types @@ -0,0 +1,136 @@ +=== tests/cases/conformance/expressions/typeGuards/typeGuardOfFormThisMember.ts === +// There's a 'File' class in the stdlib, wrap with a namespace to avoid collision +namespace Test { +>Test : typeof Test + + export class FileSystemObject { +>FileSystemObject : FileSystemObject + + get isFile(): this is File { +>isFile : this is File +>File : File + + return this instanceof File; +>this instanceof File : boolean +>this : this +>File : typeof File + } + set isFile(param) { +>isFile : this is File +>param : this is File + + // noop + } + get isDirectory(): this is Directory { +>isDirectory : this is Directory +>Directory : Directory + + return this instanceof Directory; +>this instanceof Directory : boolean +>this : this +>Directory : typeof Directory + } + isNetworked: this is (Networked & this); +>isNetworked : this is Networked & this +>Networked : Networked + + constructor(public path: string) {} +>path : string + } + + export class File extends FileSystemObject { +>File : File +>FileSystemObject : FileSystemObject + + constructor(path: string, public content: string) { super(path); } +>path : string +>content : string +>super(path) : void +>super : typeof FileSystemObject +>path : string + } + export class Directory extends FileSystemObject { +>Directory : Directory +>FileSystemObject : FileSystemObject + + children: FileSystemObject[]; +>children : FileSystemObject[] +>FileSystemObject : FileSystemObject + } + export interface Networked { +>Networked : Networked + + host: string; +>host : string + } + + let file: FileSystemObject = new File("foo/bar.txt", "foo"); +>file : FileSystemObject +>FileSystemObject : FileSystemObject +>new File("foo/bar.txt", "foo") : File +>File : typeof File +>"foo/bar.txt" : string +>"foo" : string + + file.isNetworked = false; +>file.isNetworked = false : boolean +>file.isNetworked : this is Networked & this +>file : FileSystemObject +>isNetworked : this is Networked & this +>false : boolean + + file.isNetworked = file.isDirectory; +>file.isNetworked = file.isDirectory : this is Directory +>file.isNetworked : this is Networked & this +>file : FileSystemObject +>isNetworked : this is Networked & this +>file.isDirectory : this is Directory +>file : FileSystemObject +>isDirectory : this is Directory + + file.isFile = file.isNetworked; +>file.isFile = file.isNetworked : this is Networked & this +>file.isFile : this is File +>file : FileSystemObject +>isFile : this is File +>file.isNetworked : this is Networked & this +>file : FileSystemObject +>isNetworked : this is Networked & this + + let x = file.isFile; +>x : this is File +>file.isFile : this is File +>file : FileSystemObject +>isFile : this is File + + if (file.isFile) { +>file.isFile : this is File +>file : FileSystemObject +>isFile : this is File + + file.content; +>file.content : string +>file : File +>content : string + } + else if (file.isDirectory) { +>file.isDirectory : this is Directory +>file : FileSystemObject +>isDirectory : this is Directory + + file.children; +>file.children : FileSystemObject[] +>file : Directory +>children : FileSystemObject[] + } + else if (file.isNetworked) { +>file.isNetworked : this is Networked & this +>file : FileSystemObject +>isNetworked : this is Networked & this + + file.host; +>file.host : string +>file : Networked & this +>host : string + } +} diff --git a/tests/cases/conformance/expressions/typeGuards/typeGuardOfFormThisMember.ts b/tests/cases/conformance/expressions/typeGuards/typeGuardOfFormThisMember.ts new file mode 100644 index 00000000000..1c714ff7d5a --- /dev/null +++ b/tests/cases/conformance/expressions/typeGuards/typeGuardOfFormThisMember.ts @@ -0,0 +1,43 @@ +// @target: es5 +// @declaration: true +// There's a 'File' class in the stdlib, wrap with a namespace to avoid collision +namespace Test { + export class FileSystemObject { + get isFile(): this is File { + return this instanceof File; + } + set isFile(param) { + // noop + } + get isDirectory(): this is Directory { + return this instanceof Directory; + } + isNetworked: this is (Networked & this); + constructor(public path: string) {} + } + + export class File extends FileSystemObject { + constructor(path: string, public content: string) { super(path); } + } + export class Directory extends FileSystemObject { + children: FileSystemObject[]; + } + export interface Networked { + host: string; + } + + let file: FileSystemObject = new File("foo/bar.txt", "foo"); + file.isNetworked = false; + file.isNetworked = file.isDirectory; + file.isFile = file.isNetworked; + let x = file.isFile; + if (file.isFile) { + file.content; + } + else if (file.isDirectory) { + file.children; + } + else if (file.isNetworked) { + file.host; + } +} \ No newline at end of file From fabc43d0d401795531f7597eae70d209d0bb0e33 Mon Sep 17 00:00:00 2001 From: Ryan Cavanaugh Date: Fri, 4 Dec 2015 14:11:56 -0800 Subject: [PATCH 031/177] JS Prototypes WIP --- src/compiler/binder.ts | 33 +++++++++++---------------------- src/compiler/types.ts | 1 - 2 files changed, 11 insertions(+), 23 deletions(-) diff --git a/src/compiler/binder.ts b/src/compiler/binder.ts index 86fcc809d58..eedcd456b84 100644 --- a/src/compiler/binder.ts +++ b/src/compiler/binder.ts @@ -1367,42 +1367,31 @@ namespace ts { } function bindThisPropertyAssignment(node: BinaryExpression) { + // Declare a 'member' in case it turns out the container was an ES5 class if (container.kind === SyntaxKind.FunctionExpression || container.kind === SyntaxKind.FunctionDeclaration) { container.symbol.members = container.symbol.members || {}; - declareClassMember(node, SymbolFlags.Property, SymbolFlags.PropertyExcludes); + declareSymbol(container.symbol.members, container.symbol, node, SymbolFlags.Property, SymbolFlags.PropertyExcludes); } } function bindPrototypePropertyAssignment(node: BinaryExpression) { - // We saw a node of the form 'x.prototype.y = z'. - // This does two things: turns 'x' into a constructor function, and - // adds a member 'y' to the result of that constructor function - // Get 'x', the class - const classId = ((node.left).expression).expression; + // We saw a node of the form 'x.prototype.y = z'. Declare a 'member' y on x if x was a function. - // Look up the function in the local scope, since prototype assignments should immediately + // Look up the function in the local scope, since prototype assignments should // follow the function declaration + const classId = ((node.left).expression).expression; const funcSymbol = container.locals[classId.text]; - if (!funcSymbol) { + if (!funcSymbol || !(funcSymbol.flags & SymbolFlags.Function)) { return; } - // The function is now a constructor rather than a normal function - if (!funcSymbol.inferredConstructor) { - // Have the binder set up all the related class symbols for us - declareSymbol(container.locals, funcSymbol, funcSymbol.valueDeclaration, SymbolFlags.Class, SymbolFlags.None); - // funcSymbol.members = funcSymbol.members || {}; - funcSymbol.members["__constructor"] = funcSymbol; - funcSymbol.inferredConstructor = true; + // Set up the members collection if it doesn't exist already + if (!funcSymbol.members) { + funcSymbol.members = {}; } - // Get the exports of the class so we can add the method to it - const funcExports = declareSymbol(funcSymbol.exports, funcSymbol, (node.left).expression, SymbolFlags.ObjectLiteral | SymbolFlags.Property, SymbolFlags.None); - - // Declare the method - declareSymbol(funcExports.members, funcExports, node.left, SymbolFlags.Method, SymbolFlags.None); - // and on the members of the function so it appears in 'prototype' - declareSymbol(funcSymbol.members, funcSymbol, node.left, SymbolFlags.Method, SymbolFlags.PropertyExcludes); + // Declare the method/property + declareSymbol(funcSymbol.members, funcSymbol, node.left, SymbolFlags.Property, SymbolFlags.PropertyExcludes); } function bindCallExpression(node: CallExpression) { diff --git a/src/compiler/types.ts b/src/compiler/types.ts index daec64c0dac..16e5e4b57fe 100644 --- a/src/compiler/types.ts +++ b/src/compiler/types.ts @@ -1985,7 +1985,6 @@ namespace ts { /* @internal */ parent?: Symbol; // Parent symbol /* @internal */ exportSymbol?: Symbol; // Exported symbol associated with this symbol /* @internal */ constEnumOnlyModule?: boolean; // True if module contains only const enums or other modules with only const enums - /* @internal */ inferredConstructor?: boolean; // A function promoted to constructor as the result of a prototype property assignment } /* @internal */ From fcd00a59d2b213bf469ed891e95ca9ab0d6c73a4 Mon Sep 17 00:00:00 2001 From: Ryan Cavanaugh Date: Fri, 4 Dec 2015 14:58:32 -0800 Subject: [PATCH 032/177] Simplified JS prototype class inference --- src/compiler/checker.ts | 82 ++++++------------- src/compiler/types.ts | 1 - src/services/services.ts | 1 - tests/cases/fourslash/javaScriptPrototype1.ts | 4 +- tests/cases/fourslash/javaScriptPrototype3.ts | 40 --------- tests/cases/fourslash/javaScriptPrototype4.ts | 9 -- 6 files changed, 27 insertions(+), 110 deletions(-) delete mode 100644 tests/cases/fourslash/javaScriptPrototype3.ts diff --git a/src/compiler/checker.ts b/src/compiler/checker.ts index 22b45926cad..dc2d6649013 100644 --- a/src/compiler/checker.ts +++ b/src/compiler/checker.ts @@ -123,8 +123,8 @@ namespace ts { const noConstraintType = createAnonymousType(undefined, emptySymbols, emptyArray, emptyArray, undefined, undefined); - const anySignature = createSignature(undefined, undefined, emptyArray, undefined, anyType, undefined, 0, /*hasRestParameter*/ false, /*hasStringLiterals*/ false); - const unknownSignature = createSignature(undefined, undefined, emptyArray, undefined, unknownType, undefined, 0, /*hasRestParameter*/ false, /*hasStringLiterals*/ false); + const anySignature = createSignature(undefined, undefined, emptyArray, anyType, undefined, 0, /*hasRestParameter*/ false, /*hasStringLiterals*/ false); + const unknownSignature = createSignature(undefined, undefined, emptyArray, unknownType, undefined, 0, /*hasRestParameter*/ false, /*hasStringLiterals*/ false); const globals: SymbolTable = {}; @@ -3374,13 +3374,12 @@ namespace ts { resolveObjectTypeMembers(type, source, typeParameters, typeArguments); } - function createSignature(declaration: SignatureDeclaration, typeParameters: TypeParameter[], parameters: Symbol[], kind: SignatureKind, + function createSignature(declaration: SignatureDeclaration, typeParameters: TypeParameter[], parameters: Symbol[], resolvedReturnType: Type, typePredicate: TypePredicate, minArgumentCount: number, hasRestParameter: boolean, hasStringLiterals: boolean): Signature { const sig = new Signature(checker); sig.declaration = declaration; sig.typeParameters = typeParameters; sig.parameters = parameters; - sig.kind = kind; sig.resolvedReturnType = resolvedReturnType; sig.typePredicate = typePredicate; sig.minArgumentCount = minArgumentCount; @@ -3390,13 +3389,13 @@ namespace ts { } function cloneSignature(sig: Signature): Signature { - return createSignature(sig.declaration, sig.typeParameters, sig.parameters, sig.kind, sig.resolvedReturnType, sig.typePredicate, + return createSignature(sig.declaration, sig.typeParameters, sig.parameters, sig.resolvedReturnType, sig.typePredicate, sig.minArgumentCount, sig.hasRestParameter, sig.hasStringLiterals); } function getDefaultConstructSignatures(classType: InterfaceType): Signature[] { if (!hasClassBaseType(classType)) { - return [createSignature(undefined, classType.localTypeParameters, emptyArray, SignatureKind.Construct, classType, undefined, 0, /*hasRestParameter*/ false, /*hasStringLiterals*/ false)]; + return [createSignature(undefined, classType.localTypeParameters, emptyArray, classType, undefined, 0, /*hasRestParameter*/ false, /*hasStringLiterals*/ false)]; } const baseConstructorType = getBaseConstructorTypeOfClass(classType); const baseSignatures = getSignaturesOfType(baseConstructorType, SignatureKind.Construct); @@ -3932,33 +3931,7 @@ namespace ts { } } - let kind: SignatureKind; - switch (declaration.kind) { - case SyntaxKind.Constructor: - case SyntaxKind.ConstructSignature: - case SyntaxKind.ConstructorType: - kind = SignatureKind.Construct; - break; - default: - if (declaration.symbol.inferredConstructor) { - kind = SignatureKind.Construct; - const members = createSymbolTable(emptyArray); - // Collect methods declared with className.protoype.methodName = ... - const proto = declaration.symbol.exports["prototype"]; - if (proto) { - mergeSymbolTable(members, proto.members); - } - // Collect properties defined in the constructor by this.propName = ... - mergeSymbolTable(members, declaration.symbol.members); - returnType = createAnonymousType(declaration.symbol, members, emptyArray, emptyArray, undefined, undefined); - } - else { - kind = SignatureKind.Call; - } - break; - } - - links.resolvedSignature = createSignature(declaration, typeParameters, parameters, kind, returnType, typePredicate, + links.resolvedSignature = createSignature(declaration, typeParameters, parameters, returnType, typePredicate, minArgumentCount, hasRestParameter(declaration), hasStringLiterals); } return links.resolvedSignature; @@ -3966,7 +3939,7 @@ namespace ts { function getSignaturesOfSymbol(symbol: Symbol): Signature[] { if (!symbol) return emptyArray; - let result: Signature[] = []; + const result: Signature[] = []; for (let i = 0, len = symbol.declarations.length; i < len; i++) { const node = symbol.declarations[i]; switch (node.kind) { @@ -3993,12 +3966,6 @@ namespace ts { } } result.push(getSignatureFromDeclaration(node)); - break; - - case SyntaxKind.PropertyAccessExpression: - // Inferred class method - result = getSignaturesOfType(checkExpressionCached((node.parent).right), SignatureKind.Call); - break; } } return result; @@ -4081,7 +4048,7 @@ namespace ts { // object type literal or interface (using the new keyword). Each way of declaring a constructor // will result in a different declaration kind. if (!signature.isolatedSignatureType) { - const isConstructor = signature.kind === SignatureKind.Construct; + const isConstructor = signature.declaration.kind === SyntaxKind.Constructor || signature.declaration.kind === SyntaxKind.ConstructSignature; const type = createObjectType(TypeFlags.Anonymous | TypeFlags.FromSignature); type.members = emptySymbols; type.properties = emptyArray; @@ -4784,7 +4751,6 @@ namespace ts { } const result = createSignature(signature.declaration, freshTypeParameters, instantiateList(signature.parameters, mapper, instantiateSymbol), - signature.kind, instantiateType(signature.resolvedReturnType, mapper), freshTypePredicate, signature.minArgumentCount, signature.hasRestParameter, signature.hasStringLiterals); @@ -6838,14 +6804,7 @@ namespace ts { let container: Node; if (symbol.flags & SymbolFlags.Class) { // get parent of class declaration - const classDeclaration = getClassLikeDeclarationOfSymbol(symbol); - if (classDeclaration) { - container = classDeclaration.parent; - } - else { - // JS-inferred class; do nothing - return; - } + container = getClassLikeDeclarationOfSymbol(symbol).parent; } else { // nesting structure: @@ -7189,10 +7148,7 @@ namespace ts { const operator = binaryExpression.operatorToken.kind; if (operator >= SyntaxKind.FirstAssignment && operator <= SyntaxKind.LastAssignment) { // In an assignment expression, the right operand is contextually typed by the type of the left operand. - // In JS files where a special assignment is taking place, don't contextually type the RHS to avoid - // incorrectly assuming a circular 'any' (the type of the LHS is determined by the RHS) - if (node === binaryExpression.right && - !(node.parserContextFlags & ParserContextFlags.JavaScriptFile && getSpecialPropertyAssignmentKind(binaryExpression))) { + if (node === binaryExpression.right) { return checkExpression(binaryExpression.left); } } @@ -9676,9 +9632,21 @@ namespace ts { return voidType; } if (node.kind === SyntaxKind.NewExpression) { - if (signature.kind === SignatureKind.Call) { - // When resolved signature is a call signature (and not a construct signature) the result type is any - if (compilerOptions.noImplicitAny) { + const declaration = signature.declaration; + + if (declaration && + declaration.kind !== SyntaxKind.Constructor && + declaration.kind !== SyntaxKind.ConstructSignature && + declaration.kind !== SyntaxKind.ConstructorType) { + + // When resolved signature is a call signature (and not a construct signature) the result type is any, unless + // the declaring function had members created through 'x.prototype.y = expr' or 'this.y = expr' psuedodeclarations + // in a JS file + const funcSymbol = checkExpression(node.expression).symbol; + if (funcSymbol && funcSymbol.members && (funcSymbol.flags & SymbolFlags.Function)) { + return createAnonymousType(undefined, funcSymbol.members, emptyArray, emptyArray, /*stringIndexType*/ undefined, /*numberIndexType*/ undefined); + } + else if (compilerOptions.noImplicitAny) { error(node, Diagnostics.new_expression_whose_target_lacks_a_construct_signature_implicitly_has_an_any_type); } return anyType; diff --git a/src/compiler/types.ts b/src/compiler/types.ts index 169ce4acfda..34e862768d0 100644 --- a/src/compiler/types.ts +++ b/src/compiler/types.ts @@ -2237,7 +2237,6 @@ namespace ts { declaration: SignatureDeclaration; // Originating declaration typeParameters: TypeParameter[]; // Type parameters (undefined if non-generic) parameters: Symbol[]; // Parameters - kind: SignatureKind; // Call or Construct typePredicate?: TypePredicate; // Type predicate /* @internal */ resolvedReturnType: Type; // Resolved return type diff --git a/src/services/services.ts b/src/services/services.ts index e145406ac18..4e0a0265b91 100644 --- a/src/services/services.ts +++ b/src/services/services.ts @@ -741,7 +741,6 @@ namespace ts { declaration: SignatureDeclaration; typeParameters: TypeParameter[]; parameters: Symbol[]; - kind: SignatureKind; resolvedReturnType: Type; minArgumentCount: number; hasRestParameter: boolean; diff --git a/tests/cases/fourslash/javaScriptPrototype1.ts b/tests/cases/fourslash/javaScriptPrototype1.ts index 0473d18aae8..c9c454cfb2c 100644 --- a/tests/cases/fourslash/javaScriptPrototype1.ts +++ b/tests/cases/fourslash/javaScriptPrototype1.ts @@ -22,8 +22,8 @@ // Members of the class instance goTo.marker('1'); edit.insert('.'); -verify.memberListContains('foo', undefined, undefined, 'method'); -verify.memberListContains('bar', undefined, undefined, 'method'); +verify.memberListContains('foo', undefined, undefined, 'property'); +verify.memberListContains('bar', undefined, undefined, 'property'); edit.backspace(); // Members of a class method (1) diff --git a/tests/cases/fourslash/javaScriptPrototype3.ts b/tests/cases/fourslash/javaScriptPrototype3.ts deleted file mode 100644 index 900a39ddce9..00000000000 --- a/tests/cases/fourslash/javaScriptPrototype3.ts +++ /dev/null @@ -1,40 +0,0 @@ -/// - -// ES6 classes can extend from JS classes - -// @allowNonTsExtensions: true -// @Filename: myMod.js -//// function myCtor(x) { -//// this.qua = 10; -//// } -//// myCtor.prototype.foo = function() { return 32 }; -//// myCtor.prototype.bar = function() { return '' }; -//// -//// class MyClass extends myCtor { -//// fn() { -//// this/*1*/ -//// let y = super.foo(); -//// y; -//// } -//// } -//// var n = new MyClass(3); -//// n/*2*/; - -goTo.marker('1'); -edit.insert('.'); -// Current class method -verify.completionListContains('fn', undefined, undefined, 'method'); -// Base class method -verify.completionListContains('foo', undefined, undefined, 'method'); -// Base class instance property -verify.completionListContains('qua', undefined, undefined, 'property'); -edit.backspace(); - -// Derived class instance from outside the class -goTo.marker('2'); -edit.insert('.'); -verify.completionListContains('fn', undefined, undefined, 'method'); -// Base class method -verify.completionListContains('foo', undefined, undefined, 'method'); -// Base class instance property -verify.completionListContains('qua', undefined, undefined, 'property'); diff --git a/tests/cases/fourslash/javaScriptPrototype4.ts b/tests/cases/fourslash/javaScriptPrototype4.ts index 3ed723740b4..81cb5fe3784 100644 --- a/tests/cases/fourslash/javaScriptPrototype4.ts +++ b/tests/cases/fourslash/javaScriptPrototype4.ts @@ -16,15 +16,6 @@ goTo.marker('1'); edit.insert('.'); // Check members of the function -verify.completionListContains('prototype', undefined, undefined, 'property'); verify.completionListContains('foo', undefined, undefined, 'warning'); verify.completionListContains('bar', undefined, undefined, 'warning'); verify.completionListContains('qua', undefined, undefined, 'warning'); - -// Check members of function.prototype -edit.insert('prototype.'); -verify.completionListContains('foo', undefined, undefined, 'method'); -verify.completionListContains('bar', undefined, undefined, 'method'); -verify.completionListContains('qua', undefined, undefined, 'warning'); -verify.completionListContains('prototype', undefined, undefined, 'warning'); - From c700bf9e7ddae671dcba397e3e5b9a5c6308191c Mon Sep 17 00:00:00 2001 From: Anders Hejlsberg Date: Sat, 5 Dec 2015 16:57:02 -0800 Subject: [PATCH 033/177] Fix length check in typeArgumentsRelatedTo --- src/compiler/checker.ts | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/compiler/checker.ts b/src/compiler/checker.ts index e0fe647f7c7..c4cda31a0ba 100644 --- a/src/compiler/checker.ts +++ b/src/compiler/checker.ts @@ -5232,8 +5232,9 @@ namespace ts { if (sources.length !== targets.length && relation === identityRelation) { return Ternary.False; } + const length = sources.length <= targets.length ? sources.length : targets.length; let result = Ternary.True; - for (let i = 0; i < targets.length; i++) { + for (let i = 0; i < length; i++) { const related = isRelatedTo(sources[i], targets[i], reportErrors); if (!related) { return Ternary.False; From 2e56012ac393582fd50595ddf193dea0b78b0c5b Mon Sep 17 00:00:00 2001 From: Anders Hejlsberg Date: Sat, 5 Dec 2015 16:57:22 -0800 Subject: [PATCH 034/177] Accepting new baselines --- ...functionConstraintSatisfaction2.errors.txt | 1 - ...thObjectTypeArgsAndConstraints4.errors.txt | 7 +- ...thObjectTypeArgsAndConstraints5.errors.txt | 12 ++- .../reference/maxConstraints.errors.txt | 4 +- ...essOnTypeParameterWithConstraints3.symbols | 3 + ...ccessOnTypeParameterWithConstraints3.types | 18 ++--- ...OnTypeParameterWithConstraints5.errors.txt | 5 +- ...meterAsTypeParameterConstraint2.errors.txt | 53 ++++++++++++ ...arameterAsTypeParameterConstraint2.symbols | 61 -------------- ...eParameterAsTypeParameterConstraint2.types | 81 ------------------- 10 files changed, 88 insertions(+), 157 deletions(-) create mode 100644 tests/baselines/reference/typeParameterAsTypeParameterConstraint2.errors.txt delete mode 100644 tests/baselines/reference/typeParameterAsTypeParameterConstraint2.symbols delete mode 100644 tests/baselines/reference/typeParameterAsTypeParameterConstraint2.types diff --git a/tests/baselines/reference/functionConstraintSatisfaction2.errors.txt b/tests/baselines/reference/functionConstraintSatisfaction2.errors.txt index cdefdacb1d5..7b3aa92828d 100644 --- a/tests/baselines/reference/functionConstraintSatisfaction2.errors.txt +++ b/tests/baselines/reference/functionConstraintSatisfaction2.errors.txt @@ -18,7 +18,6 @@ tests/cases/conformance/types/typeParameters/typeArgumentLists/functionConstrain Type 'new (x: T) => T' provides no match for the signature '(x: string): string' tests/cases/conformance/types/typeParameters/typeArgumentLists/functionConstraintSatisfaction2.ts(34,16): error TS2345: Argument of type 'F2' is not assignable to parameter of type '(x: string) => string'. Type 'F2' provides no match for the signature '(x: string): string' -tests/cases/conformance/types/typeParameters/typeArgumentLists/functionConstraintSatisfaction2.ts(36,38): error TS2313: Constraint of a type parameter cannot reference any type parameter from the same type parameter list. tests/cases/conformance/types/typeParameters/typeArgumentLists/functionConstraintSatisfaction2.ts(37,10): error TS2345: Argument of type 'T' is not assignable to parameter of type '(x: string) => string'. Type '() => void' is not assignable to type '(x: string) => string'. tests/cases/conformance/types/typeParameters/typeArgumentLists/functionConstraintSatisfaction2.ts(38,10): error TS2345: Argument of type 'U' is not assignable to parameter of type '(x: string) => string'. diff --git a/tests/baselines/reference/genericCallWithObjectTypeArgsAndConstraints4.errors.txt b/tests/baselines/reference/genericCallWithObjectTypeArgsAndConstraints4.errors.txt index cc4eb418596..c5c6cbe05c6 100644 --- a/tests/baselines/reference/genericCallWithObjectTypeArgsAndConstraints4.errors.txt +++ b/tests/baselines/reference/genericCallWithObjectTypeArgsAndConstraints4.errors.txt @@ -1,7 +1,9 @@ +tests/cases/conformance/types/typeRelationships/typeInference/genericCallWithObjectTypeArgsAndConstraints4.ts(19,17): error TS2345: Argument of type 'C' is not assignable to parameter of type 'D'. + Property 'y' is missing in type 'C'. tests/cases/conformance/types/typeRelationships/typeInference/genericCallWithObjectTypeArgsAndConstraints4.ts(30,24): error TS2345: Argument of type 'C' is not assignable to parameter of type 'T'. -==== tests/cases/conformance/types/typeRelationships/typeInference/genericCallWithObjectTypeArgsAndConstraints4.ts (1 errors) ==== +==== tests/cases/conformance/types/typeRelationships/typeInference/genericCallWithObjectTypeArgsAndConstraints4.ts (2 errors) ==== // Generic call with constraints infering type parameter from object member properties class C { @@ -21,6 +23,9 @@ tests/cases/conformance/types/typeRelationships/typeInference/genericCallWithObj var d: D; var r = foo(c, d); var r2 = foo(d, c); // error because C does not extend D + ~ +!!! error TS2345: Argument of type 'C' is not assignable to parameter of type 'D'. +!!! error TS2345: Property 'y' is missing in type 'C'. var r3 = foo(c, { x: '', foo: c }); var r4 = foo(null, null); var r5 = foo({}, null); diff --git a/tests/baselines/reference/genericCallWithObjectTypeArgsAndConstraints5.errors.txt b/tests/baselines/reference/genericCallWithObjectTypeArgsAndConstraints5.errors.txt index b2e69ce7505..2632e867edf 100644 --- a/tests/baselines/reference/genericCallWithObjectTypeArgsAndConstraints5.errors.txt +++ b/tests/baselines/reference/genericCallWithObjectTypeArgsAndConstraints5.errors.txt @@ -1,7 +1,11 @@ +tests/cases/conformance/types/typeRelationships/typeInference/genericCallWithObjectTypeArgsAndConstraints5.ts(18,17): error TS2345: Argument of type 'C' is not assignable to parameter of type 'D'. + Property 'y' is missing in type 'C'. +tests/cases/conformance/types/typeRelationships/typeInference/genericCallWithObjectTypeArgsAndConstraints5.ts(19,23): error TS2345: Argument of type '() => void' is not assignable to parameter of type '() => number'. + Type 'void' is not assignable to type 'number'. tests/cases/conformance/types/typeRelationships/typeInference/genericCallWithObjectTypeArgsAndConstraints5.ts(22,24): error TS2345: Argument of type 'C' is not assignable to parameter of type 'T'. -==== tests/cases/conformance/types/typeRelationships/typeInference/genericCallWithObjectTypeArgsAndConstraints5.ts (1 errors) ==== +==== tests/cases/conformance/types/typeRelationships/typeInference/genericCallWithObjectTypeArgsAndConstraints5.ts (3 errors) ==== // Generic call with constraints infering type parameter from object member properties class C { @@ -20,7 +24,13 @@ tests/cases/conformance/types/typeRelationships/typeInference/genericCallWithObj var c: C; var d: D; var r2 = foo(d, c); // the constraints are self-referencing, no downstream error + ~ +!!! error TS2345: Argument of type 'C' is not assignable to parameter of type 'D'. +!!! error TS2345: Property 'y' is missing in type 'C'. var r9 = foo(() => 1, () => { }); // the constraints are self-referencing, no downstream error + ~~~~~~~~~ +!!! error TS2345: Argument of type '() => void' is not assignable to parameter of type '() => number'. +!!! error TS2345: Type 'void' is not assignable to type 'number'. function other() { var r5 = foo(c, d); // error diff --git a/tests/baselines/reference/maxConstraints.errors.txt b/tests/baselines/reference/maxConstraints.errors.txt index 1f8af2ffacd..03e7158f725 100644 --- a/tests/baselines/reference/maxConstraints.errors.txt +++ b/tests/baselines/reference/maxConstraints.errors.txt @@ -1,4 +1,4 @@ -tests/cases/compiler/maxConstraints.ts(8,22): error TS2345: Argument of type 'number' is not assignable to parameter of type 'Comparable'. +tests/cases/compiler/maxConstraints.ts(8,22): error TS2345: Argument of type 'number' is not assignable to parameter of type 'Comparable'. Property 'compareTo' is missing in type 'Number'. @@ -12,5 +12,5 @@ tests/cases/compiler/maxConstraints.ts(8,22): error TS2345: Argument of type 'nu var max2: Comparer = (x, y) => { return (x.compareTo(y) > 0) ? x : y }; var maxResult = max2(1, 2); ~ -!!! error TS2345: Argument of type 'number' is not assignable to parameter of type 'Comparable'. +!!! error TS2345: Argument of type 'number' is not assignable to parameter of type 'Comparable'. !!! error TS2345: Property 'compareTo' is missing in type 'Number'. \ No newline at end of file diff --git a/tests/baselines/reference/propertyAccessOnTypeParameterWithConstraints3.symbols b/tests/baselines/reference/propertyAccessOnTypeParameterWithConstraints3.symbols index 0761c4612f1..6d1074b14f6 100644 --- a/tests/baselines/reference/propertyAccessOnTypeParameterWithConstraints3.symbols +++ b/tests/baselines/reference/propertyAccessOnTypeParameterWithConstraints3.symbols @@ -135,11 +135,14 @@ var a: { } var r3 = a().foo(); // error, no inferences for U so it doesn't satisfy constraint >r3 : Symbol(r3, Decl(propertyAccessOnTypeParameterWithConstraints3.ts, 41, 3)) +>a().foo : Symbol(A.foo, Decl(propertyAccessOnTypeParameterWithConstraints3.ts, 2, 9)) >a : Symbol(a, Decl(propertyAccessOnTypeParameterWithConstraints3.ts, 37, 3)) +>foo : Symbol(A.foo, Decl(propertyAccessOnTypeParameterWithConstraints3.ts, 2, 9)) var r3b = a()['foo'](); >r3b : Symbol(r3b, Decl(propertyAccessOnTypeParameterWithConstraints3.ts, 42, 3)) >a : Symbol(a, Decl(propertyAccessOnTypeParameterWithConstraints3.ts, 37, 3)) +>'foo' : Symbol(A.foo, Decl(propertyAccessOnTypeParameterWithConstraints3.ts, 2, 9)) // parameter supplied for type argument inference for U var r3c = a(new B()).foo(); // valid call to an invalid function, U is inferred as B, which has a foo diff --git a/tests/baselines/reference/propertyAccessOnTypeParameterWithConstraints3.types b/tests/baselines/reference/propertyAccessOnTypeParameterWithConstraints3.types index ea325190da6..f2423f2bff8 100644 --- a/tests/baselines/reference/propertyAccessOnTypeParameterWithConstraints3.types +++ b/tests/baselines/reference/propertyAccessOnTypeParameterWithConstraints3.types @@ -154,18 +154,18 @@ var a: { >U : U } var r3 = a().foo(); // error, no inferences for U so it doesn't satisfy constraint ->r3 : any ->a().foo() : any ->a().foo : any ->a() : any +>r3 : string +>a().foo() : string +>a().foo : () => string +>a() : A >a : { (): T; (x: U): U; } ->foo : any +>foo : () => string var r3b = a()['foo'](); ->r3b : any ->a()['foo']() : any ->a()['foo'] : any ->a() : any +>r3b : string +>a()['foo']() : string +>a()['foo'] : () => string +>a() : A >a : { (): T; (x: U): U; } >'foo' : string diff --git a/tests/baselines/reference/propertyAccessOnTypeParameterWithConstraints5.errors.txt b/tests/baselines/reference/propertyAccessOnTypeParameterWithConstraints5.errors.txt index d7aa10cc353..fd012d0e5a5 100644 --- a/tests/baselines/reference/propertyAccessOnTypeParameterWithConstraints5.errors.txt +++ b/tests/baselines/reference/propertyAccessOnTypeParameterWithConstraints5.errors.txt @@ -1,10 +1,11 @@ tests/cases/conformance/types/typeParameters/typeParameterLists/propertyAccessOnTypeParameterWithConstraints5.ts(15,32): error TS2339: Property 'notHere' does not exist on type 'U'. tests/cases/conformance/types/typeParameters/typeParameterLists/propertyAccessOnTypeParameterWithConstraints5.ts(25,16): error TS2339: Property 'notHere' does not exist on type 'B'. +tests/cases/conformance/types/typeParameters/typeParameterLists/propertyAccessOnTypeParameterWithConstraints5.ts(32,22): error TS2339: Property 'notHere' does not exist on type 'A'. tests/cases/conformance/types/typeParameters/typeParameterLists/propertyAccessOnTypeParameterWithConstraints5.ts(38,16): error TS2322: Type 'string' is not assignable to type 'U'. tests/cases/conformance/types/typeParameters/typeParameterLists/propertyAccessOnTypeParameterWithConstraints5.ts(38,22): error TS2339: Property 'notHere' does not exist on type 'U'. -==== tests/cases/conformance/types/typeParameters/typeParameterLists/propertyAccessOnTypeParameterWithConstraints5.ts (4 errors) ==== +==== tests/cases/conformance/types/typeParameters/typeParameterLists/propertyAccessOnTypeParameterWithConstraints5.ts (5 errors) ==== class A { foo(): string { return ''; } } @@ -41,6 +42,8 @@ tests/cases/conformance/types/typeParameters/typeParameterLists/propertyAccessOn } // BUG 794164 var r3: string = a().notHere(); + ~~~~~~~ +!!! error TS2339: Property 'notHere' does not exist on type 'A'. var r3b: string = a()['foo'](); var b = { diff --git a/tests/baselines/reference/typeParameterAsTypeParameterConstraint2.errors.txt b/tests/baselines/reference/typeParameterAsTypeParameterConstraint2.errors.txt new file mode 100644 index 00000000000..282e942e0f7 --- /dev/null +++ b/tests/baselines/reference/typeParameterAsTypeParameterConstraint2.errors.txt @@ -0,0 +1,53 @@ +tests/cases/conformance/types/typeParameters/typeArgumentLists/typeParameterAsTypeParameterConstraint2.ts(6,8): error TS2345: Argument of type 'string' is not assignable to parameter of type 'number'. +tests/cases/conformance/types/typeParameters/typeArgumentLists/typeParameterAsTypeParameterConstraint2.ts(7,8): error TS2345: Argument of type '{}' is not assignable to parameter of type 'number'. +tests/cases/conformance/types/typeParameters/typeArgumentLists/typeParameterAsTypeParameterConstraint2.ts(13,17): error TS2345: Argument of type 'NumberVariant' is not assignable to parameter of type 'number'. +tests/cases/conformance/types/typeParameters/typeArgumentLists/typeParameterAsTypeParameterConstraint2.ts(16,9): error TS2345: Argument of type '{ length: string; }' is not assignable to parameter of type '{ length: number; }'. + Types of property 'length' are incompatible. + Type 'string' is not assignable to type 'number'. +tests/cases/conformance/types/typeParameters/typeArgumentLists/typeParameterAsTypeParameterConstraint2.ts(17,9): error TS2345: Argument of type '{ length: {}; }' is not assignable to parameter of type '{ length: number; }'. + Types of property 'length' are incompatible. + Type '{}' is not assignable to type 'number'. +tests/cases/conformance/types/typeParameters/typeArgumentLists/typeParameterAsTypeParameterConstraint2.ts(18,10): error TS2345: Argument of type 'string[]' is not assignable to parameter of type '{ length: any[]; }'. + Types of property 'length' are incompatible. + Type 'number' is not assignable to type 'any[]'. + Property 'length' is missing in type 'Number'. + + +==== tests/cases/conformance/types/typeParameters/typeArgumentLists/typeParameterAsTypeParameterConstraint2.ts (6 errors) ==== + // using a type parameter as a constraint for a type parameter is invalid + // these should be errors unless otherwise noted + + function foo(x: T, y: U): U { return y; } // this is now an error + + foo(1, ''); + ~~ +!!! error TS2345: Argument of type 'string' is not assignable to parameter of type 'number'. + foo(1, {}); + ~~ +!!! error TS2345: Argument of type '{}' is not assignable to parameter of type 'number'. + + interface NumberVariant extends Number { + x: number; + } + var n: NumberVariant; + var r3 = foo(1, n); + ~ +!!! error TS2345: Argument of type 'NumberVariant' is not assignable to parameter of type 'number'. + + function foo2(x: T, y: U) { return y; } // this is now an error + foo2(1, { length: '' }); + ~~~~~~~~~~~~~~ +!!! error TS2345: Argument of type '{ length: string; }' is not assignable to parameter of type '{ length: number; }'. +!!! error TS2345: Types of property 'length' are incompatible. +!!! error TS2345: Type 'string' is not assignable to type 'number'. + foo2(1, { length: {} }); + ~~~~~~~~~~~~~~ +!!! error TS2345: Argument of type '{ length: {}; }' is not assignable to parameter of type '{ length: number; }'. +!!! error TS2345: Types of property 'length' are incompatible. +!!! error TS2345: Type '{}' is not assignable to type 'number'. + foo2([], ['']); + ~~~~ +!!! error TS2345: Argument of type 'string[]' is not assignable to parameter of type '{ length: any[]; }'. +!!! error TS2345: Types of property 'length' are incompatible. +!!! error TS2345: Type 'number' is not assignable to type 'any[]'. +!!! error TS2345: Property 'length' is missing in type 'Number'. \ No newline at end of file diff --git a/tests/baselines/reference/typeParameterAsTypeParameterConstraint2.symbols b/tests/baselines/reference/typeParameterAsTypeParameterConstraint2.symbols deleted file mode 100644 index b6fde452280..00000000000 --- a/tests/baselines/reference/typeParameterAsTypeParameterConstraint2.symbols +++ /dev/null @@ -1,61 +0,0 @@ -=== tests/cases/conformance/types/typeParameters/typeArgumentLists/typeParameterAsTypeParameterConstraint2.ts === -// using a type parameter as a constraint for a type parameter is invalid -// these should be errors unless otherwise noted - -function foo(x: T, y: U): U { return y; } // this is now an error ->foo : Symbol(foo, Decl(typeParameterAsTypeParameterConstraint2.ts, 0, 0)) ->T : Symbol(T, Decl(typeParameterAsTypeParameterConstraint2.ts, 3, 13)) ->U : Symbol(U, Decl(typeParameterAsTypeParameterConstraint2.ts, 3, 15)) ->T : Symbol(T, Decl(typeParameterAsTypeParameterConstraint2.ts, 3, 13)) ->x : Symbol(x, Decl(typeParameterAsTypeParameterConstraint2.ts, 3, 29)) ->T : Symbol(T, Decl(typeParameterAsTypeParameterConstraint2.ts, 3, 13)) ->y : Symbol(y, Decl(typeParameterAsTypeParameterConstraint2.ts, 3, 34)) ->U : Symbol(U, Decl(typeParameterAsTypeParameterConstraint2.ts, 3, 15)) ->U : Symbol(U, Decl(typeParameterAsTypeParameterConstraint2.ts, 3, 15)) ->y : Symbol(y, Decl(typeParameterAsTypeParameterConstraint2.ts, 3, 34)) - -foo(1, ''); ->foo : Symbol(foo, Decl(typeParameterAsTypeParameterConstraint2.ts, 0, 0)) - -foo(1, {}); ->foo : Symbol(foo, Decl(typeParameterAsTypeParameterConstraint2.ts, 0, 0)) - -interface NumberVariant extends Number { ->NumberVariant : Symbol(NumberVariant, Decl(typeParameterAsTypeParameterConstraint2.ts, 6, 11)) ->Number : Symbol(Number, Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --)) - - x: number; ->x : Symbol(x, Decl(typeParameterAsTypeParameterConstraint2.ts, 8, 40)) -} -var n: NumberVariant; ->n : Symbol(n, Decl(typeParameterAsTypeParameterConstraint2.ts, 11, 3)) ->NumberVariant : Symbol(NumberVariant, Decl(typeParameterAsTypeParameterConstraint2.ts, 6, 11)) - -var r3 = foo(1, n); ->r3 : Symbol(r3, Decl(typeParameterAsTypeParameterConstraint2.ts, 12, 3)) ->foo : Symbol(foo, Decl(typeParameterAsTypeParameterConstraint2.ts, 0, 0)) ->n : Symbol(n, Decl(typeParameterAsTypeParameterConstraint2.ts, 11, 3)) - -function foo2(x: T, y: U) { return y; } // this is now an error ->foo2 : Symbol(foo2, Decl(typeParameterAsTypeParameterConstraint2.ts, 12, 19)) ->T : Symbol(T, Decl(typeParameterAsTypeParameterConstraint2.ts, 14, 14)) ->U : Symbol(U, Decl(typeParameterAsTypeParameterConstraint2.ts, 14, 16)) ->length : Symbol(length, Decl(typeParameterAsTypeParameterConstraint2.ts, 14, 28)) ->T : Symbol(T, Decl(typeParameterAsTypeParameterConstraint2.ts, 14, 14)) ->x : Symbol(x, Decl(typeParameterAsTypeParameterConstraint2.ts, 14, 42)) ->T : Symbol(T, Decl(typeParameterAsTypeParameterConstraint2.ts, 14, 14)) ->y : Symbol(y, Decl(typeParameterAsTypeParameterConstraint2.ts, 14, 47)) ->U : Symbol(U, Decl(typeParameterAsTypeParameterConstraint2.ts, 14, 16)) ->y : Symbol(y, Decl(typeParameterAsTypeParameterConstraint2.ts, 14, 47)) - -foo2(1, { length: '' }); ->foo2 : Symbol(foo2, Decl(typeParameterAsTypeParameterConstraint2.ts, 12, 19)) ->length : Symbol(length, Decl(typeParameterAsTypeParameterConstraint2.ts, 15, 9)) - -foo2(1, { length: {} }); ->foo2 : Symbol(foo2, Decl(typeParameterAsTypeParameterConstraint2.ts, 12, 19)) ->length : Symbol(length, Decl(typeParameterAsTypeParameterConstraint2.ts, 16, 9)) - -foo2([], ['']); ->foo2 : Symbol(foo2, Decl(typeParameterAsTypeParameterConstraint2.ts, 12, 19)) - diff --git a/tests/baselines/reference/typeParameterAsTypeParameterConstraint2.types b/tests/baselines/reference/typeParameterAsTypeParameterConstraint2.types deleted file mode 100644 index e73cdaeda53..00000000000 --- a/tests/baselines/reference/typeParameterAsTypeParameterConstraint2.types +++ /dev/null @@ -1,81 +0,0 @@ -=== tests/cases/conformance/types/typeParameters/typeArgumentLists/typeParameterAsTypeParameterConstraint2.ts === -// using a type parameter as a constraint for a type parameter is invalid -// these should be errors unless otherwise noted - -function foo(x: T, y: U): U { return y; } // this is now an error ->foo : (x: T, y: U) => U ->T : T ->U : U ->T : T ->x : T ->T : T ->y : U ->U : U ->U : U ->y : U - -foo(1, ''); ->foo(1, '') : any ->foo : (x: T, y: U) => U ->1 : number ->'' : string - -foo(1, {}); ->foo(1, {}) : any ->foo : (x: T, y: U) => U ->1 : number ->{} : {} - -interface NumberVariant extends Number { ->NumberVariant : NumberVariant ->Number : Number - - x: number; ->x : number -} -var n: NumberVariant; ->n : NumberVariant ->NumberVariant : NumberVariant - -var r3 = foo(1, n); ->r3 : any ->foo(1, n) : any ->foo : (x: T, y: U) => U ->1 : number ->n : NumberVariant - -function foo2(x: T, y: U) { return y; } // this is now an error ->foo2 : (x: T, y: U) => U ->T : T ->U : U ->length : T ->T : T ->x : T ->T : T ->y : U ->U : U ->y : U - -foo2(1, { length: '' }); ->foo2(1, { length: '' }) : { length: any; } ->foo2 : (x: T, y: U) => U ->1 : number ->{ length: '' } : { length: string; } ->length : string ->'' : string - -foo2(1, { length: {} }); ->foo2(1, { length: {} }) : { length: any; } ->foo2 : (x: T, y: U) => U ->1 : number ->{ length: {} } : { length: {}; } ->length : {} ->{} : {} - -foo2([], ['']); ->foo2([], ['']) : { length: any; } ->foo2 : (x: T, y: U) => U ->[] : undefined[] ->[''] : string[] ->'' : string - From 6fcceb491bf7f13ab1e9cda61158dbb0f3f208fe Mon Sep 17 00:00:00 2001 From: Anders Hejlsberg Date: Sat, 5 Dec 2015 17:09:51 -0800 Subject: [PATCH 035/177] Fix linting errors --- src/compiler/checker.ts | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/compiler/checker.ts b/src/compiler/checker.ts index c4cda31a0ba..aac78ea9611 100644 --- a/src/compiler/checker.ts +++ b/src/compiler/checker.ts @@ -4152,7 +4152,7 @@ namespace ts { return true; } (checked || (checked = [])).push(type); - let constraintDeclaration = getConstraintDeclaration(type); + const constraintDeclaration = getConstraintDeclaration(type); type = constraintDeclaration && getTypeFromTypeNode(constraintDeclaration); } return false; @@ -4165,7 +4165,7 @@ namespace ts { type.constraint = targetConstraint ? instantiateType(targetConstraint, type.mapper) : noConstraintType; } else { - let constraintDeclaration = getConstraintDeclaration(type); + const constraintDeclaration = getConstraintDeclaration(type); let constraint = getTypeFromTypeNode(constraintDeclaration); if (hasConstraintReferenceTo(constraint, type)) { error(constraintDeclaration, Diagnostics.Type_parameter_0_has_a_circular_constraint, typeToString(type)); From 30dbf9c48e2047d34bc8e75adac80c6b9a52ef33 Mon Sep 17 00:00:00 2001 From: Anders Hejlsberg Date: Sun, 6 Dec 2015 15:51:51 -0800 Subject: [PATCH 036/177] Addressing CR feedback --- src/compiler/checker.ts | 25 +++++++++++++------------ 1 file changed, 13 insertions(+), 12 deletions(-) diff --git a/src/compiler/checker.ts b/src/compiler/checker.ts index aac78ea9611..ede1afb757e 100644 --- a/src/compiler/checker.ts +++ b/src/compiler/checker.ts @@ -4158,23 +4158,23 @@ namespace ts { return false; } - function getConstraintOfTypeParameter(type: TypeParameter): Type { - if (!type.constraint) { - if (type.target) { - const targetConstraint = getConstraintOfTypeParameter(type.target); - type.constraint = targetConstraint ? instantiateType(targetConstraint, type.mapper) : noConstraintType; + function getConstraintOfTypeParameter(typeParameter: TypeParameter): Type { + if (!typeParameter.constraint) { + if (typeParameter.target) { + const targetConstraint = getConstraintOfTypeParameter(typeParameter.target); + typeParameter.constraint = targetConstraint ? instantiateType(targetConstraint, typeParameter.mapper) : noConstraintType; } else { - const constraintDeclaration = getConstraintDeclaration(type); + const constraintDeclaration = getConstraintDeclaration(typeParameter); let constraint = getTypeFromTypeNode(constraintDeclaration); - if (hasConstraintReferenceTo(constraint, type)) { - error(constraintDeclaration, Diagnostics.Type_parameter_0_has_a_circular_constraint, typeToString(type)); + if (hasConstraintReferenceTo(constraint, typeParameter)) { + error(constraintDeclaration, Diagnostics.Type_parameter_0_has_a_circular_constraint, typeToString(typeParameter)); constraint = unknownType; } - type.constraint = constraint; + typeParameter.constraint = constraint; } } - return type.constraint === noConstraintType ? undefined : type.constraint; + return typeParameter.constraint === noConstraintType ? undefined : typeParameter.constraint; } function getParentSymbolOfTypeParameter(typeParameter: TypeParameter): Symbol { @@ -4721,8 +4721,9 @@ namespace ts { function getInferenceMapper(context: InferenceContext): TypeMapper { if (!context.mapper) { const mapper: TypeMapper = t => { - for (let i = 0; i < context.typeParameters.length; i++) { - if (t === context.typeParameters[i]) { + const typeParameters = context.typeParameters; + for (let i = 0; i < typeParameters.length; i++) { + if (t === typeParameters[i]) { context.inferences[i].isFixed = true; return getInferredType(context, i); } From e22863238a4948d1d3ff086a187b9455aecee083 Mon Sep 17 00:00:00 2001 From: Iain Monro Date: Mon, 7 Dec 2015 17:37:27 +0000 Subject: [PATCH 037/177] Limit error reporting for methods to the method name --- src/compiler/checker.ts | 2 +- src/compiler/utilities.ts | 1 + ...ssAbstractMethodInNonAbstractClass.errors.txt | 4 ++-- ...ssAbstractMethodWithImplementation.errors.txt | 4 ++-- .../computedPropertyNames40_ES5.errors.txt | 2 +- .../computedPropertyNames40_ES6.errors.txt | 2 +- .../reference/generatorTypeCheck59.errors.txt | 5 ++--- .../reference/implicitAnyAmbients.errors.txt | 4 ++-- ...itAnyFunctionReturnNullOrUndefined.errors.txt | 16 ++++++---------- .../implicitAnyInAmbientDeclaration.errors.txt | 4 ++-- ...implicitAnyInAmbientDeclaration2.d.errors.txt | 4 ++-- .../noImplicitAnyForMethodParameters.errors.txt | 4 ++-- .../reference/noImplicitAnyModule.errors.txt | 4 ++-- ...adOnConstNoNonSpecializedSignature.errors.txt | 2 +- .../reference/parserParameterList16.errors.txt | 2 +- ...otSubtypeOfNonSpecializedSignature.errors.txt | 6 +++--- ...exerConstrainsPropertyDeclarations.errors.txt | 8 +++----- ...ralTypesInImplementationSignatures.errors.txt | 4 ++-- ...alTypesInImplementationSignatures2.errors.txt | 6 +++--- .../typeCheckObjectLiteralMethodBody.errors.txt | 2 +- 20 files changed, 40 insertions(+), 46 deletions(-) diff --git a/src/compiler/checker.ts b/src/compiler/checker.ts index 30d4818592b..7b48e8b2016 100644 --- a/src/compiler/checker.ts +++ b/src/compiler/checker.ts @@ -11175,7 +11175,7 @@ namespace ts { // Abstract methods cannot have an implementation. // Extra checks are to avoid reporting multiple errors relating to the "abstractness" of the node. if (node.flags & NodeFlags.Abstract && node.body) { - error(node, Diagnostics.Method_0_cannot_have_an_implementation_because_it_is_marked_abstract, declarationNameToString(node.name)); + error(node.body, Diagnostics.Method_0_cannot_have_an_implementation_because_it_is_marked_abstract, declarationNameToString(node.name)); } } diff --git a/src/compiler/utilities.ts b/src/compiler/utilities.ts index 95bf4ff7fa3..f955db2d0c2 100644 --- a/src/compiler/utilities.ts +++ b/src/compiler/utilities.ts @@ -342,6 +342,7 @@ namespace ts { case SyntaxKind.EnumMember: case SyntaxKind.FunctionDeclaration: case SyntaxKind.FunctionExpression: + case SyntaxKind.MethodDeclaration: errorNode = (node).name; break; } diff --git a/tests/baselines/reference/classAbstractMethodInNonAbstractClass.errors.txt b/tests/baselines/reference/classAbstractMethodInNonAbstractClass.errors.txt index d6f9b7540d4..25842a1840a 100644 --- a/tests/baselines/reference/classAbstractMethodInNonAbstractClass.errors.txt +++ b/tests/baselines/reference/classAbstractMethodInNonAbstractClass.errors.txt @@ -1,6 +1,6 @@ tests/cases/conformance/classes/classDeclarations/classAbstractKeyword/classAbstractMethodInNonAbstractClass.ts(2,5): error TS1244: Abstract methods can only appear within an abstract class. tests/cases/conformance/classes/classDeclarations/classAbstractKeyword/classAbstractMethodInNonAbstractClass.ts(6,5): error TS1244: Abstract methods can only appear within an abstract class. -tests/cases/conformance/classes/classDeclarations/classAbstractKeyword/classAbstractMethodInNonAbstractClass.ts(6,5): error TS1245: Method 'foo' cannot have an implementation because it is marked abstract. +tests/cases/conformance/classes/classDeclarations/classAbstractKeyword/classAbstractMethodInNonAbstractClass.ts(6,20): error TS1245: Method 'foo' cannot have an implementation because it is marked abstract. ==== tests/cases/conformance/classes/classDeclarations/classAbstractKeyword/classAbstractMethodInNonAbstractClass.ts (3 errors) ==== @@ -14,6 +14,6 @@ tests/cases/conformance/classes/classDeclarations/classAbstractKeyword/classAbst abstract foo() {} ~~~~~~~~ !!! error TS1244: Abstract methods can only appear within an abstract class. - ~~~~~~~~~~~~~~~~~ + ~~ !!! error TS1245: Method 'foo' cannot have an implementation because it is marked abstract. } \ No newline at end of file diff --git a/tests/baselines/reference/classAbstractMethodWithImplementation.errors.txt b/tests/baselines/reference/classAbstractMethodWithImplementation.errors.txt index 412378e267d..abaeef7c750 100644 --- a/tests/baselines/reference/classAbstractMethodWithImplementation.errors.txt +++ b/tests/baselines/reference/classAbstractMethodWithImplementation.errors.txt @@ -1,9 +1,9 @@ -tests/cases/conformance/classes/classDeclarations/classAbstractKeyword/classAbstractMethodWithImplementation.ts(2,5): error TS1245: Method 'foo' cannot have an implementation because it is marked abstract. +tests/cases/conformance/classes/classDeclarations/classAbstractKeyword/classAbstractMethodWithImplementation.ts(2,20): error TS1245: Method 'foo' cannot have an implementation because it is marked abstract. ==== tests/cases/conformance/classes/classDeclarations/classAbstractKeyword/classAbstractMethodWithImplementation.ts (1 errors) ==== abstract class A { abstract foo() {} - ~~~~~~~~~~~~~~~~~ + ~~ !!! error TS1245: Method 'foo' cannot have an implementation because it is marked abstract. } \ No newline at end of file diff --git a/tests/baselines/reference/computedPropertyNames40_ES5.errors.txt b/tests/baselines/reference/computedPropertyNames40_ES5.errors.txt index 482978064d1..40a9e9a2e3d 100644 --- a/tests/baselines/reference/computedPropertyNames40_ES5.errors.txt +++ b/tests/baselines/reference/computedPropertyNames40_ES5.errors.txt @@ -14,7 +14,7 @@ tests/cases/conformance/es6/computedProperties/computedPropertyNames40_ES5.ts(9, [""]() { return new Foo } ~~~~ !!! error TS2393: Duplicate function implementation. - ~~~~~~~~~~~~~~~~~~~~~~~~~ + ~~~~ !!! error TS2411: Property '[""]' of type '() => Foo' is not assignable to string index type '() => Foo2'. [""]() { return new Foo2 } ~~~~ diff --git a/tests/baselines/reference/computedPropertyNames40_ES6.errors.txt b/tests/baselines/reference/computedPropertyNames40_ES6.errors.txt index 669d0d04e66..10c0a456dbe 100644 --- a/tests/baselines/reference/computedPropertyNames40_ES6.errors.txt +++ b/tests/baselines/reference/computedPropertyNames40_ES6.errors.txt @@ -14,7 +14,7 @@ tests/cases/conformance/es6/computedProperties/computedPropertyNames40_ES6.ts(9, [""]() { return new Foo } ~~~~ !!! error TS2393: Duplicate function implementation. - ~~~~~~~~~~~~~~~~~~~~~~~~~ + ~~~~ !!! error TS2411: Property '[""]' of type '() => Foo' is not assignable to string index type '() => Foo2'. [""]() { return new Foo2 } ~~~~ diff --git a/tests/baselines/reference/generatorTypeCheck59.errors.txt b/tests/baselines/reference/generatorTypeCheck59.errors.txt index d8d532a430a..d8179803821 100644 --- a/tests/baselines/reference/generatorTypeCheck59.errors.txt +++ b/tests/baselines/reference/generatorTypeCheck59.errors.txt @@ -1,16 +1,15 @@ -tests/cases/conformance/es6/yieldExpressions/generatorTypeCheck59.ts(3,9): error TS1219: Experimental support for decorators is a feature that is subject to change in a future release. Specify '--experimentalDecorators' to remove this warning. tests/cases/conformance/es6/yieldExpressions/generatorTypeCheck59.ts(3,11): error TS1163: A 'yield' expression is only allowed in a generator body. +tests/cases/conformance/es6/yieldExpressions/generatorTypeCheck59.ts(4,9): error TS1219: Experimental support for decorators is a feature that is subject to change in a future release. Specify '--experimentalDecorators' to remove this warning. ==== tests/cases/conformance/es6/yieldExpressions/generatorTypeCheck59.ts (2 errors) ==== function* g() { class C { @(yield "") - ~~~~~~~~~~~ ~~~~~ !!! error TS1163: A 'yield' expression is only allowed in a generator body. m() { } - ~~~~~~~~~~~~~~~ + ~ !!! error TS1219: Experimental support for decorators is a feature that is subject to change in a future release. Specify '--experimentalDecorators' to remove this warning. }; } \ No newline at end of file diff --git a/tests/baselines/reference/implicitAnyAmbients.errors.txt b/tests/baselines/reference/implicitAnyAmbients.errors.txt index e71fd6f72ea..d425edbfefd 100644 --- a/tests/baselines/reference/implicitAnyAmbients.errors.txt +++ b/tests/baselines/reference/implicitAnyAmbients.errors.txt @@ -39,10 +39,10 @@ tests/cases/compiler/implicitAnyAmbients.ts(23,13): error TS7005: Variable 'y' i class C { foo(); // error - ~~~~~~ + ~~~ !!! error TS7010: 'foo', which lacks return-type annotation, implicitly has an 'any' return type. foo2(x: any); // error - ~~~~~~~~~~~~~ + ~~~~ !!! error TS7010: 'foo2', which lacks return-type annotation, implicitly has an 'any' return type. foo3(x: any): any; } diff --git a/tests/baselines/reference/implicitAnyFunctionReturnNullOrUndefined.errors.txt b/tests/baselines/reference/implicitAnyFunctionReturnNullOrUndefined.errors.txt index 9ad1c550d72..40803016ae8 100644 --- a/tests/baselines/reference/implicitAnyFunctionReturnNullOrUndefined.errors.txt +++ b/tests/baselines/reference/implicitAnyFunctionReturnNullOrUndefined.errors.txt @@ -15,20 +15,16 @@ tests/cases/compiler/implicitAnyFunctionReturnNullOrUndefined.ts(10,5): error TS class C { nullWidenFuncOfC() { // error at "nullWidenFuncOfC" - ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ - return null; - ~~~~~~~~~~~~~~~~~~~~ - } - ~~~~~ + ~~~~~~~~~~~~~~~~ !!! error TS7010: 'nullWidenFuncOfC', which lacks return-type annotation, implicitly has an 'any' return type. + return null; + } underfinedWidenFuncOfC() { // error at "underfinedWidenFuncOfC" - ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ - return undefined; - ~~~~~~~~~~~~~~~~~~~~~~~~~ - } - ~~~~~ + ~~~~~~~~~~~~~~~~~~~~~~ !!! error TS7010: 'underfinedWidenFuncOfC', which lacks return-type annotation, implicitly has an 'any' return type. + return undefined; + } } // this should not be an error diff --git a/tests/baselines/reference/implicitAnyInAmbientDeclaration.errors.txt b/tests/baselines/reference/implicitAnyInAmbientDeclaration.errors.txt index 4775ec0511b..1e66f26d0d2 100644 --- a/tests/baselines/reference/implicitAnyInAmbientDeclaration.errors.txt +++ b/tests/baselines/reference/implicitAnyInAmbientDeclaration.errors.txt @@ -1,5 +1,5 @@ tests/cases/compiler/implicitAnyInAmbientDeclaration.ts(3,9): error TS7008: Member 'publicMember' implicitly has an 'any' type. -tests/cases/compiler/implicitAnyInAmbientDeclaration.ts(6,9): error TS7010: 'publicFunction', which lacks return-type annotation, implicitly has an 'any' return type. +tests/cases/compiler/implicitAnyInAmbientDeclaration.ts(6,16): error TS7010: 'publicFunction', which lacks return-type annotation, implicitly has an 'any' return type. tests/cases/compiler/implicitAnyInAmbientDeclaration.ts(6,31): error TS7006: Parameter 'x' implicitly has an 'any' type. tests/cases/compiler/implicitAnyInAmbientDeclaration.ts(8,9): error TS1089: 'private' modifier cannot appear on a constructor declaration. @@ -13,7 +13,7 @@ tests/cases/compiler/implicitAnyInAmbientDeclaration.ts(8,9): error TS1089: 'pri private privateMember; // this should not be an error public publicFunction(x); // this should be an error - ~~~~~~~~~~~~~~~~~~~~~~~~~ + ~~~~~~~~~~~~~~ !!! error TS7010: 'publicFunction', which lacks return-type annotation, implicitly has an 'any' return type. ~ !!! error TS7006: Parameter 'x' implicitly has an 'any' type. diff --git a/tests/baselines/reference/implicitAnyInAmbientDeclaration2.d.errors.txt b/tests/baselines/reference/implicitAnyInAmbientDeclaration2.d.errors.txt index 11f2ae90d35..54fe39e2efe 100644 --- a/tests/baselines/reference/implicitAnyInAmbientDeclaration2.d.errors.txt +++ b/tests/baselines/reference/implicitAnyInAmbientDeclaration2.d.errors.txt @@ -2,7 +2,7 @@ tests/cases/compiler/implicitAnyInAmbientDeclaration2.d.ts(1,18): error TS7010: tests/cases/compiler/implicitAnyInAmbientDeclaration2.d.ts(1,22): error TS7006: Parameter 'x' implicitly has an 'any' type. tests/cases/compiler/implicitAnyInAmbientDeclaration2.d.ts(2,13): error TS7005: Variable 'bar' implicitly has an 'any' type. tests/cases/compiler/implicitAnyInAmbientDeclaration2.d.ts(4,5): error TS7008: Member 'publicMember' implicitly has an 'any' type. -tests/cases/compiler/implicitAnyInAmbientDeclaration2.d.ts(7,5): error TS7010: 'publicFunction', which lacks return-type annotation, implicitly has an 'any' return type. +tests/cases/compiler/implicitAnyInAmbientDeclaration2.d.ts(7,12): error TS7010: 'publicFunction', which lacks return-type annotation, implicitly has an 'any' return type. tests/cases/compiler/implicitAnyInAmbientDeclaration2.d.ts(7,27): error TS7006: Parameter 'x' implicitly has an 'any' type. tests/cases/compiler/implicitAnyInAmbientDeclaration2.d.ts(9,5): error TS1089: 'private' modifier cannot appear on a constructor declaration. tests/cases/compiler/implicitAnyInAmbientDeclaration2.d.ts(13,24): error TS7006: Parameter 'publicConsParam' implicitly has an 'any' type. @@ -24,7 +24,7 @@ tests/cases/compiler/implicitAnyInAmbientDeclaration2.d.ts(13,24): error TS7006: private privateMember; // this should not be an error public publicFunction(x); // this should be an error - ~~~~~~~~~~~~~~~~~~~~~~~~~ + ~~~~~~~~~~~~~~ !!! error TS7010: 'publicFunction', which lacks return-type annotation, implicitly has an 'any' return type. ~ !!! error TS7006: Parameter 'x' implicitly has an 'any' type. diff --git a/tests/baselines/reference/noImplicitAnyForMethodParameters.errors.txt b/tests/baselines/reference/noImplicitAnyForMethodParameters.errors.txt index 176f40f16f3..07782d86e9e 100644 --- a/tests/baselines/reference/noImplicitAnyForMethodParameters.errors.txt +++ b/tests/baselines/reference/noImplicitAnyForMethodParameters.errors.txt @@ -1,4 +1,4 @@ -tests/cases/compiler/noImplicitAnyForMethodParameters.ts(6,5): error TS7010: 'foo', which lacks return-type annotation, implicitly has an 'any' return type. +tests/cases/compiler/noImplicitAnyForMethodParameters.ts(6,12): error TS7010: 'foo', which lacks return-type annotation, implicitly has an 'any' return type. tests/cases/compiler/noImplicitAnyForMethodParameters.ts(6,16): error TS7006: Parameter 'a' implicitly has an 'any' type. tests/cases/compiler/noImplicitAnyForMethodParameters.ts(10,17): error TS7006: Parameter 'a' implicitly has an 'any' type. tests/cases/compiler/noImplicitAnyForMethodParameters.ts(13,16): error TS7006: Parameter 'a' implicitly has an 'any' type. @@ -11,7 +11,7 @@ tests/cases/compiler/noImplicitAnyForMethodParameters.ts(13,16): error TS7006: P declare class B { public foo(a); // OK - ambient class and public method - error - ~~~~~~~~~~~~~~ + ~~~ !!! error TS7010: 'foo', which lacks return-type annotation, implicitly has an 'any' return type. ~ !!! error TS7006: Parameter 'a' implicitly has an 'any' type. diff --git a/tests/baselines/reference/noImplicitAnyModule.errors.txt b/tests/baselines/reference/noImplicitAnyModule.errors.txt index cb2dfbe5793..35c0993df3e 100644 --- a/tests/baselines/reference/noImplicitAnyModule.errors.txt +++ b/tests/baselines/reference/noImplicitAnyModule.errors.txt @@ -1,6 +1,6 @@ tests/cases/compiler/noImplicitAnyModule.ts(5,9): error TS7013: Construct signature, which lacks return-type annotation, implicitly has an 'any' return type. tests/cases/compiler/noImplicitAnyModule.ts(10,18): error TS7006: Parameter 'x' implicitly has an 'any' type. -tests/cases/compiler/noImplicitAnyModule.ts(11,9): error TS7010: 'g', which lacks return-type annotation, implicitly has an 'any' return type. +tests/cases/compiler/noImplicitAnyModule.ts(11,16): error TS7010: 'g', which lacks return-type annotation, implicitly has an 'any' return type. tests/cases/compiler/noImplicitAnyModule.ts(18,14): error TS7010: 'f', which lacks return-type annotation, implicitly has an 'any' return type. @@ -20,7 +20,7 @@ tests/cases/compiler/noImplicitAnyModule.ts(18,14): error TS7010: 'f', which lac ~ !!! error TS7006: Parameter 'x' implicitly has an 'any' type. public g(x: any); - ~~~~~~~~~~~~~~~~~ + ~ !!! error TS7010: 'g', which lacks return-type annotation, implicitly has an 'any' return type. // Should not return error at all. diff --git a/tests/baselines/reference/overloadOnConstNoNonSpecializedSignature.errors.txt b/tests/baselines/reference/overloadOnConstNoNonSpecializedSignature.errors.txt index f897cae121d..6b96abce29e 100644 --- a/tests/baselines/reference/overloadOnConstNoNonSpecializedSignature.errors.txt +++ b/tests/baselines/reference/overloadOnConstNoNonSpecializedSignature.errors.txt @@ -4,7 +4,7 @@ tests/cases/compiler/overloadOnConstNoNonSpecializedSignature.ts(2,4): error TS2 ==== tests/cases/compiler/overloadOnConstNoNonSpecializedSignature.ts (1 errors) ==== class C { x1(a: 'hi'); // error, no non-specialized signature in overload list - ~~~~~~~~~~~~ + ~~ !!! error TS2382: Specialized overload signature is not assignable to any non-specialized signature. x1(a: string) { } } diff --git a/tests/baselines/reference/parserParameterList16.errors.txt b/tests/baselines/reference/parserParameterList16.errors.txt index f4de32b0f91..4b30b386e6f 100644 --- a/tests/baselines/reference/parserParameterList16.errors.txt +++ b/tests/baselines/reference/parserParameterList16.errors.txt @@ -5,7 +5,7 @@ tests/cases/conformance/parser/ecmascript5/ParameterLists/parserParameterList16. ==== tests/cases/conformance/parser/ecmascript5/ParameterLists/parserParameterList16.ts (2 errors) ==== class C { foo(a = 4); - ~~~~~~~~~~~ + ~~~ !!! error TS2394: Overload signature is not compatible with function implementation. ~~~~~ !!! error TS2371: A parameter initializer is only allowed in a function or constructor implementation. diff --git a/tests/baselines/reference/specializedSignatureIsNotSubtypeOfNonSpecializedSignature.errors.txt b/tests/baselines/reference/specializedSignatureIsNotSubtypeOfNonSpecializedSignature.errors.txt index 6b705a0c34d..a9293a83a13 100644 --- a/tests/baselines/reference/specializedSignatureIsNotSubtypeOfNonSpecializedSignature.errors.txt +++ b/tests/baselines/reference/specializedSignatureIsNotSubtypeOfNonSpecializedSignature.errors.txt @@ -23,7 +23,7 @@ tests/cases/conformance/types/objectTypeLiteral/callSignatures/specializedSignat class C { foo(x: 'a'); - ~~~~~~~~~~~~ + ~~~ !!! error TS2382: Specialized overload signature is not assignable to any non-specialized signature. foo(x: number); foo(x: any) { } @@ -31,7 +31,7 @@ tests/cases/conformance/types/objectTypeLiteral/callSignatures/specializedSignat class C2 { foo(x: 'a'); - ~~~~~~~~~~~~ + ~~~ !!! error TS2382: Specialized overload signature is not assignable to any non-specialized signature. foo(x: T); foo(x: any) { } @@ -39,7 +39,7 @@ tests/cases/conformance/types/objectTypeLiteral/callSignatures/specializedSignat class C3 { foo(x: 'a'); - ~~~~~~~~~~~~ + ~~~ !!! error TS2382: Specialized overload signature is not assignable to any non-specialized signature. foo(x: T); foo(x: any) { } diff --git a/tests/baselines/reference/stringIndexerConstrainsPropertyDeclarations.errors.txt b/tests/baselines/reference/stringIndexerConstrainsPropertyDeclarations.errors.txt index 1f4ee3debed..08881be2a86 100644 --- a/tests/baselines/reference/stringIndexerConstrainsPropertyDeclarations.errors.txt +++ b/tests/baselines/reference/stringIndexerConstrainsPropertyDeclarations.errors.txt @@ -75,12 +75,10 @@ tests/cases/conformance/types/objectTypeLiteral/indexSignatures/stringIndexerCon !!! error TS1056: Accessors are only available when targeting ECMAScript 5 and higher. foo() { // error - ~~~~~~~~~~~~~~~~ - return ''; - ~~~~~~~~~~~~~~~~~~ - } - ~~~~~ + ~~~ !!! error TS2411: Property 'foo' of type '() => string' is not assignable to string index type 'string'. + return ''; + } static sa: number; // ok static sb: string; // ok diff --git a/tests/baselines/reference/stringLiteralTypesInImplementationSignatures.errors.txt b/tests/baselines/reference/stringLiteralTypesInImplementationSignatures.errors.txt index b89553fcf5b..2bff320197a 100644 --- a/tests/baselines/reference/stringLiteralTypesInImplementationSignatures.errors.txt +++ b/tests/baselines/reference/stringLiteralTypesInImplementationSignatures.errors.txt @@ -26,7 +26,7 @@ tests/cases/conformance/types/objectTypeLiteral/callSignatures/stringLiteralType class C { foo(x: 'hi') { } - ~~~~~~~~~~~~~~~~ + ~~~ !!! error TS2381: A signature with an implementation cannot use a string literal type. } @@ -50,7 +50,7 @@ tests/cases/conformance/types/objectTypeLiteral/callSignatures/stringLiteralType var b = { foo(x: 'hi') { }, - ~~~~~~~~~~~~~~~~ + ~~~ !!! error TS2381: A signature with an implementation cannot use a string literal type. a: function foo(x: 'hi', y: 'hi') { }, ~~~ diff --git a/tests/baselines/reference/stringLiteralTypesInImplementationSignatures2.errors.txt b/tests/baselines/reference/stringLiteralTypesInImplementationSignatures2.errors.txt index 8d296e68a17..4f94bad7441 100644 --- a/tests/baselines/reference/stringLiteralTypesInImplementationSignatures2.errors.txt +++ b/tests/baselines/reference/stringLiteralTypesInImplementationSignatures2.errors.txt @@ -25,7 +25,7 @@ tests/cases/conformance/types/objectTypeLiteral/callSignatures/stringLiteralType class C { foo(x: string); foo(x: 'hi') { } - ~~~~~~~~~~~~~~~~ + ~~~ !!! error TS2381: A signature with an implementation cannot use a string literal type. } @@ -63,12 +63,12 @@ tests/cases/conformance/types/objectTypeLiteral/callSignatures/stringLiteralType foo(x: 'hi') { }, ~~~ !!! error TS2300: Duplicate identifier 'foo'. - ~~~~~~~~~~~~~~~~ + ~~~ !!! error TS2381: A signature with an implementation cannot use a string literal type. foo(x: 'a') { }, ~~~ !!! error TS2300: Duplicate identifier 'foo'. - ~~~~~~~~~~~~~~~ + ~~~ !!! error TS2381: A signature with an implementation cannot use a string literal type. } \ No newline at end of file diff --git a/tests/baselines/reference/typeCheckObjectLiteralMethodBody.errors.txt b/tests/baselines/reference/typeCheckObjectLiteralMethodBody.errors.txt index 7db4c2506cc..5c4a9236e01 100644 --- a/tests/baselines/reference/typeCheckObjectLiteralMethodBody.errors.txt +++ b/tests/baselines/reference/typeCheckObjectLiteralMethodBody.errors.txt @@ -3,5 +3,5 @@ tests/cases/compiler/typeCheckObjectLiteralMethodBody.ts(1,13): error TS7010: 'b ==== tests/cases/compiler/typeCheckObjectLiteralMethodBody.ts (1 errors) ==== var foo = { bar() { return undefined } }; - ~~~~~~~~~~~~~~~~~~~~~~~~~~ + ~~~ !!! error TS7010: 'bar', which lacks return-type annotation, implicitly has an 'any' return type. \ No newline at end of file From c97dffff3b2590e92311fccf2bf3744599972370 Mon Sep 17 00:00:00 2001 From: Ryan Cavanaugh Date: Mon, 7 Dec 2015 11:55:30 -0800 Subject: [PATCH 038/177] Support 'this' in inferred method bodies --- src/compiler/checker.ts | 17 ++++++++++++++++ tests/cases/fourslash/javaScriptPrototype3.ts | 20 +++++++++++++++++++ tests/cases/fourslash/javaScriptPrototype5.ts | 19 ++++++++++++++++++ 3 files changed, 56 insertions(+) create mode 100644 tests/cases/fourslash/javaScriptPrototype3.ts create mode 100644 tests/cases/fourslash/javaScriptPrototype5.ts diff --git a/src/compiler/checker.ts b/src/compiler/checker.ts index dc2d6649013..79f514e7864 100644 --- a/src/compiler/checker.ts +++ b/src/compiler/checker.ts @@ -6897,6 +6897,23 @@ namespace ts { const symbol = getSymbolOfNode(container.parent); return container.flags & NodeFlags.Static ? getTypeOfSymbol(symbol) : (getDeclaredTypeOfSymbol(symbol)).thisType; } + + // If this is a function in a JS file, it might be a class method. Check if it's the RHS + // of a x.prototype.y = function [name]() { .... } + if (isInJavaScriptFile(node) && container.kind === SyntaxKind.FunctionExpression) { + if (getSpecialPropertyAssignmentKind(container.parent) === SpecialPropertyAssignmentKind.PrototypeProperty) { + // Get the 'x' of 'x.prototype.y = f' (here, 'f' is 'container') + const className = (((container.parent as BinaryExpression) // x.protoype.y = f + .left as PropertyAccessExpression) // x.prototype.y + .expression as PropertyAccessExpression) // x.prototype + .expression; // x + const classSymbol = checkExpression(className).symbol; + if (classSymbol.members) { + return createAnonymousType(undefined, classSymbol.members, emptyArray, emptyArray, /*stringIndexType*/ undefined, /*numberIndexType*/ undefined); + } + } + } + return anyType; } diff --git a/tests/cases/fourslash/javaScriptPrototype3.ts b/tests/cases/fourslash/javaScriptPrototype3.ts new file mode 100644 index 00000000000..7b3f63eca57 --- /dev/null +++ b/tests/cases/fourslash/javaScriptPrototype3.ts @@ -0,0 +1,20 @@ +/// + +// Inside an inferred method body, the type of 'this' is the class type + +// @allowNonTsExtensions: true +// @Filename: myMod.js +//// function myCtor(x) { +//// this.qua = 10; +//// } +//// myCtor.prototype.foo = function() { return this/**/; }; +//// myCtor.prototype.bar = function() { return '' }; +//// + +goTo.marker(); +edit.insert('.'); + +// Check members of the function +verify.completionListContains('foo', undefined, undefined, 'property'); +verify.completionListContains('bar', undefined, undefined, 'property'); +verify.completionListContains('qua', undefined, undefined, 'property'); diff --git a/tests/cases/fourslash/javaScriptPrototype5.ts b/tests/cases/fourslash/javaScriptPrototype5.ts new file mode 100644 index 00000000000..a0125e47512 --- /dev/null +++ b/tests/cases/fourslash/javaScriptPrototype5.ts @@ -0,0 +1,19 @@ +/// + +// No prototype assignments are needed to enable class inference + +// @allowNonTsExtensions: true +// @Filename: myMod.js +//// function myCtor() { +//// this.foo = 'hello'; +//// this.bar = 10; +//// } +//// let x = new myCtor(); +//// x/**/ + +goTo.marker(); +edit.insert('.'); + +// Check members of the function +verify.completionListContains('foo', undefined, undefined, 'property'); +verify.completionListContains('bar', undefined, undefined, 'property'); From be6e341d2afcaf0f00b13212db896991a2f339b7 Mon Sep 17 00:00:00 2001 From: Wesley Wigham Date: Mon, 7 Dec 2015 18:16:05 -0800 Subject: [PATCH 039/177] Fix narrowing, interfaces. Expose issue with generic instantiation --- src/compiler/binder.ts | 13 +++- src/compiler/checker.ts | 40 ++++++------ src/compiler/types.ts | 2 +- .../typeGuards/typeGuardFunctionOfFormThis.ts | 6 ++ .../typeGuards/typeGuardOfFormThisMember.ts | 62 ++++++++++++++++++- 5 files changed, 101 insertions(+), 22 deletions(-) diff --git a/src/compiler/binder.ts b/src/compiler/binder.ts index 7561783d139..837260e5e1b 100644 --- a/src/compiler/binder.ts +++ b/src/compiler/binder.ts @@ -1189,7 +1189,8 @@ namespace ts { case SyntaxKind.ThisType: seenThisKeyword = true; return; - + case SyntaxKind.TypePredicate: + return checkTypePredicate(node as TypePredicateNode); case SyntaxKind.TypeParameter: return declareSymbolAndAddToSymbolTable(node, SymbolFlags.TypeParameter, SymbolFlags.TypeParameterExcludes); case SyntaxKind.Parameter: @@ -1275,6 +1276,16 @@ namespace ts { } } + function checkTypePredicate(node: TypePredicateNode) { + if (node.parameterName && node.parameterName.kind === SyntaxKind.Identifier) { + checkStrictModeIdentifier(node.parameterName as Identifier); + } + if (node.parameterName && node.parameterName.kind === SyntaxKind.ThisType) { + seenThisKeyword = true; + } + bind(node.type); + } + function bindSourceFileIfExternalModule() { setExportContextFlag(file); if (isExternalModule(file)) { diff --git a/src/compiler/checker.ts b/src/compiler/checker.ts index a1d13faff5a..02ddd7b26cf 100644 --- a/src/compiler/checker.ts +++ b/src/compiler/checker.ts @@ -2634,7 +2634,13 @@ namespace ts { // During a normal type check we'll never get to here with a property assignment (the check of the containing // object literal uses a different path). We exclude widening only so that language services and type verification // tools see the actual type. - return declaration.kind !== SyntaxKind.PropertyAssignment ? getWidenedType(type) : type; + if (declaration.kind === SyntaxKind.PropertyAssignment) { + return type; + } + if (type.flags & TypeFlags.PredicateType && (declaration.kind === SyntaxKind.PropertyDeclaration || declaration.kind === SyntaxKind.PropertySignature)) { + return type; + } + return getWidenedType(type); } // Rest parameters default to type any[], other parameters default to type any @@ -4602,7 +4608,7 @@ namespace ts { } function getPredicateType(node: TypePredicateNode): Type { - if (!(node.parent.kind === SyntaxKind.PropertyDeclaration || node.parent.kind === SyntaxKind.GetAccessor)) { + if (!(node.parent.kind === SyntaxKind.PropertyDeclaration || node.parent.kind === SyntaxKind.PropertySignature || node.parent.kind === SyntaxKind.GetAccessor)) { return booleanType; } else { @@ -6008,6 +6014,9 @@ namespace ts { function getWidenedType(type: Type): Type { if (type.flags & TypeFlags.RequiresWidening) { + if (type.flags & TypeFlags.PredicateType) { + return booleanType; + } if (type.flags & (TypeFlags.Undefined | TypeFlags.Null)) { return anyType; } @@ -11078,8 +11087,9 @@ namespace ts { } switch (node.parent.kind) { case SyntaxKind.PropertyDeclaration: + case SyntaxKind.PropertySignature: case SyntaxKind.GetAccessor: - return node === (node.parent).type; + return node === (node.parent as (PropertyDeclaration | GetAccessorDeclaration | PropertySignature)).type; } return false; } @@ -11104,12 +11114,8 @@ namespace ts { if (node.type.kind === SyntaxKind.TypePredicate) { const typePredicate = getSignatureFromDeclaration(node).typePredicate; const typePredicateNode = node.type; + checkSourceElement(typePredicateNode); if (isIdentifierTypePredicate(typePredicate)) { - if (!isInLegalTypePredicatePosition(typePredicateNode)) { - error(typePredicateNode, - Diagnostics.A_type_predicate_is_only_allowed_in_return_type_position_for_functions_and_methods); - return; - } if (typePredicate.parameterIndex >= 0) { if (node.parameters[typePredicate.parameterIndex].dotDotDotToken) { error(typePredicateNode.parameterName, @@ -11157,15 +11163,6 @@ namespace ts { } } } - else { - if (!isInLegalThisTypePredicatePosition(typePredicateNode)) { - error(typePredicateNode, - Diagnostics.A_this_based_type_predicate_is_only_allowed_in_class_or_interface_members_get_accessors_or_return_type_positions_for_functions_and_methods); - return; - } - // Reuse this type diagnostics on the this type node to determine if a this type predicate is valid - getTypeFromThisTypeNode(typePredicateNode.parameterName as ThisTypeNode); - } } else { checkSourceElement(node.type); @@ -14295,8 +14292,13 @@ namespace ts { if (node.parameterName.kind === SyntaxKind.Identifier && !isInLegalTypePredicatePosition(node)) { error(node, Diagnostics.A_type_predicate_is_only_allowed_in_return_type_position_for_functions_and_methods); } - else if (node.parameterName.kind === SyntaxKind.ThisType && (!isInLegalThisTypePredicatePosition(node) || getTypeFromThisTypeNode(node.parameterName as ThisTypeNode) === unknownType)) { - error(node, Diagnostics.A_this_based_type_predicate_is_only_allowed_in_class_or_interface_members_get_accessors_or_return_type_positions_for_functions_and_methods); + else if (node.parameterName.kind === SyntaxKind.ThisType) { + if (!isInLegalThisTypePredicatePosition(node)) { + error(node, Diagnostics.A_this_based_type_predicate_is_only_allowed_in_class_or_interface_members_get_accessors_or_return_type_positions_for_functions_and_methods); + } + else { + getTypeFromThisTypeNode(node.parameterName as ThisTypeNode); + } } } diff --git a/src/compiler/types.ts b/src/compiler/types.ts index d8e6291ac02..54eb4f449dd 100644 --- a/src/compiler/types.ts +++ b/src/compiler/types.ts @@ -2120,7 +2120,7 @@ namespace ts { UnionOrIntersection = Union | Intersection, StructuredType = ObjectType | Union | Intersection, /* @internal */ - RequiresWidening = ContainsUndefinedOrNull | ContainsObjectLiteral, + RequiresWidening = ContainsUndefinedOrNull | ContainsObjectLiteral | PredicateType, /* @internal */ PropagatingFlags = ContainsUndefinedOrNull | ContainsObjectLiteral | ContainsAnyFunctionType } diff --git a/tests/cases/conformance/expressions/typeGuards/typeGuardFunctionOfFormThis.ts b/tests/cases/conformance/expressions/typeGuards/typeGuardFunctionOfFormThis.ts index c053ec55d07..aadbf3cd9c5 100644 --- a/tests/cases/conformance/expressions/typeGuards/typeGuardFunctionOfFormThis.ts +++ b/tests/cases/conformance/expressions/typeGuards/typeGuardFunctionOfFormThis.ts @@ -133,3 +133,9 @@ if (mimic.isFollower()) { mimic.follow(); mimic.isFollower = a.isFollower; } + + +interface MimicGuardInterface { + isLeader(): this is LeadGuard; + isFollower(): this is FollowerGuard; +} diff --git a/tests/cases/conformance/expressions/typeGuards/typeGuardOfFormThisMember.ts b/tests/cases/conformance/expressions/typeGuards/typeGuardOfFormThisMember.ts index 1c714ff7d5a..182d475b815 100644 --- a/tests/cases/conformance/expressions/typeGuards/typeGuardOfFormThisMember.ts +++ b/tests/cases/conformance/expressions/typeGuards/typeGuardOfFormThisMember.ts @@ -40,4 +40,64 @@ namespace Test { else if (file.isNetworked) { file.host; } -} \ No newline at end of file + + interface GenericLeadGuard extends GenericGuard { + lead(): void; + } + + interface GenericFollowerGuard extends GenericGuard { + follow(): void; + } + + interface GenericGuard { + target: T; + isLeader: this is (GenericLeadGuard); + isFollower: this is GenericFollowerGuard; + } + + let guard: GenericGuard; + if (guard.isLeader) { + guard.lead(); + } + else if (guard.isFollower) { + guard.follow(); + } + + interface SpecificGuard { + isMoreSpecific: this is MoreSpecificGuard; + } + + interface MoreSpecificGuard extends SpecificGuard { + do(): void; + } + + let general: SpecificGuard; + if (general.isMoreSpecific) { + general.do(); + } + + + class doThing { + constructor(private x: T) {} + isThing(x: any): x is doThing { + return true; + } + + } + + let z: doThing<{}> = new doThing({x: 10}); + let z1 = new doThing({x: 10}); + if (z1.isThing(z)) { + z; + } +} + +function f(g: (x: number) => void) { + + +} + +f(function(x) { + + +}) \ No newline at end of file From da009c5b2177f97d44d0c615c8585386ec84b384 Mon Sep 17 00:00:00 2001 From: Zhengbo Li Date: Mon, 7 Dec 2015 22:28:02 -0800 Subject: [PATCH 040/177] update lib.d.ts from TSJS repo --- src/lib/dom.generated.d.ts | 26 +++++++++++++++++++++++--- src/lib/webworker.generated.d.ts | 17 ++++++++++++++--- 2 files changed, 37 insertions(+), 6 deletions(-) diff --git a/src/lib/dom.generated.d.ts b/src/lib/dom.generated.d.ts index 5984505c4cf..0dff2cedc39 100644 --- a/src/lib/dom.generated.d.ts +++ b/src/lib/dom.generated.d.ts @@ -6923,7 +6923,7 @@ interface IDBDatabase extends EventTarget { onerror: (ev: Event) => any; version: string; close(): void; - createObjectStore(name: string, optionalParameters?: any): IDBObjectStore; + createObjectStore(name: string, optionalParameters?: IDBObjectStoreParameters): IDBObjectStore; deleteObjectStore(name: string): void; transaction(storeNames: any, mode?: string): IDBTransaction; addEventListener(type: "abort", listener: (ev: Event) => any, useCapture?: boolean): void; @@ -6948,10 +6948,11 @@ declare var IDBFactory: { } interface IDBIndex { - keyPath: string; + keyPath: string | string[]; name: string; objectStore: IDBObjectStore; unique: boolean; + multiEntry: boolean; count(key?: any): IDBRequest; get(key: any): IDBRequest; getKey(key: any): IDBRequest; @@ -6988,7 +6989,7 @@ interface IDBObjectStore { add(value: any, key?: any): IDBRequest; clear(): IDBRequest; count(key?: any): IDBRequest; - createIndex(name: string, keyPath: string, optionalParameters?: any): IDBIndex; + createIndex(name: string, keyPath: string | string[], optionalParameters?: IDBIndexParameters): IDBIndex; delete(key: any): IDBRequest; deleteIndex(indexName: string): void; get(key: any): IDBRequest; @@ -12575,6 +12576,16 @@ interface XMLHttpRequestEventTarget { addEventListener(type: string, listener: EventListenerOrEventListenerObject, useCapture?: boolean): void; } +interface IDBObjectStoreParameters { + keyPath?: string | string[]; + autoIncrement?: boolean; +} + +interface IDBIndexParameters { + unique?: boolean; + multiEntry?: boolean; +} + interface NodeListOf extends NodeList { length: number; item(index: number): TNode; @@ -12610,6 +12621,15 @@ interface ProgressEventInit extends EventInit { total?: number; } +interface HTMLTemplateElement extends HTMLElement { + content: DocumentFragment; +} + +declare var HTMLTemplateElement: { + prototype: HTMLTemplateElement; + new(): HTMLTemplateElement; +} + declare type EventListenerOrEventListenerObject = EventListener | EventListenerObject; interface ErrorEventHandler { diff --git a/src/lib/webworker.generated.d.ts b/src/lib/webworker.generated.d.ts index 8001511a98b..a1d87f79787 100644 --- a/src/lib/webworker.generated.d.ts +++ b/src/lib/webworker.generated.d.ts @@ -311,7 +311,7 @@ interface IDBDatabase extends EventTarget { onerror: (ev: Event) => any; version: string; close(): void; - createObjectStore(name: string, optionalParameters?: any): IDBObjectStore; + createObjectStore(name: string, optionalParameters?: IDBObjectStoreParameters): IDBObjectStore; deleteObjectStore(name: string): void; transaction(storeNames: any, mode?: string): IDBTransaction; addEventListener(type: "abort", listener: (ev: Event) => any, useCapture?: boolean): void; @@ -336,10 +336,11 @@ declare var IDBFactory: { } interface IDBIndex { - keyPath: string; + keyPath: string | string[]; name: string; objectStore: IDBObjectStore; unique: boolean; + multiEntry: boolean; count(key?: any): IDBRequest; get(key: any): IDBRequest; getKey(key: any): IDBRequest; @@ -376,7 +377,7 @@ interface IDBObjectStore { add(value: any, key?: any): IDBRequest; clear(): IDBRequest; count(key?: any): IDBRequest; - createIndex(name: string, keyPath: string, optionalParameters?: any): IDBIndex; + createIndex(name: string, keyPath: string | string[], optionalParameters?: IDBIndexParameters): IDBIndex; delete(key: any): IDBRequest; deleteIndex(indexName: string): void; get(key: any): IDBRequest; @@ -892,6 +893,16 @@ interface WorkerUtils extends Object, WindowBase64 { setTimeout(handler: any, timeout?: any, ...args: any[]): number; } +interface IDBObjectStoreParameters { + keyPath?: string | string[]; + autoIncrement?: boolean; +} + +interface IDBIndexParameters { + unique?: boolean; + multiEntry?: boolean; +} + interface BlobPropertyBag { type?: string; endings?: string; From 46f1a2cc5dcdb6c9062bc7fd9c67dd3cff6c7a28 Mon Sep 17 00:00:00 2001 From: Iain Monro Date: Tue, 8 Dec 2015 12:25:45 +0000 Subject: [PATCH 041/177] Revert change to abstract-method-with-body error location --- src/compiler/checker.ts | 2 +- .../classAbstractMethodInNonAbstractClass.errors.txt | 4 ++-- .../classAbstractMethodWithImplementation.errors.txt | 4 ++-- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/src/compiler/checker.ts b/src/compiler/checker.ts index 7b48e8b2016..30d4818592b 100644 --- a/src/compiler/checker.ts +++ b/src/compiler/checker.ts @@ -11175,7 +11175,7 @@ namespace ts { // Abstract methods cannot have an implementation. // Extra checks are to avoid reporting multiple errors relating to the "abstractness" of the node. if (node.flags & NodeFlags.Abstract && node.body) { - error(node.body, Diagnostics.Method_0_cannot_have_an_implementation_because_it_is_marked_abstract, declarationNameToString(node.name)); + error(node, Diagnostics.Method_0_cannot_have_an_implementation_because_it_is_marked_abstract, declarationNameToString(node.name)); } } diff --git a/tests/baselines/reference/classAbstractMethodInNonAbstractClass.errors.txt b/tests/baselines/reference/classAbstractMethodInNonAbstractClass.errors.txt index 25842a1840a..48968c2b585 100644 --- a/tests/baselines/reference/classAbstractMethodInNonAbstractClass.errors.txt +++ b/tests/baselines/reference/classAbstractMethodInNonAbstractClass.errors.txt @@ -1,6 +1,6 @@ tests/cases/conformance/classes/classDeclarations/classAbstractKeyword/classAbstractMethodInNonAbstractClass.ts(2,5): error TS1244: Abstract methods can only appear within an abstract class. tests/cases/conformance/classes/classDeclarations/classAbstractKeyword/classAbstractMethodInNonAbstractClass.ts(6,5): error TS1244: Abstract methods can only appear within an abstract class. -tests/cases/conformance/classes/classDeclarations/classAbstractKeyword/classAbstractMethodInNonAbstractClass.ts(6,20): error TS1245: Method 'foo' cannot have an implementation because it is marked abstract. +tests/cases/conformance/classes/classDeclarations/classAbstractKeyword/classAbstractMethodInNonAbstractClass.ts(6,14): error TS1245: Method 'foo' cannot have an implementation because it is marked abstract. ==== tests/cases/conformance/classes/classDeclarations/classAbstractKeyword/classAbstractMethodInNonAbstractClass.ts (3 errors) ==== @@ -14,6 +14,6 @@ tests/cases/conformance/classes/classDeclarations/classAbstractKeyword/classAbst abstract foo() {} ~~~~~~~~ !!! error TS1244: Abstract methods can only appear within an abstract class. - ~~ + ~~~ !!! error TS1245: Method 'foo' cannot have an implementation because it is marked abstract. } \ No newline at end of file diff --git a/tests/baselines/reference/classAbstractMethodWithImplementation.errors.txt b/tests/baselines/reference/classAbstractMethodWithImplementation.errors.txt index abaeef7c750..0917b1f50b4 100644 --- a/tests/baselines/reference/classAbstractMethodWithImplementation.errors.txt +++ b/tests/baselines/reference/classAbstractMethodWithImplementation.errors.txt @@ -1,9 +1,9 @@ -tests/cases/conformance/classes/classDeclarations/classAbstractKeyword/classAbstractMethodWithImplementation.ts(2,20): error TS1245: Method 'foo' cannot have an implementation because it is marked abstract. +tests/cases/conformance/classes/classDeclarations/classAbstractKeyword/classAbstractMethodWithImplementation.ts(2,14): error TS1245: Method 'foo' cannot have an implementation because it is marked abstract. ==== tests/cases/conformance/classes/classDeclarations/classAbstractKeyword/classAbstractMethodWithImplementation.ts (1 errors) ==== abstract class A { abstract foo() {} - ~~ + ~~~ !!! error TS1245: Method 'foo' cannot have an implementation because it is marked abstract. } \ No newline at end of file From 34b303a9c5caad182f0fafd5b60302333bcd4dce Mon Sep 17 00:00:00 2001 From: SaschaNaz Date: Tue, 8 Dec 2015 21:39:46 +0900 Subject: [PATCH 042/177] directly expose nodeWillIndentChild --- src/services/formatting/formatting.ts | 3 ++- src/services/formatting/smartIndenter.ts | 26 +++++++----------------- 2 files changed, 9 insertions(+), 20 deletions(-) diff --git a/src/services/formatting/formatting.ts b/src/services/formatting/formatting.ts index ee47e4fc98e..55adb7b7233 100644 --- a/src/services/formatting/formatting.ts +++ b/src/services/formatting/formatting.ts @@ -496,7 +496,8 @@ namespace ts.formatting { } function getEffectiveDelta(delta: number, child: TextRangeWithKind) { - return SmartIndenter.shouldInheritParentIndentation(node, child) ? 0 : delta; + // Delta value should be zero when the node explicitly prevents indentation of the child node + return SmartIndenter.nodeWillIndentChild(node, child, true) ? delta : 0; } } diff --git a/src/services/formatting/smartIndenter.ts b/src/services/formatting/smartIndenter.ts index 83ef1df7144..9ede3691fc0 100644 --- a/src/services/formatting/smartIndenter.ts +++ b/src/services/formatting/smartIndenter.ts @@ -465,11 +465,8 @@ namespace ts.formatting { } return false; } - - /** - * Function returns true when a node with conditional indentation rule will indent certain child node - */ - function nodeWillIndentChild(parent: TextRangeWithKind, child: TextRangeWithKind, indentByDefault: boolean) { + + export function nodeWillIndentChild(parent: TextRangeWithKind, child: TextRangeWithKind, indentByDefault: boolean) { let childKind = child ? child.kind : SyntaxKind.Unknown; switch (parent.kind) { case SyntaxKind.DoStatement: @@ -487,24 +484,15 @@ namespace ts.formatting { case SyntaxKind.SetAccessor: return childKind !== SyntaxKind.Block; } - // No explicit rule for selected nodes, so result will follow the default value argument + // No explicit rule for given nodes so the result will follow the default value argument return indentByDefault; } + /* + Function returns true when the parent node should indent the given child by an explicit rule + */ export function shouldIndentChildNode(parent: TextRangeWithKind, child?: TextRangeWithKind): boolean { - if (nodeContentIsAlwaysIndented(parent.kind)) { - return true; - } - return nodeWillIndentChild(parent, child, false); - } - - /** - * Function returns true if existing node content indentation should be suppressed for a specific child - */ - export function shouldInheritParentIndentation(parent: TextRangeWithKind, child: TextRangeWithKind): boolean { - // Consider parents without indentation rules can indent their children - // so that they can apply inherited delta value to them - return !nodeWillIndentChild(parent, child, true); + return nodeContentIsAlwaysIndented(parent.kind) || nodeWillIndentChild(parent, child, false); } } } From 595f134e8bbfe5bf8ce93387a1a7ec2991ce7f0f Mon Sep 17 00:00:00 2001 From: SaschaNaz Date: Wed, 9 Dec 2015 00:02:10 +0900 Subject: [PATCH 043/177] space around arrow --- src/services/formatting/rules.ts | 14 +++++++------- .../cases/fourslash/formattingFatArrowFunctions.ts | 5 ++++- 2 files changed, 11 insertions(+), 8 deletions(-) diff --git a/src/services/formatting/rules.ts b/src/services/formatting/rules.ts index 12efb774dd3..de4761f57d2 100644 --- a/src/services/formatting/rules.ts +++ b/src/services/formatting/rules.ts @@ -123,6 +123,7 @@ namespace ts.formatting { public SpaceAfterModuleName: Rule; // Lambda expressions + public SpaceBeforeArrow: Rule; public SpaceAfterArrow: Rule; // Optional parameters and let args @@ -254,7 +255,7 @@ namespace ts.formatting { // No space before and after indexer this.NoSpaceBeforeOpenBracket = new Rule(RuleDescriptor.create2(Shared.TokenRange.Any, SyntaxKind.OpenBracketToken), RuleOperation.create2(new RuleOperationContext(Rules.IsSameLineTokenContext), RuleAction.Delete)); - this.NoSpaceAfterCloseBracket = new Rule(RuleDescriptor.create3(SyntaxKind.CloseBracketToken, Shared.TokenRange.Any), RuleOperation.create2(new RuleOperationContext(Rules.IsSameLineTokenContext, Rules.IsNotBeforeBlockInFunctionDeclarationContext ), RuleAction.Delete)); + this.NoSpaceAfterCloseBracket = new Rule(RuleDescriptor.create3(SyntaxKind.CloseBracketToken, Shared.TokenRange.Any), RuleOperation.create2(new RuleOperationContext(Rules.IsSameLineTokenContext, Rules.IsNotBeforeBlockInFunctionDeclarationContext), RuleAction.Delete)); // Place a space before open brace in a function declaration this.FunctionOpenBraceLeftTokenRange = Shared.TokenRange.AnyIncludingMultilineComments; @@ -342,6 +343,7 @@ namespace ts.formatting { this.SpaceAfterModuleName = new Rule(RuleDescriptor.create1(SyntaxKind.StringLiteral, SyntaxKind.OpenBraceToken), RuleOperation.create2(new RuleOperationContext(Rules.IsModuleDeclContext), RuleAction.Space)); // Lambda expressions + this.SpaceBeforeArrow = new Rule(RuleDescriptor.create2(Shared.TokenRange.Any, SyntaxKind.EqualsGreaterThanToken), RuleOperation.create2(new RuleOperationContext(Rules.IsSameLineTokenContext), RuleAction.Space)); this.SpaceAfterArrow = new Rule(RuleDescriptor.create3(SyntaxKind.EqualsGreaterThanToken, Shared.TokenRange.Any), RuleOperation.create2(new RuleOperationContext(Rules.IsSameLineTokenContext), RuleAction.Space)); // Optional parameters and let args @@ -379,8 +381,7 @@ namespace ts.formatting { this.NoSpaceBeforeTemplateMiddleAndTail = new Rule(RuleDescriptor.create4(Shared.TokenRange.Any, Shared.TokenRange.FromTokens([SyntaxKind.TemplateMiddle, SyntaxKind.TemplateTail])), RuleOperation.create2(new RuleOperationContext(Rules.IsSameLineTokenContext), RuleAction.Delete)); // These rules are higher in priority than user-configurable rules. - this.HighPriorityCommonRules = - [ + this.HighPriorityCommonRules = [ this.IgnoreBeforeComment, this.IgnoreAfterLineComment, this.NoSpaceBeforeColon, this.SpaceAfterColon, this.NoSpaceBeforeQuestionMark, this.SpaceAfterQuestionMarkInConditionalOperator, this.NoSpaceAfterQuestionMark, @@ -411,7 +412,7 @@ namespace ts.formatting { this.NoSpaceAfterConstructor, this.NoSpaceAfterModuleImport, this.SpaceAfterCertainTypeScriptKeywords, this.SpaceBeforeCertainTypeScriptKeywords, this.SpaceAfterModuleName, - this.SpaceAfterArrow, + this.SpaceBeforeArrow, this.SpaceAfterArrow, this.NoSpaceAfterEllipsis, this.NoSpaceAfterOptionalParameters, this.NoSpaceBetweenEmptyInterfaceBraceBrackets, @@ -427,8 +428,7 @@ namespace ts.formatting { ]; // These rules are lower in priority than user-configurable rules. - this.LowPriorityCommonRules = - [ + this.LowPriorityCommonRules = [ this.NoSpaceBeforeSemicolon, this.SpaceBeforeOpenBraceInControl, this.SpaceBeforeOpenBraceInFunction, this.SpaceBeforeOpenBraceInTypeScriptDeclWithBlock, this.NoSpaceBeforeComma, @@ -732,7 +732,7 @@ namespace ts.formatting { } static IsStartOfVariableDeclarationList(context: FormattingContext): boolean { - return context.currentTokenParent.kind === SyntaxKind.VariableDeclarationList && + return context.currentTokenParent.kind === SyntaxKind.VariableDeclarationList && context.currentTokenParent.getStart(context.sourceFile) === context.currentTokenSpan.pos; } diff --git a/tests/cases/fourslash/formattingFatArrowFunctions.ts b/tests/cases/fourslash/formattingFatArrowFunctions.ts index c540c2837e1..d4ce38dbd62 100644 --- a/tests/cases/fourslash/formattingFatArrowFunctions.ts +++ b/tests/cases/fourslash/formattingFatArrowFunctions.ts @@ -4,6 +4,7 @@ //// ( ) => 1 ;/*1*/ //// ( arg ) => 2 ;/*2*/ //// arg => 2 ;/*3*/ +//// arg=>2 ;/*3a*/ //// ( arg = 1 ) => 3 ;/*4*/ //// ( arg ? ) => 4 ;/*5*/ //// ( arg : number ) => 5 ;/*6*/ @@ -118,7 +119,9 @@ verify.currentLineContentIs("() => 1;"); goTo.marker("2"); verify.currentLineContentIs("(arg) => 2;"); goTo.marker("3"); -verify.currentLineContentIs("arg => 2;"); +verify.currentLineContentIs("arg => 2;"); +goTo.marker("3a"); +verify.currentLineContentIs("arg => 2;"); goTo.marker("4"); verify.currentLineContentIs("(arg = 1) => 3;"); goTo.marker("5"); From 51c547428b6ae3534af891610e12518a83bae462 Mon Sep 17 00:00:00 2001 From: Ryan Cavanaugh Date: Tue, 8 Dec 2015 09:53:47 -0800 Subject: [PATCH 044/177] Parse JSX attributes as AssignmentExpressions We should issue an error when parsing `

` as the comma operator is not a legal production in a JSX Expression Fixes (mitigates?) bug #5991 --- src/compiler/parser.ts | 2 +- .../reference/jsxParsingError1.errors.txt | 25 +++++++++++++++++++ tests/baselines/reference/jsxParsingError1.js | 21 ++++++++++++++++ .../conformance/jsx/jsxParsingError1.tsx | 14 +++++++++++ 4 files changed, 61 insertions(+), 1 deletion(-) create mode 100644 tests/baselines/reference/jsxParsingError1.errors.txt create mode 100644 tests/baselines/reference/jsxParsingError1.js create mode 100644 tests/cases/conformance/jsx/jsxParsingError1.tsx diff --git a/src/compiler/parser.ts b/src/compiler/parser.ts index e4262458d30..a6e1c03db25 100644 --- a/src/compiler/parser.ts +++ b/src/compiler/parser.ts @@ -3639,7 +3639,7 @@ namespace ts { parseExpected(SyntaxKind.OpenBraceToken); if (token !== SyntaxKind.CloseBraceToken) { - node.expression = parseExpression(); + node.expression = parseAssignmentExpressionOrHigher(); } if (inExpressionContext) { parseExpected(SyntaxKind.CloseBraceToken); diff --git a/tests/baselines/reference/jsxParsingError1.errors.txt b/tests/baselines/reference/jsxParsingError1.errors.txt new file mode 100644 index 00000000000..e769947dfa6 --- /dev/null +++ b/tests/baselines/reference/jsxParsingError1.errors.txt @@ -0,0 +1,25 @@ +tests/cases/conformance/jsx/file.tsx(12,36): error TS1005: '}' expected. +tests/cases/conformance/jsx/file.tsx(12,44): error TS1003: Identifier expected. +tests/cases/conformance/jsx/file.tsx(12,46): error TS1161: Unterminated regular expression literal. + + +==== tests/cases/conformance/jsx/file.tsx (3 errors) ==== + + declare module JSX { + interface Element { } + interface IntrinsicElements { + [s: string]: any; + } + } + + // This should be a parse error + const class1 = "foo"; + const class2 = "bar"; + const elem =
; + ~ +!!! error TS1005: '}' expected. + ~ +!!! error TS1003: Identifier expected. + +!!! error TS1161: Unterminated regular expression literal. + \ No newline at end of file diff --git a/tests/baselines/reference/jsxParsingError1.js b/tests/baselines/reference/jsxParsingError1.js new file mode 100644 index 00000000000..14b60afdde8 --- /dev/null +++ b/tests/baselines/reference/jsxParsingError1.js @@ -0,0 +1,21 @@ +//// [file.tsx] + +declare module JSX { + interface Element { } + interface IntrinsicElements { + [s: string]: any; + } +} + +// This should be a parse error +const class1 = "foo"; +const class2 = "bar"; +const elem =
; + + +//// [file.jsx] +// This should be a parse error +var class1 = "foo"; +var class2 = "bar"; +var elem =
; +/>;; diff --git a/tests/cases/conformance/jsx/jsxParsingError1.tsx b/tests/cases/conformance/jsx/jsxParsingError1.tsx new file mode 100644 index 00000000000..2668f04e885 --- /dev/null +++ b/tests/cases/conformance/jsx/jsxParsingError1.tsx @@ -0,0 +1,14 @@ +//@jsx: preserve + +//@filename: file.tsx +declare module JSX { + interface Element { } + interface IntrinsicElements { + [s: string]: any; + } +} + +// This should be a parse error +const class1 = "foo"; +const class2 = "bar"; +const elem =
; From 92d7d1c9536f1b02ae50f2ace609f5c1e627ac16 Mon Sep 17 00:00:00 2001 From: Ryan Cavanaugh Date: Tue, 8 Dec 2015 10:11:29 -0800 Subject: [PATCH 045/177] Disallow modifiers in object literal property assignment Fixes bug #5994 --- src/compiler/checker.ts | 5 ++++ src/compiler/parser.ts | 1 + .../modifiersInObjectLiterals.errors.txt | 24 +++++++++++++++++++ .../reference/modifiersInObjectLiterals.js | 19 +++++++++++++++ .../compiler/modifiersInObjectLiterals.ts | 8 +++++++ 5 files changed, 57 insertions(+) create mode 100644 tests/baselines/reference/modifiersInObjectLiterals.errors.txt create mode 100644 tests/baselines/reference/modifiersInObjectLiterals.js create mode 100644 tests/cases/compiler/modifiersInObjectLiterals.ts diff --git a/src/compiler/checker.ts b/src/compiler/checker.ts index 30d4818592b..9b694d9084e 100644 --- a/src/compiler/checker.ts +++ b/src/compiler/checker.ts @@ -15969,6 +15969,11 @@ namespace ts { return grammarErrorOnNode((prop).equalsToken, Diagnostics.can_only_be_used_in_an_object_literal_property_inside_a_destructuring_assignment); } + // Modifiers cannot appear in property assignments + if (prop.modifiers && prop.modifiers.length > 0) { + grammarErrorOnNode(prop.modifiers[0], Diagnostics.Modifiers_cannot_appear_here); + } + // ECMA-262 11.1.5 Object Initialiser // If previous is not undefined then throw a SyntaxError exception if any of the following conditions are true // a.This production is contained in strict code and IsDataDescriptor(previous) is true and diff --git a/src/compiler/parser.ts b/src/compiler/parser.ts index e4262458d30..ad108fe4115 100644 --- a/src/compiler/parser.ts +++ b/src/compiler/parser.ts @@ -3981,6 +3981,7 @@ namespace ts { } else { const propertyAssignment = createNode(SyntaxKind.PropertyAssignment, fullStart); + propertyAssignment.modifiers = modifiers; propertyAssignment.name = propertyName; propertyAssignment.questionToken = questionToken; parseExpected(SyntaxKind.ColonToken); diff --git a/tests/baselines/reference/modifiersInObjectLiterals.errors.txt b/tests/baselines/reference/modifiersInObjectLiterals.errors.txt new file mode 100644 index 00000000000..c23a8c3c630 --- /dev/null +++ b/tests/baselines/reference/modifiersInObjectLiterals.errors.txt @@ -0,0 +1,24 @@ +tests/cases/compiler/modifiersInObjectLiterals.ts(2,2): error TS1184: Modifiers cannot appear here. +tests/cases/compiler/modifiersInObjectLiterals.ts(3,2): error TS1184: Modifiers cannot appear here. +tests/cases/compiler/modifiersInObjectLiterals.ts(4,2): error TS1184: Modifiers cannot appear here. +tests/cases/compiler/modifiersInObjectLiterals.ts(5,2): error TS1184: Modifiers cannot appear here. + + +==== tests/cases/compiler/modifiersInObjectLiterals.ts (4 errors) ==== + let data = { + public foo: 'hey', + ~~~~~~ +!!! error TS1184: Modifiers cannot appear here. + private bar: 'nay', + ~~~~~~~ +!!! error TS1184: Modifiers cannot appear here. + protected baz: 'oh my', + ~~~~~~~~~ +!!! error TS1184: Modifiers cannot appear here. + abstract noWay: 'yes' + ~~~~~~~~ +!!! error TS1184: Modifiers cannot appear here. + }; + + data.foo + data.bar + data.baz + data.noWay + \ No newline at end of file diff --git a/tests/baselines/reference/modifiersInObjectLiterals.js b/tests/baselines/reference/modifiersInObjectLiterals.js new file mode 100644 index 00000000000..0a59b13c21e --- /dev/null +++ b/tests/baselines/reference/modifiersInObjectLiterals.js @@ -0,0 +1,19 @@ +//// [modifiersInObjectLiterals.ts] +let data = { + public foo: 'hey', + private bar: 'nay', + protected baz: 'oh my', + abstract noWay: 'yes' +}; + +data.foo + data.bar + data.baz + data.noWay + + +//// [modifiersInObjectLiterals.js] +var data = { + foo: 'hey', + bar: 'nay', + baz: 'oh my', + noWay: 'yes' +}; +data.foo + data.bar + data.baz + data.noWay; diff --git a/tests/cases/compiler/modifiersInObjectLiterals.ts b/tests/cases/compiler/modifiersInObjectLiterals.ts new file mode 100644 index 00000000000..58fa64f82e9 --- /dev/null +++ b/tests/cases/compiler/modifiersInObjectLiterals.ts @@ -0,0 +1,8 @@ +let data = { + public foo: 'hey', + private bar: 'nay', + protected baz: 'oh my', + abstract noWay: 'yes' +}; + +data.foo + data.bar + data.baz + data.noWay From 964fbea9c110faa384edec3f45ea1d5caff8c1a4 Mon Sep 17 00:00:00 2001 From: Ryan Cavanaugh Date: Tue, 8 Dec 2015 10:57:33 -0800 Subject: [PATCH 046/177] Fix up for 'async' --- src/compiler/checker.ts | 11 ++++++++--- .../modifiersInObjectLiterals.errors.txt | 16 ++++++++-------- .../objectLiteralMemberWithModifiers1.errors.txt | 5 ++++- .../objectLiteralMemberWithModifiers2.errors.txt | 5 ++++- .../reference/parserAccessors10.errors.txt | 5 ++++- 5 files changed, 28 insertions(+), 14 deletions(-) diff --git a/src/compiler/checker.ts b/src/compiler/checker.ts index 9b694d9084e..6b25b47d26c 100644 --- a/src/compiler/checker.ts +++ b/src/compiler/checker.ts @@ -15970,9 +15970,14 @@ namespace ts { } // Modifiers cannot appear in property assignments - if (prop.modifiers && prop.modifiers.length > 0) { - grammarErrorOnNode(prop.modifiers[0], Diagnostics.Modifiers_cannot_appear_here); - } + forEach(prop.modifiers, mod => { + if (mod.kind !== SyntaxKind.AsyncKeyword) { + grammarErrorOnNode(mod, Diagnostics._0_modifier_cannot_be_used_here, getTextOfNode(mod)); + } + else if (prop.kind !== SyntaxKind.MethodDeclaration) { + grammarErrorOnNode(mod, Diagnostics._0_modifier_cannot_be_used_here, getTextOfNode(mod)); + } + }); // ECMA-262 11.1.5 Object Initialiser // If previous is not undefined then throw a SyntaxError exception if any of the following conditions are true diff --git a/tests/baselines/reference/modifiersInObjectLiterals.errors.txt b/tests/baselines/reference/modifiersInObjectLiterals.errors.txt index c23a8c3c630..25382123390 100644 --- a/tests/baselines/reference/modifiersInObjectLiterals.errors.txt +++ b/tests/baselines/reference/modifiersInObjectLiterals.errors.txt @@ -1,23 +1,23 @@ -tests/cases/compiler/modifiersInObjectLiterals.ts(2,2): error TS1184: Modifiers cannot appear here. -tests/cases/compiler/modifiersInObjectLiterals.ts(3,2): error TS1184: Modifiers cannot appear here. -tests/cases/compiler/modifiersInObjectLiterals.ts(4,2): error TS1184: Modifiers cannot appear here. -tests/cases/compiler/modifiersInObjectLiterals.ts(5,2): error TS1184: Modifiers cannot appear here. +tests/cases/compiler/modifiersInObjectLiterals.ts(2,2): error TS1042: 'public' modifier cannot be used here. +tests/cases/compiler/modifiersInObjectLiterals.ts(3,2): error TS1042: 'private' modifier cannot be used here. +tests/cases/compiler/modifiersInObjectLiterals.ts(4,2): error TS1042: 'protected' modifier cannot be used here. +tests/cases/compiler/modifiersInObjectLiterals.ts(5,2): error TS1042: 'abstract' modifier cannot be used here. ==== tests/cases/compiler/modifiersInObjectLiterals.ts (4 errors) ==== let data = { public foo: 'hey', ~~~~~~ -!!! error TS1184: Modifiers cannot appear here. +!!! error TS1042: 'public' modifier cannot be used here. private bar: 'nay', ~~~~~~~ -!!! error TS1184: Modifiers cannot appear here. +!!! error TS1042: 'private' modifier cannot be used here. protected baz: 'oh my', ~~~~~~~~~ -!!! error TS1184: Modifiers cannot appear here. +!!! error TS1042: 'protected' modifier cannot be used here. abstract noWay: 'yes' ~~~~~~~~ -!!! error TS1184: Modifiers cannot appear here. +!!! error TS1042: 'abstract' modifier cannot be used here. }; data.foo + data.bar + data.baz + data.noWay diff --git a/tests/baselines/reference/objectLiteralMemberWithModifiers1.errors.txt b/tests/baselines/reference/objectLiteralMemberWithModifiers1.errors.txt index 9e739194f54..182eab1b4cf 100644 --- a/tests/baselines/reference/objectLiteralMemberWithModifiers1.errors.txt +++ b/tests/baselines/reference/objectLiteralMemberWithModifiers1.errors.txt @@ -1,7 +1,10 @@ +tests/cases/compiler/objectLiteralMemberWithModifiers1.ts(1,11): error TS1042: 'public' modifier cannot be used here. tests/cases/compiler/objectLiteralMemberWithModifiers1.ts(1,11): error TS1184: Modifiers cannot appear here. -==== tests/cases/compiler/objectLiteralMemberWithModifiers1.ts (1 errors) ==== +==== tests/cases/compiler/objectLiteralMemberWithModifiers1.ts (2 errors) ==== var v = { public foo() { } } ~~~~~~ +!!! error TS1042: 'public' modifier cannot be used here. + ~~~~~~ !!! error TS1184: Modifiers cannot appear here. \ No newline at end of file diff --git a/tests/baselines/reference/objectLiteralMemberWithModifiers2.errors.txt b/tests/baselines/reference/objectLiteralMemberWithModifiers2.errors.txt index be2bea5e241..0d1822339b6 100644 --- a/tests/baselines/reference/objectLiteralMemberWithModifiers2.errors.txt +++ b/tests/baselines/reference/objectLiteralMemberWithModifiers2.errors.txt @@ -1,9 +1,12 @@ +tests/cases/compiler/objectLiteralMemberWithModifiers2.ts(1,11): error TS1042: 'public' modifier cannot be used here. tests/cases/compiler/objectLiteralMemberWithModifiers2.ts(1,22): error TS1056: Accessors are only available when targeting ECMAScript 5 and higher. tests/cases/compiler/objectLiteralMemberWithModifiers2.ts(1,22): error TS2378: A 'get' accessor must return a value. -==== tests/cases/compiler/objectLiteralMemberWithModifiers2.ts (2 errors) ==== +==== tests/cases/compiler/objectLiteralMemberWithModifiers2.ts (3 errors) ==== var v = { public get foo() { } } + ~~~~~~ +!!! error TS1042: 'public' modifier cannot be used here. ~~~ !!! error TS1056: Accessors are only available when targeting ECMAScript 5 and higher. ~~~ diff --git a/tests/baselines/reference/parserAccessors10.errors.txt b/tests/baselines/reference/parserAccessors10.errors.txt index d6a2b99eaca..b309b5e3947 100644 --- a/tests/baselines/reference/parserAccessors10.errors.txt +++ b/tests/baselines/reference/parserAccessors10.errors.txt @@ -1,9 +1,12 @@ +tests/cases/conformance/parser/ecmascript5/Accessors/parserAccessors10.ts(2,3): error TS1042: 'public' modifier cannot be used here. tests/cases/conformance/parser/ecmascript5/Accessors/parserAccessors10.ts(2,14): error TS2378: A 'get' accessor must return a value. -==== tests/cases/conformance/parser/ecmascript5/Accessors/parserAccessors10.ts (1 errors) ==== +==== tests/cases/conformance/parser/ecmascript5/Accessors/parserAccessors10.ts (2 errors) ==== var v = { public get foo() { } + ~~~~~~ +!!! error TS1042: 'public' modifier cannot be used here. ~~~ !!! error TS2378: A 'get' accessor must return a value. }; \ No newline at end of file From f3e4befc3efac6ba80c4fa5d2d918a123635edc4 Mon Sep 17 00:00:00 2001 From: Vladimir Matveev Date: Tue, 8 Dec 2015 13:28:55 -0800 Subject: [PATCH 047/177] merge with master --- src/compiler/checker.ts | 2 ++ tests/baselines/reference/exportStarForValues.js | 2 ++ tests/baselines/reference/exportStarForValues10.js | 3 +++ tests/baselines/reference/exportStarForValues2.js | 3 +++ tests/baselines/reference/exportStarForValues3.js | 5 +++++ tests/baselines/reference/exportStarForValues4.js | 3 +++ tests/baselines/reference/exportStarForValues5.js | 2 ++ tests/baselines/reference/exportStarForValues6.js | 2 ++ tests/baselines/reference/exportStarForValues7.js | 3 +++ tests/baselines/reference/exportStarForValues8.js | 5 +++++ tests/baselines/reference/exportStarForValues9.js | 3 +++ tests/baselines/reference/exportStarForValuesInSystem.js | 2 ++ 12 files changed, 35 insertions(+) diff --git a/src/compiler/checker.ts b/src/compiler/checker.ts index 50fdd87e31d..777a25a4c12 100644 --- a/src/compiler/checker.ts +++ b/src/compiler/checker.ts @@ -15025,6 +15025,8 @@ namespace ts { } const hasExportAssignment = getExportAssignmentSymbol(moduleSymbol) !== undefined; + // if module has export assignment then 'resolveExternalModuleSymbol' will return resolved symbol for export assignment + // otherwise it will return moduleSymbol itself moduleSymbol = resolveExternalModuleSymbol(moduleSymbol); const symbolLinks = getSymbolLinks(moduleSymbol); diff --git a/tests/baselines/reference/exportStarForValues.js b/tests/baselines/reference/exportStarForValues.js index bd82373d52a..dd432ecc1d3 100644 --- a/tests/baselines/reference/exportStarForValues.js +++ b/tests/baselines/reference/exportStarForValues.js @@ -10,8 +10,10 @@ var x; //// [file1.js] define(["require", "exports"], function (require, exports) { + "use strict"; }); //// [file2.js] define(["require", "exports"], function (require, exports) { + "use strict"; var x; }); diff --git a/tests/baselines/reference/exportStarForValues10.js b/tests/baselines/reference/exportStarForValues10.js index 781316cb8f9..dca5dad9b7a 100644 --- a/tests/baselines/reference/exportStarForValues10.js +++ b/tests/baselines/reference/exportStarForValues10.js @@ -14,6 +14,7 @@ var x = 1; //// [file0.js] System.register([], function(exports_1) { + "use strict"; var v; return { setters:[], @@ -24,6 +25,7 @@ System.register([], function(exports_1) { }); //// [file1.js] System.register([], function(exports_1) { + "use strict"; return { setters:[], execute: function() { @@ -32,6 +34,7 @@ System.register([], function(exports_1) { }); //// [file2.js] System.register(["file0"], function(exports_1) { + "use strict"; var x; function exportStar_1(m) { var exports = {}; diff --git a/tests/baselines/reference/exportStarForValues2.js b/tests/baselines/reference/exportStarForValues2.js index 3d6b24ae433..e45d5bdd3ba 100644 --- a/tests/baselines/reference/exportStarForValues2.js +++ b/tests/baselines/reference/exportStarForValues2.js @@ -14,12 +14,15 @@ var x = 1; //// [file1.js] define(["require", "exports"], function (require, exports) { + "use strict"; }); //// [file2.js] define(["require", "exports"], function (require, exports) { + "use strict"; var x = 1; }); //// [file3.js] define(["require", "exports"], function (require, exports) { + "use strict"; var x = 1; }); diff --git a/tests/baselines/reference/exportStarForValues3.js b/tests/baselines/reference/exportStarForValues3.js index c5136e57eef..9efe5ccf8e5 100644 --- a/tests/baselines/reference/exportStarForValues3.js +++ b/tests/baselines/reference/exportStarForValues3.js @@ -26,20 +26,25 @@ var x = 1; //// [file1.js] define(["require", "exports"], function (require, exports) { + "use strict"; }); //// [file2.js] define(["require", "exports"], function (require, exports) { + "use strict"; var x = 1; }); //// [file3.js] define(["require", "exports"], function (require, exports) { + "use strict"; var x = 1; }); //// [file4.js] define(["require", "exports"], function (require, exports) { + "use strict"; var x = 1; }); //// [file5.js] define(["require", "exports"], function (require, exports) { + "use strict"; var x = 1; }); diff --git a/tests/baselines/reference/exportStarForValues4.js b/tests/baselines/reference/exportStarForValues4.js index 2e7b84a6c2f..34b13bb00f3 100644 --- a/tests/baselines/reference/exportStarForValues4.js +++ b/tests/baselines/reference/exportStarForValues4.js @@ -18,12 +18,15 @@ var x = 1; //// [file1.js] define(["require", "exports"], function (require, exports) { + "use strict"; }); //// [file3.js] define(["require", "exports"], function (require, exports) { + "use strict"; var x = 1; }); //// [file2.js] define(["require", "exports"], function (require, exports) { + "use strict"; var x = 1; }); diff --git a/tests/baselines/reference/exportStarForValues5.js b/tests/baselines/reference/exportStarForValues5.js index 48caf8bdb85..dc4d4c8b68e 100644 --- a/tests/baselines/reference/exportStarForValues5.js +++ b/tests/baselines/reference/exportStarForValues5.js @@ -10,7 +10,9 @@ export var x; //// [file1.js] define(["require", "exports"], function (require, exports) { + "use strict"; }); //// [file2.js] define(["require", "exports"], function (require, exports) { + "use strict"; }); diff --git a/tests/baselines/reference/exportStarForValues6.js b/tests/baselines/reference/exportStarForValues6.js index e393ad3fe7e..69357d87ee0 100644 --- a/tests/baselines/reference/exportStarForValues6.js +++ b/tests/baselines/reference/exportStarForValues6.js @@ -10,6 +10,7 @@ export var x = 1; //// [file1.js] System.register([], function(exports_1) { + "use strict"; return { setters:[], execute: function() { @@ -18,6 +19,7 @@ System.register([], function(exports_1) { }); //// [file2.js] System.register([], function(exports_1) { + "use strict"; var x; return { setters:[], diff --git a/tests/baselines/reference/exportStarForValues7.js b/tests/baselines/reference/exportStarForValues7.js index 1e249f45906..39a152fdc89 100644 --- a/tests/baselines/reference/exportStarForValues7.js +++ b/tests/baselines/reference/exportStarForValues7.js @@ -14,13 +14,16 @@ export var x = 1; //// [file1.js] define(["require", "exports"], function (require, exports) { + "use strict"; }); //// [file2.js] define(["require", "exports"], function (require, exports) { + "use strict"; exports.x = 1; }); //// [file3.js] define(["require", "exports", "file2"], function (require, exports, file2_1) { + "use strict"; function __export(m) { for (var p in m) if (!exports.hasOwnProperty(p)) exports[p] = m[p]; } diff --git a/tests/baselines/reference/exportStarForValues8.js b/tests/baselines/reference/exportStarForValues8.js index aca678ddd17..f8e7678a40c 100644 --- a/tests/baselines/reference/exportStarForValues8.js +++ b/tests/baselines/reference/exportStarForValues8.js @@ -26,17 +26,21 @@ export var x = 1; //// [file1.js] define(["require", "exports"], function (require, exports) { + "use strict"; }); //// [file2.js] define(["require", "exports"], function (require, exports) { + "use strict"; exports.x = 1; }); //// [file3.js] define(["require", "exports"], function (require, exports) { + "use strict"; exports.x = 1; }); //// [file4.js] define(["require", "exports", "file2", "file3"], function (require, exports, file2_1, file3_1) { + "use strict"; function __export(m) { for (var p in m) if (!exports.hasOwnProperty(p)) exports[p] = m[p]; } @@ -46,6 +50,7 @@ define(["require", "exports", "file2", "file3"], function (require, exports, fil }); //// [file5.js] define(["require", "exports", "file4"], function (require, exports, file4_1) { + "use strict"; function __export(m) { for (var p in m) if (!exports.hasOwnProperty(p)) exports[p] = m[p]; } diff --git a/tests/baselines/reference/exportStarForValues9.js b/tests/baselines/reference/exportStarForValues9.js index 76758d8a2a0..e057e4d4027 100644 --- a/tests/baselines/reference/exportStarForValues9.js +++ b/tests/baselines/reference/exportStarForValues9.js @@ -18,9 +18,11 @@ export var x = 1; //// [file1.js] define(["require", "exports"], function (require, exports) { + "use strict"; }); //// [file3.js] define(["require", "exports", "file2"], function (require, exports, file2_1) { + "use strict"; function __export(m) { for (var p in m) if (!exports.hasOwnProperty(p)) exports[p] = m[p]; } @@ -29,6 +31,7 @@ define(["require", "exports", "file2"], function (require, exports, file2_1) { }); //// [file2.js] define(["require", "exports", "file3"], function (require, exports, file3_1) { + "use strict"; function __export(m) { for (var p in m) if (!exports.hasOwnProperty(p)) exports[p] = m[p]; } diff --git a/tests/baselines/reference/exportStarForValuesInSystem.js b/tests/baselines/reference/exportStarForValuesInSystem.js index 29b839731a8..a33465f7e2e 100644 --- a/tests/baselines/reference/exportStarForValuesInSystem.js +++ b/tests/baselines/reference/exportStarForValuesInSystem.js @@ -10,6 +10,7 @@ var x = 1; //// [file1.js] System.register([], function(exports_1) { + "use strict"; return { setters:[], execute: function() { @@ -18,6 +19,7 @@ System.register([], function(exports_1) { }); //// [file2.js] System.register([], function(exports_1) { + "use strict"; var x; return { setters:[], From 378e5c39417721f0bb92d984c17130db54ee7bd5 Mon Sep 17 00:00:00 2001 From: Mohamed Hegazy Date: Tue, 8 Dec 2015 13:55:59 -0800 Subject: [PATCH 048/177] Add full path to spec md file in generate-spec target --- Jakefile.js | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/Jakefile.js b/Jakefile.js index 398b897097d..beb16d2886f 100644 --- a/Jakefile.js +++ b/Jakefile.js @@ -544,7 +544,8 @@ compileFile(word2mdJs, // The generated spec.md; built for the 'generate-spec' task file(specMd, [word2mdJs, specWord], function () { var specWordFullPath = path.resolve(specWord); - var cmd = "cscript //nologo " + word2mdJs + ' "' + specWordFullPath + '" ' + specMd; + var specMDFullPath = path.resolve(specMd); + var cmd = "cscript //nologo " + word2mdJs + ' "' + specWordFullPath + '" ' + '"' + specMDFullPath + '"'; console.log(cmd); child_process.exec(cmd, function () { complete(); From 2cc6c4cc289c1e6f8d622a8c5da616357d1230f0 Mon Sep 17 00:00:00 2001 From: Daniel Rosenwasser Date: Tue, 8 Dec 2015 14:28:35 -0800 Subject: [PATCH 049/177] Fixed test to explicitly have return type annotation. --- .../types/stringLiteral/stringLiteralTypesOverloads01.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tests/cases/conformance/types/stringLiteral/stringLiteralTypesOverloads01.ts b/tests/cases/conformance/types/stringLiteral/stringLiteralTypesOverloads01.ts index d88167eaeff..00441134405 100644 --- a/tests/cases/conformance/types/stringLiteral/stringLiteralTypesOverloads01.ts +++ b/tests/cases/conformance/types/stringLiteral/stringLiteralTypesOverloads01.ts @@ -9,7 +9,7 @@ function getFalsyPrimitive(x: "boolean" | "string"): boolean | string; function getFalsyPrimitive(x: "boolean" | "number"): boolean | number; function getFalsyPrimitive(x: "number" | "string"): number | string; function getFalsyPrimitive(x: "number" | "string" | "boolean"): number | string | boolean; -function getFalsyPrimitive(x: PrimitiveName) { +function getFalsyPrimitive(x: PrimitiveName): number | string | boolean { if (x === "string") { return ""; } From 5ef8a306422abded21cb09e87f6b4cada7d4fb2d Mon Sep 17 00:00:00 2001 From: Daniel Rosenwasser Date: Tue, 8 Dec 2015 14:34:20 -0800 Subject: [PATCH 050/177] Accepted baselines. --- .../reference/stringLiteralTypesOverloads01.errors.txt | 8 ++++---- .../baselines/reference/stringLiteralTypesOverloads01.js | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/tests/baselines/reference/stringLiteralTypesOverloads01.errors.txt b/tests/baselines/reference/stringLiteralTypesOverloads01.errors.txt index 1592427208b..0a3fdb91929 100644 --- a/tests/baselines/reference/stringLiteralTypesOverloads01.errors.txt +++ b/tests/baselines/reference/stringLiteralTypesOverloads01.errors.txt @@ -1,4 +1,4 @@ -tests/cases/conformance/types/stringLiteral/stringLiteralTypesOverloads01.ts(11,10): error TS2354: No best common type exists among return expressions. +tests/cases/conformance/types/stringLiteral/stringLiteralTypesOverloads01.ts(7,10): error TS2394: Overload signature is not compatible with function implementation. ==== tests/cases/conformance/types/stringLiteral/stringLiteralTypesOverloads01.ts (1 errors) ==== @@ -9,12 +9,12 @@ tests/cases/conformance/types/stringLiteral/stringLiteralTypesOverloads01.ts(11, function getFalsyPrimitive(x: "number"): number; function getFalsyPrimitive(x: "boolean"): boolean; function getFalsyPrimitive(x: "boolean" | "string"): boolean | string; + ~~~~~~~~~~~~~~~~~ +!!! error TS2394: Overload signature is not compatible with function implementation. function getFalsyPrimitive(x: "boolean" | "number"): boolean | number; function getFalsyPrimitive(x: "number" | "string"): number | string; function getFalsyPrimitive(x: "number" | "string" | "boolean"): number | string | boolean; - function getFalsyPrimitive(x: PrimitiveName) { - ~~~~~~~~~~~~~~~~~ -!!! error TS2354: No best common type exists among return expressions. + function getFalsyPrimitive(x: PrimitiveName): number | string | boolean { if (x === "string") { return ""; } diff --git a/tests/baselines/reference/stringLiteralTypesOverloads01.js b/tests/baselines/reference/stringLiteralTypesOverloads01.js index 73dabd26fab..f3331c9f717 100644 --- a/tests/baselines/reference/stringLiteralTypesOverloads01.js +++ b/tests/baselines/reference/stringLiteralTypesOverloads01.js @@ -9,7 +9,7 @@ function getFalsyPrimitive(x: "boolean" | "string"): boolean | string; function getFalsyPrimitive(x: "boolean" | "number"): boolean | number; function getFalsyPrimitive(x: "number" | "string"): number | string; function getFalsyPrimitive(x: "number" | "string" | "boolean"): number | string | boolean; -function getFalsyPrimitive(x: PrimitiveName) { +function getFalsyPrimitive(x: PrimitiveName): number | string | boolean { if (x === "string") { return ""; } From 2c2b8be2386f5a29b085ecb489b22786b8acba03 Mon Sep 17 00:00:00 2001 From: Daniel Rosenwasser Date: Tue, 8 Dec 2015 14:53:05 -0800 Subject: [PATCH 051/177] Remove empty test. --- .../functions/conformanceFunctionOverloads.ts | 22 ------------------- 1 file changed, 22 deletions(-) delete mode 100644 tests/cases/conformance/functions/conformanceFunctionOverloads.ts diff --git a/tests/cases/conformance/functions/conformanceFunctionOverloads.ts b/tests/cases/conformance/functions/conformanceFunctionOverloads.ts deleted file mode 100644 index f1e08782a51..00000000000 --- a/tests/cases/conformance/functions/conformanceFunctionOverloads.ts +++ /dev/null @@ -1,22 +0,0 @@ -// Function overloads do not emit code - -// Function overload signature with optional parameter - -// Function overload signature with optional parameter - -// Function overloads with generic and non-generic overloads - -// Function overloads whose only difference is returning different unconstrained generic parameters - -// Function overloads whose only difference is returning different constrained generic parameters - -// Function overloads that differ only by type parameter constraints - -// Function overloads with matching accessibility - -// Function overloads with matching export - -// Function overloads with more params than implementation signature - -// Function overloads where return types are same infinitely recursive type reference - From b6eb4ae10f290a648bc127f8e9965939e594a8c9 Mon Sep 17 00:00:00 2001 From: Wesley Wigham Date: Tue, 8 Dec 2015 15:00:47 -0800 Subject: [PATCH 052/177] fix generic instantiation, nested this guards now work --- src/compiler/checker.ts | 15 +- .../typeGuardFunctionErrors.errors.txt | 9 +- .../reference/typeGuardFunctionOfFormThis.js | 10 ++ .../typeGuardFunctionOfFormThis.symbols | 13 ++ .../typeGuardFunctionOfFormThis.types | 13 ++ .../reference/typeGuardOfFormThisMember.js | 57 ++++++- .../typeGuardOfFormThisMember.symbols | 113 ++++++++++++++ .../reference/typeGuardOfFormThisMember.types | 140 ++++++++++++++++-- .../typeGuards/typeGuardOfFormThisMember.ts | 29 +--- 9 files changed, 354 insertions(+), 45 deletions(-) diff --git a/src/compiler/checker.ts b/src/compiler/checker.ts index 02ddd7b26cf..68dea4eb4eb 100644 --- a/src/compiler/checker.ts +++ b/src/compiler/checker.ts @@ -4612,13 +4612,17 @@ namespace ts { return booleanType; } else { - const type = createType(TypeFlags.Boolean | TypeFlags.PredicateType) as PredicateType; - type.symbol = getSymbolOfNode(node); - type.predicate = createTypePredicateFromTypePredicateNode(node) as ThisTypePredicate; - return type; + return createPredicateType(getSymbolOfNode(node), createTypePredicateFromTypePredicateNode(node) as ThisTypePredicate); } } + function createPredicateType(symbol: Symbol, predicate: ThisTypePredicate) { + const type = createType(TypeFlags.Boolean | TypeFlags.PredicateType) as PredicateType; + type.symbol = symbol; + type.predicate = predicate; + return type; + } + function getTypeFromPredicateTypeNode(node: TypePredicateNode): Type { const links = getNodeLinks(node); if (!links.resolvedType) { @@ -4867,6 +4871,9 @@ namespace ts { if (type.flags & TypeFlags.Intersection) { return getIntersectionType(instantiateList((type).types, mapper, instantiateType)); } + if (type.flags & TypeFlags.PredicateType) { + return createPredicateType(type.symbol, {kind: TypePredicateKind.This, type: instantiateType((type as PredicateType).predicate.type, mapper)} as ThisTypePredicate); + } } return type; } diff --git a/tests/baselines/reference/typeGuardFunctionErrors.errors.txt b/tests/baselines/reference/typeGuardFunctionErrors.errors.txt index 9ad0ac6aa4a..2d40520a8ce 100644 --- a/tests/baselines/reference/typeGuardFunctionErrors.errors.txt +++ b/tests/baselines/reference/typeGuardFunctionErrors.errors.txt @@ -25,7 +25,7 @@ tests/cases/conformance/expressions/typeGuards/typeGuardFunctionErrors.ts(91,1): tests/cases/conformance/expressions/typeGuards/typeGuardFunctionErrors.ts(96,9): error TS1228: A type predicate is only allowed in return type position for functions and methods. tests/cases/conformance/expressions/typeGuards/typeGuardFunctionErrors.ts(97,16): error TS1228: A type predicate is only allowed in return type position for functions and methods. tests/cases/conformance/expressions/typeGuards/typeGuardFunctionErrors.ts(98,20): error TS1228: A type predicate is only allowed in return type position for functions and methods. -tests/cases/conformance/expressions/typeGuards/typeGuardFunctionErrors.ts(104,25): error TS2519: A 'this'-based type predicate is only allowed in class or interface members, get accessors, or return type positions for functions and methods +tests/cases/conformance/expressions/typeGuards/typeGuardFunctionErrors.ts(104,25): error TS1228: A type predicate is only allowed in return type position for functions and methods. tests/cases/conformance/expressions/typeGuards/typeGuardFunctionErrors.ts(105,16): error TS2322: Type 'boolean' is not assignable to type 'D'. Property 'm1' is missing in type 'Boolean'. tests/cases/conformance/expressions/typeGuards/typeGuardFunctionErrors.ts(105,16): error TS2409: Return type of constructor signature must be assignable to the instance type of the class @@ -33,6 +33,7 @@ tests/cases/conformance/expressions/typeGuards/typeGuardFunctionErrors.ts(107,20 tests/cases/conformance/expressions/typeGuards/typeGuardFunctionErrors.ts(110,20): error TS1228: A type predicate is only allowed in return type position for functions and methods. tests/cases/conformance/expressions/typeGuards/typeGuardFunctionErrors.ts(111,16): error TS2408: Setters cannot return a value. tests/cases/conformance/expressions/typeGuards/typeGuardFunctionErrors.ts(116,18): error TS1228: A type predicate is only allowed in return type position for functions and methods. +tests/cases/conformance/expressions/typeGuards/typeGuardFunctionErrors.ts(120,22): error TS1225: Cannot find parameter 'p1'. tests/cases/conformance/expressions/typeGuards/typeGuardFunctionErrors.ts(120,22): error TS1228: A type predicate is only allowed in return type position for functions and methods. tests/cases/conformance/expressions/typeGuards/typeGuardFunctionErrors.ts(124,20): error TS1229: A type predicate cannot reference a rest parameter. tests/cases/conformance/expressions/typeGuards/typeGuardFunctionErrors.ts(129,34): error TS1230: A type predicate cannot reference element 'p1' in a binding pattern. @@ -40,7 +41,7 @@ tests/cases/conformance/expressions/typeGuards/typeGuardFunctionErrors.ts(133,34 tests/cases/conformance/expressions/typeGuards/typeGuardFunctionErrors.ts(137,39): error TS1230: A type predicate cannot reference element 'p1' in a binding pattern. -==== tests/cases/conformance/expressions/typeGuards/typeGuardFunctionErrors.ts (33 errors) ==== +==== tests/cases/conformance/expressions/typeGuards/typeGuardFunctionErrors.ts (34 errors) ==== class A { propA: number; @@ -194,7 +195,7 @@ tests/cases/conformance/expressions/typeGuards/typeGuardFunctionErrors.ts(137,39 class D { constructor(p1: A): p1 is C { ~~~~~~~ -!!! error TS2519: A 'this'-based type predicate is only allowed in class or interface members, get accessors, or return type positions for functions and methods +!!! error TS1228: A type predicate is only allowed in return type position for functions and methods. return true; ~~~~ !!! error TS2322: Type 'boolean' is not assignable to type 'D'. @@ -224,6 +225,8 @@ tests/cases/conformance/expressions/typeGuards/typeGuardFunctionErrors.ts(137,39 interface I2 { [index: number]: p1 is C; + ~~ +!!! error TS1225: Cannot find parameter 'p1'. ~~~~~~~ !!! error TS1228: A type predicate is only allowed in return type position for functions and methods. } diff --git a/tests/baselines/reference/typeGuardFunctionOfFormThis.js b/tests/baselines/reference/typeGuardFunctionOfFormThis.js index bc91defc244..c1c670e8d7d 100644 --- a/tests/baselines/reference/typeGuardFunctionOfFormThis.js +++ b/tests/baselines/reference/typeGuardFunctionOfFormThis.js @@ -133,6 +133,12 @@ if (mimic.isFollower()) { mimic.follow(); mimic.isFollower = a.isFollower; } + + +interface MimicGuardInterface { + isLeader(): this is LeadGuard; + isFollower(): this is FollowerGuard; +} //// [typeGuardFunctionOfFormThis.js] @@ -335,3 +341,7 @@ declare class MimicFollower extends MimicGuard { follow(): void; } declare let mimic: MimicGuard; +interface MimicGuardInterface { + isLeader(): this is LeadGuard; + isFollower(): this is FollowerGuard; +} diff --git a/tests/baselines/reference/typeGuardFunctionOfFormThis.symbols b/tests/baselines/reference/typeGuardFunctionOfFormThis.symbols index 84c07a17f0e..2968063dc51 100644 --- a/tests/baselines/reference/typeGuardFunctionOfFormThis.symbols +++ b/tests/baselines/reference/typeGuardFunctionOfFormThis.symbols @@ -370,3 +370,16 @@ if (mimic.isFollower()) { >isFollower : Symbol(RoyalGuard.isFollower, Decl(typeGuardFunctionOfFormThis.ts, 3, 5)) } + +interface MimicGuardInterface { +>MimicGuardInterface : Symbol(MimicGuardInterface, Decl(typeGuardFunctionOfFormThis.ts, 133, 1)) + + isLeader(): this is LeadGuard; +>isLeader : Symbol(isLeader, Decl(typeGuardFunctionOfFormThis.ts, 136, 31)) +>LeadGuard : Symbol(LeadGuard, Decl(typeGuardFunctionOfFormThis.ts, 7, 1)) + + isFollower(): this is FollowerGuard; +>isFollower : Symbol(isFollower, Decl(typeGuardFunctionOfFormThis.ts, 137, 34)) +>FollowerGuard : Symbol(FollowerGuard, Decl(typeGuardFunctionOfFormThis.ts, 11, 1)) +} + diff --git a/tests/baselines/reference/typeGuardFunctionOfFormThis.types b/tests/baselines/reference/typeGuardFunctionOfFormThis.types index fa5becc7790..6b21fea3457 100644 --- a/tests/baselines/reference/typeGuardFunctionOfFormThis.types +++ b/tests/baselines/reference/typeGuardFunctionOfFormThis.types @@ -426,3 +426,16 @@ if (mimic.isFollower()) { >isFollower : () => this is FollowerGuard } + +interface MimicGuardInterface { +>MimicGuardInterface : MimicGuardInterface + + isLeader(): this is LeadGuard; +>isLeader : () => this is LeadGuard +>LeadGuard : LeadGuard + + isFollower(): this is FollowerGuard; +>isFollower : () => this is FollowerGuard +>FollowerGuard : FollowerGuard +} + diff --git a/tests/baselines/reference/typeGuardOfFormThisMember.js b/tests/baselines/reference/typeGuardOfFormThisMember.js index 2a53be25ab1..cbf70c4a640 100644 --- a/tests/baselines/reference/typeGuardOfFormThisMember.js +++ b/tests/baselines/reference/typeGuardOfFormThisMember.js @@ -32,6 +32,10 @@ namespace Test { let x = file.isFile; if (file.isFile) { file.content; + if (file.isNetworked) { + file.host; + file.content; + } } else if (file.isDirectory) { file.children; @@ -39,7 +43,43 @@ namespace Test { else if (file.isNetworked) { file.host; } -} + + interface GenericLeadGuard extends GenericGuard { + lead(): void; + } + + interface GenericFollowerGuard extends GenericGuard { + follow(): void; + } + + interface GenericGuard { + target: T; + isLeader: this is (GenericLeadGuard); + isFollower: this is GenericFollowerGuard; + } + + let guard: GenericGuard; + if (guard.isLeader) { + guard.lead(); + } + else if (guard.isFollower) { + guard.follow(); + } + + interface SpecificGuard { + isMoreSpecific: this is MoreSpecificGuard; + } + + interface MoreSpecificGuard extends SpecificGuard { + do(): void; + } + + let general: SpecificGuard; + if (general.isMoreSpecific) { + general.do(); + } +} + //// [typeGuardOfFormThisMember.js] var __extends = (this && this.__extends) || function (d, b) { @@ -98,6 +138,10 @@ var Test; var x = file.isFile; if (file.isFile) { file.content; + if (file.isNetworked) { + file.host; + file.content; + } } else if (file.isDirectory) { file.children; @@ -105,6 +149,17 @@ var Test; else if (file.isNetworked) { file.host; } + var guard; + if (guard.isLeader) { + guard.lead(); + } + else if (guard.isFollower) { + guard.follow(); + } + var general; + if (general.isMoreSpecific) { + general.do(); + } })(Test || (Test = {})); diff --git a/tests/baselines/reference/typeGuardOfFormThisMember.symbols b/tests/baselines/reference/typeGuardOfFormThisMember.symbols index fe78ed16507..84573ddf0c7 100644 --- a/tests/baselines/reference/typeGuardOfFormThisMember.symbols +++ b/tests/baselines/reference/typeGuardOfFormThisMember.symbols @@ -102,6 +102,22 @@ namespace Test { >file.content : Symbol(File.content, Decl(typeGuardOfFormThisMember.ts, 17, 27)) >file : Symbol(file, Decl(typeGuardOfFormThisMember.ts, 26, 4)) >content : Symbol(File.content, Decl(typeGuardOfFormThisMember.ts, 17, 27)) + + if (file.isNetworked) { +>file.isNetworked : Symbol(FileSystemObject.isNetworked, Decl(typeGuardOfFormThisMember.ts, 11, 3)) +>file : Symbol(file, Decl(typeGuardOfFormThisMember.ts, 26, 4)) +>isNetworked : Symbol(FileSystemObject.isNetworked, Decl(typeGuardOfFormThisMember.ts, 11, 3)) + + file.host; +>file.host : Symbol(Networked.host, Decl(typeGuardOfFormThisMember.ts, 22, 29)) +>file : Symbol(file, Decl(typeGuardOfFormThisMember.ts, 26, 4)) +>host : Symbol(Networked.host, Decl(typeGuardOfFormThisMember.ts, 22, 29)) + + file.content; +>file.content : Symbol(File.content, Decl(typeGuardOfFormThisMember.ts, 17, 27)) +>file : Symbol(file, Decl(typeGuardOfFormThisMember.ts, 26, 4)) +>content : Symbol(File.content, Decl(typeGuardOfFormThisMember.ts, 17, 27)) + } } else if (file.isDirectory) { >file.isDirectory : Symbol(FileSystemObject.isDirectory, Decl(typeGuardOfFormThisMember.ts, 8, 3)) @@ -123,4 +139,101 @@ namespace Test { >file : Symbol(file, Decl(typeGuardOfFormThisMember.ts, 26, 4)) >host : Symbol(Networked.host, Decl(typeGuardOfFormThisMember.ts, 22, 29)) } + + interface GenericLeadGuard extends GenericGuard { +>GenericLeadGuard : Symbol(GenericLeadGuard, Decl(typeGuardOfFormThisMember.ts, 43, 2)) +>T : Symbol(T, Decl(typeGuardOfFormThisMember.ts, 45, 28)) +>GenericGuard : Symbol(GenericGuard, Decl(typeGuardOfFormThisMember.ts, 51, 2)) +>T : Symbol(T, Decl(typeGuardOfFormThisMember.ts, 45, 28)) + + lead(): void; +>lead : Symbol(lead, Decl(typeGuardOfFormThisMember.ts, 45, 56)) + } + + interface GenericFollowerGuard extends GenericGuard { +>GenericFollowerGuard : Symbol(GenericFollowerGuard, Decl(typeGuardOfFormThisMember.ts, 47, 2)) +>T : Symbol(T, Decl(typeGuardOfFormThisMember.ts, 49, 32)) +>GenericGuard : Symbol(GenericGuard, Decl(typeGuardOfFormThisMember.ts, 51, 2)) +>T : Symbol(T, Decl(typeGuardOfFormThisMember.ts, 49, 32)) + + follow(): void; +>follow : Symbol(follow, Decl(typeGuardOfFormThisMember.ts, 49, 60)) + } + + interface GenericGuard { +>GenericGuard : Symbol(GenericGuard, Decl(typeGuardOfFormThisMember.ts, 51, 2)) +>T : Symbol(T, Decl(typeGuardOfFormThisMember.ts, 53, 24)) + + target: T; +>target : Symbol(target, Decl(typeGuardOfFormThisMember.ts, 53, 28)) +>T : Symbol(T, Decl(typeGuardOfFormThisMember.ts, 53, 24)) + + isLeader: this is (GenericLeadGuard); +>isLeader : Symbol(isLeader, Decl(typeGuardOfFormThisMember.ts, 54, 12)) +>GenericLeadGuard : Symbol(GenericLeadGuard, Decl(typeGuardOfFormThisMember.ts, 43, 2)) +>T : Symbol(T, Decl(typeGuardOfFormThisMember.ts, 53, 24)) + + isFollower: this is GenericFollowerGuard; +>isFollower : Symbol(isFollower, Decl(typeGuardOfFormThisMember.ts, 55, 42)) +>GenericFollowerGuard : Symbol(GenericFollowerGuard, Decl(typeGuardOfFormThisMember.ts, 47, 2)) +>T : Symbol(T, Decl(typeGuardOfFormThisMember.ts, 53, 24)) + } + + let guard: GenericGuard; +>guard : Symbol(guard, Decl(typeGuardOfFormThisMember.ts, 59, 4)) +>GenericGuard : Symbol(GenericGuard, Decl(typeGuardOfFormThisMember.ts, 51, 2)) +>File : Symbol(File, Decl(typeGuardOfFormThisMember.ts, 14, 2)) + + if (guard.isLeader) { +>guard.isLeader : Symbol(GenericGuard.isLeader, Decl(typeGuardOfFormThisMember.ts, 54, 12)) +>guard : Symbol(guard, Decl(typeGuardOfFormThisMember.ts, 59, 4)) +>isLeader : Symbol(GenericGuard.isLeader, Decl(typeGuardOfFormThisMember.ts, 54, 12)) + + guard.lead(); +>guard.lead : Symbol(GenericLeadGuard.lead, Decl(typeGuardOfFormThisMember.ts, 45, 56)) +>guard : Symbol(guard, Decl(typeGuardOfFormThisMember.ts, 59, 4)) +>lead : Symbol(GenericLeadGuard.lead, Decl(typeGuardOfFormThisMember.ts, 45, 56)) + } + else if (guard.isFollower) { +>guard.isFollower : Symbol(GenericGuard.isFollower, Decl(typeGuardOfFormThisMember.ts, 55, 42)) +>guard : Symbol(guard, Decl(typeGuardOfFormThisMember.ts, 59, 4)) +>isFollower : Symbol(GenericGuard.isFollower, Decl(typeGuardOfFormThisMember.ts, 55, 42)) + + guard.follow(); +>guard.follow : Symbol(GenericFollowerGuard.follow, Decl(typeGuardOfFormThisMember.ts, 49, 60)) +>guard : Symbol(guard, Decl(typeGuardOfFormThisMember.ts, 59, 4)) +>follow : Symbol(GenericFollowerGuard.follow, Decl(typeGuardOfFormThisMember.ts, 49, 60)) + } + + interface SpecificGuard { +>SpecificGuard : Symbol(SpecificGuard, Decl(typeGuardOfFormThisMember.ts, 65, 2)) + + isMoreSpecific: this is MoreSpecificGuard; +>isMoreSpecific : Symbol(isMoreSpecific, Decl(typeGuardOfFormThisMember.ts, 67, 26)) +>MoreSpecificGuard : Symbol(MoreSpecificGuard, Decl(typeGuardOfFormThisMember.ts, 69, 2)) + } + + interface MoreSpecificGuard extends SpecificGuard { +>MoreSpecificGuard : Symbol(MoreSpecificGuard, Decl(typeGuardOfFormThisMember.ts, 69, 2)) +>SpecificGuard : Symbol(SpecificGuard, Decl(typeGuardOfFormThisMember.ts, 65, 2)) + + do(): void; +>do : Symbol(do, Decl(typeGuardOfFormThisMember.ts, 71, 52)) + } + + let general: SpecificGuard; +>general : Symbol(general, Decl(typeGuardOfFormThisMember.ts, 75, 4)) +>SpecificGuard : Symbol(SpecificGuard, Decl(typeGuardOfFormThisMember.ts, 65, 2)) + + if (general.isMoreSpecific) { +>general.isMoreSpecific : Symbol(SpecificGuard.isMoreSpecific, Decl(typeGuardOfFormThisMember.ts, 67, 26)) +>general : Symbol(general, Decl(typeGuardOfFormThisMember.ts, 75, 4)) +>isMoreSpecific : Symbol(SpecificGuard.isMoreSpecific, Decl(typeGuardOfFormThisMember.ts, 67, 26)) + + general.do(); +>general.do : Symbol(MoreSpecificGuard.do, Decl(typeGuardOfFormThisMember.ts, 71, 52)) +>general : Symbol(general, Decl(typeGuardOfFormThisMember.ts, 75, 4)) +>do : Symbol(MoreSpecificGuard.do, Decl(typeGuardOfFormThisMember.ts, 71, 52)) + } } + diff --git a/tests/baselines/reference/typeGuardOfFormThisMember.types b/tests/baselines/reference/typeGuardOfFormThisMember.types index c379186fac7..3ecb174653b 100644 --- a/tests/baselines/reference/typeGuardOfFormThisMember.types +++ b/tests/baselines/reference/typeGuardOfFormThisMember.types @@ -17,7 +17,7 @@ namespace Test { } set isFile(param) { >isFile : this is File ->param : this is File +>param : boolean // noop } @@ -74,31 +74,31 @@ namespace Test { file.isNetworked = false; >file.isNetworked = false : boolean ->file.isNetworked : this is Networked & this +>file.isNetworked : this is Networked & FileSystemObject >file : FileSystemObject ->isNetworked : this is Networked & this +>isNetworked : this is Networked & FileSystemObject >false : boolean file.isNetworked = file.isDirectory; >file.isNetworked = file.isDirectory : this is Directory ->file.isNetworked : this is Networked & this +>file.isNetworked : this is Networked & FileSystemObject >file : FileSystemObject ->isNetworked : this is Networked & this +>isNetworked : this is Networked & FileSystemObject >file.isDirectory : this is Directory >file : FileSystemObject >isDirectory : this is Directory file.isFile = file.isNetworked; ->file.isFile = file.isNetworked : this is Networked & this +>file.isFile = file.isNetworked : this is Networked & FileSystemObject >file.isFile : this is File >file : FileSystemObject >isFile : this is File ->file.isNetworked : this is Networked & this +>file.isNetworked : this is Networked & FileSystemObject >file : FileSystemObject ->isNetworked : this is Networked & this +>isNetworked : this is Networked & FileSystemObject let x = file.isFile; ->x : this is File +>x : boolean >file.isFile : this is File >file : FileSystemObject >isFile : this is File @@ -112,6 +112,22 @@ namespace Test { >file.content : string >file : File >content : string + + if (file.isNetworked) { +>file.isNetworked : this is Networked & File +>file : File +>isNetworked : this is Networked & File + + file.host; +>file.host : string +>file : Networked & File +>host : string + + file.content; +>file.content : string +>file : Networked & File +>content : string + } } else if (file.isDirectory) { >file.isDirectory : this is Directory @@ -124,13 +140,113 @@ namespace Test { >children : FileSystemObject[] } else if (file.isNetworked) { ->file.isNetworked : this is Networked & this +>file.isNetworked : this is Networked & FileSystemObject >file : FileSystemObject ->isNetworked : this is Networked & this +>isNetworked : this is Networked & FileSystemObject file.host; >file.host : string ->file : Networked & this +>file : Networked & FileSystemObject >host : string } + + interface GenericLeadGuard extends GenericGuard { +>GenericLeadGuard : GenericLeadGuard +>T : T +>GenericGuard : GenericGuard +>T : T + + lead(): void; +>lead : () => void + } + + interface GenericFollowerGuard extends GenericGuard { +>GenericFollowerGuard : GenericFollowerGuard +>T : T +>GenericGuard : GenericGuard +>T : T + + follow(): void; +>follow : () => void + } + + interface GenericGuard { +>GenericGuard : GenericGuard +>T : T + + target: T; +>target : T +>T : T + + isLeader: this is (GenericLeadGuard); +>isLeader : this is GenericLeadGuard +>GenericLeadGuard : GenericLeadGuard +>T : T + + isFollower: this is GenericFollowerGuard; +>isFollower : this is GenericFollowerGuard +>GenericFollowerGuard : GenericFollowerGuard +>T : T + } + + let guard: GenericGuard; +>guard : GenericGuard +>GenericGuard : GenericGuard +>File : File + + if (guard.isLeader) { +>guard.isLeader : this is GenericLeadGuard +>guard : GenericGuard +>isLeader : this is GenericLeadGuard + + guard.lead(); +>guard.lead() : void +>guard.lead : () => void +>guard : GenericLeadGuard +>lead : () => void + } + else if (guard.isFollower) { +>guard.isFollower : this is GenericFollowerGuard +>guard : GenericGuard +>isFollower : this is GenericFollowerGuard + + guard.follow(); +>guard.follow() : void +>guard.follow : () => void +>guard : GenericFollowerGuard +>follow : () => void + } + + interface SpecificGuard { +>SpecificGuard : SpecificGuard + + isMoreSpecific: this is MoreSpecificGuard; +>isMoreSpecific : this is MoreSpecificGuard +>MoreSpecificGuard : MoreSpecificGuard + } + + interface MoreSpecificGuard extends SpecificGuard { +>MoreSpecificGuard : MoreSpecificGuard +>SpecificGuard : SpecificGuard + + do(): void; +>do : () => void + } + + let general: SpecificGuard; +>general : SpecificGuard +>SpecificGuard : SpecificGuard + + if (general.isMoreSpecific) { +>general.isMoreSpecific : this is MoreSpecificGuard +>general : SpecificGuard +>isMoreSpecific : this is MoreSpecificGuard + + general.do(); +>general.do() : void +>general.do : () => void +>general : MoreSpecificGuard +>do : () => void + } } + diff --git a/tests/cases/conformance/expressions/typeGuards/typeGuardOfFormThisMember.ts b/tests/cases/conformance/expressions/typeGuards/typeGuardOfFormThisMember.ts index 182d475b815..707f0f6eea5 100644 --- a/tests/cases/conformance/expressions/typeGuards/typeGuardOfFormThisMember.ts +++ b/tests/cases/conformance/expressions/typeGuards/typeGuardOfFormThisMember.ts @@ -33,6 +33,10 @@ namespace Test { let x = file.isFile; if (file.isFile) { file.content; + if (file.isNetworked) { + file.host; + file.content; + } } else if (file.isDirectory) { file.children; @@ -75,29 +79,4 @@ namespace Test { if (general.isMoreSpecific) { general.do(); } - - - class doThing { - constructor(private x: T) {} - isThing(x: any): x is doThing { - return true; - } - - } - - let z: doThing<{}> = new doThing({x: 10}); - let z1 = new doThing({x: 10}); - if (z1.isThing(z)) { - z; - } } - -function f(g: (x: number) => void) { - - -} - -f(function(x) { - - -}) \ No newline at end of file From 820a2cb257ae3926b7752c69f0bf31959e4114bb Mon Sep 17 00:00:00 2001 From: Daniel Rosenwasser Date: Tue, 8 Dec 2015 15:03:58 -0800 Subject: [PATCH 053/177] Added some tests for overload compatibility. --- tests/cases/compiler/functionOverloads43.ts | 12 +++++++++++ tests/cases/compiler/functionOverloads44.ts | 22 +++++++++++++++++++++ tests/cases/compiler/functionOverloads45.ts | 22 +++++++++++++++++++++ 3 files changed, 56 insertions(+) create mode 100644 tests/cases/compiler/functionOverloads43.ts create mode 100644 tests/cases/compiler/functionOverloads44.ts create mode 100644 tests/cases/compiler/functionOverloads45.ts diff --git a/tests/cases/compiler/functionOverloads43.ts b/tests/cases/compiler/functionOverloads43.ts new file mode 100644 index 00000000000..8822fd86c1b --- /dev/null +++ b/tests/cases/compiler/functionOverloads43.ts @@ -0,0 +1,12 @@ +function foo(bar: { a:number }[]): number; +function foo(bar: { a:string }[]): string; +function foo([x]: { a:number | string }[]): string | number { + if (x) { + return x.a; + } + + return undefined; +} + +var x = foo([{a: "str"}]); +var y = foo([{a: 100}]); \ No newline at end of file diff --git a/tests/cases/compiler/functionOverloads44.ts b/tests/cases/compiler/functionOverloads44.ts new file mode 100644 index 00000000000..20a7ed540f0 --- /dev/null +++ b/tests/cases/compiler/functionOverloads44.ts @@ -0,0 +1,22 @@ +interface Animal { animal } +interface Dog extends Animal { dog } +interface Cat extends Animal { cat } + +function foo1(bar: { a:number }[]): Dog; +function foo1(bar: { a:string }[]): Animal; +function foo1([x]: { a:number | string }[]): Dog { + return undefined; +} + +function foo2(bar: { a:number }[]): Cat; +function foo2(bar: { a:string }[]): Cat | Dog; +function foo2([x]: { a:number | string }[]): Cat { + return undefined; +} + + +var x1 = foo1([{a: "str"}]); +var y1 = foo1([{a: 100}]); + +var x2 = foo2([{a: "str"}]); +var y2 = foo2([{a: 100}]); \ No newline at end of file diff --git a/tests/cases/compiler/functionOverloads45.ts b/tests/cases/compiler/functionOverloads45.ts new file mode 100644 index 00000000000..6210bd13427 --- /dev/null +++ b/tests/cases/compiler/functionOverloads45.ts @@ -0,0 +1,22 @@ +interface Animal { animal } +interface Dog extends Animal { dog } +interface Cat extends Animal { cat } + +function foo1(bar: { a:number }[]): Cat; +function foo1(bar: { a:string }[]): Dog; +function foo1([x]: { a:number | string }[]): Animal { + return undefined; +} + +function foo2(bar: { a:number }[]): Cat; +function foo2(bar: { a:string }[]): Dog; +function foo2([x]: { a:number | string }[]): Cat | Dog { + return undefined; +} + + +var x1 = foo1([{a: "str"}]); +var y1 = foo1([{a: 100}]); + +var x2 = foo2([{a: "str"}]); +var y2 = foo2([{a: 100}]); \ No newline at end of file From 5d94e48e42a680eabb5969bb62047c6f9277a788 Mon Sep 17 00:00:00 2001 From: Daniel Rosenwasser Date: Tue, 8 Dec 2015 15:12:52 -0800 Subject: [PATCH 054/177] Accepted baselines. --- .../reference/conformanceFunctionOverloads.js | 37 ------- .../conformanceFunctionOverloads.symbols | 25 ----- .../conformanceFunctionOverloads.types | 25 ----- .../reference/functionOverloads43.errors.txt | 18 ++++ .../reference/functionOverloads43.js | 24 +++++ .../reference/functionOverloads44.js | 37 +++++++ .../reference/functionOverloads44.symbols | 81 ++++++++++++++++ .../reference/functionOverloads44.types | 97 +++++++++++++++++++ .../reference/functionOverloads45.errors.txt | 31 ++++++ .../reference/functionOverloads45.js | 37 +++++++ 10 files changed, 325 insertions(+), 87 deletions(-) delete mode 100644 tests/baselines/reference/conformanceFunctionOverloads.js delete mode 100644 tests/baselines/reference/conformanceFunctionOverloads.symbols delete mode 100644 tests/baselines/reference/conformanceFunctionOverloads.types create mode 100644 tests/baselines/reference/functionOverloads43.errors.txt create mode 100644 tests/baselines/reference/functionOverloads43.js create mode 100644 tests/baselines/reference/functionOverloads44.js create mode 100644 tests/baselines/reference/functionOverloads44.symbols create mode 100644 tests/baselines/reference/functionOverloads44.types create mode 100644 tests/baselines/reference/functionOverloads45.errors.txt create mode 100644 tests/baselines/reference/functionOverloads45.js diff --git a/tests/baselines/reference/conformanceFunctionOverloads.js b/tests/baselines/reference/conformanceFunctionOverloads.js deleted file mode 100644 index b245f6a2c91..00000000000 --- a/tests/baselines/reference/conformanceFunctionOverloads.js +++ /dev/null @@ -1,37 +0,0 @@ -//// [conformanceFunctionOverloads.ts] -// Function overloads do not emit code - -// Function overload signature with optional parameter - -// Function overload signature with optional parameter - -// Function overloads with generic and non-generic overloads - -// Function overloads whose only difference is returning different unconstrained generic parameters - -// Function overloads whose only difference is returning different constrained generic parameters - -// Function overloads that differ only by type parameter constraints - -// Function overloads with matching accessibility - -// Function overloads with matching export - -// Function overloads with more params than implementation signature - -// Function overloads where return types are same infinitely recursive type reference - - - -//// [conformanceFunctionOverloads.js] -// Function overloads do not emit code -// Function overload signature with optional parameter -// Function overload signature with optional parameter -// Function overloads with generic and non-generic overloads -// Function overloads whose only difference is returning different unconstrained generic parameters -// Function overloads whose only difference is returning different constrained generic parameters -// Function overloads that differ only by type parameter constraints -// Function overloads with matching accessibility -// Function overloads with matching export -// Function overloads with more params than implementation signature -// Function overloads where return types are same infinitely recursive type reference diff --git a/tests/baselines/reference/conformanceFunctionOverloads.symbols b/tests/baselines/reference/conformanceFunctionOverloads.symbols deleted file mode 100644 index a80814ea93e..00000000000 --- a/tests/baselines/reference/conformanceFunctionOverloads.symbols +++ /dev/null @@ -1,25 +0,0 @@ -=== tests/cases/conformance/functions/conformanceFunctionOverloads.ts === -// Function overloads do not emit code -No type information for this code. -No type information for this code.// Function overload signature with optional parameter -No type information for this code. -No type information for this code.// Function overload signature with optional parameter -No type information for this code. -No type information for this code.// Function overloads with generic and non-generic overloads -No type information for this code. -No type information for this code.// Function overloads whose only difference is returning different unconstrained generic parameters -No type information for this code. -No type information for this code.// Function overloads whose only difference is returning different constrained generic parameters -No type information for this code. -No type information for this code.// Function overloads that differ only by type parameter constraints -No type information for this code. -No type information for this code.// Function overloads with matching accessibility -No type information for this code. -No type information for this code.// Function overloads with matching export -No type information for this code. -No type information for this code.// Function overloads with more params than implementation signature -No type information for this code. -No type information for this code.// Function overloads where return types are same infinitely recursive type reference -No type information for this code. -No type information for this code. -No type information for this code. \ No newline at end of file diff --git a/tests/baselines/reference/conformanceFunctionOverloads.types b/tests/baselines/reference/conformanceFunctionOverloads.types deleted file mode 100644 index a80814ea93e..00000000000 --- a/tests/baselines/reference/conformanceFunctionOverloads.types +++ /dev/null @@ -1,25 +0,0 @@ -=== tests/cases/conformance/functions/conformanceFunctionOverloads.ts === -// Function overloads do not emit code -No type information for this code. -No type information for this code.// Function overload signature with optional parameter -No type information for this code. -No type information for this code.// Function overload signature with optional parameter -No type information for this code. -No type information for this code.// Function overloads with generic and non-generic overloads -No type information for this code. -No type information for this code.// Function overloads whose only difference is returning different unconstrained generic parameters -No type information for this code. -No type information for this code.// Function overloads whose only difference is returning different constrained generic parameters -No type information for this code. -No type information for this code.// Function overloads that differ only by type parameter constraints -No type information for this code. -No type information for this code.// Function overloads with matching accessibility -No type information for this code. -No type information for this code.// Function overloads with matching export -No type information for this code. -No type information for this code.// Function overloads with more params than implementation signature -No type information for this code. -No type information for this code.// Function overloads where return types are same infinitely recursive type reference -No type information for this code. -No type information for this code. -No type information for this code. \ No newline at end of file diff --git a/tests/baselines/reference/functionOverloads43.errors.txt b/tests/baselines/reference/functionOverloads43.errors.txt new file mode 100644 index 00000000000..769bb467186 --- /dev/null +++ b/tests/baselines/reference/functionOverloads43.errors.txt @@ -0,0 +1,18 @@ +tests/cases/compiler/functionOverloads43.ts(1,10): error TS2394: Overload signature is not compatible with function implementation. + + +==== tests/cases/compiler/functionOverloads43.ts (1 errors) ==== + function foo(bar: { a:number }[]): number; + ~~~ +!!! error TS2394: Overload signature is not compatible with function implementation. + function foo(bar: { a:string }[]): string; + function foo([x]: { a:number | string }[]): string | number { + if (x) { + return x.a; + } + + return undefined; + } + + var x = foo([{a: "str"}]); + var y = foo([{a: 100}]); \ No newline at end of file diff --git a/tests/baselines/reference/functionOverloads43.js b/tests/baselines/reference/functionOverloads43.js new file mode 100644 index 00000000000..2bb4b61af14 --- /dev/null +++ b/tests/baselines/reference/functionOverloads43.js @@ -0,0 +1,24 @@ +//// [functionOverloads43.ts] +function foo(bar: { a:number }[]): number; +function foo(bar: { a:string }[]): string; +function foo([x]: { a:number | string }[]): string | number { + if (x) { + return x.a; + } + + return undefined; +} + +var x = foo([{a: "str"}]); +var y = foo([{a: 100}]); + +//// [functionOverloads43.js] +function foo(_a) { + var x = _a[0]; + if (x) { + return x.a; + } + return undefined; +} +var x = foo([{ a: "str" }]); +var y = foo([{ a: 100 }]); diff --git a/tests/baselines/reference/functionOverloads44.js b/tests/baselines/reference/functionOverloads44.js new file mode 100644 index 00000000000..916204d123c --- /dev/null +++ b/tests/baselines/reference/functionOverloads44.js @@ -0,0 +1,37 @@ +//// [functionOverloads44.ts] +interface Animal { animal } +interface Dog extends Animal { dog } +interface Cat extends Animal { cat } + +function foo1(bar: { a:number }[]): Dog; +function foo1(bar: { a:string }[]): Animal; +function foo1([x]: { a:number | string }[]): Dog { + return undefined; +} + +function foo2(bar: { a:number }[]): Cat; +function foo2(bar: { a:string }[]): Cat | Dog; +function foo2([x]: { a:number | string }[]): Cat { + return undefined; +} + + +var x1 = foo1([{a: "str"}]); +var y1 = foo1([{a: 100}]); + +var x2 = foo2([{a: "str"}]); +var y2 = foo2([{a: 100}]); + +//// [functionOverloads44.js] +function foo1(_a) { + var x = _a[0]; + return undefined; +} +function foo2(_a) { + var x = _a[0]; + return undefined; +} +var x1 = foo1([{ a: "str" }]); +var y1 = foo1([{ a: 100 }]); +var x2 = foo2([{ a: "str" }]); +var y2 = foo2([{ a: 100 }]); diff --git a/tests/baselines/reference/functionOverloads44.symbols b/tests/baselines/reference/functionOverloads44.symbols new file mode 100644 index 00000000000..3520777a835 --- /dev/null +++ b/tests/baselines/reference/functionOverloads44.symbols @@ -0,0 +1,81 @@ +=== tests/cases/compiler/functionOverloads44.ts === +interface Animal { animal } +>Animal : Symbol(Animal, Decl(functionOverloads44.ts, 0, 0)) +>animal : Symbol(animal, Decl(functionOverloads44.ts, 0, 18)) + +interface Dog extends Animal { dog } +>Dog : Symbol(Dog, Decl(functionOverloads44.ts, 0, 27)) +>Animal : Symbol(Animal, Decl(functionOverloads44.ts, 0, 0)) +>dog : Symbol(dog, Decl(functionOverloads44.ts, 1, 30)) + +interface Cat extends Animal { cat } +>Cat : Symbol(Cat, Decl(functionOverloads44.ts, 1, 36)) +>Animal : Symbol(Animal, Decl(functionOverloads44.ts, 0, 0)) +>cat : Symbol(cat, Decl(functionOverloads44.ts, 2, 30)) + +function foo1(bar: { a:number }[]): Dog; +>foo1 : Symbol(foo1, Decl(functionOverloads44.ts, 2, 36), Decl(functionOverloads44.ts, 4, 40), Decl(functionOverloads44.ts, 5, 43)) +>bar : Symbol(bar, Decl(functionOverloads44.ts, 4, 14)) +>a : Symbol(a, Decl(functionOverloads44.ts, 4, 20)) +>Dog : Symbol(Dog, Decl(functionOverloads44.ts, 0, 27)) + +function foo1(bar: { a:string }[]): Animal; +>foo1 : Symbol(foo1, Decl(functionOverloads44.ts, 2, 36), Decl(functionOverloads44.ts, 4, 40), Decl(functionOverloads44.ts, 5, 43)) +>bar : Symbol(bar, Decl(functionOverloads44.ts, 5, 14)) +>a : Symbol(a, Decl(functionOverloads44.ts, 5, 20)) +>Animal : Symbol(Animal, Decl(functionOverloads44.ts, 0, 0)) + +function foo1([x]: { a:number | string }[]): Dog { +>foo1 : Symbol(foo1, Decl(functionOverloads44.ts, 2, 36), Decl(functionOverloads44.ts, 4, 40), Decl(functionOverloads44.ts, 5, 43)) +>x : Symbol(x, Decl(functionOverloads44.ts, 6, 15)) +>a : Symbol(a, Decl(functionOverloads44.ts, 6, 20)) +>Dog : Symbol(Dog, Decl(functionOverloads44.ts, 0, 27)) + + return undefined; +>undefined : Symbol(undefined) +} + +function foo2(bar: { a:number }[]): Cat; +>foo2 : Symbol(foo2, Decl(functionOverloads44.ts, 8, 1), Decl(functionOverloads44.ts, 10, 40), Decl(functionOverloads44.ts, 11, 46)) +>bar : Symbol(bar, Decl(functionOverloads44.ts, 10, 14)) +>a : Symbol(a, Decl(functionOverloads44.ts, 10, 20)) +>Cat : Symbol(Cat, Decl(functionOverloads44.ts, 1, 36)) + +function foo2(bar: { a:string }[]): Cat | Dog; +>foo2 : Symbol(foo2, Decl(functionOverloads44.ts, 8, 1), Decl(functionOverloads44.ts, 10, 40), Decl(functionOverloads44.ts, 11, 46)) +>bar : Symbol(bar, Decl(functionOverloads44.ts, 11, 14)) +>a : Symbol(a, Decl(functionOverloads44.ts, 11, 20)) +>Cat : Symbol(Cat, Decl(functionOverloads44.ts, 1, 36)) +>Dog : Symbol(Dog, Decl(functionOverloads44.ts, 0, 27)) + +function foo2([x]: { a:number | string }[]): Cat { +>foo2 : Symbol(foo2, Decl(functionOverloads44.ts, 8, 1), Decl(functionOverloads44.ts, 10, 40), Decl(functionOverloads44.ts, 11, 46)) +>x : Symbol(x, Decl(functionOverloads44.ts, 12, 15)) +>a : Symbol(a, Decl(functionOverloads44.ts, 12, 20)) +>Cat : Symbol(Cat, Decl(functionOverloads44.ts, 1, 36)) + + return undefined; +>undefined : Symbol(undefined) +} + + +var x1 = foo1([{a: "str"}]); +>x1 : Symbol(x1, Decl(functionOverloads44.ts, 17, 3)) +>foo1 : Symbol(foo1, Decl(functionOverloads44.ts, 2, 36), Decl(functionOverloads44.ts, 4, 40), Decl(functionOverloads44.ts, 5, 43)) +>a : Symbol(a, Decl(functionOverloads44.ts, 17, 16)) + +var y1 = foo1([{a: 100}]); +>y1 : Symbol(y1, Decl(functionOverloads44.ts, 18, 3)) +>foo1 : Symbol(foo1, Decl(functionOverloads44.ts, 2, 36), Decl(functionOverloads44.ts, 4, 40), Decl(functionOverloads44.ts, 5, 43)) +>a : Symbol(a, Decl(functionOverloads44.ts, 18, 16)) + +var x2 = foo2([{a: "str"}]); +>x2 : Symbol(x2, Decl(functionOverloads44.ts, 20, 3)) +>foo2 : Symbol(foo2, Decl(functionOverloads44.ts, 8, 1), Decl(functionOverloads44.ts, 10, 40), Decl(functionOverloads44.ts, 11, 46)) +>a : Symbol(a, Decl(functionOverloads44.ts, 20, 16)) + +var y2 = foo2([{a: 100}]); +>y2 : Symbol(y2, Decl(functionOverloads44.ts, 21, 3)) +>foo2 : Symbol(foo2, Decl(functionOverloads44.ts, 8, 1), Decl(functionOverloads44.ts, 10, 40), Decl(functionOverloads44.ts, 11, 46)) +>a : Symbol(a, Decl(functionOverloads44.ts, 21, 16)) + diff --git a/tests/baselines/reference/functionOverloads44.types b/tests/baselines/reference/functionOverloads44.types new file mode 100644 index 00000000000..56cad09b472 --- /dev/null +++ b/tests/baselines/reference/functionOverloads44.types @@ -0,0 +1,97 @@ +=== tests/cases/compiler/functionOverloads44.ts === +interface Animal { animal } +>Animal : Animal +>animal : any + +interface Dog extends Animal { dog } +>Dog : Dog +>Animal : Animal +>dog : any + +interface Cat extends Animal { cat } +>Cat : Cat +>Animal : Animal +>cat : any + +function foo1(bar: { a:number }[]): Dog; +>foo1 : { (bar: { a: number; }[]): Dog; (bar: { a: string; }[]): Animal; } +>bar : { a: number; }[] +>a : number +>Dog : Dog + +function foo1(bar: { a:string }[]): Animal; +>foo1 : { (bar: { a: number; }[]): Dog; (bar: { a: string; }[]): Animal; } +>bar : { a: string; }[] +>a : string +>Animal : Animal + +function foo1([x]: { a:number | string }[]): Dog { +>foo1 : { (bar: { a: number; }[]): Dog; (bar: { a: string; }[]): Animal; } +>x : { a: number | string; } +>a : number | string +>Dog : Dog + + return undefined; +>undefined : undefined +} + +function foo2(bar: { a:number }[]): Cat; +>foo2 : { (bar: { a: number; }[]): Cat; (bar: { a: string; }[]): Cat | Dog; } +>bar : { a: number; }[] +>a : number +>Cat : Cat + +function foo2(bar: { a:string }[]): Cat | Dog; +>foo2 : { (bar: { a: number; }[]): Cat; (bar: { a: string; }[]): Cat | Dog; } +>bar : { a: string; }[] +>a : string +>Cat : Cat +>Dog : Dog + +function foo2([x]: { a:number | string }[]): Cat { +>foo2 : { (bar: { a: number; }[]): Cat; (bar: { a: string; }[]): Cat | Dog; } +>x : { a: number | string; } +>a : number | string +>Cat : Cat + + return undefined; +>undefined : undefined +} + + +var x1 = foo1([{a: "str"}]); +>x1 : Animal +>foo1([{a: "str"}]) : Animal +>foo1 : { (bar: { a: number; }[]): Dog; (bar: { a: string; }[]): Animal; } +>[{a: "str"}] : { a: string; }[] +>{a: "str"} : { a: string; } +>a : string +>"str" : string + +var y1 = foo1([{a: 100}]); +>y1 : Dog +>foo1([{a: 100}]) : Dog +>foo1 : { (bar: { a: number; }[]): Dog; (bar: { a: string; }[]): Animal; } +>[{a: 100}] : { a: number; }[] +>{a: 100} : { a: number; } +>a : number +>100 : number + +var x2 = foo2([{a: "str"}]); +>x2 : Cat | Dog +>foo2([{a: "str"}]) : Cat | Dog +>foo2 : { (bar: { a: number; }[]): Cat; (bar: { a: string; }[]): Cat | Dog; } +>[{a: "str"}] : { a: string; }[] +>{a: "str"} : { a: string; } +>a : string +>"str" : string + +var y2 = foo2([{a: 100}]); +>y2 : Cat +>foo2([{a: 100}]) : Cat +>foo2 : { (bar: { a: number; }[]): Cat; (bar: { a: string; }[]): Cat | Dog; } +>[{a: 100}] : { a: number; }[] +>{a: 100} : { a: number; } +>a : number +>100 : number + diff --git a/tests/baselines/reference/functionOverloads45.errors.txt b/tests/baselines/reference/functionOverloads45.errors.txt new file mode 100644 index 00000000000..38ed387d9a1 --- /dev/null +++ b/tests/baselines/reference/functionOverloads45.errors.txt @@ -0,0 +1,31 @@ +tests/cases/compiler/functionOverloads45.ts(5,10): error TS2394: Overload signature is not compatible with function implementation. +tests/cases/compiler/functionOverloads45.ts(11,10): error TS2394: Overload signature is not compatible with function implementation. + + +==== tests/cases/compiler/functionOverloads45.ts (2 errors) ==== + interface Animal { animal } + interface Dog extends Animal { dog } + interface Cat extends Animal { cat } + + function foo1(bar: { a:number }[]): Cat; + ~~~~ +!!! error TS2394: Overload signature is not compatible with function implementation. + function foo1(bar: { a:string }[]): Dog; + function foo1([x]: { a:number | string }[]): Animal { + return undefined; + } + + function foo2(bar: { a:number }[]): Cat; + ~~~~ +!!! error TS2394: Overload signature is not compatible with function implementation. + function foo2(bar: { a:string }[]): Dog; + function foo2([x]: { a:number | string }[]): Cat | Dog { + return undefined; + } + + + var x1 = foo1([{a: "str"}]); + var y1 = foo1([{a: 100}]); + + var x2 = foo2([{a: "str"}]); + var y2 = foo2([{a: 100}]); \ No newline at end of file diff --git a/tests/baselines/reference/functionOverloads45.js b/tests/baselines/reference/functionOverloads45.js new file mode 100644 index 00000000000..89bf41893c9 --- /dev/null +++ b/tests/baselines/reference/functionOverloads45.js @@ -0,0 +1,37 @@ +//// [functionOverloads45.ts] +interface Animal { animal } +interface Dog extends Animal { dog } +interface Cat extends Animal { cat } + +function foo1(bar: { a:number }[]): Cat; +function foo1(bar: { a:string }[]): Dog; +function foo1([x]: { a:number | string }[]): Animal { + return undefined; +} + +function foo2(bar: { a:number }[]): Cat; +function foo2(bar: { a:string }[]): Dog; +function foo2([x]: { a:number | string }[]): Cat | Dog { + return undefined; +} + + +var x1 = foo1([{a: "str"}]); +var y1 = foo1([{a: 100}]); + +var x2 = foo2([{a: "str"}]); +var y2 = foo2([{a: 100}]); + +//// [functionOverloads45.js] +function foo1(_a) { + var x = _a[0]; + return undefined; +} +function foo2(_a) { + var x = _a[0]; + return undefined; +} +var x1 = foo1([{ a: "str" }]); +var y1 = foo1([{ a: 100 }]); +var x2 = foo2([{ a: "str" }]); +var y2 = foo2([{ a: 100 }]); From 58427c4d18fe64b849f0ef73945ddbf2e2cb28b1 Mon Sep 17 00:00:00 2001 From: Ryan Cavanaugh Date: Tue, 8 Dec 2015 16:59:52 -0800 Subject: [PATCH 055/177] Use logic for win --- src/compiler/checker.ts | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/src/compiler/checker.ts b/src/compiler/checker.ts index 6b25b47d26c..53900f90ffa 100644 --- a/src/compiler/checker.ts +++ b/src/compiler/checker.ts @@ -15971,10 +15971,7 @@ namespace ts { // Modifiers cannot appear in property assignments forEach(prop.modifiers, mod => { - if (mod.kind !== SyntaxKind.AsyncKeyword) { - grammarErrorOnNode(mod, Diagnostics._0_modifier_cannot_be_used_here, getTextOfNode(mod)); - } - else if (prop.kind !== SyntaxKind.MethodDeclaration) { + if (mod.kind !== SyntaxKind.AsyncKeyword || prop.kind !== SyntaxKind.MethodDeclaration) { grammarErrorOnNode(mod, Diagnostics._0_modifier_cannot_be_used_here, getTextOfNode(mod)); } }); From dc2af2fb7fd1ca54e05c8cc211d05041b23dc708 Mon Sep 17 00:00:00 2001 From: Daniel Rosenwasser Date: Tue, 8 Dec 2015 17:08:23 -0800 Subject: [PATCH 056/177] Use different relation for overload compatibility. --- src/compiler/checker.ts | 21 ++++++++++++++++++++- 1 file changed, 20 insertions(+), 1 deletion(-) diff --git a/src/compiler/checker.ts b/src/compiler/checker.ts index 30d4818592b..212d863e575 100644 --- a/src/compiler/checker.ts +++ b/src/compiler/checker.ts @@ -4959,6 +4959,25 @@ namespace ts { return checkTypeRelatedTo(sourceType, targetType, assignableRelation, /*errorNode*/ undefined); } + function isImplementationCompatibleWithOverload(implementation: Signature, overload: Signature): boolean { + const erasedSource = getErasedSignature(implementation); + const erasedTarget = getErasedSignature(overload); + + const sourceReturnType = getReturnTypeOfSignature(erasedSource); + const targetReturnType = getReturnTypeOfSignature(erasedTarget); + if (checkTypeRelatedTo(sourceReturnType, targetReturnType, assignableRelation, /*errorNode*/ undefined) + || checkTypeRelatedTo(targetReturnType, sourceReturnType, assignableRelation, /*errorNode*/ undefined)) { + const anyReturningSource = cloneSignature(erasedSource); + const anyReturningTarget = cloneSignature(erasedTarget); + anyReturningSource.resolvedReturnType = anyType; + anyReturningTarget.resolvedReturnType = anyType; + + const anyReturningSourceType = getOrCreateTypeFromSignature(anyReturningSource); + const anyReturningTargetType = getOrCreateTypeFromSignature(anyReturningTarget); + return checkTypeRelatedTo(anyReturningSourceType, anyReturningTargetType, assignableRelation, /*errorNode*/ undefined); + } + } + /** * Checks if 'source' is related to 'target' (e.g.: is a assignable to). * @param source The left-hand-side of the relation. @@ -11683,7 +11702,7 @@ namespace ts { // // The implementation is completely unrelated to the specialized signature, yet we do not check this. for (const signature of signatures) { - if (!signature.hasStringLiterals && !isSignatureAssignableTo(bodySignature, signature)) { + if (!signature.hasStringLiterals && !isImplementationCompatibleWithOverload(bodySignature, signature)) { error(signature.declaration, Diagnostics.Overload_signature_is_not_compatible_with_function_implementation); break; } From 459430165d7f802bb430b7739a51c785f14828ad Mon Sep 17 00:00:00 2001 From: Wesley Wigham Date: Tue, 8 Dec 2015 17:08:57 -0800 Subject: [PATCH 057/177] grand unified theory of predicate types --- src/compiler/checker.ts | 169 +++++-------- src/compiler/types.ts | 3 +- .../arrayBufferIsViewNarrowsType.types | 2 +- tests/baselines/reference/isArray.types | 2 +- .../stringLiteralCheckedInIf02.types | 2 +- .../stringLiteralTypesAsTags01.errors.txt | 11 +- .../reference/typeGuardFunction.types | 14 +- .../typeGuardFunctionErrors.errors.txt | 16 +- .../reference/typeGuardFunctionGenerics.types | 4 +- .../typeGuardFunctionOfFormThis.types | 36 +-- ...peGuardFunctionOfFormThisErrors.errors.txt | 28 ++- .../reference/typeGuardOfFormIsType.types | 16 +- .../typeGuardOfFormIsTypeOnInterfaces.types | 16 +- .../reference/typeGuardOfFormThisMember.js | 10 +- .../typeGuardOfFormThisMember.symbols | 237 +++++++++--------- .../reference/typeGuardOfFormThisMember.types | 26 +- ...typeGuardOfFormThisMemberErrors.errors.txt | 51 ++++ .../typeGuardOfFormThisMemberErrors.js | 112 +++++++++ .../unionAndIntersectionInference1.types | 4 +- .../typeGuards/typeGuardOfFormThisMember.ts | 5 +- .../typeGuardOfFormThisMemberErrors.ts | 34 +++ 21 files changed, 472 insertions(+), 326 deletions(-) create mode 100644 tests/baselines/reference/typeGuardOfFormThisMemberErrors.errors.txt create mode 100644 tests/baselines/reference/typeGuardOfFormThisMemberErrors.js create mode 100644 tests/cases/conformance/expressions/typeGuards/typeGuardOfFormThisMemberErrors.ts diff --git a/src/compiler/checker.ts b/src/compiler/checker.ts index 68dea4eb4eb..e496a0b07bc 100644 --- a/src/compiler/checker.ts +++ b/src/compiler/checker.ts @@ -123,8 +123,8 @@ namespace ts { const noConstraintType = createAnonymousType(undefined, emptySymbols, emptyArray, emptyArray, undefined, undefined); - const anySignature = createSignature(undefined, undefined, emptyArray, anyType, undefined, 0, /*hasRestParameter*/ false, /*hasStringLiterals*/ false); - const unknownSignature = createSignature(undefined, undefined, emptyArray, unknownType, undefined, 0, /*hasRestParameter*/ false, /*hasStringLiterals*/ false); + const anySignature = createSignature(undefined, undefined, emptyArray, anyType, 0, /*hasRestParameter*/ false, /*hasStringLiterals*/ false); + const unknownSignature = createSignature(undefined, undefined, emptyArray, unknownType, 0, /*hasRestParameter*/ false, /*hasStringLiterals*/ false); const globals: SymbolTable = {}; @@ -2074,15 +2074,7 @@ namespace ts { } writeSpace(writer); - let returnType: Type; - const predicate = signature.typePredicate; - if (predicate) { - buildTypePredicateDisplay(writer, predicate); - returnType = predicate.type; - } - else { - returnType = getReturnTypeOfSignature(signature); - } + const returnType = getReturnTypeOfSignature(signature); buildTypeDisplay(returnType, writer, enclosingDeclaration, flags, symbolStack); } @@ -3378,13 +3370,12 @@ namespace ts { } function createSignature(declaration: SignatureDeclaration, typeParameters: TypeParameter[], parameters: Symbol[], - resolvedReturnType: Type, typePredicate: IdentifierTypePredicate | ThisTypePredicate, minArgumentCount: number, hasRestParameter: boolean, hasStringLiterals: boolean): Signature { + resolvedReturnType: Type, minArgumentCount: number, hasRestParameter: boolean, hasStringLiterals: boolean): Signature { const sig = new Signature(checker); sig.declaration = declaration; sig.typeParameters = typeParameters; sig.parameters = parameters; sig.resolvedReturnType = resolvedReturnType; - sig.typePredicate = typePredicate; sig.minArgumentCount = minArgumentCount; sig.hasRestParameter = hasRestParameter; sig.hasStringLiterals = hasStringLiterals; @@ -3392,13 +3383,13 @@ namespace ts { } function cloneSignature(sig: Signature): Signature { - return createSignature(sig.declaration, sig.typeParameters, sig.parameters, sig.resolvedReturnType, sig.typePredicate, + return createSignature(sig.declaration, sig.typeParameters, sig.parameters, sig.resolvedReturnType, sig.minArgumentCount, sig.hasRestParameter, sig.hasStringLiterals); } function getDefaultConstructSignatures(classType: InterfaceType): Signature[] { if (!hasClassBaseType(classType)) { - return [createSignature(undefined, classType.localTypeParameters, emptyArray, classType, undefined, 0, /*hasRestParameter*/ false, /*hasStringLiterals*/ false)]; + return [createSignature(undefined, classType.localTypeParameters, emptyArray, classType, 0, /*hasRestParameter*/ false, /*hasStringLiterals*/ false)]; } const baseConstructorType = getBaseConstructorTypeOfClass(classType); const baseSignatures = getSignaturesOfType(baseConstructorType, SignatureKind.Construct); @@ -3924,15 +3915,11 @@ namespace ts { } let returnType: Type; - let typePredicate: IdentifierTypePredicate | ThisTypePredicate; if (classType) { returnType = classType; } else if (declaration.type) { returnType = getTypeFromTypeNode(declaration.type); - if (declaration.type.kind === SyntaxKind.TypePredicate) { - typePredicate = createTypePredicateFromTypePredicateNode(declaration.type as TypePredicateNode); - } } else { // TypeScript 1.0 spec (April 2014): @@ -3947,8 +3934,7 @@ namespace ts { } } - links.resolvedSignature = createSignature(declaration, typeParameters, parameters, returnType, typePredicate, - minArgumentCount, hasRestParameter(declaration), hasStringLiterals); + links.resolvedSignature = createSignature(declaration, typeParameters, parameters, returnType, minArgumentCount, hasRestParameter(declaration), hasStringLiterals); } return links.resolvedSignature; } @@ -4608,15 +4594,10 @@ namespace ts { } function getPredicateType(node: TypePredicateNode): Type { - if (!(node.parent.kind === SyntaxKind.PropertyDeclaration || node.parent.kind === SyntaxKind.PropertySignature || node.parent.kind === SyntaxKind.GetAccessor)) { - return booleanType; - } - else { - return createPredicateType(getSymbolOfNode(node), createTypePredicateFromTypePredicateNode(node) as ThisTypePredicate); - } + return createPredicateType(getSymbolOfNode(node), createTypePredicateFromTypePredicateNode(node)); } - function createPredicateType(symbol: Symbol, predicate: ThisTypePredicate) { + function createPredicateType(symbol: Symbol, predicate: ThisTypePredicate | IdentifierTypePredicate) { const type = createType(TypeFlags.Boolean | TypeFlags.PredicateType) as PredicateType; type.symbol = symbol; type.predicate = predicate; @@ -4801,7 +4782,6 @@ namespace ts { const result = createSignature(signature.declaration, freshTypeParameters, instantiateList(signature.parameters, mapper, instantiateSymbol), instantiateType(signature.resolvedReturnType, mapper), - signature.typePredicate && cloneTypePredicate(signature.typePredicate, mapper), signature.minArgumentCount, signature.hasRestParameter, signature.hasStringLiterals); result.target = signature; result.mapper = mapper; @@ -4872,7 +4852,8 @@ namespace ts { return getIntersectionType(instantiateList((type).types, mapper, instantiateType)); } if (type.flags & TypeFlags.PredicateType) { - return createPredicateType(type.symbol, {kind: TypePredicateKind.This, type: instantiateType((type as PredicateType).predicate.type, mapper)} as ThisTypePredicate); + const predicate = (type as PredicateType).predicate; + return createPredicateType(type.symbol, cloneTypePredicate(predicate, mapper)); } } return type; @@ -5044,7 +5025,36 @@ namespace ts { if (relation === assignableRelation) { if (isTypeAny(source)) return Ternary.True; if (source === numberType && target.flags & TypeFlags.Enum) return Ternary.True; - if (source.flags & TypeFlags.Boolean && target.flags & TypeFlags.Boolean && (source.flags & TypeFlags.PredicateType || target.flags & TypeFlags.PredicateType)) return Ternary.True; + } + if (source.flags & TypeFlags.Boolean && target.flags & TypeFlags.Boolean) { + if (source.flags & TypeFlags.PredicateType && target.flags & TypeFlags.PredicateType) { + const sourcePredicate = source as PredicateType; + const targetPredicate = target as PredicateType; + if (sourcePredicate.predicate.kind !== targetPredicate.predicate.kind) { + if (reportErrors) { + reportError(Diagnostics.A_this_based_type_guard_is_not_assignable_to_a_parameter_based_type_guard); + reportError(Diagnostics.Type_predicate_0_is_not_assignable_to_1, typeToString(source), typeToString(target)); + } + return Ternary.False; + } + if (sourcePredicate.predicate.kind === TypePredicateKind.Identifier) { + const sourceIdentifierPredicate = sourcePredicate.predicate as IdentifierTypePredicate; + const targetIdentifierPredicate = targetPredicate.predicate as IdentifierTypePredicate; + if (sourceIdentifierPredicate.parameterIndex !== targetIdentifierPredicate.parameterIndex) { + if (reportErrors) { + reportError(Diagnostics.Parameter_0_is_not_in_the_same_position_as_parameter_1, sourceIdentifierPredicate.parameterName, targetIdentifierPredicate.parameterName); + reportError(Diagnostics.Type_predicate_0_is_not_assignable_to_1, typeToString(source), typeToString(target)); + } + return Ternary.False; + } + } + const related = isRelatedTo(sourcePredicate.predicate.type, targetPredicate.predicate.type, reportErrors, headMessage); + if (related === Ternary.False && reportErrors) { + reportError(Diagnostics.Type_predicate_0_is_not_assignable_to_1, typeToString(source), typeToString(target)); + } + return related; + } + return Ternary.True; } if (source.flags & TypeFlags.FreshObjectLiteral) { @@ -5619,65 +5629,6 @@ namespace ts { result &= related; } - if (source.typePredicate && target.typePredicate) { - const sourcePredicate = source.typePredicate; - const targetPredicate = target.typePredicate; - if (source.typePredicate.kind !== target.typePredicate.kind) { - if (reportErrors) { - reportError(Diagnostics.A_this_based_type_guard_is_not_assignable_to_a_parameter_based_type_guard); - } - return Ternary.False; - } - if (!(isIdentifierTypePredicate(sourcePredicate) && isIdentifierTypePredicate(targetPredicate))) { - if (!isTypeIdenticalTo(sourcePredicate.type, targetPredicate.type)) { - if (reportErrors) { - const sourceTypeText = typeToString(sourcePredicate.type); - const targetTypeText = typeToString(targetPredicate.type); - reportError(Diagnostics.Type_0_is_not_assignable_to_type_1, - sourceTypeText, - targetTypeText); - } - return Ternary.False; - } - } - else { - const hasDifferentParameterIndex = sourcePredicate.parameterIndex !== targetPredicate.parameterIndex; - let hasDifferentTypes: boolean; - if (hasDifferentParameterIndex || - (hasDifferentTypes = !isTypeIdenticalTo(sourcePredicate.type, targetPredicate.type))) { - - if (reportErrors) { - const sourceParamText = sourcePredicate.parameterName; - const targetParamText = targetPredicate.parameterName; - const sourceTypeText = typeToString(sourcePredicate.type); - const targetTypeText = typeToString(targetPredicate.type); - - if (hasDifferentParameterIndex) { - reportError(Diagnostics.Parameter_0_is_not_in_the_same_position_as_parameter_1, - sourceParamText, - targetParamText); - } - else if (hasDifferentTypes) { - reportError(Diagnostics.Type_0_is_not_assignable_to_type_1, - sourceTypeText, - targetTypeText); - } - - reportError(Diagnostics.Type_predicate_0_is_not_assignable_to_1, - `${sourceParamText} is ${sourceTypeText}`, - `${targetParamText} is ${targetTypeText}`); - } - return Ternary.False; - } - } - } - else if (!source.typePredicate && target.typePredicate) { - if (reportErrors) { - reportError(Diagnostics.Signature_0_must_have_a_type_predicate, signatureToString(source)); - } - return Ternary.False; - } - const targetReturnType = getReturnTypeOfSignature(target); if (targetReturnType === voidType) return result; const sourceReturnType = getReturnTypeOfSignature(source); @@ -6239,6 +6190,11 @@ namespace ts { inferFromTypes(sourceTypes[i], targetTypes[i]); } } + else if (source.flags & TypeFlags.PredicateType && target.flags & TypeFlags.PredicateType) { + if ((source as PredicateType).predicate.kind === (target as PredicateType).predicate.kind) { + inferFromTypes((source as PredicateType).predicate.type, (target as PredicateType).predicate.type); + } + } else if (source.flags & TypeFlags.Tuple && target.flags & TypeFlags.Tuple && (source).elementTypes.length === (target).elementTypes.length) { // If source and target are tuples of the same size, infer from element types const sourceTypes = (source).elementTypes; @@ -6331,21 +6287,7 @@ namespace ts { function inferFromSignature(source: Signature, target: Signature) { forEachMatchingParameterType(source, target, inferFromTypes); - if (source.typePredicate && target.typePredicate) { - if (target.typePredicate.kind === source.typePredicate.kind) { - if ((target.typePredicate.kind === TypePredicateKind.Identifier - && (target.typePredicate as IdentifierTypePredicate).parameterIndex === (source.typePredicate as IdentifierTypePredicate).parameterIndex) - || target.typePredicate.kind === TypePredicateKind.This) { - // Return types from type predicates are treated as booleans. In order to infer types - // from type predicates we would need to infer using the type within the type predicate - // (i.e. 'Foo' from 'x is Foo'). - inferFromTypes(source.typePredicate.type, target.typePredicate.type); - } - } - } - else { - inferFromTypes(getReturnTypeOfSignature(source), getReturnTypeOfSignature(target)); - } + inferFromTypes(getReturnTypeOfSignature(source), getReturnTypeOfSignature(target)); } function inferFromIndexTypes(source: Type, target: Type, sourceKind: IndexKind, targetKind: IndexKind) { @@ -6791,11 +6733,12 @@ namespace ts { return type; } const signature = getResolvedSignature(expr); + const predicateType = getReturnTypeOfSignature(signature); - if (!signature.typePredicate) { + if (!predicateType || !(predicateType.flags & TypeFlags.PredicateType)) { return type; } - const predicate = signature.typePredicate; + const predicate = (predicateType as PredicateType).predicate; if (isIdentifierTypePredicate(predicate)) { const callExpression = expr as CallExpression; if (callExpression.arguments[predicate.parameterIndex] && @@ -6819,7 +6762,7 @@ namespace ts { return type; } - return narrowTypeByThisTypePredicate(type, (memberType as PredicateType).predicate, expr, assumeTrue); + return narrowTypeByThisTypePredicate(type, (memberType as PredicateType).predicate as ThisTypePredicate, expr, assumeTrue); } function narrowTypeByThisTypePredicate(type: Type, predicate: ThisTypePredicate, expression: Expression, assumeTrue: boolean): Type { @@ -11119,8 +11062,12 @@ namespace ts { if (node.type) { if (node.type.kind === SyntaxKind.TypePredicate) { - const typePredicate = getSignatureFromDeclaration(node).typePredicate; - const typePredicateNode = node.type; + const returnType = getReturnTypeOfSignature(getSignatureFromDeclaration(node)); + if (!returnType || !(returnType.flags & TypeFlags.PredicateType)) { + return; + } + const typePredicate = (returnType as PredicateType).predicate; + const typePredicateNode = node.type as TypePredicateNode; checkSourceElement(typePredicateNode); if (isIdentifierTypePredicate(typePredicate)) { if (typePredicate.parameterIndex >= 0) { @@ -13126,7 +13073,7 @@ namespace ts { error(node.expression, Diagnostics.Return_type_of_constructor_signature_must_be_assignable_to_the_instance_type_of_the_class); } } - else if (func.type || isGetAccessorWithAnnotatatedSetAccessor(func) || signature.typePredicate) { + else if (func.type || isGetAccessorWithAnnotatatedSetAccessor(func) || returnType.flags & TypeFlags.PredicateType) { if (isAsyncFunctionLike(func)) { const promisedType = getPromisedType(returnType); const awaitedType = checkAwaitedType(exprType, node.expression, Diagnostics.Return_expression_in_async_function_does_not_have_a_valid_callable_then_member); diff --git a/src/compiler/types.ts b/src/compiler/types.ts index 54eb4f449dd..9358ec24333 100644 --- a/src/compiler/types.ts +++ b/src/compiler/types.ts @@ -2143,7 +2143,7 @@ namespace ts { // Predicate types (TypeFlags.Predicate) export interface PredicateType extends Type { - predicate: ThisTypePredicate; + predicate: ThisTypePredicate | IdentifierTypePredicate; } // String literal types (TypeFlags.StringLiteral) @@ -2262,7 +2262,6 @@ namespace ts { declaration: SignatureDeclaration; // Originating declaration typeParameters: TypeParameter[]; // Type parameters (undefined if non-generic) parameters: Symbol[]; // Parameters - typePredicate?: ThisTypePredicate | IdentifierTypePredicate; // Type predicate /* @internal */ resolvedReturnType: Type; // Resolved return type /* @internal */ diff --git a/tests/baselines/reference/arrayBufferIsViewNarrowsType.types b/tests/baselines/reference/arrayBufferIsViewNarrowsType.types index 129b7d601d8..b9d4f3db81b 100644 --- a/tests/baselines/reference/arrayBufferIsViewNarrowsType.types +++ b/tests/baselines/reference/arrayBufferIsViewNarrowsType.types @@ -4,7 +4,7 @@ var obj: Object; >Object : Object if (ArrayBuffer.isView(obj)) { ->ArrayBuffer.isView(obj) : boolean +>ArrayBuffer.isView(obj) : arg is ArrayBufferView >ArrayBuffer.isView : (arg: any) => arg is ArrayBufferView >ArrayBuffer : ArrayBufferConstructor >isView : (arg: any) => arg is ArrayBufferView diff --git a/tests/baselines/reference/isArray.types b/tests/baselines/reference/isArray.types index bc452b12bef..de54e9d064c 100644 --- a/tests/baselines/reference/isArray.types +++ b/tests/baselines/reference/isArray.types @@ -4,7 +4,7 @@ var maybeArray: number | number[]; if (Array.isArray(maybeArray)) { ->Array.isArray(maybeArray) : boolean +>Array.isArray(maybeArray) : arg is any[] >Array.isArray : (arg: any) => arg is any[] >Array : ArrayConstructor >isArray : (arg: any) => arg is any[] diff --git a/tests/baselines/reference/stringLiteralCheckedInIf02.types b/tests/baselines/reference/stringLiteralCheckedInIf02.types index 79f4c6a223a..f91eea03097 100644 --- a/tests/baselines/reference/stringLiteralCheckedInIf02.types +++ b/tests/baselines/reference/stringLiteralCheckedInIf02.types @@ -31,7 +31,7 @@ function f(foo: T) { >T : ("a" | "b")[] | "a" | "b" if (isS(foo)) { ->isS(foo) : boolean +>isS(foo) : t is "a" | "b" >isS : (t: ("a" | "b")[] | "a" | "b") => t is "a" | "b" >foo : ("a" | "b")[] | "a" | "b" diff --git a/tests/baselines/reference/stringLiteralTypesAsTags01.errors.txt b/tests/baselines/reference/stringLiteralTypesAsTags01.errors.txt index 6e4f8943fb6..de3b7be2612 100644 --- a/tests/baselines/reference/stringLiteralTypesAsTags01.errors.txt +++ b/tests/baselines/reference/stringLiteralTypesAsTags01.errors.txt @@ -1,10 +1,7 @@ -tests/cases/conformance/types/stringLiteral/stringLiteralTypesAsTags01.ts(18,10): error TS2382: Specialized overload signature is not assignable to any non-specialized signature. -tests/cases/conformance/types/stringLiteral/stringLiteralTypesAsTags01.ts(19,10): error TS2382: Specialized overload signature is not assignable to any non-specialized signature. -tests/cases/conformance/types/stringLiteral/stringLiteralTypesAsTags01.ts(20,10): error TS2394: Overload signature is not compatible with function implementation. tests/cases/conformance/types/stringLiteral/stringLiteralTypesAsTags01.ts(22,21): error TS2304: Cannot find name 'is'. -==== tests/cases/conformance/types/stringLiteral/stringLiteralTypesAsTags01.ts (4 errors) ==== +==== tests/cases/conformance/types/stringLiteral/stringLiteralTypesAsTags01.ts (1 errors) ==== type Kind = "A" | "B" @@ -23,14 +20,8 @@ tests/cases/conformance/types/stringLiteral/stringLiteralTypesAsTags01.ts(22,21) } function hasKind(entity: Entity, kind: "A"): entity is A; - ~~~~~~~ -!!! error TS2382: Specialized overload signature is not assignable to any non-specialized signature. function hasKind(entity: Entity, kind: "B"): entity is B; - ~~~~~~~ -!!! error TS2382: Specialized overload signature is not assignable to any non-specialized signature. function hasKind(entity: Entity, kind: Kind): entity is Entity; - ~~~~~~~ -!!! error TS2394: Overload signature is not compatible with function implementation. function hasKind(entity: Entity, kind: Kind): boolean { return kind === is; ~~ diff --git a/tests/baselines/reference/typeGuardFunction.types b/tests/baselines/reference/typeGuardFunction.types index 50a5fcaf324..9bab1e7ca2c 100644 --- a/tests/baselines/reference/typeGuardFunction.types +++ b/tests/baselines/reference/typeGuardFunction.types @@ -54,7 +54,7 @@ var b: B; // Basic if (isC(a)) { ->isC(a) : boolean +>isC(a) : p1 is C >isC : (p1: any) => p1 is C >a : A @@ -70,7 +70,7 @@ var subType: C; >C : C if(isA(subType)) { ->isA(subType) : boolean +>isA(subType) : p1 is A >isA : (p1: any) => p1 is A >subType : C @@ -87,7 +87,7 @@ var union: A | B; >B : B if(isA(union)) { ->isA(union) : boolean +>isA(union) : p1 is A >isA : (p1: any) => p1 is A >union : A | B @@ -118,7 +118,7 @@ declare function isC_multipleParams(p1, p2): p1 is C; >C : C if (isC_multipleParams(a, 0)) { ->isC_multipleParams(a, 0) : boolean +>isC_multipleParams(a, 0) : p1 is C >isC_multipleParams : (p1: any, p2: any) => p1 is C >a : A >0 : number @@ -197,7 +197,7 @@ declare function acceptingBoolean(a: boolean); acceptingBoolean(isA(a)); >acceptingBoolean(isA(a)) : any >acceptingBoolean : (a: boolean) => any ->isA(a) : boolean +>isA(a) : p1 is A >isA : (p1: any) => p1 is A >a : A @@ -223,8 +223,8 @@ let union2: C | B; let union3: boolean | B = isA(union2) || union2; >union3 : boolean | B >B : B ->isA(union2) || union2 : boolean | B ->isA(union2) : boolean +>isA(union2) || union2 : p1 is A | B +>isA(union2) : p1 is A >isA : (p1: any) => p1 is A >union2 : C | B >union2 : B diff --git a/tests/baselines/reference/typeGuardFunctionErrors.errors.txt b/tests/baselines/reference/typeGuardFunctionErrors.errors.txt index 2d40520a8ce..445738e9783 100644 --- a/tests/baselines/reference/typeGuardFunctionErrors.errors.txt +++ b/tests/baselines/reference/typeGuardFunctionErrors.errors.txt @@ -1,4 +1,4 @@ -tests/cases/conformance/expressions/typeGuards/typeGuardFunctionErrors.ts(15,12): error TS2322: Type 'string' is not assignable to type 'boolean'. +tests/cases/conformance/expressions/typeGuards/typeGuardFunctionErrors.ts(15,12): error TS2322: Type 'string' is not assignable to type 'x is A'. tests/cases/conformance/expressions/typeGuards/typeGuardFunctionErrors.ts(22,33): error TS2304: Cannot find name 'x'. tests/cases/conformance/expressions/typeGuards/typeGuardFunctionErrors.ts(26,33): error TS1225: Cannot find parameter 'x'. tests/cases/conformance/expressions/typeGuards/typeGuardFunctionErrors.ts(30,10): error TS2391: Function implementation is missing or not immediately following the declaration. @@ -16,8 +16,7 @@ tests/cases/conformance/expressions/typeGuards/typeGuardFunctionErrors.ts(70,7): tests/cases/conformance/expressions/typeGuards/typeGuardFunctionErrors.ts(75,46): error TS2345: Argument of type '(p1: any) => p1 is C' is not assignable to parameter of type '(p1: any) => p1 is B'. Type predicate 'p1 is C' is not assignable to 'p1 is B'. Type 'C' is not assignable to type 'B'. -tests/cases/conformance/expressions/typeGuards/typeGuardFunctionErrors.ts(79,1): error TS2322: Type '(p1: any, p2: any) => boolean' is not assignable to type '(p1: any, p2: any) => p1 is A'. - Signature '(p1: any, p2: any): boolean' must have a type predicate. + Property 'propB' is missing in type 'C'. tests/cases/conformance/expressions/typeGuards/typeGuardFunctionErrors.ts(85,1): error TS2322: Type '(p1: any, p2: any) => p2 is A' is not assignable to type '(p1: any, p2: any) => p1 is A'. Type predicate 'p2 is A' is not assignable to 'p1 is A'. Parameter 'p2' is not in the same position as parameter 'p1'. @@ -25,7 +24,6 @@ tests/cases/conformance/expressions/typeGuards/typeGuardFunctionErrors.ts(91,1): tests/cases/conformance/expressions/typeGuards/typeGuardFunctionErrors.ts(96,9): error TS1228: A type predicate is only allowed in return type position for functions and methods. tests/cases/conformance/expressions/typeGuards/typeGuardFunctionErrors.ts(97,16): error TS1228: A type predicate is only allowed in return type position for functions and methods. tests/cases/conformance/expressions/typeGuards/typeGuardFunctionErrors.ts(98,20): error TS1228: A type predicate is only allowed in return type position for functions and methods. -tests/cases/conformance/expressions/typeGuards/typeGuardFunctionErrors.ts(104,25): error TS1228: A type predicate is only allowed in return type position for functions and methods. tests/cases/conformance/expressions/typeGuards/typeGuardFunctionErrors.ts(105,16): error TS2322: Type 'boolean' is not assignable to type 'D'. Property 'm1' is missing in type 'Boolean'. tests/cases/conformance/expressions/typeGuards/typeGuardFunctionErrors.ts(105,16): error TS2409: Return type of constructor signature must be assignable to the instance type of the class @@ -41,7 +39,7 @@ tests/cases/conformance/expressions/typeGuards/typeGuardFunctionErrors.ts(133,34 tests/cases/conformance/expressions/typeGuards/typeGuardFunctionErrors.ts(137,39): error TS1230: A type predicate cannot reference element 'p1' in a binding pattern. -==== tests/cases/conformance/expressions/typeGuards/typeGuardFunctionErrors.ts (34 errors) ==== +==== tests/cases/conformance/expressions/typeGuards/typeGuardFunctionErrors.ts (32 errors) ==== class A { propA: number; @@ -58,7 +56,7 @@ tests/cases/conformance/expressions/typeGuards/typeGuardFunctionErrors.ts(137,39 function hasANonBooleanReturnStatement(x): x is A { return ''; ~~ -!!! error TS2322: Type 'string' is not assignable to type 'boolean'. +!!! error TS2322: Type 'string' is not assignable to type 'x is A'. } function hasTypeGuardTypeInsideTypeGuardType(x): x is x is A { @@ -150,13 +148,11 @@ tests/cases/conformance/expressions/typeGuards/typeGuardFunctionErrors.ts(137,39 !!! error TS2345: Argument of type '(p1: any) => p1 is C' is not assignable to parameter of type '(p1: any) => p1 is B'. !!! error TS2345: Type predicate 'p1 is C' is not assignable to 'p1 is B'. !!! error TS2345: Type 'C' is not assignable to type 'B'. +!!! error TS2345: Property 'propB' is missing in type 'C'. // Boolean not assignable to type guard var assign1: (p1, p2) => p1 is A; assign1 = function(p1, p2): boolean { - ~~~~~~~ -!!! error TS2322: Type '(p1: any, p2: any) => boolean' is not assignable to type '(p1: any, p2: any) => p1 is A'. -!!! error TS2322: Signature '(p1: any, p2: any): boolean' must have a type predicate. return true; }; @@ -194,8 +190,6 @@ tests/cases/conformance/expressions/typeGuards/typeGuardFunctionErrors.ts(137,39 // Non-compatiable type predicate positions for signature declarations class D { constructor(p1: A): p1 is C { - ~~~~~~~ -!!! error TS1228: A type predicate is only allowed in return type position for functions and methods. return true; ~~~~ !!! error TS2322: Type 'boolean' is not assignable to type 'D'. diff --git a/tests/baselines/reference/typeGuardFunctionGenerics.types b/tests/baselines/reference/typeGuardFunctionGenerics.types index c4655e71f0c..1f2ad2b69be 100644 --- a/tests/baselines/reference/typeGuardFunctionGenerics.types +++ b/tests/baselines/reference/typeGuardFunctionGenerics.types @@ -100,7 +100,7 @@ let test1: boolean = funA(isB); >isB : (p1: any) => p1 is B if (funB(retC, a)) { ->funB(retC, a) : boolean +>funB(retC, a) : p2 is C >funB : (p1: (p1: any) => T, p2: any) => p2 is T >retC : (x: any) => C >a : A @@ -118,7 +118,7 @@ let test2: B = funC(isB); >isB : (p1: any) => p1 is B if (funD(isC, a)) { ->funD(isC, a) : boolean +>funD(isC, a) : p2 is C >funD : (p1: (p1: any) => p1 is T, p2: any) => p2 is T >isC : (p1: any) => p1 is C >a : A diff --git a/tests/baselines/reference/typeGuardFunctionOfFormThis.types b/tests/baselines/reference/typeGuardFunctionOfFormThis.types index 6b21fea3457..e91c77dd07a 100644 --- a/tests/baselines/reference/typeGuardFunctionOfFormThis.types +++ b/tests/baselines/reference/typeGuardFunctionOfFormThis.types @@ -45,7 +45,7 @@ let a: RoyalGuard = new FollowerGuard(); >FollowerGuard : typeof FollowerGuard if (a.isLeader()) { ->a.isLeader() : boolean +>a.isLeader() : this is LeadGuard >a.isLeader : () => this is LeadGuard >a : RoyalGuard >isLeader : () => this is LeadGuard @@ -57,7 +57,7 @@ if (a.isLeader()) { >lead : () => void } else if (a.isFollower()) { ->a.isFollower() : boolean +>a.isFollower() : this is FollowerGuard >a.isFollower : () => this is FollowerGuard >a : RoyalGuard >isFollower : () => this is FollowerGuard @@ -78,7 +78,7 @@ let b: GuardInterface; >GuardInterface : GuardInterface if (b.isLeader()) { ->b.isLeader() : boolean +>b.isLeader() : this is LeadGuard >b.isLeader : () => this is LeadGuard >b : GuardInterface >isLeader : () => this is LeadGuard @@ -90,7 +90,7 @@ if (b.isLeader()) { >lead : () => void } else if (b.isFollower()) { ->b.isFollower() : boolean +>b.isFollower() : this is FollowerGuard >b.isFollower : () => this is FollowerGuard >b : GuardInterface >isFollower : () => this is FollowerGuard @@ -103,8 +103,8 @@ else if (b.isFollower()) { } if (((a.isLeader)())) { ->((a.isLeader)()) : boolean ->(a.isLeader)() : boolean +>((a.isLeader)()) : this is LeadGuard +>(a.isLeader)() : this is LeadGuard >(a.isLeader) : () => this is LeadGuard >a.isLeader : () => this is LeadGuard >a : RoyalGuard @@ -117,8 +117,8 @@ if (((a.isLeader)())) { >lead : () => void } else if (((a).isFollower())) { ->((a).isFollower()) : boolean ->(a).isFollower() : boolean +>((a).isFollower()) : this is FollowerGuard +>(a).isFollower() : this is FollowerGuard >(a).isFollower : () => this is FollowerGuard >(a) : RoyalGuard >a : RoyalGuard @@ -132,8 +132,8 @@ else if (((a).isFollower())) { } if (((a["isLeader"])())) { ->((a["isLeader"])()) : boolean ->(a["isLeader"])() : boolean +>((a["isLeader"])()) : this is LeadGuard +>(a["isLeader"])() : this is LeadGuard >(a["isLeader"]) : () => this is LeadGuard >a["isLeader"] : () => this is LeadGuard >a : RoyalGuard @@ -146,8 +146,8 @@ if (((a["isLeader"])())) { >lead : () => void } else if (((a)["isFollower"]())) { ->((a)["isFollower"]()) : boolean ->(a)["isFollower"]() : boolean +>((a)["isFollower"]()) : this is FollowerGuard +>(a)["isFollower"]() : this is FollowerGuard >(a)["isFollower"] : () => this is FollowerGuard >(a) : RoyalGuard >a : RoyalGuard @@ -166,7 +166,7 @@ var holder2 = {a}; >a : RoyalGuard if (holder2.a.isLeader()) { ->holder2.a.isLeader() : boolean +>holder2.a.isLeader() : this is LeadGuard >holder2.a.isLeader : () => this is LeadGuard >holder2.a : RoyalGuard >holder2 : { a: RoyalGuard; } @@ -232,7 +232,7 @@ let guard = new ArrowGuard(); >ArrowGuard : typeof ArrowGuard if (guard.isElite()) { ->guard.isElite() : boolean +>guard.isElite() : this is ArrowElite >guard.isElite : () => this is ArrowElite >guard : ArrowGuard >isElite : () => this is ArrowElite @@ -244,7 +244,7 @@ if (guard.isElite()) { >defend : () => void } else if (guard.isMedic()) { ->guard.isMedic() : boolean +>guard.isMedic() : this is ArrowMedic >guard.isMedic : () => this is ArrowMedic >guard : ArrowGuard >isMedic : () => this is ArrowMedic @@ -297,7 +297,7 @@ let crate: Crate<{}>; >Crate : Crate if (crate.isSundries()) { ->crate.isSundries() : boolean +>crate.isSundries() : this is Crate >crate.isSundries : () => this is Crate >crate : Crate<{}> >isSundries : () => this is Crate @@ -312,7 +312,7 @@ if (crate.isSundries()) { >true : boolean } else if (crate.isSupplies()) { ->crate.isSupplies() : boolean +>crate.isSupplies() : this is Crate >crate.isSupplies : () => this is Crate >crate : Crate<{}> >isSupplies : () => this is Crate @@ -405,7 +405,7 @@ a.isFollower = mimic.isFollower; >isFollower : () => this is MimicFollower if (mimic.isFollower()) { ->mimic.isFollower() : boolean +>mimic.isFollower() : this is MimicFollower >mimic.isFollower : () => this is MimicFollower >mimic : MimicGuard >isFollower : () => this is MimicFollower diff --git a/tests/baselines/reference/typeGuardFunctionOfFormThisErrors.errors.txt b/tests/baselines/reference/typeGuardFunctionOfFormThisErrors.errors.txt index 605282f19bb..9f9f5d6533c 100644 --- a/tests/baselines/reference/typeGuardFunctionOfFormThisErrors.errors.txt +++ b/tests/baselines/reference/typeGuardFunctionOfFormThisErrors.errors.txt @@ -1,11 +1,17 @@ tests/cases/conformance/expressions/typeGuards/typeGuardFunctionOfFormThisErrors.ts(23,1): error TS2322: Type '() => this is LeadGuard' is not assignable to type '() => this is FollowerGuard'. - Type 'LeadGuard' is not assignable to type 'FollowerGuard'. + Type predicate 'this is LeadGuard' is not assignable to 'this is FollowerGuard'. + Type 'LeadGuard' is not assignable to type 'FollowerGuard'. + Property 'follow' is missing in type 'LeadGuard'. tests/cases/conformance/expressions/typeGuards/typeGuardFunctionOfFormThisErrors.ts(24,1): error TS2322: Type '() => this is FollowerGuard' is not assignable to type '() => this is LeadGuard'. - Type 'FollowerGuard' is not assignable to type 'LeadGuard'. + Type predicate 'this is FollowerGuard' is not assignable to 'this is LeadGuard'. + Type 'FollowerGuard' is not assignable to type 'LeadGuard'. + Property 'lead' is missing in type 'FollowerGuard'. tests/cases/conformance/expressions/typeGuards/typeGuardFunctionOfFormThisErrors.ts(26,1): error TS2322: Type '() => this is LeadGuard' is not assignable to type '() => this is FollowerGuard'. - Type 'LeadGuard' is not assignable to type 'FollowerGuard'. + Type predicate 'this is LeadGuard' is not assignable to 'this is FollowerGuard'. + Type 'LeadGuard' is not assignable to type 'FollowerGuard'. tests/cases/conformance/expressions/typeGuards/typeGuardFunctionOfFormThisErrors.ts(27,1): error TS2322: Type '() => this is FollowerGuard' is not assignable to type '() => this is LeadGuard'. - Type 'FollowerGuard' is not assignable to type 'LeadGuard'. + Type predicate 'this is FollowerGuard' is not assignable to 'this is LeadGuard'. + Type 'FollowerGuard' is not assignable to type 'LeadGuard'. tests/cases/conformance/expressions/typeGuards/typeGuardFunctionOfFormThisErrors.ts(29,32): error TS2526: A 'this' type is available only in a non-static member of a class or interface. tests/cases/conformance/expressions/typeGuards/typeGuardFunctionOfFormThisErrors.ts(55,7): error TS2339: Property 'follow' does not exist on type 'RoyalGuard'. tests/cases/conformance/expressions/typeGuards/typeGuardFunctionOfFormThisErrors.ts(58,7): error TS2339: Property 'lead' does not exist on type 'RoyalGuard'. @@ -37,20 +43,26 @@ tests/cases/conformance/expressions/typeGuards/typeGuardFunctionOfFormThisErrors b.isFollower = b.isLeader; ~~~~~~~~~~~~ !!! error TS2322: Type '() => this is LeadGuard' is not assignable to type '() => this is FollowerGuard'. -!!! error TS2322: Type 'LeadGuard' is not assignable to type 'FollowerGuard'. +!!! error TS2322: Type predicate 'this is LeadGuard' is not assignable to 'this is FollowerGuard'. +!!! error TS2322: Type 'LeadGuard' is not assignable to type 'FollowerGuard'. +!!! error TS2322: Property 'follow' is missing in type 'LeadGuard'. b.isLeader = b.isFollower; ~~~~~~~~~~ !!! error TS2322: Type '() => this is FollowerGuard' is not assignable to type '() => this is LeadGuard'. -!!! error TS2322: Type 'FollowerGuard' is not assignable to type 'LeadGuard'. +!!! error TS2322: Type predicate 'this is FollowerGuard' is not assignable to 'this is LeadGuard'. +!!! error TS2322: Type 'FollowerGuard' is not assignable to type 'LeadGuard'. +!!! error TS2322: Property 'lead' is missing in type 'FollowerGuard'. a.isFollower = a.isLeader; ~~~~~~~~~~~~ !!! error TS2322: Type '() => this is LeadGuard' is not assignable to type '() => this is FollowerGuard'. -!!! error TS2322: Type 'LeadGuard' is not assignable to type 'FollowerGuard'. +!!! error TS2322: Type predicate 'this is LeadGuard' is not assignable to 'this is FollowerGuard'. +!!! error TS2322: Type 'LeadGuard' is not assignable to type 'FollowerGuard'. a.isLeader = a.isFollower; ~~~~~~~~~~ !!! error TS2322: Type '() => this is FollowerGuard' is not assignable to type '() => this is LeadGuard'. -!!! error TS2322: Type 'FollowerGuard' is not assignable to type 'LeadGuard'. +!!! error TS2322: Type predicate 'this is FollowerGuard' is not assignable to 'this is LeadGuard'. +!!! error TS2322: Type 'FollowerGuard' is not assignable to type 'LeadGuard'. function invalidGuard(c: any): this is number { ~~~~ diff --git a/tests/baselines/reference/typeGuardOfFormIsType.types b/tests/baselines/reference/typeGuardOfFormIsType.types index e2059be7b63..aa8f8cc7d60 100644 --- a/tests/baselines/reference/typeGuardOfFormIsType.types +++ b/tests/baselines/reference/typeGuardOfFormIsType.types @@ -67,7 +67,7 @@ str = isC1(c1Orc2) && c1Orc2.p1; // C1 >str = isC1(c1Orc2) && c1Orc2.p1 : string >str : string >isC1(c1Orc2) && c1Orc2.p1 : string ->isC1(c1Orc2) : boolean +>isC1(c1Orc2) : x is C1 >isC1 : (x: any) => x is C1 >c1Orc2 : C1 | C2 >c1Orc2.p1 : string @@ -78,7 +78,7 @@ num = isC2(c1Orc2) && c1Orc2.p2; // C2 >num = isC2(c1Orc2) && c1Orc2.p2 : number >num : number >isC2(c1Orc2) && c1Orc2.p2 : number ->isC2(c1Orc2) : boolean +>isC2(c1Orc2) : x is C2 >isC2 : (x: any) => x is C2 >c1Orc2 : C1 | C2 >c1Orc2.p2 : number @@ -89,7 +89,7 @@ str = isD1(c1Orc2) && c1Orc2.p1; // D1 >str = isD1(c1Orc2) && c1Orc2.p1 : string >str : string >isD1(c1Orc2) && c1Orc2.p1 : string ->isD1(c1Orc2) : boolean +>isD1(c1Orc2) : x is D1 >isD1 : (x: any) => x is D1 >c1Orc2 : C1 | C2 >c1Orc2.p1 : string @@ -100,7 +100,7 @@ num = isD1(c1Orc2) && c1Orc2.p3; // D1 >num = isD1(c1Orc2) && c1Orc2.p3 : number >num : number >isD1(c1Orc2) && c1Orc2.p3 : number ->isD1(c1Orc2) : boolean +>isD1(c1Orc2) : x is D1 >isD1 : (x: any) => x is D1 >c1Orc2 : C1 | C2 >c1Orc2.p3 : number @@ -116,7 +116,7 @@ num = isC2(c2Ord1) && c2Ord1.p2; // C2 >num = isC2(c2Ord1) && c2Ord1.p2 : number >num : number >isC2(c2Ord1) && c2Ord1.p2 : number ->isC2(c2Ord1) : boolean +>isC2(c2Ord1) : x is C2 >isC2 : (x: any) => x is C2 >c2Ord1 : C2 | D1 >c2Ord1.p2 : number @@ -127,7 +127,7 @@ num = isD1(c2Ord1) && c2Ord1.p3; // D1 >num = isD1(c2Ord1) && c2Ord1.p3 : number >num : number >isD1(c2Ord1) && c2Ord1.p3 : number ->isD1(c2Ord1) : boolean +>isD1(c2Ord1) : x is D1 >isD1 : (x: any) => x is D1 >c2Ord1 : C2 | D1 >c2Ord1.p3 : number @@ -138,7 +138,7 @@ str = isD1(c2Ord1) && c2Ord1.p1; // D1 >str = isD1(c2Ord1) && c2Ord1.p1 : string >str : string >isD1(c2Ord1) && c2Ord1.p1 : string ->isD1(c2Ord1) : boolean +>isD1(c2Ord1) : x is D1 >isD1 : (x: any) => x is D1 >c2Ord1 : C2 | D1 >c2Ord1.p1 : string @@ -150,7 +150,7 @@ var r2: C2 | D1 = isC1(c2Ord1) && c2Ord1; // C2 | D1 >C2 : C2 >D1 : D1 >isC1(c2Ord1) && c2Ord1 : D1 ->isC1(c2Ord1) : boolean +>isC1(c2Ord1) : x is C1 >isC1 : (x: any) => x is C1 >c2Ord1 : C2 | D1 >c2Ord1 : D1 diff --git a/tests/baselines/reference/typeGuardOfFormIsTypeOnInterfaces.types b/tests/baselines/reference/typeGuardOfFormIsTypeOnInterfaces.types index ea169e95413..4e28e6a4d38 100644 --- a/tests/baselines/reference/typeGuardOfFormIsTypeOnInterfaces.types +++ b/tests/baselines/reference/typeGuardOfFormIsTypeOnInterfaces.types @@ -98,7 +98,7 @@ str = isC1(c1Orc2) && c1Orc2.p1; // C1 >str = isC1(c1Orc2) && c1Orc2.p1 : string >str : string >isC1(c1Orc2) && c1Orc2.p1 : string ->isC1(c1Orc2) : boolean +>isC1(c1Orc2) : x is C1 >isC1 : (x: any) => x is C1 >c1Orc2 : C1 | C2 >c1Orc2.p1 : string @@ -109,7 +109,7 @@ num = isC2(c1Orc2) && c1Orc2.p2; // C2 >num = isC2(c1Orc2) && c1Orc2.p2 : number >num : number >isC2(c1Orc2) && c1Orc2.p2 : number ->isC2(c1Orc2) : boolean +>isC2(c1Orc2) : x is C2 >isC2 : (x: any) => x is C2 >c1Orc2 : C1 | C2 >c1Orc2.p2 : number @@ -120,7 +120,7 @@ str = isD1(c1Orc2) && c1Orc2.p1; // D1 >str = isD1(c1Orc2) && c1Orc2.p1 : string >str : string >isD1(c1Orc2) && c1Orc2.p1 : string ->isD1(c1Orc2) : boolean +>isD1(c1Orc2) : x is D1 >isD1 : (x: any) => x is D1 >c1Orc2 : C1 | C2 >c1Orc2.p1 : string @@ -131,7 +131,7 @@ num = isD1(c1Orc2) && c1Orc2.p3; // D1 >num = isD1(c1Orc2) && c1Orc2.p3 : number >num : number >isD1(c1Orc2) && c1Orc2.p3 : number ->isD1(c1Orc2) : boolean +>isD1(c1Orc2) : x is D1 >isD1 : (x: any) => x is D1 >c1Orc2 : C1 | C2 >c1Orc2.p3 : number @@ -147,7 +147,7 @@ num = isC2(c2Ord1) && c2Ord1.p2; // C2 >num = isC2(c2Ord1) && c2Ord1.p2 : number >num : number >isC2(c2Ord1) && c2Ord1.p2 : number ->isC2(c2Ord1) : boolean +>isC2(c2Ord1) : x is C2 >isC2 : (x: any) => x is C2 >c2Ord1 : C2 | D1 >c2Ord1.p2 : number @@ -158,7 +158,7 @@ num = isD1(c2Ord1) && c2Ord1.p3; // D1 >num = isD1(c2Ord1) && c2Ord1.p3 : number >num : number >isD1(c2Ord1) && c2Ord1.p3 : number ->isD1(c2Ord1) : boolean +>isD1(c2Ord1) : x is D1 >isD1 : (x: any) => x is D1 >c2Ord1 : C2 | D1 >c2Ord1.p3 : number @@ -169,7 +169,7 @@ str = isD1(c2Ord1) && c2Ord1.p1; // D1 >str = isD1(c2Ord1) && c2Ord1.p1 : string >str : string >isD1(c2Ord1) && c2Ord1.p1 : string ->isD1(c2Ord1) : boolean +>isD1(c2Ord1) : x is D1 >isD1 : (x: any) => x is D1 >c2Ord1 : C2 | D1 >c2Ord1.p1 : string @@ -181,7 +181,7 @@ var r2: C2 | D1 = isC1(c2Ord1) && c2Ord1; // C2 | D1 >C2 : C2 >D1 : D1 >isC1(c2Ord1) && c2Ord1 : D1 ->isC1(c2Ord1) : boolean +>isC1(c2Ord1) : x is C1 >isC1 : (x: any) => x is C1 >c2Ord1 : C2 | D1 >c2Ord1 : D1 diff --git a/tests/baselines/reference/typeGuardOfFormThisMember.js b/tests/baselines/reference/typeGuardOfFormThisMember.js index cbf70c4a640..8cb5b89aa90 100644 --- a/tests/baselines/reference/typeGuardOfFormThisMember.js +++ b/tests/baselines/reference/typeGuardOfFormThisMember.js @@ -2,6 +2,7 @@ // There's a 'File' class in the stdlib, wrap with a namespace to avoid collision namespace Test { export class FileSystemObject { + isFSO: this is FileSystemObject; get isFile(): this is File { return this instanceof File; } @@ -27,8 +28,8 @@ namespace Test { let file: FileSystemObject = new File("foo/bar.txt", "foo"); file.isNetworked = false; - file.isNetworked = file.isDirectory; - file.isFile = file.isNetworked; + file.isFSO = file.isFile; + file.isFile = true; let x = file.isFile; if (file.isFile) { file.content; @@ -133,8 +134,8 @@ var Test; Test.Directory = Directory; var file = new File("foo/bar.txt", "foo"); file.isNetworked = false; - file.isNetworked = file.isDirectory; - file.isFile = file.isNetworked; + file.isFSO = file.isFile; + file.isFile = true; var x = file.isFile; if (file.isFile) { file.content; @@ -167,6 +168,7 @@ var Test; declare namespace Test { class FileSystemObject { path: string; + isFSO: this is FileSystemObject; isFile: this is File; isDirectory: this is Directory; isNetworked: this is (Networked & this); diff --git a/tests/baselines/reference/typeGuardOfFormThisMember.symbols b/tests/baselines/reference/typeGuardOfFormThisMember.symbols index 84573ddf0c7..50e15b68ca4 100644 --- a/tests/baselines/reference/typeGuardOfFormThisMember.symbols +++ b/tests/baselines/reference/typeGuardOfFormThisMember.symbols @@ -6,234 +6,235 @@ namespace Test { export class FileSystemObject { >FileSystemObject : Symbol(FileSystemObject, Decl(typeGuardOfFormThisMember.ts, 1, 16)) + isFSO: this is FileSystemObject; +>isFSO : Symbol(isFSO, Decl(typeGuardOfFormThisMember.ts, 2, 32)) +>FileSystemObject : Symbol(FileSystemObject, Decl(typeGuardOfFormThisMember.ts, 1, 16)) + get isFile(): this is File { ->isFile : Symbol(isFile, Decl(typeGuardOfFormThisMember.ts, 2, 32), Decl(typeGuardOfFormThisMember.ts, 5, 3)) ->File : Symbol(File, Decl(typeGuardOfFormThisMember.ts, 14, 2)) +>isFile : Symbol(isFile, Decl(typeGuardOfFormThisMember.ts, 3, 34), Decl(typeGuardOfFormThisMember.ts, 6, 3)) +>File : Symbol(File, Decl(typeGuardOfFormThisMember.ts, 15, 2)) return this instanceof File; >this : Symbol(FileSystemObject, Decl(typeGuardOfFormThisMember.ts, 1, 16)) ->File : Symbol(File, Decl(typeGuardOfFormThisMember.ts, 14, 2)) +>File : Symbol(File, Decl(typeGuardOfFormThisMember.ts, 15, 2)) } set isFile(param) { ->isFile : Symbol(isFile, Decl(typeGuardOfFormThisMember.ts, 2, 32), Decl(typeGuardOfFormThisMember.ts, 5, 3)) ->param : Symbol(param, Decl(typeGuardOfFormThisMember.ts, 6, 13)) +>isFile : Symbol(isFile, Decl(typeGuardOfFormThisMember.ts, 3, 34), Decl(typeGuardOfFormThisMember.ts, 6, 3)) +>param : Symbol(param, Decl(typeGuardOfFormThisMember.ts, 7, 13)) // noop } get isDirectory(): this is Directory { ->isDirectory : Symbol(isDirectory, Decl(typeGuardOfFormThisMember.ts, 8, 3)) ->Directory : Symbol(Directory, Decl(typeGuardOfFormThisMember.ts, 18, 2)) +>isDirectory : Symbol(isDirectory, Decl(typeGuardOfFormThisMember.ts, 9, 3)) +>Directory : Symbol(Directory, Decl(typeGuardOfFormThisMember.ts, 19, 2)) return this instanceof Directory; >this : Symbol(FileSystemObject, Decl(typeGuardOfFormThisMember.ts, 1, 16)) ->Directory : Symbol(Directory, Decl(typeGuardOfFormThisMember.ts, 18, 2)) +>Directory : Symbol(Directory, Decl(typeGuardOfFormThisMember.ts, 19, 2)) } isNetworked: this is (Networked & this); ->isNetworked : Symbol(isNetworked, Decl(typeGuardOfFormThisMember.ts, 11, 3)) ->Networked : Symbol(Networked, Decl(typeGuardOfFormThisMember.ts, 21, 2)) +>isNetworked : Symbol(isNetworked, Decl(typeGuardOfFormThisMember.ts, 12, 3)) +>Networked : Symbol(Networked, Decl(typeGuardOfFormThisMember.ts, 22, 2)) constructor(public path: string) {} ->path : Symbol(path, Decl(typeGuardOfFormThisMember.ts, 13, 14)) +>path : Symbol(path, Decl(typeGuardOfFormThisMember.ts, 14, 14)) } export class File extends FileSystemObject { ->File : Symbol(File, Decl(typeGuardOfFormThisMember.ts, 14, 2)) +>File : Symbol(File, Decl(typeGuardOfFormThisMember.ts, 15, 2)) >FileSystemObject : Symbol(FileSystemObject, Decl(typeGuardOfFormThisMember.ts, 1, 16)) constructor(path: string, public content: string) { super(path); } ->path : Symbol(path, Decl(typeGuardOfFormThisMember.ts, 17, 14)) ->content : Symbol(content, Decl(typeGuardOfFormThisMember.ts, 17, 27)) +>path : Symbol(path, Decl(typeGuardOfFormThisMember.ts, 18, 14)) +>content : Symbol(content, Decl(typeGuardOfFormThisMember.ts, 18, 27)) >super : Symbol(FileSystemObject, Decl(typeGuardOfFormThisMember.ts, 1, 16)) ->path : Symbol(path, Decl(typeGuardOfFormThisMember.ts, 17, 14)) +>path : Symbol(path, Decl(typeGuardOfFormThisMember.ts, 18, 14)) } export class Directory extends FileSystemObject { ->Directory : Symbol(Directory, Decl(typeGuardOfFormThisMember.ts, 18, 2)) +>Directory : Symbol(Directory, Decl(typeGuardOfFormThisMember.ts, 19, 2)) >FileSystemObject : Symbol(FileSystemObject, Decl(typeGuardOfFormThisMember.ts, 1, 16)) children: FileSystemObject[]; ->children : Symbol(children, Decl(typeGuardOfFormThisMember.ts, 19, 50)) +>children : Symbol(children, Decl(typeGuardOfFormThisMember.ts, 20, 50)) >FileSystemObject : Symbol(FileSystemObject, Decl(typeGuardOfFormThisMember.ts, 1, 16)) } export interface Networked { ->Networked : Symbol(Networked, Decl(typeGuardOfFormThisMember.ts, 21, 2)) +>Networked : Symbol(Networked, Decl(typeGuardOfFormThisMember.ts, 22, 2)) host: string; ->host : Symbol(host, Decl(typeGuardOfFormThisMember.ts, 22, 29)) +>host : Symbol(host, Decl(typeGuardOfFormThisMember.ts, 23, 29)) } let file: FileSystemObject = new File("foo/bar.txt", "foo"); ->file : Symbol(file, Decl(typeGuardOfFormThisMember.ts, 26, 4)) +>file : Symbol(file, Decl(typeGuardOfFormThisMember.ts, 27, 4)) >FileSystemObject : Symbol(FileSystemObject, Decl(typeGuardOfFormThisMember.ts, 1, 16)) ->File : Symbol(File, Decl(typeGuardOfFormThisMember.ts, 14, 2)) +>File : Symbol(File, Decl(typeGuardOfFormThisMember.ts, 15, 2)) file.isNetworked = false; ->file.isNetworked : Symbol(FileSystemObject.isNetworked, Decl(typeGuardOfFormThisMember.ts, 11, 3)) ->file : Symbol(file, Decl(typeGuardOfFormThisMember.ts, 26, 4)) ->isNetworked : Symbol(FileSystemObject.isNetworked, Decl(typeGuardOfFormThisMember.ts, 11, 3)) +>file.isNetworked : Symbol(FileSystemObject.isNetworked, Decl(typeGuardOfFormThisMember.ts, 12, 3)) +>file : Symbol(file, Decl(typeGuardOfFormThisMember.ts, 27, 4)) +>isNetworked : Symbol(FileSystemObject.isNetworked, Decl(typeGuardOfFormThisMember.ts, 12, 3)) - file.isNetworked = file.isDirectory; ->file.isNetworked : Symbol(FileSystemObject.isNetworked, Decl(typeGuardOfFormThisMember.ts, 11, 3)) ->file : Symbol(file, Decl(typeGuardOfFormThisMember.ts, 26, 4)) ->isNetworked : Symbol(FileSystemObject.isNetworked, Decl(typeGuardOfFormThisMember.ts, 11, 3)) ->file.isDirectory : Symbol(FileSystemObject.isDirectory, Decl(typeGuardOfFormThisMember.ts, 8, 3)) ->file : Symbol(file, Decl(typeGuardOfFormThisMember.ts, 26, 4)) ->isDirectory : Symbol(FileSystemObject.isDirectory, Decl(typeGuardOfFormThisMember.ts, 8, 3)) + file.isFSO = file.isFile; +>file.isFSO : Symbol(FileSystemObject.isFSO, Decl(typeGuardOfFormThisMember.ts, 2, 32)) +>file : Symbol(file, Decl(typeGuardOfFormThisMember.ts, 27, 4)) +>isFSO : Symbol(FileSystemObject.isFSO, Decl(typeGuardOfFormThisMember.ts, 2, 32)) +>file.isFile : Symbol(FileSystemObject.isFile, Decl(typeGuardOfFormThisMember.ts, 3, 34), Decl(typeGuardOfFormThisMember.ts, 6, 3)) +>file : Symbol(file, Decl(typeGuardOfFormThisMember.ts, 27, 4)) +>isFile : Symbol(FileSystemObject.isFile, Decl(typeGuardOfFormThisMember.ts, 3, 34), Decl(typeGuardOfFormThisMember.ts, 6, 3)) - file.isFile = file.isNetworked; ->file.isFile : Symbol(FileSystemObject.isFile, Decl(typeGuardOfFormThisMember.ts, 2, 32), Decl(typeGuardOfFormThisMember.ts, 5, 3)) ->file : Symbol(file, Decl(typeGuardOfFormThisMember.ts, 26, 4)) ->isFile : Symbol(FileSystemObject.isFile, Decl(typeGuardOfFormThisMember.ts, 2, 32), Decl(typeGuardOfFormThisMember.ts, 5, 3)) ->file.isNetworked : Symbol(FileSystemObject.isNetworked, Decl(typeGuardOfFormThisMember.ts, 11, 3)) ->file : Symbol(file, Decl(typeGuardOfFormThisMember.ts, 26, 4)) ->isNetworked : Symbol(FileSystemObject.isNetworked, Decl(typeGuardOfFormThisMember.ts, 11, 3)) + file.isFile = true; +>file.isFile : Symbol(FileSystemObject.isFile, Decl(typeGuardOfFormThisMember.ts, 3, 34), Decl(typeGuardOfFormThisMember.ts, 6, 3)) +>file : Symbol(file, Decl(typeGuardOfFormThisMember.ts, 27, 4)) +>isFile : Symbol(FileSystemObject.isFile, Decl(typeGuardOfFormThisMember.ts, 3, 34), Decl(typeGuardOfFormThisMember.ts, 6, 3)) let x = file.isFile; ->x : Symbol(x, Decl(typeGuardOfFormThisMember.ts, 30, 4)) ->file.isFile : Symbol(FileSystemObject.isFile, Decl(typeGuardOfFormThisMember.ts, 2, 32), Decl(typeGuardOfFormThisMember.ts, 5, 3)) ->file : Symbol(file, Decl(typeGuardOfFormThisMember.ts, 26, 4)) ->isFile : Symbol(FileSystemObject.isFile, Decl(typeGuardOfFormThisMember.ts, 2, 32), Decl(typeGuardOfFormThisMember.ts, 5, 3)) +>x : Symbol(x, Decl(typeGuardOfFormThisMember.ts, 31, 4)) +>file.isFile : Symbol(FileSystemObject.isFile, Decl(typeGuardOfFormThisMember.ts, 3, 34), Decl(typeGuardOfFormThisMember.ts, 6, 3)) +>file : Symbol(file, Decl(typeGuardOfFormThisMember.ts, 27, 4)) +>isFile : Symbol(FileSystemObject.isFile, Decl(typeGuardOfFormThisMember.ts, 3, 34), Decl(typeGuardOfFormThisMember.ts, 6, 3)) if (file.isFile) { ->file.isFile : Symbol(FileSystemObject.isFile, Decl(typeGuardOfFormThisMember.ts, 2, 32), Decl(typeGuardOfFormThisMember.ts, 5, 3)) ->file : Symbol(file, Decl(typeGuardOfFormThisMember.ts, 26, 4)) ->isFile : Symbol(FileSystemObject.isFile, Decl(typeGuardOfFormThisMember.ts, 2, 32), Decl(typeGuardOfFormThisMember.ts, 5, 3)) +>file.isFile : Symbol(FileSystemObject.isFile, Decl(typeGuardOfFormThisMember.ts, 3, 34), Decl(typeGuardOfFormThisMember.ts, 6, 3)) +>file : Symbol(file, Decl(typeGuardOfFormThisMember.ts, 27, 4)) +>isFile : Symbol(FileSystemObject.isFile, Decl(typeGuardOfFormThisMember.ts, 3, 34), Decl(typeGuardOfFormThisMember.ts, 6, 3)) file.content; ->file.content : Symbol(File.content, Decl(typeGuardOfFormThisMember.ts, 17, 27)) ->file : Symbol(file, Decl(typeGuardOfFormThisMember.ts, 26, 4)) ->content : Symbol(File.content, Decl(typeGuardOfFormThisMember.ts, 17, 27)) +>file.content : Symbol(File.content, Decl(typeGuardOfFormThisMember.ts, 18, 27)) +>file : Symbol(file, Decl(typeGuardOfFormThisMember.ts, 27, 4)) +>content : Symbol(File.content, Decl(typeGuardOfFormThisMember.ts, 18, 27)) if (file.isNetworked) { ->file.isNetworked : Symbol(FileSystemObject.isNetworked, Decl(typeGuardOfFormThisMember.ts, 11, 3)) ->file : Symbol(file, Decl(typeGuardOfFormThisMember.ts, 26, 4)) ->isNetworked : Symbol(FileSystemObject.isNetworked, Decl(typeGuardOfFormThisMember.ts, 11, 3)) +>file.isNetworked : Symbol(FileSystemObject.isNetworked, Decl(typeGuardOfFormThisMember.ts, 12, 3)) +>file : Symbol(file, Decl(typeGuardOfFormThisMember.ts, 27, 4)) +>isNetworked : Symbol(FileSystemObject.isNetworked, Decl(typeGuardOfFormThisMember.ts, 12, 3)) file.host; ->file.host : Symbol(Networked.host, Decl(typeGuardOfFormThisMember.ts, 22, 29)) ->file : Symbol(file, Decl(typeGuardOfFormThisMember.ts, 26, 4)) ->host : Symbol(Networked.host, Decl(typeGuardOfFormThisMember.ts, 22, 29)) +>file.host : Symbol(Networked.host, Decl(typeGuardOfFormThisMember.ts, 23, 29)) +>file : Symbol(file, Decl(typeGuardOfFormThisMember.ts, 27, 4)) +>host : Symbol(Networked.host, Decl(typeGuardOfFormThisMember.ts, 23, 29)) file.content; ->file.content : Symbol(File.content, Decl(typeGuardOfFormThisMember.ts, 17, 27)) ->file : Symbol(file, Decl(typeGuardOfFormThisMember.ts, 26, 4)) ->content : Symbol(File.content, Decl(typeGuardOfFormThisMember.ts, 17, 27)) +>file.content : Symbol(File.content, Decl(typeGuardOfFormThisMember.ts, 18, 27)) +>file : Symbol(file, Decl(typeGuardOfFormThisMember.ts, 27, 4)) +>content : Symbol(File.content, Decl(typeGuardOfFormThisMember.ts, 18, 27)) } } else if (file.isDirectory) { ->file.isDirectory : Symbol(FileSystemObject.isDirectory, Decl(typeGuardOfFormThisMember.ts, 8, 3)) ->file : Symbol(file, Decl(typeGuardOfFormThisMember.ts, 26, 4)) ->isDirectory : Symbol(FileSystemObject.isDirectory, Decl(typeGuardOfFormThisMember.ts, 8, 3)) +>file.isDirectory : Symbol(FileSystemObject.isDirectory, Decl(typeGuardOfFormThisMember.ts, 9, 3)) +>file : Symbol(file, Decl(typeGuardOfFormThisMember.ts, 27, 4)) +>isDirectory : Symbol(FileSystemObject.isDirectory, Decl(typeGuardOfFormThisMember.ts, 9, 3)) file.children; ->file.children : Symbol(Directory.children, Decl(typeGuardOfFormThisMember.ts, 19, 50)) ->file : Symbol(file, Decl(typeGuardOfFormThisMember.ts, 26, 4)) ->children : Symbol(Directory.children, Decl(typeGuardOfFormThisMember.ts, 19, 50)) +>file.children : Symbol(Directory.children, Decl(typeGuardOfFormThisMember.ts, 20, 50)) +>file : Symbol(file, Decl(typeGuardOfFormThisMember.ts, 27, 4)) +>children : Symbol(Directory.children, Decl(typeGuardOfFormThisMember.ts, 20, 50)) } else if (file.isNetworked) { ->file.isNetworked : Symbol(FileSystemObject.isNetworked, Decl(typeGuardOfFormThisMember.ts, 11, 3)) ->file : Symbol(file, Decl(typeGuardOfFormThisMember.ts, 26, 4)) ->isNetworked : Symbol(FileSystemObject.isNetworked, Decl(typeGuardOfFormThisMember.ts, 11, 3)) +>file.isNetworked : Symbol(FileSystemObject.isNetworked, Decl(typeGuardOfFormThisMember.ts, 12, 3)) +>file : Symbol(file, Decl(typeGuardOfFormThisMember.ts, 27, 4)) +>isNetworked : Symbol(FileSystemObject.isNetworked, Decl(typeGuardOfFormThisMember.ts, 12, 3)) file.host; ->file.host : Symbol(Networked.host, Decl(typeGuardOfFormThisMember.ts, 22, 29)) ->file : Symbol(file, Decl(typeGuardOfFormThisMember.ts, 26, 4)) ->host : Symbol(Networked.host, Decl(typeGuardOfFormThisMember.ts, 22, 29)) +>file.host : Symbol(Networked.host, Decl(typeGuardOfFormThisMember.ts, 23, 29)) +>file : Symbol(file, Decl(typeGuardOfFormThisMember.ts, 27, 4)) +>host : Symbol(Networked.host, Decl(typeGuardOfFormThisMember.ts, 23, 29)) } interface GenericLeadGuard extends GenericGuard { ->GenericLeadGuard : Symbol(GenericLeadGuard, Decl(typeGuardOfFormThisMember.ts, 43, 2)) ->T : Symbol(T, Decl(typeGuardOfFormThisMember.ts, 45, 28)) ->GenericGuard : Symbol(GenericGuard, Decl(typeGuardOfFormThisMember.ts, 51, 2)) ->T : Symbol(T, Decl(typeGuardOfFormThisMember.ts, 45, 28)) +>GenericLeadGuard : Symbol(GenericLeadGuard, Decl(typeGuardOfFormThisMember.ts, 44, 2)) +>T : Symbol(T, Decl(typeGuardOfFormThisMember.ts, 46, 28)) +>GenericGuard : Symbol(GenericGuard, Decl(typeGuardOfFormThisMember.ts, 52, 2)) +>T : Symbol(T, Decl(typeGuardOfFormThisMember.ts, 46, 28)) lead(): void; ->lead : Symbol(lead, Decl(typeGuardOfFormThisMember.ts, 45, 56)) +>lead : Symbol(lead, Decl(typeGuardOfFormThisMember.ts, 46, 56)) } interface GenericFollowerGuard extends GenericGuard { ->GenericFollowerGuard : Symbol(GenericFollowerGuard, Decl(typeGuardOfFormThisMember.ts, 47, 2)) ->T : Symbol(T, Decl(typeGuardOfFormThisMember.ts, 49, 32)) ->GenericGuard : Symbol(GenericGuard, Decl(typeGuardOfFormThisMember.ts, 51, 2)) ->T : Symbol(T, Decl(typeGuardOfFormThisMember.ts, 49, 32)) +>GenericFollowerGuard : Symbol(GenericFollowerGuard, Decl(typeGuardOfFormThisMember.ts, 48, 2)) +>T : Symbol(T, Decl(typeGuardOfFormThisMember.ts, 50, 32)) +>GenericGuard : Symbol(GenericGuard, Decl(typeGuardOfFormThisMember.ts, 52, 2)) +>T : Symbol(T, Decl(typeGuardOfFormThisMember.ts, 50, 32)) follow(): void; ->follow : Symbol(follow, Decl(typeGuardOfFormThisMember.ts, 49, 60)) +>follow : Symbol(follow, Decl(typeGuardOfFormThisMember.ts, 50, 60)) } interface GenericGuard { ->GenericGuard : Symbol(GenericGuard, Decl(typeGuardOfFormThisMember.ts, 51, 2)) ->T : Symbol(T, Decl(typeGuardOfFormThisMember.ts, 53, 24)) +>GenericGuard : Symbol(GenericGuard, Decl(typeGuardOfFormThisMember.ts, 52, 2)) +>T : Symbol(T, Decl(typeGuardOfFormThisMember.ts, 54, 24)) target: T; ->target : Symbol(target, Decl(typeGuardOfFormThisMember.ts, 53, 28)) ->T : Symbol(T, Decl(typeGuardOfFormThisMember.ts, 53, 24)) +>target : Symbol(target, Decl(typeGuardOfFormThisMember.ts, 54, 28)) +>T : Symbol(T, Decl(typeGuardOfFormThisMember.ts, 54, 24)) isLeader: this is (GenericLeadGuard); ->isLeader : Symbol(isLeader, Decl(typeGuardOfFormThisMember.ts, 54, 12)) ->GenericLeadGuard : Symbol(GenericLeadGuard, Decl(typeGuardOfFormThisMember.ts, 43, 2)) ->T : Symbol(T, Decl(typeGuardOfFormThisMember.ts, 53, 24)) +>isLeader : Symbol(isLeader, Decl(typeGuardOfFormThisMember.ts, 55, 12)) +>GenericLeadGuard : Symbol(GenericLeadGuard, Decl(typeGuardOfFormThisMember.ts, 44, 2)) +>T : Symbol(T, Decl(typeGuardOfFormThisMember.ts, 54, 24)) isFollower: this is GenericFollowerGuard; ->isFollower : Symbol(isFollower, Decl(typeGuardOfFormThisMember.ts, 55, 42)) ->GenericFollowerGuard : Symbol(GenericFollowerGuard, Decl(typeGuardOfFormThisMember.ts, 47, 2)) ->T : Symbol(T, Decl(typeGuardOfFormThisMember.ts, 53, 24)) +>isFollower : Symbol(isFollower, Decl(typeGuardOfFormThisMember.ts, 56, 42)) +>GenericFollowerGuard : Symbol(GenericFollowerGuard, Decl(typeGuardOfFormThisMember.ts, 48, 2)) +>T : Symbol(T, Decl(typeGuardOfFormThisMember.ts, 54, 24)) } let guard: GenericGuard; ->guard : Symbol(guard, Decl(typeGuardOfFormThisMember.ts, 59, 4)) ->GenericGuard : Symbol(GenericGuard, Decl(typeGuardOfFormThisMember.ts, 51, 2)) ->File : Symbol(File, Decl(typeGuardOfFormThisMember.ts, 14, 2)) +>guard : Symbol(guard, Decl(typeGuardOfFormThisMember.ts, 60, 4)) +>GenericGuard : Symbol(GenericGuard, Decl(typeGuardOfFormThisMember.ts, 52, 2)) +>File : Symbol(File, Decl(typeGuardOfFormThisMember.ts, 15, 2)) if (guard.isLeader) { ->guard.isLeader : Symbol(GenericGuard.isLeader, Decl(typeGuardOfFormThisMember.ts, 54, 12)) ->guard : Symbol(guard, Decl(typeGuardOfFormThisMember.ts, 59, 4)) ->isLeader : Symbol(GenericGuard.isLeader, Decl(typeGuardOfFormThisMember.ts, 54, 12)) +>guard.isLeader : Symbol(GenericGuard.isLeader, Decl(typeGuardOfFormThisMember.ts, 55, 12)) +>guard : Symbol(guard, Decl(typeGuardOfFormThisMember.ts, 60, 4)) +>isLeader : Symbol(GenericGuard.isLeader, Decl(typeGuardOfFormThisMember.ts, 55, 12)) guard.lead(); ->guard.lead : Symbol(GenericLeadGuard.lead, Decl(typeGuardOfFormThisMember.ts, 45, 56)) ->guard : Symbol(guard, Decl(typeGuardOfFormThisMember.ts, 59, 4)) ->lead : Symbol(GenericLeadGuard.lead, Decl(typeGuardOfFormThisMember.ts, 45, 56)) +>guard.lead : Symbol(GenericLeadGuard.lead, Decl(typeGuardOfFormThisMember.ts, 46, 56)) +>guard : Symbol(guard, Decl(typeGuardOfFormThisMember.ts, 60, 4)) +>lead : Symbol(GenericLeadGuard.lead, Decl(typeGuardOfFormThisMember.ts, 46, 56)) } else if (guard.isFollower) { ->guard.isFollower : Symbol(GenericGuard.isFollower, Decl(typeGuardOfFormThisMember.ts, 55, 42)) ->guard : Symbol(guard, Decl(typeGuardOfFormThisMember.ts, 59, 4)) ->isFollower : Symbol(GenericGuard.isFollower, Decl(typeGuardOfFormThisMember.ts, 55, 42)) +>guard.isFollower : Symbol(GenericGuard.isFollower, Decl(typeGuardOfFormThisMember.ts, 56, 42)) +>guard : Symbol(guard, Decl(typeGuardOfFormThisMember.ts, 60, 4)) +>isFollower : Symbol(GenericGuard.isFollower, Decl(typeGuardOfFormThisMember.ts, 56, 42)) guard.follow(); ->guard.follow : Symbol(GenericFollowerGuard.follow, Decl(typeGuardOfFormThisMember.ts, 49, 60)) ->guard : Symbol(guard, Decl(typeGuardOfFormThisMember.ts, 59, 4)) ->follow : Symbol(GenericFollowerGuard.follow, Decl(typeGuardOfFormThisMember.ts, 49, 60)) +>guard.follow : Symbol(GenericFollowerGuard.follow, Decl(typeGuardOfFormThisMember.ts, 50, 60)) +>guard : Symbol(guard, Decl(typeGuardOfFormThisMember.ts, 60, 4)) +>follow : Symbol(GenericFollowerGuard.follow, Decl(typeGuardOfFormThisMember.ts, 50, 60)) } interface SpecificGuard { ->SpecificGuard : Symbol(SpecificGuard, Decl(typeGuardOfFormThisMember.ts, 65, 2)) +>SpecificGuard : Symbol(SpecificGuard, Decl(typeGuardOfFormThisMember.ts, 66, 2)) isMoreSpecific: this is MoreSpecificGuard; ->isMoreSpecific : Symbol(isMoreSpecific, Decl(typeGuardOfFormThisMember.ts, 67, 26)) ->MoreSpecificGuard : Symbol(MoreSpecificGuard, Decl(typeGuardOfFormThisMember.ts, 69, 2)) +>isMoreSpecific : Symbol(isMoreSpecific, Decl(typeGuardOfFormThisMember.ts, 68, 26)) +>MoreSpecificGuard : Symbol(MoreSpecificGuard, Decl(typeGuardOfFormThisMember.ts, 70, 2)) } interface MoreSpecificGuard extends SpecificGuard { ->MoreSpecificGuard : Symbol(MoreSpecificGuard, Decl(typeGuardOfFormThisMember.ts, 69, 2)) ->SpecificGuard : Symbol(SpecificGuard, Decl(typeGuardOfFormThisMember.ts, 65, 2)) +>MoreSpecificGuard : Symbol(MoreSpecificGuard, Decl(typeGuardOfFormThisMember.ts, 70, 2)) +>SpecificGuard : Symbol(SpecificGuard, Decl(typeGuardOfFormThisMember.ts, 66, 2)) do(): void; ->do : Symbol(do, Decl(typeGuardOfFormThisMember.ts, 71, 52)) +>do : Symbol(do, Decl(typeGuardOfFormThisMember.ts, 72, 52)) } let general: SpecificGuard; ->general : Symbol(general, Decl(typeGuardOfFormThisMember.ts, 75, 4)) ->SpecificGuard : Symbol(SpecificGuard, Decl(typeGuardOfFormThisMember.ts, 65, 2)) +>general : Symbol(general, Decl(typeGuardOfFormThisMember.ts, 76, 4)) +>SpecificGuard : Symbol(SpecificGuard, Decl(typeGuardOfFormThisMember.ts, 66, 2)) if (general.isMoreSpecific) { ->general.isMoreSpecific : Symbol(SpecificGuard.isMoreSpecific, Decl(typeGuardOfFormThisMember.ts, 67, 26)) ->general : Symbol(general, Decl(typeGuardOfFormThisMember.ts, 75, 4)) ->isMoreSpecific : Symbol(SpecificGuard.isMoreSpecific, Decl(typeGuardOfFormThisMember.ts, 67, 26)) +>general.isMoreSpecific : Symbol(SpecificGuard.isMoreSpecific, Decl(typeGuardOfFormThisMember.ts, 68, 26)) +>general : Symbol(general, Decl(typeGuardOfFormThisMember.ts, 76, 4)) +>isMoreSpecific : Symbol(SpecificGuard.isMoreSpecific, Decl(typeGuardOfFormThisMember.ts, 68, 26)) general.do(); ->general.do : Symbol(MoreSpecificGuard.do, Decl(typeGuardOfFormThisMember.ts, 71, 52)) ->general : Symbol(general, Decl(typeGuardOfFormThisMember.ts, 75, 4)) ->do : Symbol(MoreSpecificGuard.do, Decl(typeGuardOfFormThisMember.ts, 71, 52)) +>general.do : Symbol(MoreSpecificGuard.do, Decl(typeGuardOfFormThisMember.ts, 72, 52)) +>general : Symbol(general, Decl(typeGuardOfFormThisMember.ts, 76, 4)) +>do : Symbol(MoreSpecificGuard.do, Decl(typeGuardOfFormThisMember.ts, 72, 52)) } } diff --git a/tests/baselines/reference/typeGuardOfFormThisMember.types b/tests/baselines/reference/typeGuardOfFormThisMember.types index 3ecb174653b..68343947fb4 100644 --- a/tests/baselines/reference/typeGuardOfFormThisMember.types +++ b/tests/baselines/reference/typeGuardOfFormThisMember.types @@ -6,6 +6,10 @@ namespace Test { export class FileSystemObject { >FileSystemObject : FileSystemObject + isFSO: this is FileSystemObject; +>isFSO : this is FileSystemObject +>FileSystemObject : FileSystemObject + get isFile(): this is File { >isFile : this is File >File : File @@ -79,23 +83,21 @@ namespace Test { >isNetworked : this is Networked & FileSystemObject >false : boolean - file.isNetworked = file.isDirectory; ->file.isNetworked = file.isDirectory : this is Directory ->file.isNetworked : this is Networked & FileSystemObject + file.isFSO = file.isFile; +>file.isFSO = file.isFile : this is File +>file.isFSO : this is FileSystemObject >file : FileSystemObject ->isNetworked : this is Networked & FileSystemObject ->file.isDirectory : this is Directory ->file : FileSystemObject ->isDirectory : this is Directory - - file.isFile = file.isNetworked; ->file.isFile = file.isNetworked : this is Networked & FileSystemObject +>isFSO : this is FileSystemObject >file.isFile : this is File >file : FileSystemObject >isFile : this is File ->file.isNetworked : this is Networked & FileSystemObject + + file.isFile = true; +>file.isFile = true : boolean +>file.isFile : this is File >file : FileSystemObject ->isNetworked : this is Networked & FileSystemObject +>isFile : this is File +>true : boolean let x = file.isFile; >x : boolean diff --git a/tests/baselines/reference/typeGuardOfFormThisMemberErrors.errors.txt b/tests/baselines/reference/typeGuardOfFormThisMemberErrors.errors.txt new file mode 100644 index 00000000000..754cbffe6e6 --- /dev/null +++ b/tests/baselines/reference/typeGuardOfFormThisMemberErrors.errors.txt @@ -0,0 +1,51 @@ +tests/cases/conformance/expressions/typeGuards/typeGuardOfFormThisMemberErrors.ts(29,2): error TS1226: Type predicate 'this is File' is not assignable to 'this is Networked & FileSystemObject'. + Type 'File' is not assignable to type 'Networked & FileSystemObject'. + Type 'File' is not assignable to type 'Networked'. + Property 'host' is missing in type 'File'. +tests/cases/conformance/expressions/typeGuards/typeGuardOfFormThisMemberErrors.ts(31,2): error TS1226: Type predicate 'this is FileSystemObject' is not assignable to 'this is File'. + Type 'FileSystemObject' is not assignable to type 'File'. + Property 'content' is missing in type 'FileSystemObject'. + + +==== tests/cases/conformance/expressions/typeGuards/typeGuardOfFormThisMemberErrors.ts (2 errors) ==== + // There's a 'File' class in the stdlib, wrap with a namespace to avoid collision + namespace Test { + export class FileSystemObject { + isFSO: this is FileSystemObject; + get isFile(): this is File { + return this instanceof File; + } + set isFile(param) { + // noop + } + get isDirectory(): this is Directory { + return this instanceof Directory; + } + isNetworked: this is (Networked & this); + constructor(public path: string) {} + } + + export class File extends FileSystemObject { + constructor(path: string, public content: string) { super(path); } + } + export class Directory extends FileSystemObject { + children: FileSystemObject[]; + } + export interface Networked { + host: string; + } + + let file: FileSystemObject = new File("foo/bar.txt", "foo"); + file.isNetworked = file.isFile; + ~~~~~~~~~~~~~~~~ +!!! error TS1226: Type predicate 'this is File' is not assignable to 'this is Networked & FileSystemObject'. +!!! error TS1226: Type 'File' is not assignable to type 'Networked & FileSystemObject'. +!!! error TS1226: Type 'File' is not assignable to type 'Networked'. +!!! error TS1226: Property 'host' is missing in type 'File'. + file.isFSO = file.isNetworked; + file.isFile = file.isFSO; + ~~~~~~~~~~~ +!!! error TS1226: Type predicate 'this is FileSystemObject' is not assignable to 'this is File'. +!!! error TS1226: Type 'FileSystemObject' is not assignable to type 'File'. +!!! error TS1226: Property 'content' is missing in type 'FileSystemObject'. + } \ No newline at end of file diff --git a/tests/baselines/reference/typeGuardOfFormThisMemberErrors.js b/tests/baselines/reference/typeGuardOfFormThisMemberErrors.js new file mode 100644 index 00000000000..e6b2f556621 --- /dev/null +++ b/tests/baselines/reference/typeGuardOfFormThisMemberErrors.js @@ -0,0 +1,112 @@ +//// [typeGuardOfFormThisMemberErrors.ts] +// There's a 'File' class in the stdlib, wrap with a namespace to avoid collision +namespace Test { + export class FileSystemObject { + isFSO: this is FileSystemObject; + get isFile(): this is File { + return this instanceof File; + } + set isFile(param) { + // noop + } + get isDirectory(): this is Directory { + return this instanceof Directory; + } + isNetworked: this is (Networked & this); + constructor(public path: string) {} + } + + export class File extends FileSystemObject { + constructor(path: string, public content: string) { super(path); } + } + export class Directory extends FileSystemObject { + children: FileSystemObject[]; + } + export interface Networked { + host: string; + } + + let file: FileSystemObject = new File("foo/bar.txt", "foo"); + file.isNetworked = file.isFile; + file.isFSO = file.isNetworked; + file.isFile = file.isFSO; +} + +//// [typeGuardOfFormThisMemberErrors.js] +var __extends = (this && this.__extends) || function (d, b) { + for (var p in b) if (b.hasOwnProperty(p)) d[p] = b[p]; + function __() { this.constructor = d; } + d.prototype = b === null ? Object.create(b) : (__.prototype = b.prototype, new __()); +}; +// There's a 'File' class in the stdlib, wrap with a namespace to avoid collision +var Test; +(function (Test) { + var FileSystemObject = (function () { + function FileSystemObject(path) { + this.path = path; + } + Object.defineProperty(FileSystemObject.prototype, "isFile", { + get: function () { + return this instanceof File; + }, + set: function (param) { + // noop + }, + enumerable: true, + configurable: true + }); + Object.defineProperty(FileSystemObject.prototype, "isDirectory", { + get: function () { + return this instanceof Directory; + }, + enumerable: true, + configurable: true + }); + return FileSystemObject; + })(); + Test.FileSystemObject = FileSystemObject; + var File = (function (_super) { + __extends(File, _super); + function File(path, content) { + _super.call(this, path); + this.content = content; + } + return File; + })(FileSystemObject); + Test.File = File; + var Directory = (function (_super) { + __extends(Directory, _super); + function Directory() { + _super.apply(this, arguments); + } + return Directory; + })(FileSystemObject); + Test.Directory = Directory; + var file = new File("foo/bar.txt", "foo"); + file.isNetworked = file.isFile; + file.isFSO = file.isNetworked; + file.isFile = file.isFSO; +})(Test || (Test = {})); + + +//// [typeGuardOfFormThisMemberErrors.d.ts] +declare namespace Test { + class FileSystemObject { + path: string; + isFSO: this is FileSystemObject; + isFile: this is File; + isDirectory: this is Directory; + isNetworked: this is (Networked & this); + constructor(path: string); + } + class File extends FileSystemObject { + content: string; + constructor(path: string, content: string); + } + class Directory extends FileSystemObject { + children: FileSystemObject[]; + } + interface Networked { + host: string; + } +} diff --git a/tests/baselines/reference/unionAndIntersectionInference1.types b/tests/baselines/reference/unionAndIntersectionInference1.types index 5d23688f0b7..3de2514a2fa 100644 --- a/tests/baselines/reference/unionAndIntersectionInference1.types +++ b/tests/baselines/reference/unionAndIntersectionInference1.types @@ -110,7 +110,7 @@ function foo1(value: void|a): void { >a : a if (isVoid(value)) { ->isVoid(value) : boolean +>isVoid(value) : value is void >isVoid : (value: void | a) => value is void >value : void | a @@ -130,7 +130,7 @@ function baz1(value: void|a): void { >a : a if (isNonVoid(value)) { ->isNonVoid(value) : boolean +>isNonVoid(value) : value is {} >isNonVoid : (value: void | a) => value is a >value : void | a diff --git a/tests/cases/conformance/expressions/typeGuards/typeGuardOfFormThisMember.ts b/tests/cases/conformance/expressions/typeGuards/typeGuardOfFormThisMember.ts index 707f0f6eea5..decf6d99353 100644 --- a/tests/cases/conformance/expressions/typeGuards/typeGuardOfFormThisMember.ts +++ b/tests/cases/conformance/expressions/typeGuards/typeGuardOfFormThisMember.ts @@ -3,6 +3,7 @@ // There's a 'File' class in the stdlib, wrap with a namespace to avoid collision namespace Test { export class FileSystemObject { + isFSO: this is FileSystemObject; get isFile(): this is File { return this instanceof File; } @@ -28,8 +29,8 @@ namespace Test { let file: FileSystemObject = new File("foo/bar.txt", "foo"); file.isNetworked = false; - file.isNetworked = file.isDirectory; - file.isFile = file.isNetworked; + file.isFSO = file.isFile; + file.isFile = true; let x = file.isFile; if (file.isFile) { file.content; diff --git a/tests/cases/conformance/expressions/typeGuards/typeGuardOfFormThisMemberErrors.ts b/tests/cases/conformance/expressions/typeGuards/typeGuardOfFormThisMemberErrors.ts new file mode 100644 index 00000000000..d629a2a1cdd --- /dev/null +++ b/tests/cases/conformance/expressions/typeGuards/typeGuardOfFormThisMemberErrors.ts @@ -0,0 +1,34 @@ +// @target: es5 +// @declaration: true +// There's a 'File' class in the stdlib, wrap with a namespace to avoid collision +namespace Test { + export class FileSystemObject { + isFSO: this is FileSystemObject; + get isFile(): this is File { + return this instanceof File; + } + set isFile(param) { + // noop + } + get isDirectory(): this is Directory { + return this instanceof Directory; + } + isNetworked: this is (Networked & this); + constructor(public path: string) {} + } + + export class File extends FileSystemObject { + constructor(path: string, public content: string) { super(path); } + } + export class Directory extends FileSystemObject { + children: FileSystemObject[]; + } + export interface Networked { + host: string; + } + + let file: FileSystemObject = new File("foo/bar.txt", "foo"); + file.isNetworked = file.isFile; + file.isFSO = file.isNetworked; + file.isFile = file.isFSO; +} \ No newline at end of file From e1004fac60608142dff3941ef0ac586c71942fc8 Mon Sep 17 00:00:00 2001 From: Daniel Rosenwasser Date: Tue, 8 Dec 2015 17:13:16 -0800 Subject: [PATCH 058/177] Removed misleading comment from test. --- tests/cases/compiler/overloadOnConstConstraintChecks4.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tests/cases/compiler/overloadOnConstConstraintChecks4.ts b/tests/cases/compiler/overloadOnConstConstraintChecks4.ts index f63c5b46349..55425f63393 100644 --- a/tests/cases/compiler/overloadOnConstConstraintChecks4.ts +++ b/tests/cases/compiler/overloadOnConstConstraintChecks4.ts @@ -6,7 +6,7 @@ class C extends A { } function foo(name: 'hi'): B; function foo(name: 'bye'): C; -function foo(name: string): A; // error +function foo(name: string): A; function foo(name: any): Z { return null; } From 51d240989aada5f805808c4a1025f13ecbfba68f Mon Sep 17 00:00:00 2001 From: Daniel Rosenwasser Date: Tue, 8 Dec 2015 17:13:46 -0800 Subject: [PATCH 059/177] Accepted baselines. --- .../reference/functionOverloads22.errors.txt | 10 - .../reference/functionOverloads22.symbols | 19 ++ .../reference/functionOverloads22.types | 22 +++ .../reference/functionOverloads43.errors.txt | 18 -- .../reference/functionOverloads43.symbols | 39 ++++ .../reference/functionOverloads43.types | 47 +++++ .../reference/functionOverloads45.errors.txt | 31 ---- .../reference/functionOverloads45.symbols | 81 ++++++++ .../reference/functionOverloads45.types | 97 ++++++++++ ...verloadOnConstConstraintChecks4.errors.txt | 19 -- .../overloadOnConstConstraintChecks4.js | 2 +- .../overloadOnConstConstraintChecks4.symbols | 43 +++++ .../overloadOnConstConstraintChecks4.types | 45 +++++ .../stringLiteralTypesOverloads01.errors.txt | 59 ------ .../stringLiteralTypesOverloads01.symbols | 144 +++++++++++++++ .../stringLiteralTypesOverloads01.types | 174 ++++++++++++++++++ 16 files changed, 712 insertions(+), 138 deletions(-) delete mode 100644 tests/baselines/reference/functionOverloads22.errors.txt create mode 100644 tests/baselines/reference/functionOverloads22.symbols create mode 100644 tests/baselines/reference/functionOverloads22.types delete mode 100644 tests/baselines/reference/functionOverloads43.errors.txt create mode 100644 tests/baselines/reference/functionOverloads43.symbols create mode 100644 tests/baselines/reference/functionOverloads43.types delete mode 100644 tests/baselines/reference/functionOverloads45.errors.txt create mode 100644 tests/baselines/reference/functionOverloads45.symbols create mode 100644 tests/baselines/reference/functionOverloads45.types delete mode 100644 tests/baselines/reference/overloadOnConstConstraintChecks4.errors.txt create mode 100644 tests/baselines/reference/overloadOnConstConstraintChecks4.symbols create mode 100644 tests/baselines/reference/overloadOnConstConstraintChecks4.types delete mode 100644 tests/baselines/reference/stringLiteralTypesOverloads01.errors.txt create mode 100644 tests/baselines/reference/stringLiteralTypesOverloads01.symbols create mode 100644 tests/baselines/reference/stringLiteralTypesOverloads01.types diff --git a/tests/baselines/reference/functionOverloads22.errors.txt b/tests/baselines/reference/functionOverloads22.errors.txt deleted file mode 100644 index c9fc8aa2b2f..00000000000 --- a/tests/baselines/reference/functionOverloads22.errors.txt +++ /dev/null @@ -1,10 +0,0 @@ -tests/cases/compiler/functionOverloads22.ts(2,10): error TS2394: Overload signature is not compatible with function implementation. - - -==== tests/cases/compiler/functionOverloads22.ts (1 errors) ==== - function foo(bar:number):{a:number;}[]; - function foo(bar:string):{a:number; b:string;}[]; - ~~~ -!!! error TS2394: Overload signature is not compatible with function implementation. - function foo(bar:any):{a:any;b?:any;}[] { return [{a:""}] } - \ No newline at end of file diff --git a/tests/baselines/reference/functionOverloads22.symbols b/tests/baselines/reference/functionOverloads22.symbols new file mode 100644 index 00000000000..7924da073b0 --- /dev/null +++ b/tests/baselines/reference/functionOverloads22.symbols @@ -0,0 +1,19 @@ +=== tests/cases/compiler/functionOverloads22.ts === +function foo(bar:number):{a:number;}[]; +>foo : Symbol(foo, Decl(functionOverloads22.ts, 0, 0), Decl(functionOverloads22.ts, 0, 39), Decl(functionOverloads22.ts, 1, 49)) +>bar : Symbol(bar, Decl(functionOverloads22.ts, 0, 13)) +>a : Symbol(a, Decl(functionOverloads22.ts, 0, 26)) + +function foo(bar:string):{a:number; b:string;}[]; +>foo : Symbol(foo, Decl(functionOverloads22.ts, 0, 0), Decl(functionOverloads22.ts, 0, 39), Decl(functionOverloads22.ts, 1, 49)) +>bar : Symbol(bar, Decl(functionOverloads22.ts, 1, 13)) +>a : Symbol(a, Decl(functionOverloads22.ts, 1, 26)) +>b : Symbol(b, Decl(functionOverloads22.ts, 1, 35)) + +function foo(bar:any):{a:any;b?:any;}[] { return [{a:""}] } +>foo : Symbol(foo, Decl(functionOverloads22.ts, 0, 0), Decl(functionOverloads22.ts, 0, 39), Decl(functionOverloads22.ts, 1, 49)) +>bar : Symbol(bar, Decl(functionOverloads22.ts, 2, 13)) +>a : Symbol(a, Decl(functionOverloads22.ts, 2, 23)) +>b : Symbol(b, Decl(functionOverloads22.ts, 2, 29)) +>a : Symbol(a, Decl(functionOverloads22.ts, 2, 51)) + diff --git a/tests/baselines/reference/functionOverloads22.types b/tests/baselines/reference/functionOverloads22.types new file mode 100644 index 00000000000..7557b1c049f --- /dev/null +++ b/tests/baselines/reference/functionOverloads22.types @@ -0,0 +1,22 @@ +=== tests/cases/compiler/functionOverloads22.ts === +function foo(bar:number):{a:number;}[]; +>foo : { (bar: number): { a: number; }[]; (bar: string): { a: number; b: string; }[]; } +>bar : number +>a : number + +function foo(bar:string):{a:number; b:string;}[]; +>foo : { (bar: number): { a: number; }[]; (bar: string): { a: number; b: string; }[]; } +>bar : string +>a : number +>b : string + +function foo(bar:any):{a:any;b?:any;}[] { return [{a:""}] } +>foo : { (bar: number): { a: number; }[]; (bar: string): { a: number; b: string; }[]; } +>bar : any +>a : any +>b : any +>[{a:""}] : { a: string; }[] +>{a:""} : { a: string; } +>a : string +>"" : string + diff --git a/tests/baselines/reference/functionOverloads43.errors.txt b/tests/baselines/reference/functionOverloads43.errors.txt deleted file mode 100644 index 769bb467186..00000000000 --- a/tests/baselines/reference/functionOverloads43.errors.txt +++ /dev/null @@ -1,18 +0,0 @@ -tests/cases/compiler/functionOverloads43.ts(1,10): error TS2394: Overload signature is not compatible with function implementation. - - -==== tests/cases/compiler/functionOverloads43.ts (1 errors) ==== - function foo(bar: { a:number }[]): number; - ~~~ -!!! error TS2394: Overload signature is not compatible with function implementation. - function foo(bar: { a:string }[]): string; - function foo([x]: { a:number | string }[]): string | number { - if (x) { - return x.a; - } - - return undefined; - } - - var x = foo([{a: "str"}]); - var y = foo([{a: 100}]); \ No newline at end of file diff --git a/tests/baselines/reference/functionOverloads43.symbols b/tests/baselines/reference/functionOverloads43.symbols new file mode 100644 index 00000000000..179ba3e3fed --- /dev/null +++ b/tests/baselines/reference/functionOverloads43.symbols @@ -0,0 +1,39 @@ +=== tests/cases/compiler/functionOverloads43.ts === +function foo(bar: { a:number }[]): number; +>foo : Symbol(foo, Decl(functionOverloads43.ts, 0, 0), Decl(functionOverloads43.ts, 0, 42), Decl(functionOverloads43.ts, 1, 42)) +>bar : Symbol(bar, Decl(functionOverloads43.ts, 0, 13)) +>a : Symbol(a, Decl(functionOverloads43.ts, 0, 19)) + +function foo(bar: { a:string }[]): string; +>foo : Symbol(foo, Decl(functionOverloads43.ts, 0, 0), Decl(functionOverloads43.ts, 0, 42), Decl(functionOverloads43.ts, 1, 42)) +>bar : Symbol(bar, Decl(functionOverloads43.ts, 1, 13)) +>a : Symbol(a, Decl(functionOverloads43.ts, 1, 19)) + +function foo([x]: { a:number | string }[]): string | number { +>foo : Symbol(foo, Decl(functionOverloads43.ts, 0, 0), Decl(functionOverloads43.ts, 0, 42), Decl(functionOverloads43.ts, 1, 42)) +>x : Symbol(x, Decl(functionOverloads43.ts, 2, 14)) +>a : Symbol(a, Decl(functionOverloads43.ts, 2, 19)) + + if (x) { +>x : Symbol(x, Decl(functionOverloads43.ts, 2, 14)) + + return x.a; +>x.a : Symbol(a, Decl(functionOverloads43.ts, 2, 19)) +>x : Symbol(x, Decl(functionOverloads43.ts, 2, 14)) +>a : Symbol(a, Decl(functionOverloads43.ts, 2, 19)) + } + + return undefined; +>undefined : Symbol(undefined) +} + +var x = foo([{a: "str"}]); +>x : Symbol(x, Decl(functionOverloads43.ts, 10, 3)) +>foo : Symbol(foo, Decl(functionOverloads43.ts, 0, 0), Decl(functionOverloads43.ts, 0, 42), Decl(functionOverloads43.ts, 1, 42)) +>a : Symbol(a, Decl(functionOverloads43.ts, 10, 14)) + +var y = foo([{a: 100}]); +>y : Symbol(y, Decl(functionOverloads43.ts, 11, 3)) +>foo : Symbol(foo, Decl(functionOverloads43.ts, 0, 0), Decl(functionOverloads43.ts, 0, 42), Decl(functionOverloads43.ts, 1, 42)) +>a : Symbol(a, Decl(functionOverloads43.ts, 11, 14)) + diff --git a/tests/baselines/reference/functionOverloads43.types b/tests/baselines/reference/functionOverloads43.types new file mode 100644 index 00000000000..7c0fa8eb818 --- /dev/null +++ b/tests/baselines/reference/functionOverloads43.types @@ -0,0 +1,47 @@ +=== tests/cases/compiler/functionOverloads43.ts === +function foo(bar: { a:number }[]): number; +>foo : { (bar: { a: number; }[]): number; (bar: { a: string; }[]): string; } +>bar : { a: number; }[] +>a : number + +function foo(bar: { a:string }[]): string; +>foo : { (bar: { a: number; }[]): number; (bar: { a: string; }[]): string; } +>bar : { a: string; }[] +>a : string + +function foo([x]: { a:number | string }[]): string | number { +>foo : { (bar: { a: number; }[]): number; (bar: { a: string; }[]): string; } +>x : { a: number | string; } +>a : number | string + + if (x) { +>x : { a: number | string; } + + return x.a; +>x.a : number | string +>x : { a: number | string; } +>a : number | string + } + + return undefined; +>undefined : undefined +} + +var x = foo([{a: "str"}]); +>x : string +>foo([{a: "str"}]) : string +>foo : { (bar: { a: number; }[]): number; (bar: { a: string; }[]): string; } +>[{a: "str"}] : { a: string; }[] +>{a: "str"} : { a: string; } +>a : string +>"str" : string + +var y = foo([{a: 100}]); +>y : number +>foo([{a: 100}]) : number +>foo : { (bar: { a: number; }[]): number; (bar: { a: string; }[]): string; } +>[{a: 100}] : { a: number; }[] +>{a: 100} : { a: number; } +>a : number +>100 : number + diff --git a/tests/baselines/reference/functionOverloads45.errors.txt b/tests/baselines/reference/functionOverloads45.errors.txt deleted file mode 100644 index 38ed387d9a1..00000000000 --- a/tests/baselines/reference/functionOverloads45.errors.txt +++ /dev/null @@ -1,31 +0,0 @@ -tests/cases/compiler/functionOverloads45.ts(5,10): error TS2394: Overload signature is not compatible with function implementation. -tests/cases/compiler/functionOverloads45.ts(11,10): error TS2394: Overload signature is not compatible with function implementation. - - -==== tests/cases/compiler/functionOverloads45.ts (2 errors) ==== - interface Animal { animal } - interface Dog extends Animal { dog } - interface Cat extends Animal { cat } - - function foo1(bar: { a:number }[]): Cat; - ~~~~ -!!! error TS2394: Overload signature is not compatible with function implementation. - function foo1(bar: { a:string }[]): Dog; - function foo1([x]: { a:number | string }[]): Animal { - return undefined; - } - - function foo2(bar: { a:number }[]): Cat; - ~~~~ -!!! error TS2394: Overload signature is not compatible with function implementation. - function foo2(bar: { a:string }[]): Dog; - function foo2([x]: { a:number | string }[]): Cat | Dog { - return undefined; - } - - - var x1 = foo1([{a: "str"}]); - var y1 = foo1([{a: 100}]); - - var x2 = foo2([{a: "str"}]); - var y2 = foo2([{a: 100}]); \ No newline at end of file diff --git a/tests/baselines/reference/functionOverloads45.symbols b/tests/baselines/reference/functionOverloads45.symbols new file mode 100644 index 00000000000..28599339099 --- /dev/null +++ b/tests/baselines/reference/functionOverloads45.symbols @@ -0,0 +1,81 @@ +=== tests/cases/compiler/functionOverloads45.ts === +interface Animal { animal } +>Animal : Symbol(Animal, Decl(functionOverloads45.ts, 0, 0)) +>animal : Symbol(animal, Decl(functionOverloads45.ts, 0, 18)) + +interface Dog extends Animal { dog } +>Dog : Symbol(Dog, Decl(functionOverloads45.ts, 0, 27)) +>Animal : Symbol(Animal, Decl(functionOverloads45.ts, 0, 0)) +>dog : Symbol(dog, Decl(functionOverloads45.ts, 1, 30)) + +interface Cat extends Animal { cat } +>Cat : Symbol(Cat, Decl(functionOverloads45.ts, 1, 36)) +>Animal : Symbol(Animal, Decl(functionOverloads45.ts, 0, 0)) +>cat : Symbol(cat, Decl(functionOverloads45.ts, 2, 30)) + +function foo1(bar: { a:number }[]): Cat; +>foo1 : Symbol(foo1, Decl(functionOverloads45.ts, 2, 36), Decl(functionOverloads45.ts, 4, 40), Decl(functionOverloads45.ts, 5, 40)) +>bar : Symbol(bar, Decl(functionOverloads45.ts, 4, 14)) +>a : Symbol(a, Decl(functionOverloads45.ts, 4, 20)) +>Cat : Symbol(Cat, Decl(functionOverloads45.ts, 1, 36)) + +function foo1(bar: { a:string }[]): Dog; +>foo1 : Symbol(foo1, Decl(functionOverloads45.ts, 2, 36), Decl(functionOverloads45.ts, 4, 40), Decl(functionOverloads45.ts, 5, 40)) +>bar : Symbol(bar, Decl(functionOverloads45.ts, 5, 14)) +>a : Symbol(a, Decl(functionOverloads45.ts, 5, 20)) +>Dog : Symbol(Dog, Decl(functionOverloads45.ts, 0, 27)) + +function foo1([x]: { a:number | string }[]): Animal { +>foo1 : Symbol(foo1, Decl(functionOverloads45.ts, 2, 36), Decl(functionOverloads45.ts, 4, 40), Decl(functionOverloads45.ts, 5, 40)) +>x : Symbol(x, Decl(functionOverloads45.ts, 6, 15)) +>a : Symbol(a, Decl(functionOverloads45.ts, 6, 20)) +>Animal : Symbol(Animal, Decl(functionOverloads45.ts, 0, 0)) + + return undefined; +>undefined : Symbol(undefined) +} + +function foo2(bar: { a:number }[]): Cat; +>foo2 : Symbol(foo2, Decl(functionOverloads45.ts, 8, 1), Decl(functionOverloads45.ts, 10, 40), Decl(functionOverloads45.ts, 11, 40)) +>bar : Symbol(bar, Decl(functionOverloads45.ts, 10, 14)) +>a : Symbol(a, Decl(functionOverloads45.ts, 10, 20)) +>Cat : Symbol(Cat, Decl(functionOverloads45.ts, 1, 36)) + +function foo2(bar: { a:string }[]): Dog; +>foo2 : Symbol(foo2, Decl(functionOverloads45.ts, 8, 1), Decl(functionOverloads45.ts, 10, 40), Decl(functionOverloads45.ts, 11, 40)) +>bar : Symbol(bar, Decl(functionOverloads45.ts, 11, 14)) +>a : Symbol(a, Decl(functionOverloads45.ts, 11, 20)) +>Dog : Symbol(Dog, Decl(functionOverloads45.ts, 0, 27)) + +function foo2([x]: { a:number | string }[]): Cat | Dog { +>foo2 : Symbol(foo2, Decl(functionOverloads45.ts, 8, 1), Decl(functionOverloads45.ts, 10, 40), Decl(functionOverloads45.ts, 11, 40)) +>x : Symbol(x, Decl(functionOverloads45.ts, 12, 15)) +>a : Symbol(a, Decl(functionOverloads45.ts, 12, 20)) +>Cat : Symbol(Cat, Decl(functionOverloads45.ts, 1, 36)) +>Dog : Symbol(Dog, Decl(functionOverloads45.ts, 0, 27)) + + return undefined; +>undefined : Symbol(undefined) +} + + +var x1 = foo1([{a: "str"}]); +>x1 : Symbol(x1, Decl(functionOverloads45.ts, 17, 3)) +>foo1 : Symbol(foo1, Decl(functionOverloads45.ts, 2, 36), Decl(functionOverloads45.ts, 4, 40), Decl(functionOverloads45.ts, 5, 40)) +>a : Symbol(a, Decl(functionOverloads45.ts, 17, 16)) + +var y1 = foo1([{a: 100}]); +>y1 : Symbol(y1, Decl(functionOverloads45.ts, 18, 3)) +>foo1 : Symbol(foo1, Decl(functionOverloads45.ts, 2, 36), Decl(functionOverloads45.ts, 4, 40), Decl(functionOverloads45.ts, 5, 40)) +>a : Symbol(a, Decl(functionOverloads45.ts, 18, 16)) + +var x2 = foo2([{a: "str"}]); +>x2 : Symbol(x2, Decl(functionOverloads45.ts, 20, 3)) +>foo2 : Symbol(foo2, Decl(functionOverloads45.ts, 8, 1), Decl(functionOverloads45.ts, 10, 40), Decl(functionOverloads45.ts, 11, 40)) +>a : Symbol(a, Decl(functionOverloads45.ts, 20, 16)) + +var y2 = foo2([{a: 100}]); +>y2 : Symbol(y2, Decl(functionOverloads45.ts, 21, 3)) +>foo2 : Symbol(foo2, Decl(functionOverloads45.ts, 8, 1), Decl(functionOverloads45.ts, 10, 40), Decl(functionOverloads45.ts, 11, 40)) +>a : Symbol(a, Decl(functionOverloads45.ts, 21, 16)) + diff --git a/tests/baselines/reference/functionOverloads45.types b/tests/baselines/reference/functionOverloads45.types new file mode 100644 index 00000000000..257a615e334 --- /dev/null +++ b/tests/baselines/reference/functionOverloads45.types @@ -0,0 +1,97 @@ +=== tests/cases/compiler/functionOverloads45.ts === +interface Animal { animal } +>Animal : Animal +>animal : any + +interface Dog extends Animal { dog } +>Dog : Dog +>Animal : Animal +>dog : any + +interface Cat extends Animal { cat } +>Cat : Cat +>Animal : Animal +>cat : any + +function foo1(bar: { a:number }[]): Cat; +>foo1 : { (bar: { a: number; }[]): Cat; (bar: { a: string; }[]): Dog; } +>bar : { a: number; }[] +>a : number +>Cat : Cat + +function foo1(bar: { a:string }[]): Dog; +>foo1 : { (bar: { a: number; }[]): Cat; (bar: { a: string; }[]): Dog; } +>bar : { a: string; }[] +>a : string +>Dog : Dog + +function foo1([x]: { a:number | string }[]): Animal { +>foo1 : { (bar: { a: number; }[]): Cat; (bar: { a: string; }[]): Dog; } +>x : { a: number | string; } +>a : number | string +>Animal : Animal + + return undefined; +>undefined : undefined +} + +function foo2(bar: { a:number }[]): Cat; +>foo2 : { (bar: { a: number; }[]): Cat; (bar: { a: string; }[]): Dog; } +>bar : { a: number; }[] +>a : number +>Cat : Cat + +function foo2(bar: { a:string }[]): Dog; +>foo2 : { (bar: { a: number; }[]): Cat; (bar: { a: string; }[]): Dog; } +>bar : { a: string; }[] +>a : string +>Dog : Dog + +function foo2([x]: { a:number | string }[]): Cat | Dog { +>foo2 : { (bar: { a: number; }[]): Cat; (bar: { a: string; }[]): Dog; } +>x : { a: number | string; } +>a : number | string +>Cat : Cat +>Dog : Dog + + return undefined; +>undefined : undefined +} + + +var x1 = foo1([{a: "str"}]); +>x1 : Dog +>foo1([{a: "str"}]) : Dog +>foo1 : { (bar: { a: number; }[]): Cat; (bar: { a: string; }[]): Dog; } +>[{a: "str"}] : { a: string; }[] +>{a: "str"} : { a: string; } +>a : string +>"str" : string + +var y1 = foo1([{a: 100}]); +>y1 : Cat +>foo1([{a: 100}]) : Cat +>foo1 : { (bar: { a: number; }[]): Cat; (bar: { a: string; }[]): Dog; } +>[{a: 100}] : { a: number; }[] +>{a: 100} : { a: number; } +>a : number +>100 : number + +var x2 = foo2([{a: "str"}]); +>x2 : Dog +>foo2([{a: "str"}]) : Dog +>foo2 : { (bar: { a: number; }[]): Cat; (bar: { a: string; }[]): Dog; } +>[{a: "str"}] : { a: string; }[] +>{a: "str"} : { a: string; } +>a : string +>"str" : string + +var y2 = foo2([{a: 100}]); +>y2 : Cat +>foo2([{a: 100}]) : Cat +>foo2 : { (bar: { a: number; }[]): Cat; (bar: { a: string; }[]): Dog; } +>[{a: 100}] : { a: number; }[] +>{a: 100} : { a: number; } +>a : number +>100 : number + diff --git a/tests/baselines/reference/overloadOnConstConstraintChecks4.errors.txt b/tests/baselines/reference/overloadOnConstConstraintChecks4.errors.txt deleted file mode 100644 index 7a8037b3dd7..00000000000 --- a/tests/baselines/reference/overloadOnConstConstraintChecks4.errors.txt +++ /dev/null @@ -1,19 +0,0 @@ -tests/cases/compiler/overloadOnConstConstraintChecks4.ts(9,10): error TS2394: Overload signature is not compatible with function implementation. - - -==== tests/cases/compiler/overloadOnConstConstraintChecks4.ts (1 errors) ==== - class Z { } - class A extends Z { private x = 1 } - class B extends A {} - class C extends A { - public foo() { } - } - function foo(name: 'hi'): B; - function foo(name: 'bye'): C; - function foo(name: string): A; // error - ~~~ -!!! error TS2394: Overload signature is not compatible with function implementation. - function foo(name: any): Z { - return null; - } - \ No newline at end of file diff --git a/tests/baselines/reference/overloadOnConstConstraintChecks4.js b/tests/baselines/reference/overloadOnConstConstraintChecks4.js index 17ec3779620..c0422e3611e 100644 --- a/tests/baselines/reference/overloadOnConstConstraintChecks4.js +++ b/tests/baselines/reference/overloadOnConstConstraintChecks4.js @@ -7,7 +7,7 @@ class C extends A { } function foo(name: 'hi'): B; function foo(name: 'bye'): C; -function foo(name: string): A; // error +function foo(name: string): A; function foo(name: any): Z { return null; } diff --git a/tests/baselines/reference/overloadOnConstConstraintChecks4.symbols b/tests/baselines/reference/overloadOnConstConstraintChecks4.symbols new file mode 100644 index 00000000000..6e2a34b55e9 --- /dev/null +++ b/tests/baselines/reference/overloadOnConstConstraintChecks4.symbols @@ -0,0 +1,43 @@ +=== tests/cases/compiler/overloadOnConstConstraintChecks4.ts === +class Z { } +>Z : Symbol(Z, Decl(overloadOnConstConstraintChecks4.ts, 0, 0)) + +class A extends Z { private x = 1 } +>A : Symbol(A, Decl(overloadOnConstConstraintChecks4.ts, 0, 11)) +>Z : Symbol(Z, Decl(overloadOnConstConstraintChecks4.ts, 0, 0)) +>x : Symbol(x, Decl(overloadOnConstConstraintChecks4.ts, 1, 19)) + +class B extends A {} +>B : Symbol(B, Decl(overloadOnConstConstraintChecks4.ts, 1, 35)) +>A : Symbol(A, Decl(overloadOnConstConstraintChecks4.ts, 0, 11)) + +class C extends A { +>C : Symbol(C, Decl(overloadOnConstConstraintChecks4.ts, 2, 20)) +>A : Symbol(A, Decl(overloadOnConstConstraintChecks4.ts, 0, 11)) + + public foo() { } +>foo : Symbol(foo, Decl(overloadOnConstConstraintChecks4.ts, 3, 19)) +} +function foo(name: 'hi'): B; +>foo : Symbol(foo, Decl(overloadOnConstConstraintChecks4.ts, 5, 1), Decl(overloadOnConstConstraintChecks4.ts, 6, 28), Decl(overloadOnConstConstraintChecks4.ts, 7, 29), Decl(overloadOnConstConstraintChecks4.ts, 8, 30)) +>name : Symbol(name, Decl(overloadOnConstConstraintChecks4.ts, 6, 13)) +>B : Symbol(B, Decl(overloadOnConstConstraintChecks4.ts, 1, 35)) + +function foo(name: 'bye'): C; +>foo : Symbol(foo, Decl(overloadOnConstConstraintChecks4.ts, 5, 1), Decl(overloadOnConstConstraintChecks4.ts, 6, 28), Decl(overloadOnConstConstraintChecks4.ts, 7, 29), Decl(overloadOnConstConstraintChecks4.ts, 8, 30)) +>name : Symbol(name, Decl(overloadOnConstConstraintChecks4.ts, 7, 13)) +>C : Symbol(C, Decl(overloadOnConstConstraintChecks4.ts, 2, 20)) + +function foo(name: string): A; +>foo : Symbol(foo, Decl(overloadOnConstConstraintChecks4.ts, 5, 1), Decl(overloadOnConstConstraintChecks4.ts, 6, 28), Decl(overloadOnConstConstraintChecks4.ts, 7, 29), Decl(overloadOnConstConstraintChecks4.ts, 8, 30)) +>name : Symbol(name, Decl(overloadOnConstConstraintChecks4.ts, 8, 13)) +>A : Symbol(A, Decl(overloadOnConstConstraintChecks4.ts, 0, 11)) + +function foo(name: any): Z { +>foo : Symbol(foo, Decl(overloadOnConstConstraintChecks4.ts, 5, 1), Decl(overloadOnConstConstraintChecks4.ts, 6, 28), Decl(overloadOnConstConstraintChecks4.ts, 7, 29), Decl(overloadOnConstConstraintChecks4.ts, 8, 30)) +>name : Symbol(name, Decl(overloadOnConstConstraintChecks4.ts, 9, 13)) +>Z : Symbol(Z, Decl(overloadOnConstConstraintChecks4.ts, 0, 0)) + + return null; +} + diff --git a/tests/baselines/reference/overloadOnConstConstraintChecks4.types b/tests/baselines/reference/overloadOnConstConstraintChecks4.types new file mode 100644 index 00000000000..6ca7288ead9 --- /dev/null +++ b/tests/baselines/reference/overloadOnConstConstraintChecks4.types @@ -0,0 +1,45 @@ +=== tests/cases/compiler/overloadOnConstConstraintChecks4.ts === +class Z { } +>Z : Z + +class A extends Z { private x = 1 } +>A : A +>Z : Z +>x : number +>1 : number + +class B extends A {} +>B : B +>A : A + +class C extends A { +>C : C +>A : A + + public foo() { } +>foo : () => void +} +function foo(name: 'hi'): B; +>foo : { (name: "hi"): B; (name: "bye"): C; (name: string): A; } +>name : "hi" +>B : B + +function foo(name: 'bye'): C; +>foo : { (name: "hi"): B; (name: "bye"): C; (name: string): A; } +>name : "bye" +>C : C + +function foo(name: string): A; +>foo : { (name: "hi"): B; (name: "bye"): C; (name: string): A; } +>name : string +>A : A + +function foo(name: any): Z { +>foo : { (name: "hi"): B; (name: "bye"): C; (name: string): A; } +>name : any +>Z : Z + + return null; +>null : null +} + diff --git a/tests/baselines/reference/stringLiteralTypesOverloads01.errors.txt b/tests/baselines/reference/stringLiteralTypesOverloads01.errors.txt deleted file mode 100644 index 0a3fdb91929..00000000000 --- a/tests/baselines/reference/stringLiteralTypesOverloads01.errors.txt +++ /dev/null @@ -1,59 +0,0 @@ -tests/cases/conformance/types/stringLiteral/stringLiteralTypesOverloads01.ts(7,10): error TS2394: Overload signature is not compatible with function implementation. - - -==== tests/cases/conformance/types/stringLiteral/stringLiteralTypesOverloads01.ts (1 errors) ==== - - type PrimitiveName = 'string' | 'number' | 'boolean'; - - function getFalsyPrimitive(x: "string"): string; - function getFalsyPrimitive(x: "number"): number; - function getFalsyPrimitive(x: "boolean"): boolean; - function getFalsyPrimitive(x: "boolean" | "string"): boolean | string; - ~~~~~~~~~~~~~~~~~ -!!! error TS2394: Overload signature is not compatible with function implementation. - function getFalsyPrimitive(x: "boolean" | "number"): boolean | number; - function getFalsyPrimitive(x: "number" | "string"): number | string; - function getFalsyPrimitive(x: "number" | "string" | "boolean"): number | string | boolean; - function getFalsyPrimitive(x: PrimitiveName): number | string | boolean { - if (x === "string") { - return ""; - } - if (x === "number") { - return 0; - } - if (x === "boolean") { - return false; - } - - // Should be unreachable. - throw "Invalid value"; - } - - namespace Consts1 { - const EMPTY_STRING = getFalsyPrimitive("string"); - const ZERO = getFalsyPrimitive('number'); - const FALSE = getFalsyPrimitive("boolean"); - } - - const string: "string" = "string" - const number: "number" = "number" - const boolean: "boolean" = "boolean" - - const stringOrNumber = string || number; - const stringOrBoolean = string || boolean; - const booleanOrNumber = number || boolean; - const stringOrBooleanOrNumber = stringOrBoolean || number; - - namespace Consts2 { - const EMPTY_STRING = getFalsyPrimitive(string); - const ZERO = getFalsyPrimitive(number); - const FALSE = getFalsyPrimitive(boolean); - - const a = getFalsyPrimitive(stringOrNumber); - const b = getFalsyPrimitive(stringOrBoolean); - const c = getFalsyPrimitive(booleanOrNumber); - const d = getFalsyPrimitive(stringOrBooleanOrNumber); - } - - - \ No newline at end of file diff --git a/tests/baselines/reference/stringLiteralTypesOverloads01.symbols b/tests/baselines/reference/stringLiteralTypesOverloads01.symbols new file mode 100644 index 00000000000..c92fe134076 --- /dev/null +++ b/tests/baselines/reference/stringLiteralTypesOverloads01.symbols @@ -0,0 +1,144 @@ +=== tests/cases/conformance/types/stringLiteral/stringLiteralTypesOverloads01.ts === + +type PrimitiveName = 'string' | 'number' | 'boolean'; +>PrimitiveName : Symbol(PrimitiveName, Decl(stringLiteralTypesOverloads01.ts, 0, 0)) + +function getFalsyPrimitive(x: "string"): string; +>getFalsyPrimitive : Symbol(getFalsyPrimitive, Decl(stringLiteralTypesOverloads01.ts, 1, 53), Decl(stringLiteralTypesOverloads01.ts, 3, 48), Decl(stringLiteralTypesOverloads01.ts, 4, 48), Decl(stringLiteralTypesOverloads01.ts, 5, 50), Decl(stringLiteralTypesOverloads01.ts, 6, 70), Decl(stringLiteralTypesOverloads01.ts, 7, 70), Decl(stringLiteralTypesOverloads01.ts, 8, 68), Decl(stringLiteralTypesOverloads01.ts, 9, 90)) +>x : Symbol(x, Decl(stringLiteralTypesOverloads01.ts, 3, 27)) + +function getFalsyPrimitive(x: "number"): number; +>getFalsyPrimitive : Symbol(getFalsyPrimitive, Decl(stringLiteralTypesOverloads01.ts, 1, 53), Decl(stringLiteralTypesOverloads01.ts, 3, 48), Decl(stringLiteralTypesOverloads01.ts, 4, 48), Decl(stringLiteralTypesOverloads01.ts, 5, 50), Decl(stringLiteralTypesOverloads01.ts, 6, 70), Decl(stringLiteralTypesOverloads01.ts, 7, 70), Decl(stringLiteralTypesOverloads01.ts, 8, 68), Decl(stringLiteralTypesOverloads01.ts, 9, 90)) +>x : Symbol(x, Decl(stringLiteralTypesOverloads01.ts, 4, 27)) + +function getFalsyPrimitive(x: "boolean"): boolean; +>getFalsyPrimitive : Symbol(getFalsyPrimitive, Decl(stringLiteralTypesOverloads01.ts, 1, 53), Decl(stringLiteralTypesOverloads01.ts, 3, 48), Decl(stringLiteralTypesOverloads01.ts, 4, 48), Decl(stringLiteralTypesOverloads01.ts, 5, 50), Decl(stringLiteralTypesOverloads01.ts, 6, 70), Decl(stringLiteralTypesOverloads01.ts, 7, 70), Decl(stringLiteralTypesOverloads01.ts, 8, 68), Decl(stringLiteralTypesOverloads01.ts, 9, 90)) +>x : Symbol(x, Decl(stringLiteralTypesOverloads01.ts, 5, 27)) + +function getFalsyPrimitive(x: "boolean" | "string"): boolean | string; +>getFalsyPrimitive : Symbol(getFalsyPrimitive, Decl(stringLiteralTypesOverloads01.ts, 1, 53), Decl(stringLiteralTypesOverloads01.ts, 3, 48), Decl(stringLiteralTypesOverloads01.ts, 4, 48), Decl(stringLiteralTypesOverloads01.ts, 5, 50), Decl(stringLiteralTypesOverloads01.ts, 6, 70), Decl(stringLiteralTypesOverloads01.ts, 7, 70), Decl(stringLiteralTypesOverloads01.ts, 8, 68), Decl(stringLiteralTypesOverloads01.ts, 9, 90)) +>x : Symbol(x, Decl(stringLiteralTypesOverloads01.ts, 6, 27)) + +function getFalsyPrimitive(x: "boolean" | "number"): boolean | number; +>getFalsyPrimitive : Symbol(getFalsyPrimitive, Decl(stringLiteralTypesOverloads01.ts, 1, 53), Decl(stringLiteralTypesOverloads01.ts, 3, 48), Decl(stringLiteralTypesOverloads01.ts, 4, 48), Decl(stringLiteralTypesOverloads01.ts, 5, 50), Decl(stringLiteralTypesOverloads01.ts, 6, 70), Decl(stringLiteralTypesOverloads01.ts, 7, 70), Decl(stringLiteralTypesOverloads01.ts, 8, 68), Decl(stringLiteralTypesOverloads01.ts, 9, 90)) +>x : Symbol(x, Decl(stringLiteralTypesOverloads01.ts, 7, 27)) + +function getFalsyPrimitive(x: "number" | "string"): number | string; +>getFalsyPrimitive : Symbol(getFalsyPrimitive, Decl(stringLiteralTypesOverloads01.ts, 1, 53), Decl(stringLiteralTypesOverloads01.ts, 3, 48), Decl(stringLiteralTypesOverloads01.ts, 4, 48), Decl(stringLiteralTypesOverloads01.ts, 5, 50), Decl(stringLiteralTypesOverloads01.ts, 6, 70), Decl(stringLiteralTypesOverloads01.ts, 7, 70), Decl(stringLiteralTypesOverloads01.ts, 8, 68), Decl(stringLiteralTypesOverloads01.ts, 9, 90)) +>x : Symbol(x, Decl(stringLiteralTypesOverloads01.ts, 8, 27)) + +function getFalsyPrimitive(x: "number" | "string" | "boolean"): number | string | boolean; +>getFalsyPrimitive : Symbol(getFalsyPrimitive, Decl(stringLiteralTypesOverloads01.ts, 1, 53), Decl(stringLiteralTypesOverloads01.ts, 3, 48), Decl(stringLiteralTypesOverloads01.ts, 4, 48), Decl(stringLiteralTypesOverloads01.ts, 5, 50), Decl(stringLiteralTypesOverloads01.ts, 6, 70), Decl(stringLiteralTypesOverloads01.ts, 7, 70), Decl(stringLiteralTypesOverloads01.ts, 8, 68), Decl(stringLiteralTypesOverloads01.ts, 9, 90)) +>x : Symbol(x, Decl(stringLiteralTypesOverloads01.ts, 9, 27)) + +function getFalsyPrimitive(x: PrimitiveName): number | string | boolean { +>getFalsyPrimitive : Symbol(getFalsyPrimitive, Decl(stringLiteralTypesOverloads01.ts, 1, 53), Decl(stringLiteralTypesOverloads01.ts, 3, 48), Decl(stringLiteralTypesOverloads01.ts, 4, 48), Decl(stringLiteralTypesOverloads01.ts, 5, 50), Decl(stringLiteralTypesOverloads01.ts, 6, 70), Decl(stringLiteralTypesOverloads01.ts, 7, 70), Decl(stringLiteralTypesOverloads01.ts, 8, 68), Decl(stringLiteralTypesOverloads01.ts, 9, 90)) +>x : Symbol(x, Decl(stringLiteralTypesOverloads01.ts, 10, 27)) +>PrimitiveName : Symbol(PrimitiveName, Decl(stringLiteralTypesOverloads01.ts, 0, 0)) + + if (x === "string") { +>x : Symbol(x, Decl(stringLiteralTypesOverloads01.ts, 10, 27)) + + return ""; + } + if (x === "number") { +>x : Symbol(x, Decl(stringLiteralTypesOverloads01.ts, 10, 27)) + + return 0; + } + if (x === "boolean") { +>x : Symbol(x, Decl(stringLiteralTypesOverloads01.ts, 10, 27)) + + return false; + } + + // Should be unreachable. + throw "Invalid value"; +} + +namespace Consts1 { +>Consts1 : Symbol(Consts1, Decl(stringLiteralTypesOverloads01.ts, 23, 1)) + + const EMPTY_STRING = getFalsyPrimitive("string"); +>EMPTY_STRING : Symbol(EMPTY_STRING, Decl(stringLiteralTypesOverloads01.ts, 26, 9)) +>getFalsyPrimitive : Symbol(getFalsyPrimitive, Decl(stringLiteralTypesOverloads01.ts, 1, 53), Decl(stringLiteralTypesOverloads01.ts, 3, 48), Decl(stringLiteralTypesOverloads01.ts, 4, 48), Decl(stringLiteralTypesOverloads01.ts, 5, 50), Decl(stringLiteralTypesOverloads01.ts, 6, 70), Decl(stringLiteralTypesOverloads01.ts, 7, 70), Decl(stringLiteralTypesOverloads01.ts, 8, 68), Decl(stringLiteralTypesOverloads01.ts, 9, 90)) + + const ZERO = getFalsyPrimitive('number'); +>ZERO : Symbol(ZERO, Decl(stringLiteralTypesOverloads01.ts, 27, 9)) +>getFalsyPrimitive : Symbol(getFalsyPrimitive, Decl(stringLiteralTypesOverloads01.ts, 1, 53), Decl(stringLiteralTypesOverloads01.ts, 3, 48), Decl(stringLiteralTypesOverloads01.ts, 4, 48), Decl(stringLiteralTypesOverloads01.ts, 5, 50), Decl(stringLiteralTypesOverloads01.ts, 6, 70), Decl(stringLiteralTypesOverloads01.ts, 7, 70), Decl(stringLiteralTypesOverloads01.ts, 8, 68), Decl(stringLiteralTypesOverloads01.ts, 9, 90)) + + const FALSE = getFalsyPrimitive("boolean"); +>FALSE : Symbol(FALSE, Decl(stringLiteralTypesOverloads01.ts, 28, 9)) +>getFalsyPrimitive : Symbol(getFalsyPrimitive, Decl(stringLiteralTypesOverloads01.ts, 1, 53), Decl(stringLiteralTypesOverloads01.ts, 3, 48), Decl(stringLiteralTypesOverloads01.ts, 4, 48), Decl(stringLiteralTypesOverloads01.ts, 5, 50), Decl(stringLiteralTypesOverloads01.ts, 6, 70), Decl(stringLiteralTypesOverloads01.ts, 7, 70), Decl(stringLiteralTypesOverloads01.ts, 8, 68), Decl(stringLiteralTypesOverloads01.ts, 9, 90)) +} + +const string: "string" = "string" +>string : Symbol(string, Decl(stringLiteralTypesOverloads01.ts, 31, 5)) + +const number: "number" = "number" +>number : Symbol(number, Decl(stringLiteralTypesOverloads01.ts, 32, 5)) + +const boolean: "boolean" = "boolean" +>boolean : Symbol(boolean, Decl(stringLiteralTypesOverloads01.ts, 33, 5)) + +const stringOrNumber = string || number; +>stringOrNumber : Symbol(stringOrNumber, Decl(stringLiteralTypesOverloads01.ts, 35, 5)) +>string : Symbol(string, Decl(stringLiteralTypesOverloads01.ts, 31, 5)) +>number : Symbol(number, Decl(stringLiteralTypesOverloads01.ts, 32, 5)) + +const stringOrBoolean = string || boolean; +>stringOrBoolean : Symbol(stringOrBoolean, Decl(stringLiteralTypesOverloads01.ts, 36, 5)) +>string : Symbol(string, Decl(stringLiteralTypesOverloads01.ts, 31, 5)) +>boolean : Symbol(boolean, Decl(stringLiteralTypesOverloads01.ts, 33, 5)) + +const booleanOrNumber = number || boolean; +>booleanOrNumber : Symbol(booleanOrNumber, Decl(stringLiteralTypesOverloads01.ts, 37, 5)) +>number : Symbol(number, Decl(stringLiteralTypesOverloads01.ts, 32, 5)) +>boolean : Symbol(boolean, Decl(stringLiteralTypesOverloads01.ts, 33, 5)) + +const stringOrBooleanOrNumber = stringOrBoolean || number; +>stringOrBooleanOrNumber : Symbol(stringOrBooleanOrNumber, Decl(stringLiteralTypesOverloads01.ts, 38, 5)) +>stringOrBoolean : Symbol(stringOrBoolean, Decl(stringLiteralTypesOverloads01.ts, 36, 5)) +>number : Symbol(number, Decl(stringLiteralTypesOverloads01.ts, 32, 5)) + +namespace Consts2 { +>Consts2 : Symbol(Consts2, Decl(stringLiteralTypesOverloads01.ts, 38, 58)) + + const EMPTY_STRING = getFalsyPrimitive(string); +>EMPTY_STRING : Symbol(EMPTY_STRING, Decl(stringLiteralTypesOverloads01.ts, 41, 9)) +>getFalsyPrimitive : Symbol(getFalsyPrimitive, Decl(stringLiteralTypesOverloads01.ts, 1, 53), Decl(stringLiteralTypesOverloads01.ts, 3, 48), Decl(stringLiteralTypesOverloads01.ts, 4, 48), Decl(stringLiteralTypesOverloads01.ts, 5, 50), Decl(stringLiteralTypesOverloads01.ts, 6, 70), Decl(stringLiteralTypesOverloads01.ts, 7, 70), Decl(stringLiteralTypesOverloads01.ts, 8, 68), Decl(stringLiteralTypesOverloads01.ts, 9, 90)) +>string : Symbol(string, Decl(stringLiteralTypesOverloads01.ts, 31, 5)) + + const ZERO = getFalsyPrimitive(number); +>ZERO : Symbol(ZERO, Decl(stringLiteralTypesOverloads01.ts, 42, 9)) +>getFalsyPrimitive : Symbol(getFalsyPrimitive, Decl(stringLiteralTypesOverloads01.ts, 1, 53), Decl(stringLiteralTypesOverloads01.ts, 3, 48), Decl(stringLiteralTypesOverloads01.ts, 4, 48), Decl(stringLiteralTypesOverloads01.ts, 5, 50), Decl(stringLiteralTypesOverloads01.ts, 6, 70), Decl(stringLiteralTypesOverloads01.ts, 7, 70), Decl(stringLiteralTypesOverloads01.ts, 8, 68), Decl(stringLiteralTypesOverloads01.ts, 9, 90)) +>number : Symbol(number, Decl(stringLiteralTypesOverloads01.ts, 32, 5)) + + const FALSE = getFalsyPrimitive(boolean); +>FALSE : Symbol(FALSE, Decl(stringLiteralTypesOverloads01.ts, 43, 9)) +>getFalsyPrimitive : Symbol(getFalsyPrimitive, Decl(stringLiteralTypesOverloads01.ts, 1, 53), Decl(stringLiteralTypesOverloads01.ts, 3, 48), Decl(stringLiteralTypesOverloads01.ts, 4, 48), Decl(stringLiteralTypesOverloads01.ts, 5, 50), Decl(stringLiteralTypesOverloads01.ts, 6, 70), Decl(stringLiteralTypesOverloads01.ts, 7, 70), Decl(stringLiteralTypesOverloads01.ts, 8, 68), Decl(stringLiteralTypesOverloads01.ts, 9, 90)) +>boolean : Symbol(boolean, Decl(stringLiteralTypesOverloads01.ts, 33, 5)) + + const a = getFalsyPrimitive(stringOrNumber); +>a : Symbol(a, Decl(stringLiteralTypesOverloads01.ts, 45, 9)) +>getFalsyPrimitive : Symbol(getFalsyPrimitive, Decl(stringLiteralTypesOverloads01.ts, 1, 53), Decl(stringLiteralTypesOverloads01.ts, 3, 48), Decl(stringLiteralTypesOverloads01.ts, 4, 48), Decl(stringLiteralTypesOverloads01.ts, 5, 50), Decl(stringLiteralTypesOverloads01.ts, 6, 70), Decl(stringLiteralTypesOverloads01.ts, 7, 70), Decl(stringLiteralTypesOverloads01.ts, 8, 68), Decl(stringLiteralTypesOverloads01.ts, 9, 90)) +>stringOrNumber : Symbol(stringOrNumber, Decl(stringLiteralTypesOverloads01.ts, 35, 5)) + + const b = getFalsyPrimitive(stringOrBoolean); +>b : Symbol(b, Decl(stringLiteralTypesOverloads01.ts, 46, 9)) +>getFalsyPrimitive : Symbol(getFalsyPrimitive, Decl(stringLiteralTypesOverloads01.ts, 1, 53), Decl(stringLiteralTypesOverloads01.ts, 3, 48), Decl(stringLiteralTypesOverloads01.ts, 4, 48), Decl(stringLiteralTypesOverloads01.ts, 5, 50), Decl(stringLiteralTypesOverloads01.ts, 6, 70), Decl(stringLiteralTypesOverloads01.ts, 7, 70), Decl(stringLiteralTypesOverloads01.ts, 8, 68), Decl(stringLiteralTypesOverloads01.ts, 9, 90)) +>stringOrBoolean : Symbol(stringOrBoolean, Decl(stringLiteralTypesOverloads01.ts, 36, 5)) + + const c = getFalsyPrimitive(booleanOrNumber); +>c : Symbol(c, Decl(stringLiteralTypesOverloads01.ts, 47, 9)) +>getFalsyPrimitive : Symbol(getFalsyPrimitive, Decl(stringLiteralTypesOverloads01.ts, 1, 53), Decl(stringLiteralTypesOverloads01.ts, 3, 48), Decl(stringLiteralTypesOverloads01.ts, 4, 48), Decl(stringLiteralTypesOverloads01.ts, 5, 50), Decl(stringLiteralTypesOverloads01.ts, 6, 70), Decl(stringLiteralTypesOverloads01.ts, 7, 70), Decl(stringLiteralTypesOverloads01.ts, 8, 68), Decl(stringLiteralTypesOverloads01.ts, 9, 90)) +>booleanOrNumber : Symbol(booleanOrNumber, Decl(stringLiteralTypesOverloads01.ts, 37, 5)) + + const d = getFalsyPrimitive(stringOrBooleanOrNumber); +>d : Symbol(d, Decl(stringLiteralTypesOverloads01.ts, 48, 9)) +>getFalsyPrimitive : Symbol(getFalsyPrimitive, Decl(stringLiteralTypesOverloads01.ts, 1, 53), Decl(stringLiteralTypesOverloads01.ts, 3, 48), Decl(stringLiteralTypesOverloads01.ts, 4, 48), Decl(stringLiteralTypesOverloads01.ts, 5, 50), Decl(stringLiteralTypesOverloads01.ts, 6, 70), Decl(stringLiteralTypesOverloads01.ts, 7, 70), Decl(stringLiteralTypesOverloads01.ts, 8, 68), Decl(stringLiteralTypesOverloads01.ts, 9, 90)) +>stringOrBooleanOrNumber : Symbol(stringOrBooleanOrNumber, Decl(stringLiteralTypesOverloads01.ts, 38, 5)) +} + + + diff --git a/tests/baselines/reference/stringLiteralTypesOverloads01.types b/tests/baselines/reference/stringLiteralTypesOverloads01.types new file mode 100644 index 00000000000..6ba8d482117 --- /dev/null +++ b/tests/baselines/reference/stringLiteralTypesOverloads01.types @@ -0,0 +1,174 @@ +=== tests/cases/conformance/types/stringLiteral/stringLiteralTypesOverloads01.ts === + +type PrimitiveName = 'string' | 'number' | 'boolean'; +>PrimitiveName : "string" | "number" | "boolean" + +function getFalsyPrimitive(x: "string"): string; +>getFalsyPrimitive : { (x: "string"): string; (x: "number"): number; (x: "boolean"): boolean; (x: "boolean" | "string"): boolean | string; (x: "boolean" | "number"): boolean | number; (x: "number" | "string"): number | string; (x: "number" | "string" | "boolean"): number | string | boolean; } +>x : "string" + +function getFalsyPrimitive(x: "number"): number; +>getFalsyPrimitive : { (x: "string"): string; (x: "number"): number; (x: "boolean"): boolean; (x: "boolean" | "string"): boolean | string; (x: "boolean" | "number"): boolean | number; (x: "number" | "string"): number | string; (x: "number" | "string" | "boolean"): number | string | boolean; } +>x : "number" + +function getFalsyPrimitive(x: "boolean"): boolean; +>getFalsyPrimitive : { (x: "string"): string; (x: "number"): number; (x: "boolean"): boolean; (x: "boolean" | "string"): boolean | string; (x: "boolean" | "number"): boolean | number; (x: "number" | "string"): number | string; (x: "number" | "string" | "boolean"): number | string | boolean; } +>x : "boolean" + +function getFalsyPrimitive(x: "boolean" | "string"): boolean | string; +>getFalsyPrimitive : { (x: "string"): string; (x: "number"): number; (x: "boolean"): boolean; (x: "boolean" | "string"): boolean | string; (x: "boolean" | "number"): boolean | number; (x: "number" | "string"): number | string; (x: "number" | "string" | "boolean"): number | string | boolean; } +>x : "boolean" | "string" + +function getFalsyPrimitive(x: "boolean" | "number"): boolean | number; +>getFalsyPrimitive : { (x: "string"): string; (x: "number"): number; (x: "boolean"): boolean; (x: "boolean" | "string"): boolean | string; (x: "boolean" | "number"): boolean | number; (x: "number" | "string"): number | string; (x: "number" | "string" | "boolean"): number | string | boolean; } +>x : "boolean" | "number" + +function getFalsyPrimitive(x: "number" | "string"): number | string; +>getFalsyPrimitive : { (x: "string"): string; (x: "number"): number; (x: "boolean"): boolean; (x: "boolean" | "string"): boolean | string; (x: "boolean" | "number"): boolean | number; (x: "number" | "string"): number | string; (x: "number" | "string" | "boolean"): number | string | boolean; } +>x : "number" | "string" + +function getFalsyPrimitive(x: "number" | "string" | "boolean"): number | string | boolean; +>getFalsyPrimitive : { (x: "string"): string; (x: "number"): number; (x: "boolean"): boolean; (x: "boolean" | "string"): boolean | string; (x: "boolean" | "number"): boolean | number; (x: "number" | "string"): number | string; (x: "number" | "string" | "boolean"): number | string | boolean; } +>x : "number" | "string" | "boolean" + +function getFalsyPrimitive(x: PrimitiveName): number | string | boolean { +>getFalsyPrimitive : { (x: "string"): string; (x: "number"): number; (x: "boolean"): boolean; (x: "boolean" | "string"): boolean | string; (x: "boolean" | "number"): boolean | number; (x: "number" | "string"): number | string; (x: "number" | "string" | "boolean"): number | string | boolean; } +>x : "string" | "number" | "boolean" +>PrimitiveName : "string" | "number" | "boolean" + + if (x === "string") { +>x === "string" : boolean +>x : "string" | "number" | "boolean" +>"string" : string + + return ""; +>"" : string + } + if (x === "number") { +>x === "number" : boolean +>x : "string" | "number" | "boolean" +>"number" : string + + return 0; +>0 : number + } + if (x === "boolean") { +>x === "boolean" : boolean +>x : "string" | "number" | "boolean" +>"boolean" : string + + return false; +>false : boolean + } + + // Should be unreachable. + throw "Invalid value"; +>"Invalid value" : string +} + +namespace Consts1 { +>Consts1 : typeof Consts1 + + const EMPTY_STRING = getFalsyPrimitive("string"); +>EMPTY_STRING : string +>getFalsyPrimitive("string") : string +>getFalsyPrimitive : { (x: "string"): string; (x: "number"): number; (x: "boolean"): boolean; (x: "boolean" | "string"): boolean | string; (x: "boolean" | "number"): boolean | number; (x: "number" | "string"): number | string; (x: "number" | "string" | "boolean"): number | string | boolean; } +>"string" : "string" + + const ZERO = getFalsyPrimitive('number'); +>ZERO : number +>getFalsyPrimitive('number') : number +>getFalsyPrimitive : { (x: "string"): string; (x: "number"): number; (x: "boolean"): boolean; (x: "boolean" | "string"): boolean | string; (x: "boolean" | "number"): boolean | number; (x: "number" | "string"): number | string; (x: "number" | "string" | "boolean"): number | string | boolean; } +>'number' : "number" + + const FALSE = getFalsyPrimitive("boolean"); +>FALSE : boolean +>getFalsyPrimitive("boolean") : boolean +>getFalsyPrimitive : { (x: "string"): string; (x: "number"): number; (x: "boolean"): boolean; (x: "boolean" | "string"): boolean | string; (x: "boolean" | "number"): boolean | number; (x: "number" | "string"): number | string; (x: "number" | "string" | "boolean"): number | string | boolean; } +>"boolean" : "boolean" +} + +const string: "string" = "string" +>string : "string" +>"string" : "string" + +const number: "number" = "number" +>number : "number" +>"number" : "number" + +const boolean: "boolean" = "boolean" +>boolean : "boolean" +>"boolean" : "boolean" + +const stringOrNumber = string || number; +>stringOrNumber : "string" | "number" +>string || number : "string" | "number" +>string : "string" +>number : "number" + +const stringOrBoolean = string || boolean; +>stringOrBoolean : "string" | "boolean" +>string || boolean : "string" | "boolean" +>string : "string" +>boolean : "boolean" + +const booleanOrNumber = number || boolean; +>booleanOrNumber : "number" | "boolean" +>number || boolean : "number" | "boolean" +>number : "number" +>boolean : "boolean" + +const stringOrBooleanOrNumber = stringOrBoolean || number; +>stringOrBooleanOrNumber : "string" | "boolean" | "number" +>stringOrBoolean || number : "string" | "boolean" | "number" +>stringOrBoolean : "string" | "boolean" +>number : "number" + +namespace Consts2 { +>Consts2 : typeof Consts2 + + const EMPTY_STRING = getFalsyPrimitive(string); +>EMPTY_STRING : string +>getFalsyPrimitive(string) : string +>getFalsyPrimitive : { (x: "string"): string; (x: "number"): number; (x: "boolean"): boolean; (x: "boolean" | "string"): boolean | string; (x: "boolean" | "number"): boolean | number; (x: "number" | "string"): number | string; (x: "number" | "string" | "boolean"): number | string | boolean; } +>string : "string" + + const ZERO = getFalsyPrimitive(number); +>ZERO : number +>getFalsyPrimitive(number) : number +>getFalsyPrimitive : { (x: "string"): string; (x: "number"): number; (x: "boolean"): boolean; (x: "boolean" | "string"): boolean | string; (x: "boolean" | "number"): boolean | number; (x: "number" | "string"): number | string; (x: "number" | "string" | "boolean"): number | string | boolean; } +>number : "number" + + const FALSE = getFalsyPrimitive(boolean); +>FALSE : boolean +>getFalsyPrimitive(boolean) : boolean +>getFalsyPrimitive : { (x: "string"): string; (x: "number"): number; (x: "boolean"): boolean; (x: "boolean" | "string"): boolean | string; (x: "boolean" | "number"): boolean | number; (x: "number" | "string"): number | string; (x: "number" | "string" | "boolean"): number | string | boolean; } +>boolean : "boolean" + + const a = getFalsyPrimitive(stringOrNumber); +>a : number | string +>getFalsyPrimitive(stringOrNumber) : number | string +>getFalsyPrimitive : { (x: "string"): string; (x: "number"): number; (x: "boolean"): boolean; (x: "boolean" | "string"): boolean | string; (x: "boolean" | "number"): boolean | number; (x: "number" | "string"): number | string; (x: "number" | "string" | "boolean"): number | string | boolean; } +>stringOrNumber : "string" | "number" + + const b = getFalsyPrimitive(stringOrBoolean); +>b : boolean | string +>getFalsyPrimitive(stringOrBoolean) : boolean | string +>getFalsyPrimitive : { (x: "string"): string; (x: "number"): number; (x: "boolean"): boolean; (x: "boolean" | "string"): boolean | string; (x: "boolean" | "number"): boolean | number; (x: "number" | "string"): number | string; (x: "number" | "string" | "boolean"): number | string | boolean; } +>stringOrBoolean : "string" | "boolean" + + const c = getFalsyPrimitive(booleanOrNumber); +>c : boolean | number +>getFalsyPrimitive(booleanOrNumber) : boolean | number +>getFalsyPrimitive : { (x: "string"): string; (x: "number"): number; (x: "boolean"): boolean; (x: "boolean" | "string"): boolean | string; (x: "boolean" | "number"): boolean | number; (x: "number" | "string"): number | string; (x: "number" | "string" | "boolean"): number | string | boolean; } +>booleanOrNumber : "number" | "boolean" + + const d = getFalsyPrimitive(stringOrBooleanOrNumber); +>d : number | string | boolean +>getFalsyPrimitive(stringOrBooleanOrNumber) : number | string | boolean +>getFalsyPrimitive : { (x: "string"): string; (x: "number"): number; (x: "boolean"): boolean; (x: "boolean" | "string"): boolean | string; (x: "boolean" | "number"): boolean | number; (x: "number" | "string"): number | string; (x: "number" | "string" | "boolean"): number | string | boolean; } +>stringOrBooleanOrNumber : "string" | "boolean" | "number" +} + + + From d3c98155266cf5257600d3d2df8c31e5df1b66e2 Mon Sep 17 00:00:00 2001 From: Ryan Cavanaugh Date: Tue, 8 Dec 2015 17:37:38 -0800 Subject: [PATCH 060/177] Improve comment --- src/compiler/checker.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/compiler/checker.ts b/src/compiler/checker.ts index 53900f90ffa..ceadceab20f 100644 --- a/src/compiler/checker.ts +++ b/src/compiler/checker.ts @@ -15969,7 +15969,7 @@ namespace ts { return grammarErrorOnNode((prop).equalsToken, Diagnostics.can_only_be_used_in_an_object_literal_property_inside_a_destructuring_assignment); } - // Modifiers cannot appear in property assignments + // Modifiers are never allowed on properties except for 'async' on a method declaration forEach(prop.modifiers, mod => { if (mod.kind !== SyntaxKind.AsyncKeyword || prop.kind !== SyntaxKind.MethodDeclaration) { grammarErrorOnNode(mod, Diagnostics._0_modifier_cannot_be_used_here, getTextOfNode(mod)); From 0228ec3ced6e47bd9775efcc75f718ea81acecd8 Mon Sep 17 00:00:00 2001 From: Wesley Wigham Date: Tue, 8 Dec 2015 17:45:11 -0800 Subject: [PATCH 061/177] preserve some old behavior at @DanielRosenwassers request --- src/compiler/checker.ts | 10 ++++++++++ .../reference/stringLiteralTypesAsTags01.errors.txt | 5 ++++- .../reference/typeGuardFunctionErrors.errors.txt | 7 ++++++- 3 files changed, 20 insertions(+), 2 deletions(-) diff --git a/src/compiler/checker.ts b/src/compiler/checker.ts index e496a0b07bc..3296824123a 100644 --- a/src/compiler/checker.ts +++ b/src/compiler/checker.ts @@ -5633,6 +5633,16 @@ namespace ts { if (targetReturnType === voidType) return result; const sourceReturnType = getReturnTypeOfSignature(source); + // The follow block preserves old behavior forbidding boolean returning functions from being assignable to type guard returning functions + if (targetReturnType.flags & TypeFlags.PredicateType && (targetReturnType as PredicateType).predicate.kind === TypePredicateKind.Identifier) { + if (!(sourceReturnType.flags & TypeFlags.PredicateType)) { + if (reportErrors) { + reportError(Diagnostics.Signature_0_must_have_a_type_predicate, signatureToString(source)); + } + return Ternary.False; + } + } + return result & isRelatedTo(sourceReturnType, targetReturnType, reportErrors); } diff --git a/tests/baselines/reference/stringLiteralTypesAsTags01.errors.txt b/tests/baselines/reference/stringLiteralTypesAsTags01.errors.txt index de3b7be2612..90c8c3efdf7 100644 --- a/tests/baselines/reference/stringLiteralTypesAsTags01.errors.txt +++ b/tests/baselines/reference/stringLiteralTypesAsTags01.errors.txt @@ -1,7 +1,8 @@ +tests/cases/conformance/types/stringLiteral/stringLiteralTypesAsTags01.ts(20,10): error TS2394: Overload signature is not compatible with function implementation. tests/cases/conformance/types/stringLiteral/stringLiteralTypesAsTags01.ts(22,21): error TS2304: Cannot find name 'is'. -==== tests/cases/conformance/types/stringLiteral/stringLiteralTypesAsTags01.ts (1 errors) ==== +==== tests/cases/conformance/types/stringLiteral/stringLiteralTypesAsTags01.ts (2 errors) ==== type Kind = "A" | "B" @@ -22,6 +23,8 @@ tests/cases/conformance/types/stringLiteral/stringLiteralTypesAsTags01.ts(22,21) function hasKind(entity: Entity, kind: "A"): entity is A; function hasKind(entity: Entity, kind: "B"): entity is B; function hasKind(entity: Entity, kind: Kind): entity is Entity; + ~~~~~~~ +!!! error TS2394: Overload signature is not compatible with function implementation. function hasKind(entity: Entity, kind: Kind): boolean { return kind === is; ~~ diff --git a/tests/baselines/reference/typeGuardFunctionErrors.errors.txt b/tests/baselines/reference/typeGuardFunctionErrors.errors.txt index 445738e9783..e1fdf303870 100644 --- a/tests/baselines/reference/typeGuardFunctionErrors.errors.txt +++ b/tests/baselines/reference/typeGuardFunctionErrors.errors.txt @@ -17,6 +17,8 @@ tests/cases/conformance/expressions/typeGuards/typeGuardFunctionErrors.ts(75,46) Type predicate 'p1 is C' is not assignable to 'p1 is B'. Type 'C' is not assignable to type 'B'. Property 'propB' is missing in type 'C'. +tests/cases/conformance/expressions/typeGuards/typeGuardFunctionErrors.ts(79,1): error TS2322: Type '(p1: any, p2: any) => boolean' is not assignable to type '(p1: any, p2: any) => p1 is A'. + Signature '(p1: any, p2: any): boolean' must have a type predicate. tests/cases/conformance/expressions/typeGuards/typeGuardFunctionErrors.ts(85,1): error TS2322: Type '(p1: any, p2: any) => p2 is A' is not assignable to type '(p1: any, p2: any) => p1 is A'. Type predicate 'p2 is A' is not assignable to 'p1 is A'. Parameter 'p2' is not in the same position as parameter 'p1'. @@ -39,7 +41,7 @@ tests/cases/conformance/expressions/typeGuards/typeGuardFunctionErrors.ts(133,34 tests/cases/conformance/expressions/typeGuards/typeGuardFunctionErrors.ts(137,39): error TS1230: A type predicate cannot reference element 'p1' in a binding pattern. -==== tests/cases/conformance/expressions/typeGuards/typeGuardFunctionErrors.ts (32 errors) ==== +==== tests/cases/conformance/expressions/typeGuards/typeGuardFunctionErrors.ts (33 errors) ==== class A { propA: number; @@ -153,6 +155,9 @@ tests/cases/conformance/expressions/typeGuards/typeGuardFunctionErrors.ts(137,39 // Boolean not assignable to type guard var assign1: (p1, p2) => p1 is A; assign1 = function(p1, p2): boolean { + ~~~~~~~ +!!! error TS2322: Type '(p1: any, p2: any) => boolean' is not assignable to type '(p1: any, p2: any) => p1 is A'. +!!! error TS2322: Signature '(p1: any, p2: any): boolean' must have a type predicate. return true; }; From 99ea3ca9b59356207b70d2efea845d48ec7f9204 Mon Sep 17 00:00:00 2001 From: Daniel Rosenwasser Date: Tue, 8 Dec 2015 17:47:12 -0800 Subject: [PATCH 062/177] Moved a paren. --- src/compiler/emitter.ts | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/compiler/emitter.ts b/src/compiler/emitter.ts index a73d7374b59..f0b49854734 100644 --- a/src/compiler/emitter.ts +++ b/src/compiler/emitter.ts @@ -5260,11 +5260,11 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, Promi writeLine(); emitToken(SyntaxKind.CloseBraceToken, node.members.end); emitStart(node); - write(")("); + write("("); if (baseTypeNode) { emit(baseTypeNode.expression); } - write(")"); + write("))"); if (node.kind === SyntaxKind.ClassDeclaration) { write(";"); } From c8baadfbc20363ee7403039cf0d5d86819893b87 Mon Sep 17 00:00:00 2001 From: Daniel Rosenwasser Date: Tue, 8 Dec 2015 17:49:29 -0800 Subject: [PATCH 063/177] Updated unit test. --- tests/cases/unittests/transpile.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tests/cases/unittests/transpile.ts b/tests/cases/unittests/transpile.ts index 4781182224b..513d37673bb 100644 --- a/tests/cases/unittests/transpile.ts +++ b/tests/cases/unittests/transpile.ts @@ -256,7 +256,7 @@ var x = 0;`, ` ], MyClass);\n` + ` return MyClass;\n` + ` var _a;\n` + - `})();\n` + + `}());\n` + `exports.MyClass = MyClass;\n`; test(input, From 61972a9f076ee3252474e5c24b7553099f4f2b48 Mon Sep 17 00:00:00 2001 From: Daniel Rosenwasser Date: Tue, 8 Dec 2015 17:51:05 -0800 Subject: [PATCH 064/177] Accepted baselines for non-project tests. --- tests/baselines/reference/2dArrays.js | 6 +- ...onAmbientClassWithSameNameAndCommonRoot.js | 2 +- ...hModuleMemberThatUsesClassTypeParameter.js | 12 +- ...GenericClassStaticFunctionOfTheSameName.js | 2 +- ...GenericClassStaticFunctionOfTheSameName.js | 2 +- ...dStaticFunctionUsingClassPrivateStatics.js | 2 +- ...nctionAndExportedFunctionThatShareAName.js | 4 +- ...ionAndNonExportedFunctionThatShareAName.js | 4 +- ...ticVariableAndExportedVarThatShareAName.js | 4 +- ...VariableAndNonExportedVarThatShareAName.js | 4 +- ...ClassAndModuleWithSameNameAndCommonRoot.js | 4 +- .../baselines/reference/ClassDeclaration10.js | 2 +- .../baselines/reference/ClassDeclaration11.js | 2 +- .../baselines/reference/ClassDeclaration13.js | 2 +- .../baselines/reference/ClassDeclaration14.js | 2 +- .../baselines/reference/ClassDeclaration15.js | 2 +- .../baselines/reference/ClassDeclaration21.js | 2 +- .../baselines/reference/ClassDeclaration22.js | 2 +- .../baselines/reference/ClassDeclaration24.js | 2 +- .../baselines/reference/ClassDeclaration25.js | 2 +- .../baselines/reference/ClassDeclaration26.js | 2 +- .../baselines/reference/ClassDeclaration8.js | 2 +- .../baselines/reference/ClassDeclaration9.js | 2 +- ...onWithInvalidConstOnPropertyDeclaration.js | 2 +- ...nWithInvalidConstOnPropertyDeclaration2.js | 2 +- .../reference/ES5For-ofTypeCheck10.js | 2 +- .../baselines/reference/ES5SymbolProperty2.js | 2 +- .../baselines/reference/ES5SymbolProperty3.js | 2 +- .../baselines/reference/ES5SymbolProperty4.js | 2 +- .../baselines/reference/ES5SymbolProperty5.js | 2 +- .../baselines/reference/ES5SymbolProperty6.js | 2 +- .../baselines/reference/ES5SymbolProperty7.js | 2 +- .../EnumAndModuleWithSameNameAndCommonRoot.js | 2 +- .../baselines/reference/ExportAssignment7.js | 2 +- .../baselines/reference/ExportAssignment8.js | 2 +- ...ichExtendsInterfaceWithInaccessibleType.js | 2 +- ...sClassHeritageListMemberTypeAnnotations.js | 6 +- ...naccessibleTypeInIndexerTypeAnnotations.js | 4 +- ...accessibleTypeInTypeParameterConstraint.js | 6 +- ...TypesInParameterAndReturnTypeAnnotation.js | 4 +- ...ccessibleTypesInParameterTypeAnnotation.js | 4 +- ...InaccessibleTypesInReturnTypeAnnotation.js | 4 +- ...WithAccessibleTypesOnItsExportedMembers.js | 4 +- ...hAccessibleTypesInMemberTypeAnnotations.js | 2 +- ...sibleTypesInNestedMemberTypeAnnotations.js | 2 +- ...cTypeWithInaccessibleTypeAsTypeArgument.js | 2 +- .../reference/MemberAccessorDeclaration15.js | 2 +- .../MemberFunctionDeclaration1_es6.js | 2 +- .../MemberFunctionDeclaration2_es6.js | 2 +- .../MemberFunctionDeclaration3_es6.js | 2 +- .../MemberFunctionDeclaration4_es6.js | 2 +- .../MemberFunctionDeclaration5_es6.js | 2 +- .../MemberFunctionDeclaration6_es6.js | 2 +- .../MemberFunctionDeclaration7_es6.js | 2 +- .../MemberFunctionDeclaration8_es6.js | 2 +- ...ModuleAndClassWithSameNameAndCommonRoot.js | 4 +- .../ModuleAndEnumWithSameNameAndCommonRoot.js | 2 +- ...ModuleWithExportedAndNonExportedClasses.js | 8 +- ...leWithExportedAndNonExportedImportAlias.js | 2 +- .../NonInitializedExportInInternalModule.js | 4 +- tests/baselines/reference/ParameterList6.js | 2 +- tests/baselines/reference/ParameterList7.js | 2 +- tests/baselines/reference/Protected1.js | 2 +- tests/baselines/reference/Protected3.js | 2 +- tests/baselines/reference/Protected4.js | 2 +- tests/baselines/reference/Protected5.js | 2 +- tests/baselines/reference/Protected6.js | 2 +- tests/baselines/reference/Protected7.js | 2 +- tests/baselines/reference/Protected9.js | 2 +- ...ortedAndNonExportedClassesOfTheSameName.js | 8 +- ...tedAndNonExportedLocalVarsOfTheSameName.js | 2 +- ...rgeEachWithExportedClassesOfTheSameName.js | 8 +- ...eEachWithExportedLocalVarsOfTheSameName.js | 2 +- ...rgeEachWithExportedModulesOfTheSameName.js | 4 +- ...esWithTheSameNameAndDifferentCommonRoot.js | 2 +- ...ModulesWithTheSameNameAndSameCommonRoot.js | 2 +- .../reference/TypeGuardWithArrayUnion.js | 2 +- .../reference/YieldExpression11_es6.js | 2 +- .../reference/YieldExpression12_es6.js | 2 +- .../reference/YieldExpression14_es6.js | 2 +- .../accessOverriddenBaseClassMember1.js | 4 +- .../reference/accessibilityModifiers.js | 6 +- .../accessorParameterAccessibilityModifier.js | 2 +- tests/baselines/reference/accessorWithES3.js | 4 +- tests/baselines/reference/accessorWithES5.js | 4 +- .../reference/accessorWithInitializer.js | 2 +- ...sorWithMismatchedAccessibilityModifiers.js | 8 +- .../reference/accessorWithRestParam.js | 2 +- .../accessorsAreNotContextuallyTyped.js | 2 +- tests/baselines/reference/accessorsEmit.js | 6 +- .../reference/accessorsNotAllowedInES3.js | 2 +- .../accessors_spec_section-4.5_error-cases.js | 2 +- .../accessors_spec_section-4.5_inference.js | 6 +- .../additionOperatorWithAnyAndEveryType.js | 2 +- .../additionOperatorWithInvalidOperands.js | 2 +- tests/baselines/reference/aliasAssignments.js | 2 +- tests/baselines/reference/aliasBug.js | 4 +- tests/baselines/reference/aliasErrors.js | 4 +- .../reference/aliasInaccessibleModule2.js | 2 +- .../reference/aliasUsageInAccessorsOfClass.js | 6 +- .../baselines/reference/aliasUsageInArray.js | 4 +- .../aliasUsageInFunctionExpression.js | 4 +- .../reference/aliasUsageInGenericFunction.js | 4 +- .../reference/aliasUsageInIndexerOfClass.js | 8 +- .../reference/aliasUsageInObjectLiteral.js | 4 +- .../reference/aliasUsageInOrExpression.js | 4 +- ...aliasUsageInTypeArgumentOfExtendsClause.js | 8 +- .../reference/aliasUsageInVarAssignment.js | 4 +- .../allowSyntheticDefaultImports1.js | 2 +- .../allowSyntheticDefaultImports2.js | 2 +- .../allowSyntheticDefaultImports3.js | 2 +- ...ntExternalModuleInAnotherExternalModule.js | 2 +- .../ambiguousCallsWhereReturnTypesAgree.js | 4 +- .../reference/ambiguousOverloadResolution.js | 4 +- .../amdImportNotAsPrimaryExpression.js | 2 +- tests/baselines/reference/amdModuleName1.js | 2 +- tests/baselines/reference/amdModuleName2.js | 2 +- tests/baselines/reference/anonterface.js | 2 +- .../reference/anonymousClassExpression1.js | 2 +- .../reference/anyAsGenericFunctionCall.js | 2 +- .../anyAssignabilityInInheritance.js | 6 +- .../reference/anyAssignableToEveryType.js | 2 +- .../reference/anyAssignableToEveryType2.js | 6 +- .../reference/anyIdenticalToItself.js | 2 +- .../reference/apparentTypeSubtyping.js | 8 +- .../reference/apparentTypeSupertype.js | 4 +- tests/baselines/reference/argsInScope.js | 2 +- .../argumentsUsedInObjectLiteralProperty.js | 2 +- .../baselines/reference/arithAssignTyping.js | 2 +- .../reference/arrayAssignmentTest1.js | 6 +- .../reference/arrayAssignmentTest2.js | 6 +- .../reference/arrayAssignmentTest3.js | 4 +- .../reference/arrayAssignmentTest4.js | 2 +- .../reference/arrayAssignmentTest5.js | 2 +- .../reference/arrayAssignmentTest6.js | 2 +- .../reference/arrayBestCommonTypes.js | 16 +- .../reference/arrayLiteralContextualType.js | 4 +- .../reference/arrayLiteralTypeInference.js | 6 +- tests/baselines/reference/arrayLiterals.js | 8 +- .../arrayLiteralsWithRecursiveGenerics.js | 6 +- .../reference/arrayOfExportedClass.js | 4 +- .../reference/arrayOfFunctionTypes3.js | 2 +- .../arrayReferenceWithoutTypeArgs.js | 2 +- tests/baselines/reference/arrayconcat.js | 2 +- .../reference/arrowFunctionContexts.js | 8 +- .../reference/arrowFunctionExpressions.js | 2 +- .../arrowFunctionInConstructorArgument1.js | 2 +- tests/baselines/reference/asOperatorASI.js | 2 +- tests/baselines/reference/asiAbstract.js | 6 +- tests/baselines/reference/asiInES6Classes.js | 2 +- .../reference/asiPublicPrivateProtected.js | 14 +- .../assertInWrapSomeTypeParameter.js | 2 +- .../reference/assignAnyToEveryType.js | 2 +- .../reference/assignEveryTypeToAny.js | 2 +- .../reference/assignToExistingClass.js | 4 +- ...assignToObjectTypeWithPrototypeProperty.js | 2 +- .../reference/assignmentCompatBug3.js | 2 +- ...CompatInterfaceWithStringIndexSignature.js | 2 +- .../reference/assignmentCompatOnNew.js | 2 +- .../assignmentCompatWithCallSignatures3.js | 8 +- .../assignmentCompatWithCallSignatures4.js | 8 +- .../assignmentCompatWithCallSignatures5.js | 8 +- .../assignmentCompatWithCallSignatures6.js | 8 +- ...ssignmentCompatWithConstructSignatures3.js | 8 +- ...ssignmentCompatWithConstructSignatures4.js | 8 +- ...ssignmentCompatWithConstructSignatures5.js | 8 +- ...ssignmentCompatWithConstructSignatures6.js | 8 +- ...ricCallSignaturesWithOptionalParameters.js | 8 +- .../assignmentCompatWithNumericIndexer.js | 6 +- .../assignmentCompatWithNumericIndexer3.js | 6 +- .../assignmentCompatWithObjectMembers.js | 8 +- .../assignmentCompatWithObjectMembers2.js | 4 +- .../assignmentCompatWithObjectMembers3.js | 4 +- .../assignmentCompatWithObjectMembers4.js | 20 +- .../assignmentCompatWithObjectMembers5.js | 2 +- ...entCompatWithObjectMembersAccessibility.js | 12 +- ...mentCompatWithObjectMembersNumericNames.js | 4 +- ...nmentCompatWithObjectMembersOptionality.js | 6 +- ...mentCompatWithObjectMembersOptionality2.js | 6 +- ...mpatWithObjectMembersStringNumericNames.js | 8 +- .../assignmentCompatWithOverloads.js | 2 +- .../assignmentCompatWithStringIndexer.js | 8 +- .../assignmentCompatWithStringIndexer3.js | 2 +- .../reference/assignmentCompatability10.js | 2 +- .../reference/assignmentCompatability39.js | 2 +- .../reference/assignmentCompatability40.js | 2 +- .../reference/assignmentCompatability41.js | 2 +- .../reference/assignmentCompatability42.js | 2 +- .../reference/assignmentCompatability8.js | 2 +- .../reference/assignmentCompatability9.js | 2 +- .../reference/assignmentLHSIsValue.js | 4 +- .../assignmentNonObjectTypeConstraints.js | 4 +- .../assignmentToParenthesizedIdentifiers.js | 2 +- .../reference/assignmentToReferenceTypes.js | 2 +- tests/baselines/reference/assignments.js | 2 +- .../reference/augmentedTypesClass.js | 4 +- .../reference/augmentedTypesClass2.js | 6 +- .../reference/augmentedTypesClass2a.js | 2 +- .../reference/augmentedTypesClass3.js | 8 +- .../reference/augmentedTypesClass4.js | 4 +- .../baselines/reference/augmentedTypesEnum.js | 2 +- .../reference/augmentedTypesEnum2.js | 2 +- .../augmentedTypesExternalModule1.js | 2 +- .../reference/augmentedTypesFunction.js | 4 +- .../reference/augmentedTypesInterface.js | 2 +- .../reference/augmentedTypesModules.js | 16 +- .../reference/augmentedTypesModules2.js | 2 +- .../reference/augmentedTypesModules3.js | 4 +- .../reference/augmentedTypesModules3b.js | 6 +- .../reference/augmentedTypesModules4.js | 2 +- .../baselines/reference/augmentedTypesVar.js | 4 +- .../autoAsiForStaticsInClassDeclaration.js | 2 +- tests/baselines/reference/autoLift2.js | 2 +- tests/baselines/reference/autolift3.js | 2 +- tests/baselines/reference/autolift4.js | 4 +- tests/baselines/reference/avoid.js | 2 +- tests/baselines/reference/badArraySyntax.js | 2 +- tests/baselines/reference/badThisBinding.js | 2 +- tests/baselines/reference/baseCheck.js | 12 +- .../reference/baseIndexSignatureResolution.js | 4 +- .../reference/baseTypeAfterDerivedType.js | 2 +- .../reference/baseTypeOrderChecking.js | 8 +- .../reference/baseTypePrivateMemberClash.js | 4 +- .../baseTypeWrappingInstantiationChain.js | 10 +- tests/baselines/reference/bases.js | 4 +- .../bestCommonTypeOfConditionalExpressions.js | 6 +- ...bestCommonTypeOfConditionalExpressions2.js | 6 +- .../reference/bestCommonTypeOfTuple2.js | 12 +- tests/baselines/reference/bind1.js | 2 +- .../binopAssignmentShouldHaveType.js | 2 +- .../bitwiseNotOperatorWithAnyOtherType.js | 2 +- .../bitwiseNotOperatorWithBooleanType.js | 2 +- .../bitwiseNotOperatorWithNumberType.js | 2 +- .../bitwiseNotOperatorWithStringType.js | 2 +- .../blockScopedVariablesUseBeforeDef.js | 16 +- ...ctionWithIncorrectNumberOfTypeArguments.js | 4 +- ...allGenericFunctionWithZeroTypeArguments.js | 4 +- ...callNonGenericFunctionWithTypeArguments.js | 4 +- tests/baselines/reference/callOnClass.js | 2 +- .../callOverloadViaElementAccessExpression.js | 2 +- tests/baselines/reference/callOverloads1.js | 2 +- tests/baselines/reference/callOverloads2.js | 2 +- tests/baselines/reference/callOverloads3.js | 2 +- tests/baselines/reference/callOverloads4.js | 2 +- tests/baselines/reference/callOverloads5.js | 2 +- ...allSignatureAssignabilityInInheritance2.js | 8 +- ...allSignatureAssignabilityInInheritance3.js | 8 +- ...allSignatureAssignabilityInInheritance4.js | 8 +- ...allSignatureAssignabilityInInheritance5.js | 8 +- ...allSignatureAssignabilityInInheritance6.js | 8 +- ...tureWithOptionalParameterAndInitializer.js | 2 +- ...ureWithoutReturnTypeAnnotationInference.js | 6 +- ...sWithAccessibilityModifiersOnParameters.js | 2 +- .../callSignaturesWithDuplicateParameters.js | 2 +- .../callSignaturesWithOptionalParameters.js | 2 +- .../callSignaturesWithOptionalParameters2.js | 2 +- ...callSignaturesWithParameterInitializers.js | 2 +- ...allSignaturesWithParameterInitializers2.js | 2 +- tests/baselines/reference/callWithSpread.js | 4 +- .../cannotInvokeNewOnErrorExpression.js | 2 +- .../reference/captureThisInSuperCall.js | 4 +- .../reference/capturedLetConstInLoop10.js | 4 +- .../reference/capturedLetConstInLoop9.js | 4 +- tests/baselines/reference/castParentheses.js | 2 +- tests/baselines/reference/castingTuple.js | 10 +- .../baselines/reference/chainedAssignment1.js | 6 +- .../baselines/reference/chainedAssignment3.js | 4 +- .../reference/chainedAssignmentChecking.js | 6 +- ...arameterConstrainedToOtherTypeParameter.js | 8 +- ...rameterConstrainedToOtherTypeParameter2.js | 4 +- .../reference/checkForObjectTooStrict.js | 6 +- .../checkSwitchStatementIfCaseTypeIsString.js | 2 +- .../reference/circularImportAlias.js | 4 +- .../baselines/reference/circularReference.js | 4 +- .../circularTypeAliasForUnionWithClass.js | 6 +- tests/baselines/reference/class2.js | 2 +- .../reference/classAbstractAsIdentifier.js | 2 +- ...bstractAssignabilityConstructorFunction.js | 2 +- .../classAbstractClinterfaceAssignability.js | 2 +- .../reference/classAbstractConstructor.js | 2 +- .../classAbstractConstructorAssignability.js | 6 +- .../reference/classAbstractCrashedOnce.js | 4 +- .../reference/classAbstractExtends.js | 10 +- .../reference/classAbstractFactoryFunction.js | 4 +- .../reference/classAbstractGeneric.js | 14 +- .../classAbstractImportInstantiation.js | 2 +- .../reference/classAbstractInAModule.js | 4 +- .../reference/classAbstractInheritance.js | 20 +- .../reference/classAbstractInstantiations1.js | 6 +- .../reference/classAbstractInstantiations2.js | 16 +- .../reference/classAbstractManyKeywords.js | 8 +- .../classAbstractMergedDeclaration.js | 16 +- .../classAbstractMethodInNonAbstractClass.js | 4 +- .../classAbstractMethodWithImplementation.js | 2 +- .../classAbstractMixedWithModifiers.js | 2 +- .../reference/classAbstractOverloads.js | 4 +- .../classAbstractOverrideWithAbstract.js | 12 +- .../reference/classAbstractProperties.js | 2 +- .../reference/classAbstractSingleLineDecl.js | 6 +- .../reference/classAbstractSuperCalls.js | 10 +- .../classAbstractUsingAbstractMethod1.js | 6 +- .../classAbstractUsingAbstractMethods2.js | 18 +- .../classAndInterfaceWithSameName.js | 4 +- .../reference/classAndVariableWithSameName.js | 4 +- .../classAppearsToHaveMembersOfObject.js | 2 +- .../reference/classBodyWithStatements.js | 6 +- .../reference/classCannotExtendVar.js | 2 +- .../classConstructorAccessibility.js | 12 +- ...classConstructorParametersAccessibility.js | 8 +- ...lassConstructorParametersAccessibility2.js | 8 +- ...lassConstructorParametersAccessibility3.js | 4 +- .../classDeclarationBlockScoping1.js | 4 +- .../classDeclarationBlockScoping2.js | 4 +- ...clarationMergedInModuleWithContinuation.js | 4 +- .../classDoesNotDependOnBaseTypes.js | 4 +- .../classDoesNotDependOnPrivateMember.js | 2 +- tests/baselines/reference/classExpression.js | 6 +- tests/baselines/reference/classExpression1.js | 2 +- tests/baselines/reference/classExpression2.js | 4 +- tests/baselines/reference/classExpression3.js | 6 +- tests/baselines/reference/classExpression4.js | 2 +- .../classExpressionExtendingAbstractClass.js | 4 +- .../reference/classExpressionTest1.js | 2 +- .../reference/classExpressionTest2.js | 2 +- .../classExpressionWithDecorator1.js | 2 +- ...onWithResolutionOfNamespaceOfSameName01.js | 2 +- .../classExpressionWithStaticProperties1.js | 2 +- .../classExpressionWithStaticProperties2.js | 2 +- .../reference/classExtendingBuiltinType.js | 20 +- .../reference/classExtendingClass.js | 8 +- .../reference/classExtendingClassLikeType.js | 12 +- .../reference/classExtendingNonConstructor.js | 14 +- .../baselines/reference/classExtendingNull.js | 4 +- .../reference/classExtendingPrimitive.js | 20 +- .../reference/classExtendingPrimitive2.js | 4 +- .../reference/classExtendingQualifiedName.js | 4 +- .../reference/classExtendingQualifiedName2.js | 4 +- ...sMergedWithModuleNotReferingConstructor.js | 4 +- ...tendsClauseClassNotReferringConstructor.js | 4 +- .../reference/classExtendsEveryObjectType.js | 12 +- .../reference/classExtendsEveryObjectType2.js | 4 +- .../reference/classExtendsInterface.js | 8 +- ...sInterfaceThatExtendsClassWithPrivates1.js | 4 +- .../baselines/reference/classExtendsItself.js | 6 +- .../reference/classExtendsItselfIndirectly.js | 12 +- .../classExtendsItselfIndirectly2.js | 12 +- .../classExtendsItselfIndirectly3.js | 12 +- .../classExtendsMultipleBaseClasses.js | 6 +- tests/baselines/reference/classExtendsNull.js | 4 +- ...classExtendsShadowedConstructorFunction.js | 4 +- .../classExtendsValidConstructorFunction.js | 2 +- .../classHeritageWithTrailingSeparator.js | 4 +- .../classImplementingInterfaceIndexer.js | 2 +- .../reference/classImplementsClass1.js | 4 +- .../reference/classImplementsClass2.js | 6 +- .../reference/classImplementsClass3.js | 6 +- .../reference/classImplementsClass4.js | 6 +- .../reference/classImplementsClass5.js | 6 +- .../reference/classImplementsClass6.js | 6 +- .../classImplementsImportedInterface.js | 2 +- .../classImplementsMergedClassInterface.js | 8 +- tests/baselines/reference/classIndexer.js | 2 +- tests/baselines/reference/classIndexer2.js | 2 +- tests/baselines/reference/classIndexer3.js | 4 +- tests/baselines/reference/classIndexer4.js | 2 +- tests/baselines/reference/classInheritence.js | 4 +- tests/baselines/reference/classInsideBlock.js | 2 +- .../reference/classIsSubtypeOfBaseType.js | 6 +- .../classMemberInitializerScoping.js | 4 +- .../classMemberInitializerWithLamdaScoping.js | 4 +- ...classMemberInitializerWithLamdaScoping2.js | 2 +- ...classMemberInitializerWithLamdaScoping3.js | 2 +- ...classMemberInitializerWithLamdaScoping4.js | 2 +- ...classMemberInitializerWithLamdaScoping5.js | 2 +- .../classMemberWithMissingIdentifier.js | 2 +- .../classMemberWithMissingIdentifier2.js | 2 +- .../reference/classMethodWithKeywordName1.js | 2 +- tests/baselines/reference/classOrder1.js | 2 +- tests/baselines/reference/classOrder2.js | 4 +- tests/baselines/reference/classOrderBug.js | 6 +- .../reference/classOverloadForFunction.js | 2 +- .../reference/classOverloadForFunction2.js | 2 +- .../reference/classPropertyAsPrivate.js | 2 +- .../reference/classPropertyAsProtected.js | 2 +- .../classPropertyIsPublicByDefault.js | 2 +- .../reference/classSideInheritance1.js | 4 +- .../reference/classSideInheritance2.js | 4 +- .../reference/classSideInheritance3.js | 6 +- .../reference/classTypeParametersInStatics.js | 2 +- tests/baselines/reference/classUpdateTests.js | 36 +-- .../classWithBaseClassButNoConstructor.js | 12 +- .../reference/classWithConstructors.js | 12 +- .../baselines/reference/classWithEmptyBody.js | 4 +- .../reference/classWithMultipleBaseClasses.js | 6 +- .../classWithNoConstructorOrBaseClass.js | 4 +- ...hOnlyPublicMembersEquivalentToInterface.js | 2 +- ...OnlyPublicMembersEquivalentToInterface2.js | 2 +- .../reference/classWithOptionalParameter.js | 4 +- ...ssWithOverloadImplementationOfWrongName.js | 2 +- ...sWithOverloadImplementationOfWrongName2.js | 2 +- .../classWithPredefinedTypesAsNames.js | 8 +- .../classWithPredefinedTypesAsNames2.js | 2 +- .../reference/classWithPrivateProperty.js | 2 +- .../reference/classWithProtectedProperty.js | 4 +- .../reference/classWithPublicProperty.js | 2 +- .../classWithSemicolonClassElement1.js | 2 +- .../classWithSemicolonClassElement2.js | 2 +- .../reference/classWithStaticMembers.js | 4 +- .../classWithTwoConstructorDefinitions.js | 4 +- .../classWithoutExplicitConstructor.js | 4 +- tests/baselines/reference/classdecl.js | 20 +- tests/baselines/reference/clinterfaces.js | 8 +- .../cloduleAcrossModuleDefinitions.js | 2 +- .../reference/cloduleAndTypeParameters.js | 4 +- .../reference/cloduleSplitAcrossFiles.js | 2 +- .../reference/cloduleStaticMembers.js | 2 +- .../reference/cloduleWithDuplicateMember1.js | 2 +- .../reference/cloduleWithDuplicateMember2.js | 2 +- .../cloduleWithPriorInstantiatedModule.js | 4 +- .../cloduleWithPriorUninstantiatedModule.js | 4 +- .../cloduleWithRecursiveReference.js | 2 +- .../reference/clodulesDerivedClasses.js | 4 +- .../collisionArgumentsClassConstructor.js | 20 +- .../collisionArgumentsClassMethod.js | 4 +- ...lisionCodeGenModuleWithAccessorChildren.js | 10 +- ...ionCodeGenModuleWithConstructorChildren.js | 6 +- ...ionCodeGenModuleWithMemberClassConflict.js | 6 +- ...odeGenModuleWithMemberInterfaceConflict.js | 2 +- ...ollisionCodeGenModuleWithMethodChildren.js | 8 +- ...ollisionCodeGenModuleWithModuleChildren.js | 2 +- ...llisionCodeGenModuleWithModuleReopening.js | 8 +- ...collisionCodeGenModuleWithPrivateMember.js | 4 +- .../collisionCodeGenModuleWithUnicodeNames.js | 2 +- .../collisionExportsRequireAndClass.js | 24 +- ...ionExportsRequireAndInternalModuleAlias.js | 2 +- ...quireAndInternalModuleAliasInGlobalFile.js | 2 +- .../collisionExportsRequireAndModule.js | 24 +- .../collisionRestParameterClassConstructor.js | 16 +- .../collisionRestParameterClassMethod.js | 4 +- .../collisionRestParameterUnderscoreIUsage.js | 2 +- ...llisionSuperAndLocalFunctionInAccessors.js | 6 +- ...isionSuperAndLocalFunctionInConstructor.js | 6 +- .../collisionSuperAndLocalFunctionInMethod.js | 6 +- ...ollisionSuperAndLocalFunctionInProperty.js | 4 +- .../collisionSuperAndLocalVarInAccessors.js | 6 +- .../collisionSuperAndLocalVarInConstructor.js | 6 +- .../collisionSuperAndLocalVarInMethod.js | 6 +- .../collisionSuperAndLocalVarInProperty.js | 4 +- .../collisionSuperAndNameResolution.js | 4 +- .../reference/collisionSuperAndParameter.js | 6 +- .../reference/collisionSuperAndParameter1.js | 4 +- ...perAndPropertyNameAsConstuctorParameter.js | 10 +- ...collisionThisExpressionAndClassInGlobal.js | 2 +- ...ionThisExpressionAndLocalVarInAccessors.js | 4 +- ...nThisExpressionAndLocalVarInConstructor.js | 4 +- ...lisionThisExpressionAndLocalVarInMethod.js | 2 +- ...sionThisExpressionAndLocalVarInProperty.js | 4 +- ...xpressionAndLocalVarWithSuperExperssion.js | 6 +- ...ollisionThisExpressionAndModuleInGlobal.js | 2 +- ...ollisionThisExpressionAndNameResolution.js | 2 +- .../collisionThisExpressionAndParameter.js | 6 +- ...ionAndPropertyNameAsConstuctorParameter.js | 8 +- ...ommaOperatorWithSecondOperandObjectType.js | 2 +- .../reference/commentBeforeStaticMethod1.js | 2 +- .../reference/commentOnClassAccessor1.js | 2 +- .../reference/commentOnClassAccessor2.js | 2 +- .../reference/commentOnClassMethod1.js | 2 +- .../reference/commentOnSignature1.js | 2 +- .../reference/commentOnStaticMember1.js | 2 +- tests/baselines/reference/commentsClass.js | 16 +- .../reference/commentsClassMembers.js | 4 +- .../reference/commentsCommentParsing.js | 2 +- .../reference/commentsDottedModuleName.js | 2 +- .../reference/commentsExternalModules.js | 4 +- .../reference/commentsExternalModules2.js | 4 +- .../reference/commentsExternalModules3.js | 4 +- .../baselines/reference/commentsFormatting.js | 8 +- .../reference/commentsInheritance.js | 8 +- tests/baselines/reference/commentsModules.js | 18 +- .../reference/commentsMultiModuleMultiFile.js | 10 +- .../commentsMultiModuleSingleFile.js | 8 +- .../reference/commentsOnReturnStatement1.js | 2 +- .../reference/commentsOnStaticMembers.js | 2 +- .../baselines/reference/commentsOverloads.js | 12 +- .../reference/commentsTypeParameters.js | 2 +- .../reference/commentsdoNotEmitComments.js | 4 +- .../reference/commentsemitComments.js | 4 +- .../commonJSImportAsPrimaryExpression.js | 2 +- .../commonJSImportNotAsPrimaryExpression.js | 2 +- .../comparisonOperatorWithIdenticalObjects.js | 10 +- ...ithNoRelationshipObjectsOnCallSignature.js | 6 +- ...lationshipObjectsOnConstructorSignature.js | 6 +- ...thNoRelationshipObjectsOnIndexSignature.js | 6 +- ...nshipObjectsOnInstantiatedCallSignature.js | 6 +- ...jectsOnInstantiatedConstructorSignature.js | 6 +- ...atorWithNoRelationshipObjectsOnProperty.js | 8 +- ...peratorWithSubtypeObjectOnCallSignature.js | 4 +- ...WithSubtypeObjectOnConstructorSignature.js | 4 +- ...eratorWithSubtypeObjectOnIndexSignature.js | 4 +- ...ubtypeObjectOnInstantiatedCallSignature.js | 4 +- ...bjectOnInstantiatedConstructorSignature.js | 4 +- ...isonOperatorWithSubtypeObjectOnProperty.js | 12 +- .../reference/complexClassRelationships.js | 16 +- ...catedGenericRecursiveBaseClassReference.js | 2 +- .../baselines/reference/complicatedPrivacy.js | 12 +- .../reference/compoundAssignmentLHSIsValue.js | 4 +- ...poundExponentiationAssignmentLHSIsValue.js | 4 +- .../reference/computedPropertyNames12_ES5.js | 2 +- .../reference/computedPropertyNames13_ES5.js | 2 +- .../reference/computedPropertyNames14_ES5.js | 2 +- .../reference/computedPropertyNames15_ES5.js | 2 +- .../reference/computedPropertyNames16_ES5.js | 2 +- .../reference/computedPropertyNames17_ES5.js | 2 +- .../reference/computedPropertyNames21_ES5.js | 2 +- .../reference/computedPropertyNames22_ES5.js | 2 +- .../reference/computedPropertyNames23_ES5.js | 2 +- .../reference/computedPropertyNames24_ES5.js | 4 +- .../reference/computedPropertyNames25_ES5.js | 4 +- .../reference/computedPropertyNames26_ES5.js | 4 +- .../reference/computedPropertyNames27_ES5.js | 4 +- .../reference/computedPropertyNames28_ES5.js | 4 +- .../reference/computedPropertyNames29_ES5.js | 2 +- .../reference/computedPropertyNames2_ES5.js | 2 +- .../reference/computedPropertyNames30_ES5.js | 4 +- .../reference/computedPropertyNames31_ES5.js | 4 +- .../reference/computedPropertyNames32_ES5.js | 2 +- .../reference/computedPropertyNames33_ES5.js | 2 +- .../reference/computedPropertyNames34_ES5.js | 2 +- .../reference/computedPropertyNames36_ES5.js | 6 +- .../reference/computedPropertyNames37_ES5.js | 6 +- .../reference/computedPropertyNames38_ES5.js | 6 +- .../reference/computedPropertyNames39_ES5.js | 6 +- .../reference/computedPropertyNames3_ES5.js | 2 +- .../reference/computedPropertyNames40_ES5.js | 6 +- .../reference/computedPropertyNames41_ES5.js | 6 +- .../reference/computedPropertyNames42_ES5.js | 6 +- .../reference/computedPropertyNames43_ES5.js | 8 +- .../reference/computedPropertyNames44_ES5.js | 8 +- .../reference/computedPropertyNames45_ES5.js | 8 +- ...mputedPropertyNamesDeclarationEmit1_ES5.js | 2 +- ...mputedPropertyNamesDeclarationEmit2_ES5.js | 2 +- .../computedPropertyNamesOnOverloads_ES5.js | 2 +- .../computedPropertyNamesSourceMap1_ES5.js | 2 +- ...dPropertyNamesSourceMap1_ES5.sourcemap.txt | 2 +- .../reference/concatClassAndString.js | 2 +- ...onditionalOperatorConditionIsObjectType.js | 2 +- .../conditionalOperatorWithIdenticalBCT.js | 6 +- .../conditionalOperatorWithoutIdenticalBCT.js | 6 +- .../reference/conflictMarkerTrivia1.js | 2 +- .../reference/conflictMarkerTrivia2.js | 2 +- ...nstDeclarationShadowedByVarDeclaration3.js | 2 +- .../reference/constEnumMergingWithValues2.js | 2 +- .../reference/constantOverloadFunction.js | 8 +- .../constantOverloadFunctionNoSubtypeError.js | 8 +- ...nstraintCheckInGenericBaseTypeReference.js | 10 +- .../constraintSatisfactionWithAny.js | 6 +- .../constraintSatisfactionWithEmptyObject.js | 4 +- ...straintsThatReferenceOtherContstraints1.js | 4 +- .../constraintsUsedInPrototypeProperty.js | 2 +- ...uctSignatureAssignabilityInInheritance2.js | 8 +- ...uctSignatureAssignabilityInInheritance3.js | 8 +- ...uctSignatureAssignabilityInInheritance4.js | 8 +- ...uctSignatureAssignabilityInInheritance5.js | 8 +- ...uctSignatureAssignabilityInInheritance6.js | 8 +- ...eWithAccessibilityModifiersOnParameters.js | 6 +- ...WithAccessibilityModifiersOnParameters2.js | 6 +- ...nstructSignaturesWithIdenticalOverloads.js | 4 +- .../constructSignaturesWithOverloads.js | 4 +- .../constructSignaturesWithOverloads2.js | 4 +- ...WithOverloadsThatDifferOnlyByReturnType.js | 4 +- .../constructorArgWithGenericCallSignature.js | 2 +- tests/baselines/reference/constructorArgs.js | 4 +- .../reference/constructorArgsErrors1.js | 2 +- .../reference/constructorArgsErrors2.js | 2 +- .../reference/constructorArgsErrors3.js | 2 +- .../reference/constructorArgsErrors4.js | 2 +- .../reference/constructorArgsErrors5.js | 2 +- ...constructorDefaultValuesReferencingThis.js | 6 +- ...uctorFunctionTypeIsAssignableToBaseType.js | 6 +- ...ctorFunctionTypeIsAssignableToBaseType2.js | 6 +- .../constructorHasPrototypeProperty.js | 8 +- ...structorImplementationWithDefaultValues.js | 6 +- ...tructorImplementationWithDefaultValues2.js | 6 +- ...constructorInvocationWithTooFewTypeArgs.js | 2 +- .../reference/constructorOverloads1.js | 2 +- .../reference/constructorOverloads2.js | 4 +- .../reference/constructorOverloads3.js | 2 +- .../reference/constructorOverloads8.js | 4 +- .../constructorOverloadsWithDefaultValues.js | 4 +- ...structorOverloadsWithOptionalParameters.js | 4 +- .../constructorParameterProperties.js | 4 +- .../constructorParameterProperties2.js | 8 +- .../constructorParameterShadowsOuterScopes.js | 4 +- ...tructorParametersInVariableDeclarations.js | 4 +- ...adowExternalNamesInVariableDeclarations.js | 4 +- .../constructorReturningAPrimitive.js | 4 +- .../constructorReturnsInvalidType.js | 2 +- .../reference/constructorStaticParamName.js | 2 +- .../constructorStaticParamNameErrors.js | 2 +- ...nstructorWithAssignableReturnExpression.js | 10 +- .../constructorWithExpressionLessReturn.js | 8 +- ...constructorWithIncompleteTypeAnnotation.js | 12 +- .../constructorsWithSpecializedSignatures.js | 4 +- .../contextualTypeAppliedToVarArgs.js | 2 +- .../reference/contextualTypeWithTuple.js | 4 +- tests/baselines/reference/contextualTyping.js | 6 +- .../reference/contextualTyping.sourcemap.txt | 6 +- .../baselines/reference/contextualTyping10.js | 2 +- .../baselines/reference/contextualTyping11.js | 2 +- .../baselines/reference/contextualTyping12.js | 2 +- .../baselines/reference/contextualTyping14.js | 2 +- .../baselines/reference/contextualTyping15.js | 2 +- .../baselines/reference/contextualTyping3.js | 2 +- .../baselines/reference/contextualTyping4.js | 2 +- .../baselines/reference/contextualTyping5.js | 2 +- .../contextualTypingArrayOfLambdas.js | 6 +- ...contextualTypingOfConditionalExpression.js | 6 +- ...ontextualTypingOfConditionalExpression2.js | 6 +- ...TypedClassExpressionMethodDeclaration01.js | 6 +- ...TypedClassExpressionMethodDeclaration02.js | 6 +- .../baselines/reference/convertKeywordsYes.js | 30 +-- tests/baselines/reference/covariance1.js | 2 +- .../crashInresolveReturnStatement.js | 6 +- ...urcePropertyIsRelatableToTargetProperty.js | 4 +- ...rashIntypeCheckObjectCreationExpression.js | 2 +- .../reference/crashOnMethodSignatures.js | 2 +- .../reference/crashRegressionTest.js | 4 +- tests/baselines/reference/createArray.js | 2 +- .../baselines/reference/declFileAccessors.js | 4 +- .../declFileAliasUseBeforeDeclaration.js | 2 +- .../reference/declFileClassExtendsNull.js | 2 +- .../declFileClassWithIndexSignature.js | 2 +- ...assWithStaticMethodReturningConstructor.js | 2 +- .../reference/declFileConstructors.js | 32 +-- .../reference/declFileExportImportChain.js | 2 +- .../reference/declFileExportImportChain2.js | 2 +- ...declFileForClassWithMultipleBaseClasses.js | 6 +- ...leForClassWithPrivateOverloadedFunction.js | 2 +- .../declFileForFunctionTypeAsTypeParameter.js | 4 +- .../reference/declFileForTypeParameters.js | 2 +- ...ileGenericClassWithGenericExtendedClass.js | 6 +- .../reference/declFileGenericType.js | 8 +- .../reference/declFileGenericType2.js | 4 +- .../declFileImportChainInExportAssignment.js | 2 +- ...eclFileImportedTypeUseInTypeArgPosition.js | 2 +- .../reference/declFileInternalAliases.js | 2 +- tests/baselines/reference/declFileMethods.js | 4 +- ...ModuleAssignmentInObjectLiteralProperty.js | 2 +- .../reference/declFileModuleContinuation.js | 2 +- .../declFileModuleWithPropertyOfTypeModule.js | 2 +- .../declFilePrivateMethodOverloads.js | 2 +- .../reference/declFilePrivateStatic.js | 2 +- .../declFileTypeAnnotationArrayType.js | 8 +- .../declFileTypeAnnotationParenType.js | 2 +- .../declFileTypeAnnotationTupleType.js | 8 +- .../declFileTypeAnnotationTypeAlias.js | 6 +- .../declFileTypeAnnotationTypeLiteral.js | 6 +- .../declFileTypeAnnotationTypeQuery.js | 8 +- .../declFileTypeAnnotationTypeReference.js | 8 +- .../declFileTypeAnnotationUnionType.js | 8 +- ...eTypeAnnotationVisibilityErrorAccessors.js | 8 +- ...ationVisibilityErrorParameterOfFunction.js | 6 +- ...tionVisibilityErrorReturnTypeOfFunction.js | 6 +- ...eTypeAnnotationVisibilityErrorTypeAlias.js | 10 +- ...ypeAnnotationVisibilityErrorTypeLiteral.js | 4 +- ...ationVisibilityErrorVariableDeclaration.js | 6 +- .../reference/declFileTypeofClass.js | 4 +- .../declFileTypeofInAnonymousType.js | 2 +- ...lictingWithClassReferredByExtendsClause.js | 4 +- ...dsClauseThatHasItsContainerNameConflict.js | 4 +- ...rnalModuleNameConflictsInExtendsClause1.js | 2 +- ...rnalModuleNameConflictsInExtendsClause2.js | 2 +- ...rnalModuleNameConflictsInExtendsClause3.js | 2 +- tests/baselines/reference/declInput-2.js | 6 +- tests/baselines/reference/declInput.js | 2 +- tests/baselines/reference/declInput3.js | 2 +- tests/baselines/reference/declInput4.js | 6 +- ...ionEmitDestructuringParameterProperties.js | 6 +- ...eclarationEmitDestructuringPrivacyError.js | 2 +- .../declarationEmitDetachedComment1.js | 6 +- .../declarationEmitDetachedComment2.js | 6 +- ...ationEmitImportInExportAssignmentModule.js | 2 +- .../declarationEmit_nameConflicts.js | 8 +- .../declarationEmit_nameConflicts2.js | 2 +- .../declarationEmit_nameConflicts3.js | 4 +- .../declarationEmit_protectedMembers.js | 8 +- .../declarationFileOverwriteError.js | 2 +- .../declarationFileOverwriteErrorWithOut.js | 2 +- tests/baselines/reference/declarationFiles.js | 8 +- .../reference/declareDottedExtend.js | 4 +- ...ifierAsBeginningOfStatementExpression01.js | 2 +- .../reference/decoratorCallGeneric.js | 2 +- .../decoratorChecksFunctionBodies.js | 2 +- ...ratorInstantiateModulesInFunctionBodies.js | 2 +- .../baselines/reference/decoratorMetadata.js | 4 +- ...taForMethodWithNoReturnTypeAnnotation01.js | 2 +- .../decoratorMetadataOnInferredType.js | 4 +- .../decoratorMetadataWithConstructorType.js | 4 +- ...adataWithImportDeclarationNameCollision.js | 4 +- ...dataWithImportDeclarationNameCollision2.js | 4 +- ...dataWithImportDeclarationNameCollision3.js | 4 +- ...dataWithImportDeclarationNameCollision4.js | 4 +- ...dataWithImportDeclarationNameCollision5.js | 4 +- ...dataWithImportDeclarationNameCollision6.js | 4 +- ...dataWithImportDeclarationNameCollision7.js | 4 +- ...dataWithImportDeclarationNameCollision8.js | 4 +- .../baselines/reference/decoratorOnClass1.js | 2 +- .../baselines/reference/decoratorOnClass2.js | 2 +- .../baselines/reference/decoratorOnClass3.js | 2 +- .../baselines/reference/decoratorOnClass4.js | 2 +- .../baselines/reference/decoratorOnClass5.js | 2 +- .../baselines/reference/decoratorOnClass8.js | 2 +- .../reference/decoratorOnClassAccessor1.js | 2 +- .../reference/decoratorOnClassAccessor2.js | 2 +- .../reference/decoratorOnClassAccessor3.js | 2 +- .../reference/decoratorOnClassAccessor4.js | 2 +- .../reference/decoratorOnClassAccessor5.js | 2 +- .../reference/decoratorOnClassAccessor6.js | 2 +- .../reference/decoratorOnClassConstructor1.js | 2 +- .../decoratorOnClassConstructorParameter1.js | 2 +- .../decoratorOnClassConstructorParameter4.js | 2 +- .../reference/decoratorOnClassMethod1.js | 2 +- .../reference/decoratorOnClassMethod10.js | 2 +- .../reference/decoratorOnClassMethod11.js | 2 +- .../reference/decoratorOnClassMethod12.js | 4 +- .../reference/decoratorOnClassMethod2.js | 2 +- .../reference/decoratorOnClassMethod3.js | 2 +- .../reference/decoratorOnClassMethod8.js | 2 +- .../decoratorOnClassMethodParameter1.js | 2 +- .../reference/decoratorOnClassProperty1.js | 2 +- .../reference/decoratorOnClassProperty10.js | 2 +- .../reference/decoratorOnClassProperty11.js | 2 +- .../reference/decoratorOnClassProperty2.js | 2 +- .../reference/decoratorOnClassProperty3.js | 2 +- .../reference/decoratorOnClassProperty6.js | 2 +- .../reference/decoratorOnClassProperty7.js | 2 +- .../decrementOperatorWithAnyOtherType.js | 2 +- ...eratorWithAnyOtherTypeInvalidOperations.js | 2 +- .../decrementOperatorWithNumberType.js | 2 +- ...OperatorWithNumberTypeInvalidOperations.js | 2 +- ...ementOperatorWithUnsupportedBooleanType.js | 2 +- ...rementOperatorWithUnsupportedStringType.js | 2 +- .../reference/defaultArgsInOverloads.js | 2 +- .../reference/defaultExportsCannotMerge02.js | 2 +- .../reference/defaultExportsCannotMerge03.js | 2 +- .../baselines/reference/defaultIndexProps1.js | 2 +- .../baselines/reference/defaultIndexProps2.js | 2 +- .../defaultValueInConstructorOverload1.js | 2 +- .../deleteOperatorInvalidOperations.js | 2 +- .../deleteOperatorWithAnyOtherType.js | 2 +- .../deleteOperatorWithBooleanType.js | 2 +- .../reference/deleteOperatorWithNumberType.js | 2 +- .../reference/deleteOperatorWithStringType.js | 2 +- .../reference/dependencyViaImportAlias.js | 2 +- ...derivedClassConstructorWithoutSuperCall.js | 12 +- ...ClassFunctionOverridesBaseClassAccessor.js | 4 +- .../derivedClassIncludesInheritedMembers.js | 8 +- ...idesIndexersWithAssignmentCompatibility.js | 8 +- .../derivedClassOverridesPrivateFunction1.js | 4 +- .../derivedClassOverridesPrivates.js | 8 +- .../derivedClassOverridesProtectedMembers.js | 4 +- .../derivedClassOverridesProtectedMembers2.js | 8 +- .../derivedClassOverridesProtectedMembers3.js | 22 +- .../derivedClassOverridesProtectedMembers4.js | 6 +- .../derivedClassOverridesPublicMembers.js | 8 +- .../derivedClassOverridesWithoutSubtype.js | 8 +- .../derivedClassParameterProperties.js | 24 +- ...dClassSuperCallsInNonConstructorMembers.js | 4 +- .../derivedClassSuperCallsWithThisArg.js | 10 +- .../reference/derivedClassTransitivity.js | 6 +- .../reference/derivedClassTransitivity2.js | 6 +- .../reference/derivedClassTransitivity3.js | 6 +- .../reference/derivedClassTransitivity4.js | 6 +- .../reference/derivedClassWithAny.js | 6 +- ...ivateInstanceShadowingProtectedInstance.js | 4 +- ...hPrivateInstanceShadowingPublicInstance.js | 4 +- ...thPrivateStaticShadowingProtectedStatic.js | 4 +- ...sWithPrivateStaticShadowingPublicStatic.js | 4 +- .../derivedClassWithoutExplicitConstructor.js | 8 +- ...derivedClassWithoutExplicitConstructor2.js | 8 +- ...derivedClassWithoutExplicitConstructor3.js | 12 +- tests/baselines/reference/derivedClasses.js | 6 +- .../reference/derivedGenericClassWithAny.js | 6 +- ...sesHiddenBaseCallViaSuperPropertyAccess.js | 4 +- ...edTypeCallingBaseImplWithOptionalParams.js | 2 +- .../derivedTypeDoesNotRequireExtendsClause.js | 6 +- .../destructuringParameterDeclaration1ES5.js | 4 +- .../destructuringParameterDeclaration2.js | 2 +- .../destructuringParameterDeclaration4.js | 2 +- .../destructuringParameterDeclaration5.js | 8 +- .../destructuringParameterProperties1.js | 6 +- .../destructuringParameterProperties2.js | 2 +- .../destructuringParameterProperties3.js | 2 +- .../destructuringParameterProperties5.js | 2 +- .../destructuringWithGenericParameter.js | 2 +- .../destructuringWithNewExpression.js | 2 +- .../detachedCommentAtStartOfConstructor1.js | 2 +- .../detachedCommentAtStartOfConstructor2.js | 2 +- .../detachedCommentAtStartOfFunctionBody1.js | 2 +- .../detachedCommentAtStartOfFunctionBody2.js | 2 +- ...detachedCommentAtStartOfLambdaFunction1.js | 2 +- ...detachedCommentAtStartOfLambdaFunction2.js | 2 +- .../reference/differentTypesWithSameName.js | 4 +- .../directDependenceBetweenTypeAliases.js | 4 +- .../disallowLineTerminatorBeforeArrow.js | 2 +- ...mitDetachedCommentsAtStartOfConstructor.js | 8 +- .../doNotEmitPinnedCommentOnNotEmittedNode.js | 2 +- ...oNotEmitPinnedCommentOnNotEmittedNodets.js | 2 +- .../reference/dottedSymbolResolution1.js | 2 +- .../reference/downlevelLetConst16.js | 4 +- .../reference/duplicateAnonymousInners1.js | 6 +- .../duplicateAnonymousModuleClasses.js | 12 +- .../reference/duplicateClassElements.js | 2 +- .../duplicateConstructorOverloadSignature.js | 2 +- .../duplicateConstructorOverloadSignature2.js | 2 +- .../reference/duplicateExportAssignments.js | 4 +- ...ateIdentifiersAcrossContainerBoundaries.js | 10 +- ...uplicateIdentifiersAcrossFileBoundaries.js | 10 +- .../reference/duplicateLocalVariable1.js | 4 +- .../reference/duplicateLocalVariable2.js | 4 +- .../reference/duplicateNumericIndexers.js | 2 +- .../reference/duplicatePropertyNames.js | 2 +- .../reference/duplicateStringIndexers.js | 2 +- .../duplicateSymbolsExportMatching.js | 2 +- .../reference/duplicateTypeParameters2.js | 4 +- .../reference/duplicateVariablesByScope.js | 2 +- tests/baselines/reference/elaboratedErrors.js | 2 +- .../emitArrowFunctionWhenUsingArguments12.js | 2 +- .../reference/emitDefaultParametersMethod.js | 6 +- .../reference/emitMemberAccessExpression.js | 4 +- .../reference/emitRestParametersMethod.js | 4 +- .../reference/emitThisInSuperMethodCall.js | 4 +- .../reference/emptyGenericParamList.js | 2 +- tests/baselines/reference/emptyModuleName.js | 2 +- .../reference/emptyTypeArgumentListWithNew.js | 2 +- .../baselines/reference/enumAssignability.js | 2 +- .../enumAssignabilityInInheritance.js | 6 +- .../reference/enumAssignmentCompat.js | 2 +- .../reference/enumAssignmentCompat2.js | 2 +- .../reference/enumGenericTypeClash.js | 2 +- .../enumIsNotASubtypeOfAnythingButNumber.js | 6 +- ...rorForwardReferenceForwadingConstructor.js | 4 +- .../errorRecoveryInClassDeclaration.js | 2 +- tests/baselines/reference/errorSuperCalls.js | 10 +- .../reference/errorSuperPropertyAccess.js | 10 +- tests/baselines/reference/errorSupression1.js | 2 +- .../reference/errorsInGenericTypeReference.js | 16 +- tests/baselines/reference/es3-amd.js | 2 +- .../reference/es3-declaration-amd.js | 2 +- .../baselines/reference/es3-sourcemap-amd.js | 2 +- .../reference/es3-sourcemap-amd.sourcemap.txt | 2 +- .../reference/es3defaultAliasIsQuoted.js | 2 +- tests/baselines/reference/es5-amd.js | 2 +- tests/baselines/reference/es5-commonjs.js | 2 +- tests/baselines/reference/es5-commonjs4.js | 2 +- .../reference/es5-declaration-amd.js | 2 +- tests/baselines/reference/es5-souremap-amd.js | 2 +- .../reference/es5-souremap-amd.sourcemap.txt | 2 +- tests/baselines/reference/es5-system.js | 2 +- tests/baselines/reference/es5-umd.js | 2 +- tests/baselines/reference/es5-umd2.js | 2 +- tests/baselines/reference/es5-umd3.js | 2 +- tests/baselines/reference/es5-umd4.js | 2 +- .../es5ExportDefaultClassDeclaration.js | 2 +- .../es5ExportDefaultClassDeclaration2.js | 2 +- .../es5ExportDefaultClassDeclaration3.js | 2 +- .../baselines/reference/es5ExportEqualsDts.js | 2 +- .../es5ModuleInternalNamedImports.js | 2 +- .../reference/es5ModuleWithModuleGenAmd.js | 2 +- .../es5ModuleWithModuleGenCommonjs.js | 2 +- .../es5ModuleWithoutModuleGenTarget.js | 2 +- tests/baselines/reference/es5andes6module.js | 2 +- .../reference/es6ClassSuperCodegenBug.js | 4 +- tests/baselines/reference/es6ClassTest.js | 4 +- tests/baselines/reference/es6ClassTest2.js | 24 +- tests/baselines/reference/es6ClassTest3.js | 2 +- tests/baselines/reference/es6ClassTest5.js | 4 +- tests/baselines/reference/es6ClassTest7.js | 2 +- tests/baselines/reference/es6ClassTest8.js | 6 +- tests/baselines/reference/es6DeclOrdering.js | 2 +- .../baselines/reference/es6ExportAllInEs5.js | 2 +- .../reference/es6ExportClauseInEs5.js | 2 +- ...ExportClauseWithoutModuleSpecifierInEs5.js | 2 +- .../reference/es6ImportDefaultBindingDts.js | 2 +- ...efaultBindingFollowedWithNamedImportDts.js | 12 +- ...faultBindingFollowedWithNamedImportDts1.js | 2 +- ...tBindingFollowedWithNamespaceBindingDts.js | 2 +- ...BindingFollowedWithNamespaceBindingDts1.js | 2 +- .../reference/es6ImportNameSpaceImportDts.js | 2 +- .../reference/es6ImportNamedImportDts.js | 28 +-- ...rtNamedImportInIndirectExportAssignment.js | 2 +- .../es6ImportNamedImportWithTypesAndValues.js | 4 +- tests/baselines/reference/es6MemberScoping.js | 4 +- .../baselines/reference/escapedIdentifiers.js | 8 +- .../reference/everyTypeAssignableToAny.js | 2 +- .../everyTypeWithAnnotationAndInitializer.js | 6 +- ...TypeWithAnnotationAndInvalidInitializer.js | 8 +- .../reference/everyTypeWithInitializer.js | 6 +- .../baselines/reference/exportAlreadySeen.js | 2 +- .../reference/exportAssignClassAndModule.js | 2 +- .../reference/exportAssignNonIdentifier.js | 2 +- .../exportAssignmentAndDeclaration.js | 2 +- .../reference/exportAssignmentClass.js | 2 +- .../exportAssignmentConstrainedGenericType.js | 2 +- .../reference/exportAssignmentGenericType.js | 2 +- .../exportAssignmentOfGenericType1.js | 4 +- .../exportAssignmentTopLevelClodule.js | 2 +- .../reference/exportAssignmentWithExports.js | 4 +- tests/baselines/reference/exportCodeGen.js | 4 +- .../exportDeclarationInInternalModule.js | 8 +- tests/baselines/reference/exportImport.js | 2 +- .../baselines/reference/exportImportAlias.js | 6 +- .../reference/exportImportAndClodule.js | 2 +- .../exportNonInitializedVariablesAMD.js | 4 +- .../exportNonInitializedVariablesCommonJS.js | 4 +- .../exportNonInitializedVariablesSystem.js | 4 +- .../exportNonInitializedVariablesUMD.js | 4 +- .../reference/exportNonVisibleType.js | 4 +- .../baselines/reference/exportPrivateType.js | 4 +- .../reference/exportStarFromEmptyModule.js | 4 +- tests/baselines/reference/exportVisibility.js | 2 +- .../exportingContainingVisibleType.js | 2 +- .../reference/exportsAndImports1-amd.js | 2 +- .../baselines/reference/exportsAndImports1.js | 2 +- .../reference/exportsAndImports3-amd.js | 2 +- .../baselines/reference/exportsAndImports3.js | 2 +- tests/baselines/reference/extBaseClass1.js | 8 +- tests/baselines/reference/extBaseClass2.js | 4 +- .../extendAndImplementTheSameBaseType.js | 4 +- .../extendAndImplementTheSameBaseType2.js | 4 +- .../extendBaseClassBeforeItsDeclared.js | 4 +- .../extendClassExpressionFromModule.js | 4 +- .../extendConstructSignatureInInterface.js | 2 +- .../reference/extendNonClassSymbol1.js | 4 +- .../reference/extendNonClassSymbol2.js | 2 +- ...xtendingClassFromAliasAndUsageInIndexer.js | 6 +- .../reference/extendsClauseAlreadySeen.js | 4 +- .../reference/extendsClauseAlreadySeen2.js | 4 +- tests/baselines/reference/externModule.js | 2 +- .../reference/externalModuleAssignToVar.js | 6 +- .../externalModuleExportingGenericClass.js | 2 +- .../reference/externalModuleQualification.js | 4 +- tests/baselines/reference/fatArrowSelf.js | 4 +- .../reference/fieldAndGetterWithSameName.js | 2 +- ...ilesEmittingIntoSameOutputWithOutOption.js | 2 +- .../fillInMissingTypeArgsOnConstructCalls.js | 2 +- tests/baselines/reference/fluentClasses.js | 6 +- tests/baselines/reference/for-inStatements.js | 6 +- .../reference/for-inStatementsInvalid.js | 4 +- tests/baselines/reference/forStatements.js | 6 +- .../forStatementsMultipleInvalidDecl.js | 8 +- tests/baselines/reference/forgottenNew.js | 2 +- tests/baselines/reference/funClodule.js | 2 +- .../functionAndPropertyNameConflict.js | 2 +- .../reference/functionArgShadowing.js | 6 +- tests/baselines/reference/functionCall5.js | 2 +- tests/baselines/reference/functionCall7.js | 2 +- .../functionConstraintSatisfaction.js | 4 +- .../functionConstraintSatisfaction2.js | 4 +- .../functionConstraintSatisfaction3.js | 4 +- ...ctionExpressionAndLambdaMatchesFunction.js | 2 +- .../functionExpressionContextualTyping1.js | 4 +- .../reference/functionImplementationErrors.js | 8 +- .../reference/functionImplementations.js | 8 +- .../reference/functionLiteralForOverloads2.js | 4 +- .../reference/functionOverloadErrors.js | 2 +- .../baselines/reference/functionOverloads5.js | 2 +- .../baselines/reference/functionOverloads6.js | 2 +- .../baselines/reference/functionOverloads7.js | 2 +- .../reference/functionOverloadsOutOfOrder.js | 4 +- ...tionOverloadsRecursiveGenericReturnType.js | 4 +- .../reference/functionSubtypingOfVarArgs.js | 4 +- .../reference/functionSubtypingOfVarArgs2.js | 4 +- .../reference/functionWithSameNameAsField.js | 2 +- .../reference/functionsInClassExpressions.js | 2 +- ...nsMissingReturnStatementsAndExpressions.js | 2 +- tests/baselines/reference/fuzzy.js | 2 +- .../reference/generatedContextualTyping.js | 222 +++++++++--------- .../generativeRecursionWithTypeOf.js | 2 +- .../genericArrayWithoutTypeAnnotation.js | 2 +- .../genericAssignmentCompatWithInterfaces1.js | 2 +- .../genericBaseClassLiteralProperty.js | 4 +- .../genericBaseClassLiteralProperty2.js | 6 +- .../genericCallTypeArgumentInference.js | 2 +- ...allWithConstraintsTypeArgumentInference.js | 8 +- .../genericCallWithFixedArguments.js | 4 +- .../genericCallWithFunctionTypedArguments4.js | 4 +- .../genericCallWithObjectTypeArgs.js | 6 +- .../genericCallWithObjectTypeArgs2.js | 6 +- ...ricCallWithObjectTypeArgsAndConstraints.js | 6 +- ...icCallWithObjectTypeArgsAndConstraints2.js | 4 +- ...icCallWithObjectTypeArgsAndConstraints3.js | 6 +- ...icCallWithObjectTypeArgsAndConstraints4.js | 4 +- ...icCallWithObjectTypeArgsAndConstraints5.js | 4 +- .../genericCallbacksAndClassHierarchy.js | 8 +- .../reference/genericCallsWithoutParens.js | 2 +- .../genericClassExpressionInFunction.js | 16 +- ...entingGenericInterfaceFromAnotherModule.js | 2 +- ...sInheritsConstructorFromNonGenericClass.js | 6 +- ...cClassPropertyInheritanceSpecialization.js | 6 +- .../reference/genericClassStaticMethod.js | 4 +- ...icClassWithFunctionTypedMemberArguments.js | 10 +- ...icClassWithObjectTypeArgsAndConstraints.js | 10 +- .../genericClassWithStaticFactory.js | 4 +- ...nericClassWithStaticsUsingTypeArguments.js | 2 +- tests/baselines/reference/genericClasses0.js | 2 +- tests/baselines/reference/genericClasses1.js | 2 +- tests/baselines/reference/genericClasses2.js | 2 +- tests/baselines/reference/genericClasses3.js | 4 +- tests/baselines/reference/genericClasses4.js | 2 +- .../reference/genericClassesInModule.js | 4 +- .../reference/genericClassesInModule2.js | 4 +- .../reference/genericCloduleInModule.js | 2 +- .../reference/genericCloduleInModule2.js | 2 +- .../reference/genericCloneReturnTypes.js | 2 +- .../reference/genericCloneReturnTypes2.js | 2 +- .../baselines/reference/genericConstraint1.js | 2 +- .../baselines/reference/genericConstraint2.js | 2 +- .../reference/genericConstraintDeclaration.js | 2 +- ...genericConstraintOnExtendedBuiltinTypes.js | 4 +- ...enericConstraintOnExtendedBuiltinTypes2.js | 4 +- .../genericConstructExpressionWithoutArgs.js | 4 +- .../genericDerivedTypeWithSpecializedBase.js | 4 +- .../genericDerivedTypeWithSpecializedBase2.js | 4 +- ...genericFunctionsWithOptionalParameters3.js | 2 +- tests/baselines/reference/genericGetter.js | 2 +- tests/baselines/reference/genericGetter2.js | 4 +- tests/baselines/reference/genericGetter3.js | 4 +- .../baselines/reference/genericImplements.js | 10 +- .../baselines/reference/genericInstanceOf.js | 2 +- .../genericInterfaceImplementation.js | 2 +- .../genericInterfacesWithoutTypeArguments.js | 2 +- .../reference/genericMemberFunction.js | 6 +- ...ricMergedDeclarationUsingTypeParameter2.js | 2 +- .../genericObjectCreationWithoutTypeArgs.js | 2 +- .../reference/genericObjectLitReturnType.js | 2 +- .../reference/genericOfACloduleType1.js | 6 +- .../reference/genericOfACloduleType2.js | 6 +- .../reference/genericOverloadSignatures.js | 2 +- .../reference/genericPrototypeProperty.js | 2 +- .../reference/genericPrototypeProperty2.js | 8 +- .../reference/genericPrototypeProperty3.js | 8 +- ...ericRecursiveImplicitConstructorErrors2.js | 4 +- ...ericRecursiveImplicitConstructorErrors3.js | 6 +- .../reference/genericReturnTypeFromGetter1.js | 2 +- .../genericReversingTypeParameters.js | 2 +- .../genericReversingTypeParameters2.js | 2 +- .../reference/genericSpecializations1.js | 6 +- .../reference/genericSpecializations2.js | 8 +- .../reference/genericSpecializations3.js | 8 +- .../reference/genericStaticAnyTypeFunction.js | 2 +- .../reference/genericTypeAssertions1.js | 2 +- .../reference/genericTypeAssertions2.js | 4 +- .../reference/genericTypeAssertions4.js | 6 +- .../reference/genericTypeAssertions6.js | 4 +- .../reference/genericTypeConstraints.js | 8 +- ...genericTypeReferenceWithoutTypeArgument.js | 10 +- ...enericTypeReferenceWithoutTypeArgument2.js | 4 +- .../genericTypeReferencesRequireTypeArgs.js | 2 +- .../genericTypeUsedWithoutTypeArguments1.js | 2 +- .../genericTypeWithCallableMembers.js | 2 +- .../genericTypeWithNonGenericBaseMisMatch.js | 2 +- .../reference/genericWithCallSignatures1.js | 2 +- .../genericWithIndexerOfTypeParameterType1.js | 2 +- .../genericWithIndexerOfTypeParameterType2.js | 8 +- .../genericWithOpenTypeParameters1.js | 2 +- tests/baselines/reference/generics3.js | 2 +- tests/baselines/reference/generics4.js | 2 +- tests/baselines/reference/generics4NoError.js | 2 +- .../genericsWithDuplicateTypeParameters1.js | 2 +- .../genericsWithoutTypeParameters1.js | 6 +- ...hImpliedReturnTypeAndFunctionClassMerge.js | 2 +- .../reference/getAndSetAsMemberNames.js | 10 +- .../reference/getAndSetNotIdenticalType.js | 2 +- .../reference/getAndSetNotIdenticalType2.js | 4 +- .../reference/getAndSetNotIdenticalType3.js | 4 +- .../reference/getEmitOutput-pp.baseline | 4 +- .../reference/getEmitOutput.baseline | 4 +- ...etEmitOutputDeclarationMultiFiles.baseline | 4 +- ...etEmitOutputDeclarationSingleFile.baseline | 4 +- .../getEmitOutputExternalModule.baseline | 2 +- .../getEmitOutputExternalModule2.baseline | 4 +- .../reference/getEmitOutputMapRoots.baseline | 2 +- .../reference/getEmitOutputNoErrors.baseline | 2 +- .../getEmitOutputOnlyOneFile.baseline | 2 +- .../reference/getEmitOutputOutFile.baseline | 4 +- .../getEmitOutputSingleFile.baseline | 4 +- .../getEmitOutputSingleFile2.baseline | 4 +- .../reference/getEmitOutputSourceMap.baseline | 2 +- .../getEmitOutputSourceMap2.baseline | 2 +- .../getEmitOutputSourceRoot.baseline | 2 +- ...getEmitOutputSourceRootMultiFiles.baseline | 4 +- .../getEmitOutputTsxFile_Preserve.baseline | 2 +- .../getEmitOutputTsxFile_React.baseline | 2 +- .../getEmitOutputWithDeclarationFile.baseline | 2 +- ...getEmitOutputWithDeclarationFile2.baseline | 2 +- .../getEmitOutputWithEmitterErrors.baseline | 2 +- .../getEmitOutputWithEmitterErrors2.baseline | 2 +- .../getSetAccessorContextualTyping.js | 2 +- .../reference/getterMissingReturnError.js | 2 +- .../getterThatThrowsShouldNotNeedReturn.js | 2 +- .../baselines/reference/gettersAndSetters.js | 2 +- .../gettersAndSettersAccessibility.js | 2 +- .../reference/gettersAndSettersErrors.js | 4 +- .../reference/gettersAndSettersTypesAgree.js | 2 +- tests/baselines/reference/giant.js | 28 +-- .../reference/grammarAmbiguities1.js | 4 +- .../heterogeneousArrayAndOverloads.js | 2 +- .../reference/heterogeneousArrayLiterals.js | 6 +- .../reference/ifDoWhileStatements.js | 10 +- .../illegalModifiersOnClassElements.js | 2 +- .../illegalSuperCallsInConstructor.js | 4 +- .../implementClausePrecedingExtends.js | 4 +- .../implementGenericWithMismatchedTypes.js | 4 +- .../implementInterfaceAnyMemberWithVoid.js | 2 +- .../implementPublicPropertyAsPrivate.js | 2 +- ...ngAnInterfaceExtendingClassWithPrivates.js | 10 +- ...gAnInterfaceExtendingClassWithPrivates2.js | 28 +-- ...AnInterfaceExtendingClassWithProtecteds.js | 18 +- .../reference/implementsClauseAlreadySeen.js | 4 +- .../reference/implementsInClassExpression.js | 2 +- .../implicitAnyAnyReturningFunction.js | 2 +- .../reference/implicitAnyCastedValue.js | 4 +- .../implicitAnyDeclareMemberWithoutType2.js | 2 +- ...plicitAnyDeclareTypePropertyWithoutType.js | 2 +- .../implicitAnyFromCircularInference.js | 4 +- ...tAnyFunctionInvocationWithAnyArguements.js | 2 +- ...mplicitAnyFunctionReturnNullOrUndefined.js | 2 +- .../reference/implicitAnyGenerics.js | 4 +- ...itAnyGetAndSetAccessorWithAnyReturnType.js | 6 +- .../baselines/reference/implicitAnyInCatch.js | 2 +- .../reference/implicitAnyWidenToAny.js | 2 +- .../reference/importAliasIdentifiers.js | 4 +- .../importAndVariableDeclarationConflict2.js | 2 +- .../baselines/reference/importAsBaseClass.js | 4 +- tests/baselines/reference/importDecl.js | 8 +- .../importDeclarationUsedAsTypeQuery.js | 2 +- .../reference/importImportOnlyModule.js | 2 +- .../reference/importInTypePosition.js | 2 +- .../reference/importShadowsGlobalName.js | 4 +- tests/baselines/reference/importStatements.js | 2 +- .../reference/importUsedInExtendsList1.js | 4 +- .../import_reference-exported-alias.js | 2 +- .../import_reference-to-type-alias.js | 2 +- ...ar-referencing-an-imported-module-alias.js | 2 +- .../importedAliasesInTypePositions.js | 4 +- .../reference/importedModuleAddToGlobal.js | 2 +- .../reference/importedModuleClassNameClash.js | 2 +- .../reference/inOperatorWithGeneric.js | 2 +- .../baselines/reference/incompatibleTypes.js | 8 +- .../reference/incorrectClassOverloadChain.js | 2 +- .../reference/incrementOnTypeParameter.js | 2 +- .../incrementOperatorWithAnyOtherType.js | 2 +- ...eratorWithAnyOtherTypeInvalidOperations.js | 2 +- .../incrementOperatorWithNumberType.js | 2 +- ...OperatorWithNumberTypeInvalidOperations.js | 2 +- ...ementOperatorWithUnsupportedBooleanType.js | 2 +- ...rementOperatorWithUnsupportedStringType.js | 2 +- .../baselines/reference/indexClassByNumber.js | 2 +- .../indexSignatureMustHaveTypeAnnotation.js | 4 +- .../reference/indexSignatureTypeCheck2.js | 2 +- ...indexSignatureWithAccessibilityModifier.js | 2 +- .../indexSignatureWithInitializer.js | 2 +- .../indexSignatureWithInitializer1.js | 2 +- .../indexSignatureWithoutTypeAnnotation1.js | 2 +- tests/baselines/reference/indexTypeCheck.js | 2 +- .../reference/indexWithoutParamType2.js | 2 +- tests/baselines/reference/indexer2A.js | 4 +- tests/baselines/reference/indexerA.js | 4 +- .../baselines/reference/indexerAsOptional.js | 2 +- .../reference/indexerConstraints2.js | 16 +- .../indexerReturningTypeParameter1.js | 2 +- .../indexerSignatureWithRestParam.js | 2 +- .../reference/indexersInClassType.js | 2 +- .../reference/indirectSelfReference.js | 4 +- .../reference/indirectSelfReferenceGeneric.js | 4 +- .../reference/inferSetterParamType.js | 4 +- .../inferentialTypingUsingApparentType3.js | 6 +- .../reference/infinitelyExpandingOverloads.js | 6 +- .../infinitelyExpandingTypesNonGenericBase.js | 6 +- .../inheritFromGenericTypeParameter.js | 2 +- ...mePrivatePropertiesFromDifferentOrigins.js | 4 +- ...SameNamePrivatePropertiesFromSameOrigin.js | 6 +- ...meNamePropertiesWithDifferentVisibility.js | 4 +- tests/baselines/reference/inheritance.js | 16 +- tests/baselines/reference/inheritance1.js | 14 +- ...itanceGrandParentPrivateMemberCollision.js | 6 +- ...tPrivateMemberCollisionWithPublicMember.js | 6 +- ...tPublicMemberCollisionWithPrivateMember.js | 6 +- ...ritanceMemberAccessorOverridingAccessor.js | 4 +- ...heritanceMemberAccessorOverridingMethod.js | 4 +- ...ritanceMemberAccessorOverridingProperty.js | 4 +- ...inheritanceMemberFuncOverridingAccessor.js | 4 +- .../inheritanceMemberFuncOverridingMethod.js | 4 +- ...inheritanceMemberFuncOverridingProperty.js | 4 +- ...ritanceMemberPropertyOverridingAccessor.js | 4 +- ...heritanceMemberPropertyOverridingMethod.js | 4 +- ...ritanceMemberPropertyOverridingProperty.js | 4 +- .../inheritanceOfGenericConstructorMethod1.js | 4 +- .../inheritanceOfGenericConstructorMethod2.js | 8 +- ...ritanceStaticAccessorOverridingAccessor.js | 4 +- ...heritanceStaticAccessorOverridingMethod.js | 4 +- ...ritanceStaticAccessorOverridingProperty.js | 4 +- ...inheritanceStaticFuncOverridingAccessor.js | 4 +- ...eStaticFuncOverridingAccessorOfFuncType.js | 4 +- .../inheritanceStaticFuncOverridingMethod.js | 4 +- ...inheritanceStaticFuncOverridingProperty.js | 4 +- ...eStaticFuncOverridingPropertyOfFuncType.js | 4 +- ...taticFunctionOverridingInstanceProperty.js | 4 +- .../inheritanceStaticMembersCompatible.js | 4 +- .../inheritanceStaticMembersIncompatible.js | 4 +- ...ritanceStaticPropertyOverridingAccessor.js | 4 +- ...heritanceStaticPropertyOverridingMethod.js | 4 +- ...ritanceStaticPropertyOverridingProperty.js | 4 +- .../inheritedConstructorWithRestParams.js | 4 +- .../inheritedConstructorWithRestParams2.js | 8 +- .../inheritedModuleMembersForClodule.js | 6 +- ...initializerReferencingConstructorLocals.js | 4 +- ...ializerReferencingConstructorParameters.js | 8 +- tests/baselines/reference/innerAliases.js | 4 +- tests/baselines/reference/innerAliases2.js | 2 +- .../reference/innerBoundLambdaEmit.js | 2 +- tests/baselines/reference/innerExtern.js | 2 +- .../innerTypeParameterShadowingOuterOne2.js | 4 +- .../instanceAndStaticDeclarations1.js | 2 +- .../instanceMemberAssignsToClassPrototype.js | 2 +- .../reference/instanceMemberInitialization.js | 2 +- .../reference/instanceOfAssignability.js | 12 +- .../reference/instanceOfInExternalModules.js | 2 +- ...nstancePropertiesInheritedIntoClassType.js | 8 +- .../reference/instancePropertyInClassType.js | 4 +- .../reference/instanceSubtypeCheck2.js | 4 +- .../baselines/reference/instanceofOperator.js | 2 +- .../instanceofOperatorWithInvalidOperands.js | 2 +- .../instanceofOperatorWithLHSIsObject.js | 2 +- ...ericClassWithWrongNumberOfTypeArguments.js | 4 +- ...ntiateGenericClassWithZeroTypeArguments.js | 4 +- ...tantiateNonGenericTypeWithTypeArguments.js | 2 +- .../instantiatedBaseTypeConstraints.js | 2 +- .../baselines/reference/instantiatedModule.js | 2 +- .../instantiatedReturnTypeContravariance.js | 4 +- tests/baselines/reference/intTypeCheck.js | 2 +- .../reference/interfaceClassMerging.js | 4 +- .../reference/interfaceClassMerging2.js | 4 +- .../reference/interfaceContextualType.js | 2 +- .../reference/interfaceDeclaration1.js | 2 +- .../reference/interfaceDeclaration2.js | 2 +- .../reference/interfaceDeclaration3.js | 22 +- .../reference/interfaceDeclaration4.js | 8 +- .../reference/interfaceDeclaration5.js | 2 +- .../reference/interfaceExtendingClass.js | 2 +- .../reference/interfaceExtendingClass2.js | 2 +- .../interfaceExtendingClassWithPrivates.js | 2 +- .../interfaceExtendingClassWithPrivates2.js | 6 +- .../interfaceExtendingClassWithProtecteds.js | 2 +- .../interfaceExtendingClassWithProtecteds2.js | 6 +- .../reference/interfaceExtendsClass1.js | 10 +- .../interfaceExtendsClassWithPrivate1.js | 4 +- .../interfaceExtendsClassWithPrivate2.js | 6 +- .../reference/interfaceImplementation1.js | 4 +- .../reference/interfaceImplementation2.js | 2 +- .../reference/interfaceImplementation3.js | 2 +- .../reference/interfaceImplementation4.js | 2 +- .../reference/interfaceImplementation5.js | 12 +- .../reference/interfaceImplementation6.js | 8 +- .../reference/interfaceImplementation7.js | 2 +- .../reference/interfaceImplementation8.js | 16 +- .../reference/interfaceInReopenedModule.js | 2 +- .../reference/interfaceInheritance.js | 2 +- .../interfacePropertiesWithSameName3.js | 4 +- .../baselines/reference/interfaceSubtyping.js | 2 +- .../interfaceWithMultipleDeclarations.js | 2 +- .../interfaceWithPropertyOfEveryType.js | 2 +- ...faceWithPropertyThatIsPrivateInBaseType.js | 4 +- ...aceWithPropertyThatIsPrivateInBaseType2.js | 4 +- tests/baselines/reference/interfacedecl.js | 2 +- .../interfacedeclWithIndexerErrors.js | 2 +- .../baselines/reference/internalAliasClass.js | 2 +- ...alAliasClassInsideLocalModuleWithExport.js | 2 +- ...liasClassInsideLocalModuleWithoutExport.js | 2 +- ...sideLocalModuleWithoutExportAccessError.js | 2 +- ...liasClassInsideTopLevelModuleWithExport.js | 2 +- ...sClassInsideTopLevelModuleWithoutExport.js | 2 +- .../internalAliasInitializedModule.js | 2 +- ...alizedModuleInsideLocalModuleWithExport.js | 2 +- ...zedModuleInsideLocalModuleWithoutExport.js | 2 +- ...sideLocalModuleWithoutExportAccessError.js | 2 +- ...zedModuleInsideTopLevelModuleWithExport.js | 2 +- ...ModuleInsideTopLevelModuleWithoutExport.js | 2 +- ...leMergedWithClassNotReferencingInstance.js | 2 +- ...thClassNotReferencingInstanceNoConflict.js | 2 +- ...leMergedWithClassNotReferencingInstance.js | 2 +- ...thClassNotReferencingInstanceNoConflict.js | 2 +- tests/baselines/reference/intrinsics.js | 4 +- .../reference/invalidAssignmentsToVoid.js | 2 +- .../reference/invalidBooleanAssignments.js | 2 +- .../invalidImportAliasIdentifiers.js | 2 +- .../reference/invalidInstantiatedModule.js | 2 +- .../invalidModuleWithStatementsOfEveryKind.js | 30 +-- .../invalidMultipleVariableDeclarations.js | 8 +- .../reference/invalidNestedModules.js | 6 +- .../reference/invalidNumberAssignments.js | 2 +- .../reference/invalidReferenceSyntax1.js | 2 +- .../reference/invalidReturnStatements.js | 4 +- .../baselines/reference/invalidStaticField.js | 4 +- .../reference/invalidStringAssignments.js | 2 +- tests/baselines/reference/invalidTypeNames.js | 2 +- .../reference/invalidUndefinedAssignments.js | 2 +- .../reference/invalidUndefinedValues.js | 2 +- .../reference/invalidVoidAssignments.js | 2 +- .../baselines/reference/invalidVoidValues.js | 2 +- ...okingNonGenericMethodWithTypeArguments1.js | 2 +- ...okingNonGenericMethodWithTypeArguments2.js | 2 +- .../isDeclarationVisibleNodeKinds.js | 2 +- .../isolatedModulesImportExportElision.js | 2 +- ...ationClassMethodContainingArrowFunction.js | 2 +- .../jsFileCompilationEmitBlockedCorrectly.js | 2 +- .../jsFileCompilationEmitDeclarations.js | 2 +- ...ileCompilationEmitTrippleSlashReference.js | 2 +- ...eclarationsWithJsFileReferenceWithNoOut.js | 2 +- ...nDeclarationsWithJsFileReferenceWithOut.js | 2 +- ...clarationsWithJsFileReferenceWithOutDir.js | 2 +- ...eclarationsWithJsFileReferenceWithNoOut.js | 2 +- ...tDeclarationsWithJsFileReferenceWithOut.js | 2 +- ...ationWithDeclarationEmitPathSameAsInput.js | 2 +- .../jsFileCompilationWithMapFileAsJs.js | 2 +- ...leCompilationWithMapFileAsJs.sourcemap.txt | 2 +- ...ationWithMapFileAsJsWithInlineSourceMap.js | 2 +- ...pFileAsJsWithInlineSourceMap.sourcemap.txt | 2 +- ...ileCompilationWithMapFileAsJsWithOutDir.js | 2 +- ...ionWithMapFileAsJsWithOutDir.sourcemap.txt | 2 +- .../reference/jsFileCompilationWithOut.js | 2 +- ...OutDeclarationFileNameSameAsInputJsFile.js | 2 +- .../reference/jsFileCompilationWithoutOut.js | 2 +- .../reference/jsxAndTypeAssertion.js | 2 +- tests/baselines/reference/jsxViaImport.js | 2 +- tests/baselines/reference/lambdaArgCrash.js | 4 +- tests/baselines/reference/lambdaPropSelf.js | 4 +- tests/baselines/reference/libMembers.js | 2 +- tests/baselines/reference/lift.js | 4 +- tests/baselines/reference/listFailure.js | 6 +- .../literalsInComputedProperties1.js | 2 +- .../baselines/reference/localClassesInLoop.js | 2 +- tests/baselines/reference/localTypes1.js | 26 +- tests/baselines/reference/localTypes2.js | 6 +- tests/baselines/reference/localTypes3.js | 6 +- tests/baselines/reference/localTypes5.js | 4 +- .../logicalNotOperatorWithAnyOtherType.js | 2 +- .../logicalNotOperatorWithBooleanType.js | 2 +- .../logicalNotOperatorWithNumberType.js | 2 +- .../logicalNotOperatorWithStringType.js | 2 +- tests/baselines/reference/m7Bugs.js | 4 +- .../reference/matchReturnTypeInAllBranches.js | 2 +- .../memberAccessMustUseModuleInstances.js | 2 +- ...FunctionOverloadMixingStaticAndInstance.js | 8 +- .../memberFunctionsWithPrivateOverloads.js | 4 +- .../memberFunctionsWithPublicOverloads.js | 4 +- ...mberFunctionsWithPublicPrivateOverloads.js | 4 +- tests/baselines/reference/memberScope.js | 2 +- .../reference/memberVariableDeclarations1.js | 4 +- .../reference/mergedClassInterface.js | 4 +- .../mergedInheritedClassInterface.js | 8 +- .../mergedInterfacesWithInheritedPrivates.js | 6 +- .../mergedInterfacesWithInheritedPrivates2.js | 8 +- .../mergedInterfacesWithInheritedPrivates3.js | 10 +- .../mergedInterfacesWithMultipleBases.js | 12 +- .../mergedInterfacesWithMultipleBases2.js | 20 +- .../mergedInterfacesWithMultipleBases3.js | 10 +- .../mergedInterfacesWithMultipleBases4.js | 10 +- .../mergedModuleDeclarationCodeGen.js | 4 +- .../mergedModuleDeclarationCodeGen5.js | 2 +- .../methodContainingLocalFunction.js | 8 +- .../methodSignatureDeclarationEmit1.js | 2 +- .../mismatchedClassConstructorVariable.js | 4 +- .../reference/mismatchedGenericArguments1.js | 4 +- .../reference/missingDecoratorType.js | 2 +- .../missingImportAfterModuleImport.js | 2 +- .../missingPropertiesOfClassExpression.js | 4 +- .../reference/missingReturnStatement.js | 2 +- .../reference/missingReturnStatement1.js | 2 +- tests/baselines/reference/missingSelf.js | 4 +- .../reference/missingTypeArguments1.js | 22 +- .../reference/missingTypeArguments2.js | 2 +- .../mixedStaticAndInstanceClassMembers.js | 4 +- .../mixingStaticAndInstanceOverloads.js | 10 +- ...ifierOnClassDeclarationMemberInFunction.js | 2 +- ...difierOnClassExpressionMemberInFunction.js | 2 +- .../reference/modifierOnParameter1.js | 2 +- .../reference/moduleAliasInterface.js | 12 +- tests/baselines/reference/moduleAsBaseType.js | 4 +- .../reference/moduleAssignmentCompat1.js | 6 +- .../reference/moduleAssignmentCompat2.js | 6 +- .../reference/moduleAssignmentCompat4.js | 4 +- .../reference/moduleClassArrayCodeGenTest.js | 4 +- .../baselines/reference/moduleCodeGenTest5.js | 4 +- tests/baselines/reference/moduleCrashBug1.js | 2 +- .../reference/moduleDuplicateIdentifiers.js | 4 +- .../reference/moduleElementsInWrongContext.js | 2 +- .../moduleElementsInWrongContext2.js | 2 +- .../moduleElementsInWrongContext3.js | 2 +- tests/baselines/reference/moduleExports1.js | 2 +- .../moduleImportedForTypeArgumentPosition.js | 4 +- .../reference/moduleInTypePosition1.js | 2 +- .../moduleMemberWithoutTypeAnnotation1.js | 10 +- tests/baselines/reference/moduleMerge.js | 4 +- .../reference/moduleMergeConstructor.js | 2 +- .../baselines/reference/moduleNewExportBug.js | 2 +- .../baselines/reference/modulePrologueAMD.js | 2 +- .../reference/modulePrologueCommonjs.js | 2 +- .../reference/modulePrologueSystem.js | 2 +- .../baselines/reference/modulePrologueUmd.js | 2 +- .../reference/moduleRedifinitionErrors.js | 2 +- .../reference/moduleReopenedTypeOtherBlock.js | 4 +- .../reference/moduleReopenedTypeSameBlock.js | 4 +- tests/baselines/reference/moduleScopingBug.js | 2 +- .../reference/moduleVisibilityTest1.js | 4 +- .../reference/moduleVisibilityTest2.js | 4 +- .../reference/moduleVisibilityTest3.js | 4 +- .../moduleWithStatementsOfEveryKind.js | 20 +- tests/baselines/reference/moduledecl.js | 10 +- .../baselines/reference/multiImportExport.js | 2 +- .../reference/multiModuleClodule1.js | 2 +- .../multipleClassPropertyModifiers.js | 2 +- .../multipleClassPropertyModifiersErrors.js | 2 +- .../reference/multipleDefaultExports01.js | 2 +- .../reference/multipleDefaultExports03.js | 4 +- .../reference/multipleInheritance.js | 20 +- .../reference/multipleNumericIndexers.js | 4 +- .../reference/multipleStringIndexers.js | 4 +- tests/baselines/reference/multivar.js | 4 +- .../mutuallyRecursiveGenericBaseTypes2.js | 4 +- tests/baselines/reference/nameCollision.js | 2 +- tests/baselines/reference/nameCollisions.js | 12 +- ...nctionExpressionAssignedToClassProperty.js | 2 +- tests/baselines/reference/namespaces2.js | 2 +- .../reference/narrowTypeByInstanceof.js | 4 +- .../negateOperatorWithAnyOtherType.js | 2 +- .../negateOperatorWithBooleanType.js | 2 +- .../reference/negateOperatorWithNumberType.js | 2 +- .../reference/negateOperatorWithStringType.js | 2 +- .../reference/nestedClassDeclaration.js | 6 +- tests/baselines/reference/nestedSelf.js | 2 +- tests/baselines/reference/newArrays.js | 4 +- .../reference/newOnInstanceSymbol.js | 2 +- tests/baselines/reference/newOperator.js | 4 +- .../reference/newOperatorConformance.js | 6 +- .../reference/newOperatorErrorCases.js | 6 +- tests/baselines/reference/newWithSpread.js | 2 +- tests/baselines/reference/newWithSpreadES5.js | 2 +- ...CollisionThisExpressionAndClassInGlobal.js | 2 +- ...ionThisExpressionAndLocalVarInAccessors.js | 4 +- ...nThisExpressionAndLocalVarInConstructor.js | 4 +- ...lisionThisExpressionAndLocalVarInMethod.js | 2 +- ...sionThisExpressionAndLocalVarInProperty.js | 4 +- .../reference/noConstraintInReturnType1.js | 2 +- tests/baselines/reference/noEmitHelpers.js | 4 +- tests/baselines/reference/noEmitHelpers2.js | 2 +- .../baselines/reference/noErrorsInCallback.js | 2 +- .../noImplicitAnyForMethodParameters.js | 4 +- .../noImplicitAnyParametersInClass.js | 2 +- .../reference/noTypeArgumentOnReturnType1.js | 2 +- ...enericClassExtendingGenericClassWithAny.js | 4 +- ...onGenericTypeReferenceWithTypeArguments.js | 4 +- .../reference/nonInstantiatedModule.js | 2 +- .../nonMergedDeclarationsAndOverloads.js | 2 +- tests/baselines/reference/null.js | 2 +- .../reference/nullAssignableToEveryType.js | 2 +- .../nullIsSubtypeOfEverythingButUndefined.js | 6 +- .../reference/numericClassMembers1.js | 6 +- ...icIndexerConstrainsPropertyDeclarations.js | 2 +- ...cIndexerConstrainsPropertyDeclarations2.js | 6 +- .../reference/numericIndexerConstraint.js | 2 +- .../reference/numericIndexerConstraint1.js | 2 +- .../reference/numericIndexerConstraint2.js | 2 +- .../reference/numericIndexerConstraint3.js | 6 +- .../reference/numericIndexerConstraint4.js | 4 +- .../reference/numericIndexerTyping2.js | 4 +- .../reference/numericIndexingResults.js | 2 +- .../baselines/reference/numericMethodName1.js | 2 +- .../numericNamedPropertyDuplicates.js | 2 +- .../numericStringNamedPropertyEquivalence.js | 2 +- ...ctCreationExpressionInFunctionParameter.js | 2 +- ...objectCreationOfElementAccessExpression.js | 16 +- tests/baselines/reference/objectIndexer.js | 2 +- .../reference/objectLitArrayDeclNoNew.js | 2 +- .../objectLiteralDeclarationGeneration1.js | 2 +- .../reference/objectMembersOnTypes.js | 2 +- ...objectTypeHidingMembersOfExtendedObject.js | 6 +- .../objectTypeHidingMembersOfObject.js | 2 +- ...peHidingMembersOfObjectAssignmentCompat.js | 2 +- ...eHidingMembersOfObjectAssignmentCompat2.js | 2 +- .../reference/objectTypePropertyAccess.js | 2 +- .../objectTypeWithDuplicateNumericProperty.js | 2 +- .../objectTypeWithNumericProperty.js | 2 +- .../objectTypeWithRecursiveWrappedProperty.js | 2 +- ...objectTypeWithRecursiveWrappedProperty2.js | 2 +- ...ecursiveWrappedPropertyCheckedNominally.js | 4 +- ...ypeWithStringIndexerHidingObjectIndexer.js | 2 +- ...bjectTypeWithStringNamedNumericProperty.js | 2 +- ...hStringNamedPropertyOfIllegalCharacters.js | 2 +- .../reference/objectTypesIdentity.js | 6 +- .../reference/objectTypesIdentity2.js | 6 +- .../objectTypesIdentityWithCallSignatures.js | 6 +- .../objectTypesIdentityWithCallSignatures2.js | 6 +- ...yWithCallSignaturesDifferingParamCounts.js | 6 +- ...IdentityWithCallSignaturesWithOverloads.js | 6 +- ...ectTypesIdentityWithConstructSignatures.js | 6 +- ...ctTypesIdentityWithConstructSignatures2.js | 4 +- ...ConstructSignaturesDifferingParamCounts.js | 4 +- ...tTypesIdentityWithGenericCallSignatures.js | 6 +- ...TypesIdentityWithGenericCallSignatures2.js | 6 +- ...ricCallSignaturesDifferingByConstraints.js | 6 +- ...icCallSignaturesDifferingByConstraints2.js | 8 +- ...icCallSignaturesDifferingByConstraints3.js | 12 +- ...ericCallSignaturesDifferingByReturnType.js | 6 +- ...ricCallSignaturesDifferingByReturnType2.js | 6 +- ...lSignaturesDifferingTypeParameterCounts.js | 6 +- ...llSignaturesDifferingTypeParameterNames.js | 6 +- ...WithGenericCallSignaturesOptionalParams.js | 6 +- ...ithGenericCallSignaturesOptionalParams2.js | 6 +- ...ithGenericCallSignaturesOptionalParams3.js | 6 +- ...nstructSignaturesDifferingByConstraints.js | 4 +- ...structSignaturesDifferingByConstraints2.js | 6 +- ...structSignaturesDifferingByConstraints3.js | 10 +- ...onstructSignaturesDifferingByReturnType.js | 4 +- ...nstructSignaturesDifferingByReturnType2.js | 4 +- ...tSignaturesDifferingTypeParameterCounts.js | 4 +- ...ctSignaturesDifferingTypeParameterNames.js | 4 +- ...enericConstructSignaturesOptionalParams.js | 4 +- ...nericConstructSignaturesOptionalParams2.js | 4 +- ...nericConstructSignaturesOptionalParams3.js | 4 +- ...objectTypesIdentityWithNumericIndexers1.js | 10 +- ...objectTypesIdentityWithNumericIndexers2.js | 14 +- ...objectTypesIdentityWithNumericIndexers3.js | 10 +- .../objectTypesIdentityWithOptionality.js | 6 +- .../objectTypesIdentityWithPrivates.js | 10 +- .../objectTypesIdentityWithPrivates2.js | 4 +- .../objectTypesIdentityWithPrivates3.js | 8 +- .../objectTypesIdentityWithPublics.js | 6 +- .../objectTypesIdentityWithStringIndexers.js | 10 +- .../objectTypesIdentityWithStringIndexers2.js | 14 +- .../objectTypesWithOptionalProperties.js | 4 +- .../objectTypesWithOptionalProperties2.js | 4 +- .../objectTypesWithPredefinedTypesAsName.js | 10 +- .../objectTypesWithPredefinedTypesAsName2.js | 2 +- .../optionalArgsWithDefaultValues.js | 2 +- .../optionalConstructorArgInSuper.js | 4 +- .../reference/optionalParamArgsTest.js | 4 +- .../reference/optionalParamInOverride.js | 4 +- .../reference/optionalPropertiesInClasses.js | 6 +- .../reference/optionalSetterParam.js | 2 +- tests/baselines/reference/out-flag.js | 2 +- .../reference/out-flag.sourcemap.txt | 2 +- tests/baselines/reference/out-flag2.js | 4 +- .../reference/out-flag2.sourcemap.txt | 4 +- tests/baselines/reference/out-flag3.js | 4 +- .../reference/out-flag3.sourcemap.txt | 4 +- .../baselines/reference/outModuleConcatAmd.js | 4 +- .../reference/outModuleConcatAmd.js.map | 2 +- .../outModuleConcatAmd.sourcemap.txt | 18 +- .../reference/outModuleConcatSystem.js | 4 +- .../reference/outModuleConcatSystem.js.map | 2 +- .../outModuleConcatSystem.sourcemap.txt | 18 +- .../reference/outModuleTripleSlashRefs.js | 6 +- .../reference/outModuleTripleSlashRefs.js.map | 2 +- .../outModuleTripleSlashRefs.sourcemap.txt | 20 +- tests/baselines/reference/overload1.js | 6 +- tests/baselines/reference/overload2.js | 2 +- .../reference/overloadAssignmentCompat.js | 2 +- tests/baselines/reference/overloadCallTest.js | 2 +- .../reference/overloadConsecutiveness.js | 2 +- .../overloadEquivalenceWithStatics.js | 2 +- .../overloadGenericFunctionWithRestArgs.js | 4 +- .../reference/overloadModifiersMustAgree.js | 2 +- .../overloadOnConstConstraintChecks1.js | 10 +- .../overloadOnConstConstraintChecks2.js | 6 +- .../overloadOnConstConstraintChecks3.js | 6 +- .../overloadOnConstConstraintChecks4.js | 8 +- ...nstInBaseWithBadImplementationInDerived.js | 2 +- .../reference/overloadOnConstInCallback1.js | 2 +- .../reference/overloadOnConstInheritance4.js | 2 +- .../overloadOnConstNoAnyImplementation2.js | 2 +- ...verloadOnConstNoNonSpecializedSignature.js | 2 +- .../overloadOnConstNoStringImplementation2.js | 2 +- .../overloadOnConstantsInvalidOverload1.js | 8 +- ...verloadOnGenericClassAndNonGenericClass.js | 12 +- .../baselines/reference/overloadResolution.js | 8 +- .../overloadResolutionClassConstructors.js | 18 +- .../overloadResolutionConstructors.js | 8 +- ...overloadResolutionOnDefaultConstructor1.js | 2 +- .../overloadResolutionOverNonCTLambdas.js | 2 +- .../reference/overloadReturnTypes.js | 2 +- .../overloadedStaticMethodSpecialization.js | 2 +- .../reference/overloadingOnConstants1.js | 8 +- .../reference/overloadingOnConstants2.js | 6 +- ...esolutionWithConstraintCheckingDeferred.js | 2 +- .../reference/overloadsWithinClasses.js | 6 +- .../overridingPrivateStaticMembers.js | 4 +- .../reference/paramPropertiesInSignatures.js | 2 +- ...parameterInitializersForwardReferencing.js | 2 +- .../parameterNamesInTypeParameterList.js | 2 +- .../parameterPropertyInConstructor2.js | 2 +- ...ameterPropertyInitializerInInitializers.js | 2 +- .../parameterPropertyOutsideConstructor.js | 2 +- ...ameterPropertyReferencingOtherParameter.js | 2 +- .../parameterReferencesOtherParameter1.js | 4 +- .../parameterReferencesOtherParameter2.js | 4 +- .../parametersWithNoAnnotationAreAny.js | 2 +- .../reference/parseErrorInHeritageClause1.js | 2 +- tests/baselines/reference/parser0_004152.js | 2 +- tests/baselines/reference/parser509546.js | 2 +- tests/baselines/reference/parser509546_1.js | 2 +- tests/baselines/reference/parser509546_2.js | 2 +- tests/baselines/reference/parser509630.js | 4 +- tests/baselines/reference/parser509667.js | 2 +- tests/baselines/reference/parser509668.js | 2 +- tests/baselines/reference/parser512084.js | 2 +- tests/baselines/reference/parser553699.js | 4 +- tests/baselines/reference/parser585151.js | 2 +- tests/baselines/reference/parser618973.js | 2 +- tests/baselines/reference/parser642331.js | 2 +- tests/baselines/reference/parser642331_1.js | 2 +- .../parserAccessibilityAfterStatic1.js | 2 +- .../parserAccessibilityAfterStatic10.js | 2 +- .../parserAccessibilityAfterStatic11.js | 2 +- .../parserAccessibilityAfterStatic14.js | 2 +- .../parserAccessibilityAfterStatic2.js | 2 +- .../parserAccessibilityAfterStatic3.js | 2 +- .../parserAccessibilityAfterStatic4.js | 2 +- .../parserAccessibilityAfterStatic5.js | 2 +- .../parserAccessibilityAfterStatic6.js | 2 +- .../parserAccessibilityAfterStatic7.js | 2 +- tests/baselines/reference/parserAccessors1.js | 2 +- tests/baselines/reference/parserAccessors2.js | 2 +- tests/baselines/reference/parserAstSpans1.js | 12 +- tests/baselines/reference/parserClass1.js | 2 +- tests/baselines/reference/parserClass2.js | 2 +- .../reference/parserClassDeclaration1.js | 2 +- .../reference/parserClassDeclaration10.js | 2 +- .../reference/parserClassDeclaration11.js | 2 +- .../reference/parserClassDeclaration12.js | 2 +- .../reference/parserClassDeclaration13.js | 2 +- .../reference/parserClassDeclaration14.js | 2 +- .../reference/parserClassDeclaration15.js | 2 +- .../reference/parserClassDeclaration16.js | 2 +- .../reference/parserClassDeclaration19.js | 2 +- .../reference/parserClassDeclaration2.js | 2 +- .../reference/parserClassDeclaration20.js | 2 +- .../reference/parserClassDeclaration21.js | 2 +- .../reference/parserClassDeclaration22.js | 2 +- .../reference/parserClassDeclaration23.js | 2 +- .../reference/parserClassDeclaration24.js | 2 +- .../reference/parserClassDeclaration25.js | 2 +- .../reference/parserClassDeclaration26.js | 2 +- .../reference/parserClassDeclaration3.js | 2 +- .../reference/parserClassDeclaration4.js | 2 +- .../reference/parserClassDeclaration5.js | 2 +- .../reference/parserClassDeclaration6.js | 2 +- .../reference/parserClassDeclaration8.js | 2 +- .../reference/parserClassDeclaration9.js | 2 +- .../parserClassDeclarationIndexSignature1.js | 2 +- .../parserConstructorDeclaration1.js | 2 +- .../parserConstructorDeclaration10.js | 2 +- .../parserConstructorDeclaration11.js | 2 +- .../parserConstructorDeclaration12.js | 2 +- .../parserConstructorDeclaration2.js | 2 +- .../parserConstructorDeclaration3.js | 2 +- .../parserConstructorDeclaration4.js | 2 +- .../parserConstructorDeclaration5.js | 2 +- .../parserConstructorDeclaration6.js | 2 +- .../parserConstructorDeclaration7.js | 2 +- .../parserConstructorDeclaration8.js | 2 +- .../parserConstructorDeclaration9.js | 2 +- .../reference/parserES3Accessors1.js | 2 +- .../reference/parserES3Accessors2.js | 2 +- .../parserES5ComputedPropertyName10.js | 2 +- .../parserES5ComputedPropertyName11.js | 2 +- .../parserES5ComputedPropertyName7.js | 2 +- .../parserES5ComputedPropertyName9.js | 2 +- .../reference/parserES5SymbolIndexer2.js | 2 +- .../reference/parserES5SymbolProperty5.js | 2 +- .../reference/parserES5SymbolProperty6.js | 2 +- .../reference/parserES5SymbolProperty7.js | 2 +- .../parserErrantSemicolonInClass1.js | 2 +- .../parserErrorRecoveryIfStatement1.js | 2 +- .../parserErrorRecoveryIfStatement2.js | 2 +- .../parserErrorRecoveryIfStatement3.js | 2 +- .../parserErrorRecoveryIfStatement4.js | 2 +- .../parserErrorRecoveryIfStatement5.js | 2 +- .../parserErrorRecoveryIfStatement6.js | 2 +- .../reference/parserErrorRecovery_Block3.js | 2 +- .../parserErrorRecovery_ClassElement1.js | 4 +- .../parserErrorRecovery_ClassElement2.js | 2 +- .../parserErrorRecovery_ClassElement3.js | 2 +- ...rrorRecovery_ExtendsOrImplementsClause1.js | 2 +- ...rrorRecovery_ExtendsOrImplementsClause2.js | 2 +- ...rrorRecovery_ExtendsOrImplementsClause3.js | 2 +- ...rrorRecovery_ExtendsOrImplementsClause4.js | 2 +- ...rrorRecovery_ExtendsOrImplementsClause5.js | 2 +- ...ErrorRecovery_IncompleteMemberVariable1.js | 2 +- ...ErrorRecovery_IncompleteMemberVariable2.js | 2 +- .../parserErrorRecovery_ParameterList6.js | 2 +- .../parserErrorRecovery_SourceUnit1.js | 4 +- .../parserErrorRecovery_SwitchStatement2.js | 4 +- .../reference/parserExportAssignment7.js | 2 +- .../reference/parserExportAssignment8.js | 2 +- .../reference/parserGenericClass1.js | 2 +- .../reference/parserGenericClass2.js | 2 +- .../reference/parserGenericConstraint1.js | 2 +- .../reference/parserGenericConstraint2.js | 2 +- .../reference/parserGenericConstraint3.js | 2 +- .../reference/parserGenericConstraint4.js | 2 +- .../reference/parserGenericConstraint5.js | 2 +- .../reference/parserGenericConstraint6.js | 2 +- .../reference/parserGenericConstraint7.js | 2 +- .../parserGenericsInTypeContexts1.js | 2 +- .../parserGenericsInTypeContexts2.js | 2 +- .../parserGetAccessorWithTypeParameters1.js | 2 +- .../parserIndexMemberDeclaration1.js | 2 +- .../parserIndexMemberDeclaration10.js | 2 +- .../parserIndexMemberDeclaration2.js | 2 +- .../parserIndexMemberDeclaration3.js | 2 +- .../parserIndexMemberDeclaration4.js | 2 +- .../parserIndexMemberDeclaration5.js | 2 +- .../parserIndexMemberDeclaration6.js | 2 +- .../parserIndexMemberDeclaration7.js | 2 +- .../parserIndexMemberDeclaration8.js | 2 +- .../parserIndexMemberDeclaration9.js | 2 +- ...InvalidIdentifiersInVariableStatements1.js | 2 +- .../reference/parserMemberAccessor1.js | 2 +- .../parserMemberAccessorDeclaration1.js | 2 +- .../parserMemberAccessorDeclaration10.js | 2 +- .../parserMemberAccessorDeclaration11.js | 2 +- .../parserMemberAccessorDeclaration12.js | 2 +- .../parserMemberAccessorDeclaration13.js | 2 +- .../parserMemberAccessorDeclaration14.js | 2 +- .../parserMemberAccessorDeclaration15.js | 2 +- .../parserMemberAccessorDeclaration16.js | 2 +- .../parserMemberAccessorDeclaration17.js | 2 +- .../parserMemberAccessorDeclaration18.js | 2 +- .../parserMemberAccessorDeclaration2.js | 2 +- .../parserMemberAccessorDeclaration3.js | 2 +- .../parserMemberAccessorDeclaration4.js | 2 +- .../parserMemberAccessorDeclaration5.js | 2 +- .../parserMemberAccessorDeclaration6.js | 2 +- .../parserMemberAccessorDeclaration7.js | 2 +- .../parserMemberAccessorDeclaration8.js | 2 +- .../parserMemberAccessorDeclaration9.js | 2 +- .../parserMemberFunctionDeclaration1.js | 2 +- .../parserMemberFunctionDeclaration2.js | 2 +- .../parserMemberFunctionDeclaration3.js | 2 +- .../parserMemberFunctionDeclaration4.js | 2 +- .../parserMemberFunctionDeclaration5.js | 2 +- ...erMemberFunctionDeclarationAmbiguities1.js | 2 +- .../parserMemberVariableDeclaration1.js | 2 +- .../parserMemberVariableDeclaration2.js | 2 +- .../parserMemberVariableDeclaration3.js | 2 +- .../parserMemberVariableDeclaration4.js | 2 +- .../parserMemberVariableDeclaration5.js | 2 +- .../parserMissingLambdaOpenBrace1.js | 2 +- .../reference/parserParameterList1.js | 2 +- .../reference/parserParameterList10.js | 2 +- .../reference/parserParameterList16.js | 2 +- .../reference/parserParameterList17.js | 2 +- .../reference/parserParameterList2.js | 2 +- .../reference/parserParameterList3.js | 2 +- .../reference/parserParameterList6.js | 2 +- .../reference/parserParameterList7.js | 2 +- .../reference/parserParameterList9.js | 2 +- .../baselines/reference/parserRealSource1.js | 6 +- .../baselines/reference/parserRealSource10.js | 18 +- .../baselines/reference/parserRealSource11.js | 100 ++++---- .../baselines/reference/parserRealSource12.js | 6 +- .../baselines/reference/parserRealSource14.js | 4 +- .../baselines/reference/parserRealSource4.js | 12 +- .../baselines/reference/parserRealSource5.js | 2 +- .../baselines/reference/parserRealSource6.js | 6 +- .../baselines/reference/parserRealSource7.js | 2 +- .../baselines/reference/parserRealSource8.js | 4 +- .../baselines/reference/parserRealSource9.js | 2 +- .../parserSetAccessorWithTypeAnnotation1.js | 2 +- .../parserSetAccessorWithTypeParameters1.js | 2 +- .../reference/parserSuperExpression1.js | 4 +- .../reference/parserSuperExpression2.js | 2 +- .../reference/parserSuperExpression3.js | 2 +- .../reference/parserSuperExpression4.js | 4 +- tests/baselines/reference/parserUnicode3.js | 2 +- tests/baselines/reference/parserharness.js | 32 +-- tests/baselines/reference/parserindenter.js | 2 +- ...sRecoversWhenHittingUnexpectedSemicolon.js | 2 +- .../reference/partiallyAmbientClodule.js | 2 +- tests/baselines/reference/pinnedComments1.js | 2 +- .../reference/plusOperatorWithAnyOtherType.js | 2 +- .../reference/plusOperatorWithBooleanType.js | 2 +- .../reference/plusOperatorWithNumberType.js | 2 +- .../reference/plusOperatorWithStringType.js | 2 +- .../prespecializedGenericMembers1.js | 4 +- .../reference/primitiveConstraints2.js | 2 +- tests/baselines/reference/primitiveMembers.js | 4 +- .../reference/primitiveTypeAsClassName.js | 2 +- .../reference/privacyAccessorDeclFile.js | 146 ++++++------ .../privacyCannotNameAccessorDeclFile.js | 12 +- .../privacyCannotNameVarTypeDeclFile.js | 12 +- ...nalModuleExportAssignmentOfGenericClass.js | 2 +- ...arameterReferenceInConstructorParameter.js | 4 +- tests/baselines/reference/privacyClass.js | 84 +++---- .../privacyClassExtendsClauseDeclFile.js | 64 ++--- .../privacyClassImplementsClauseDeclFile.js | 48 ++-- tests/baselines/reference/privacyFunc.js | 22 +- ...FunctionCannotNameParameterTypeDeclFile.js | 20 +- ...acyFunctionCannotNameReturnTypeDeclFile.js | 12 +- .../privacyFunctionParameterDeclFile.js | 84 +++---- .../privacyFunctionReturnTypeDeclFile.js | 84 +++---- tests/baselines/reference/privacyGetter.js | 24 +- tests/baselines/reference/privacyGloClass.js | 36 +-- tests/baselines/reference/privacyGloFunc.js | 48 ++-- tests/baselines/reference/privacyGloGetter.js | 12 +- tests/baselines/reference/privacyGloImport.js | 6 +- .../reference/privacyGloImportParseErrors.js | 6 +- .../reference/privacyGloInterface.js | 6 +- tests/baselines/reference/privacyGloVar.js | 12 +- tests/baselines/reference/privacyImport.js | 12 +- .../reference/privacyImportParseErrors.js | 12 +- tests/baselines/reference/privacyInterface.js | 12 +- ...yLocalInternalReferenceImportWithExport.js | 8 +- ...calInternalReferenceImportWithoutExport.js | 8 +- ...elAmbientExternalModuleImportWithExport.js | 4 +- ...mbientExternalModuleImportWithoutExport.js | 4 +- ...pLevelInternalReferenceImportWithExport.js | 8 +- ...velInternalReferenceImportWithoutExport.js | 8 +- .../privacyTypeParameterOfFunction.js | 16 +- .../privacyTypeParameterOfFunctionDeclFile.js | 56 ++--- .../reference/privacyTypeParametersOfClass.js | 16 +- .../privacyTypeParametersOfClassDeclFile.js | 56 ++--- .../privacyTypeParametersOfInterface.js | 8 +- ...rivacyTypeParametersOfInterfaceDeclFile.js | 24 +- tests/baselines/reference/privacyVar.js | 24 +- .../baselines/reference/privacyVarDeclFile.js | 84 +++---- .../reference/privateAccessInSubclass1.js | 4 +- ...ivateClassPropertyAccessibleWithinClass.js | 4 +- tests/baselines/reference/privateIndexer.js | 6 +- .../privateInstanceMemberAccessibility.js | 4 +- .../reference/privateInstanceVisibility.js | 4 +- .../reference/privateInterfaceProperties.js | 4 +- .../privatePropertyUsingObjectType.js | 2 +- .../privateStaticMemberAccessibility.js | 4 +- .../privateStaticNotAccessibleInClodule.js | 2 +- .../privateStaticNotAccessibleInClodule2.js | 4 +- .../baselines/reference/privateVisibility.js | 4 +- tests/baselines/reference/privateVisibles.js | 2 +- tests/baselines/reference/promiseChaining.js | 2 +- tests/baselines/reference/promiseChaining1.js | 2 +- tests/baselines/reference/promiseChaining2.js | 2 +- tests/baselines/reference/properties.js | 2 +- .../reference/properties.sourcemap.txt | 2 +- .../reference/propertiesAndIndexers.js | 4 +- .../propertiesAndIndexersForNumericNames.js | 2 +- tests/baselines/reference/propertyAccess.js | 4 +- ...rtyAccessOnTypeParameterWithConstraints.js | 2 +- ...tyAccessOnTypeParameterWithConstraints2.js | 6 +- ...tyAccessOnTypeParameterWithConstraints3.js | 6 +- ...tyAccessOnTypeParameterWithConstraints4.js | 2 +- ...tyAccessOnTypeParameterWithConstraints5.js | 6 +- ...AccessOnTypeParameterWithoutConstraints.js | 2 +- .../reference/propertyAccessibility1.js | 2 +- .../reference/propertyAccessibility2.js | 2 +- .../propertyAndAccessorWithSameName.js | 6 +- .../propertyAndFunctionWithSameName.js | 4 +- .../propertyIdentityWithPrivacyMismatch.js | 4 +- .../propertyNameWithoutTypeAnnotation.js | 2 +- .../reference/propertyNamedPrototype.js | 2 +- .../reference/propertyNamesOfReservedWords.js | 2 +- .../propertyNamesWithStringLiteral.js | 2 +- tests/baselines/reference/propertyOrdering.js | 4 +- .../baselines/reference/propertyOrdering2.js | 2 +- .../propertyParameterWithQuestionMark.js | 2 +- .../reference/propertyWrappedInTry.js | 2 +- ...ectedClassPropertyAccessibleWithinClass.js | 4 +- ...edClassPropertyAccessibleWithinSubclass.js | 4 +- ...dClassPropertyAccessibleWithinSubclass2.js | 10 +- ...dClassPropertyAccessibleWithinSubclass3.js | 4 +- .../protectedInstanceMemberAccessibility.js | 6 +- tests/baselines/reference/protectedMembers.js | 28 +-- ...icClassPropertyAccessibleWithinSubclass.js | 8 +- ...cClassPropertyAccessibleWithinSubclass2.js | 6 +- .../protectedStaticNotAccessibleInClodule.js | 2 +- .../protoAsIndexInIndexExpression.js | 2 +- tests/baselines/reference/protoInIndexer.js | 2 +- ...prototypeInstantiatedWithBaseConstraint.js | 2 +- tests/baselines/reference/publicIndexer.js | 6 +- ...emberImplementedAsPrivateInDerivedClass.js | 2 +- ...solution-does-not-affect-class-heritage.js | 2 +- .../reference/quotedAccessorName1.js | 2 +- .../reference/quotedAccessorName2.js | 2 +- .../reference/quotedFunctionName1.js | 2 +- .../reference/quotedFunctionName2.js | 2 +- .../reference/quotedPropertyName1.js | 2 +- .../reference/quotedPropertyName2.js | 2 +- .../reference/quotedPropertyName3.js | 2 +- .../raiseErrorOnParameterProperty.js | 2 +- .../reference/reachabilityChecks1.js | 2 +- .../baselines/reference/reassignStaticProp.js | 2 +- .../reference/recursiveBaseCheck3.js | 4 +- .../reference/recursiveBaseCheck4.js | 2 +- .../reference/recursiveBaseCheck5.js | 2 +- .../reference/recursiveBaseCheck6.js | 2 +- .../recursiveBaseConstructorCreation1.js | 4 +- ...ssInstantiationsWithDefaultConstructors.js | 4 +- .../reference/recursiveClassReferenceTest.js | 10 +- .../recursiveClassReferenceTest.js.map | 2 +- .../recursiveClassReferenceTest.sourcemap.txt | 40 ++-- .../reference/recursiveCloduleReference.js | 2 +- .../reference/recursiveComplicatedClasses.js | 10 +- ...siveExportAssignmentAndFindAliasedType1.js | 2 +- ...siveExportAssignmentAndFindAliasedType2.js | 2 +- ...siveExportAssignmentAndFindAliasedType3.js | 2 +- ...siveExportAssignmentAndFindAliasedType4.js | 2 +- ...siveExportAssignmentAndFindAliasedType5.js | 2 +- ...siveExportAssignmentAndFindAliasedType6.js | 2 +- ...siveExportAssignmentAndFindAliasedType7.js | 2 +- .../reference/recursiveFunctionTypes.js | 2 +- .../reference/recursiveFunctionTypes1.js | 2 +- .../reference/recursiveGetterAccess.js | 2 +- .../reference/recursiveInheritance3.js | 2 +- tests/baselines/reference/recursiveMods.js | 2 +- .../reference/recursiveProperties.js | 4 +- .../recursiveSpecializationOfSignatures.js | 2 +- .../recursiveTypeInGenericConstraint.js | 6 +- ...rameterConstraintReferenceLacksTypeArgs.js | 2 +- .../recursiveTypeParameterReferenceError1.js | 4 +- .../recursiveTypesUsedAsFunctionParameters.js | 4 +- ...sivelySpecializedConstructorDeclaration.js | 4 +- .../reference/reexportClassDefinition.js | 4 +- .../reference/requireEmitSemicolon.js | 4 +- .../requiredInitializedParameter2.js | 2 +- .../requiredInitializedParameter3.js | 2 +- .../requiredInitializedParameter4.js | 2 +- ...lveTypeAliasWithSameLetDeclarationName1.js | 2 +- ...lassDeclarationWhenInBaseTypeResolution.js | 200 ++++++++-------- .../baselines/reference/restParamModifier.js | 2 +- .../baselines/reference/restParamModifier2.js | 2 +- .../restParameterAssignmentCompatibility.js | 6 +- ...estParameterWithoutAnnotationIsAnyArray.js | 2 +- .../restParametersOfNonArrayTypes.js | 2 +- .../restParametersOfNonArrayTypes2.js | 4 +- .../restParametersWithArrayTypeAnnotations.js | 4 +- .../reference/returnInConstructor1.js | 18 +- tests/baselines/reference/returnStatements.js | 4 +- .../reference/returnTypeTypeArguments.js | 14 +- .../reference/returnValueInSetter.js | 2 +- tests/baselines/reference/scannerClass2.js | 2 +- tests/baselines/reference/scannertest1.js | 2 +- ...peCheckExtendedClassInsidePublicMethod2.js | 4 +- ...peCheckExtendedClassInsideStaticMethod1.js | 4 +- .../scopeCheckInsidePublicMethod1.js | 2 +- .../scopeCheckInsideStaticMethod1.js | 2 +- .../reference/scopeResolutionIdentifiers.js | 2 +- tests/baselines/reference/scopeTests.js | 4 +- tests/baselines/reference/selfInCallback.js | 2 +- tests/baselines/reference/selfInLambdas.js | 2 +- tests/baselines/reference/selfRef.js | 2 +- .../selfReferencesInFunctionParameters.js | 2 +- .../reference/selfReferencingFile.js | 2 +- .../reference/selfReferencingFile2.js | 2 +- .../reference/selfReferencingFile3.js | 2 +- .../baselines/reference/setterBeforeGetter.js | 2 +- tests/baselines/reference/setterWithReturn.js | 2 +- .../reference/shadowPrivateMembers.js | 4 +- .../reference/shadowedInternalModule.js | 2 +- .../sigantureIsSubTypeIfTheyAreIdentical.js | 2 +- .../baselines/reference/sourceMap-Comments.js | 2 +- .../sourceMap-Comments.sourcemap.txt | 2 +- .../reference/sourceMap-FileWithComments.js | 2 +- .../sourceMap-FileWithComments.sourcemap.txt | 2 +- tests/baselines/reference/sourceMapSample.js | 2 +- .../reference/sourceMapSample.sourcemap.txt | 2 +- .../reference/sourceMapValidationClass.js | 2 +- .../sourceMapValidationClass.sourcemap.txt | 2 +- ...apValidationClassWithDefaultConstructor.js | 2 +- ...nClassWithDefaultConstructor.sourcemap.txt | 2 +- ...aultConstructorAndCapturedThisStatement.js | 2 +- ...ctorAndCapturedThisStatement.sourcemap.txt | 2 +- ...sWithDefaultConstructorAndExtendsClause.js | 4 +- ...hDefaultConstructorAndExtendsClause.js.map | 2 +- ...tConstructorAndExtendsClause.sourcemap.txt | 24 +- .../reference/sourceMapValidationClasses.js | 2 +- .../sourceMapValidationClasses.sourcemap.txt | 2 +- .../sourceMapValidationDecorators.js | 2 +- ...ourceMapValidationDecorators.sourcemap.txt | 2 +- .../sourceMapValidationExportAssignment.js | 2 +- ...apValidationExportAssignment.sourcemap.txt | 2 +- ...ceMapValidationExportAssignmentCommonjs.js | 2 +- ...tionExportAssignmentCommonjs.sourcemap.txt | 2 +- .../reference/sourceMapValidationImport.js | 2 +- .../sourceMapValidationImport.sourcemap.txt | 2 +- .../sourceMapValidationWithComments.js | 2 +- ...rceMapValidationWithComments.sourcemap.txt | 2 +- .../sourceMapWithCaseSensitiveFileNames.js | 4 +- ...apWithCaseSensitiveFileNames.sourcemap.txt | 4 +- ...eMapWithCaseSensitiveFileNamesAndOutDir.js | 4 +- ...eSensitiveFileNamesAndOutDir.sourcemap.txt | 4 +- ...ultipleFilesWithFileEndingWithInterface.js | 2 +- ...sWithFileEndingWithInterface.sourcemap.txt | 2 +- .../sourceMapWithNonCaseSensitiveFileNames.js | 4 +- ...ithNonCaseSensitiveFileNames.sourcemap.txt | 4 +- ...pWithNonCaseSensitiveFileNamesAndOutDir.js | 4 +- ...eSensitiveFileNamesAndOutDir.sourcemap.txt | 4 +- .../sourcemapValidationDuplicateNames.js | 2 +- ...emapValidationDuplicateNames.sourcemap.txt | 2 +- .../specializationOfExportedClass.js | 2 +- .../specializedInheritedConstructors1.js | 6 +- .../specializedLambdaTypeArguments.js | 2 +- .../specializedOverloadWithRestParameters.js | 4 +- ...reIsNotSubtypeOfNonSpecializedSignature.js | 6 +- ...atureIsSubtypeOfNonSpecializedSignature.js | 6 +- .../reference/staticAndMemberFunctions.js | 2 +- .../staticAndNonStaticPropertiesSameName.js | 2 +- .../baselines/reference/staticAsIdentifier.js | 2 +- .../reference/staticClassMemberError.js | 4 +- tests/baselines/reference/staticClassProps.js | 2 +- tests/baselines/reference/staticFactory1.js | 4 +- tests/baselines/reference/staticGetter1.js | 2 +- tests/baselines/reference/staticGetter2.js | 2 +- .../reference/staticGetterAndSetter.js | 2 +- tests/baselines/reference/staticIndexer.js | 2 +- tests/baselines/reference/staticIndexers.js | 6 +- .../baselines/reference/staticInheritance.js | 4 +- .../reference/staticInstanceResolution.js | 2 +- .../reference/staticInstanceResolution2.js | 4 +- .../reference/staticInstanceResolution3.js | 2 +- .../reference/staticInstanceResolution4.js | 2 +- .../staticInterfaceAssignmentCompat.js | 2 +- .../staticMemberAccessOffDerivedType1.js | 4 +- ...mberAssignsToConstructorFunctionMembers.js | 2 +- .../reference/staticMemberExportAccess.js | 2 +- .../reference/staticMemberInitialization.js | 2 +- ...AndPublicMemberOfAnotherClassAssignment.js | 4 +- .../staticMemberWithStringAndNumberNames.js | 2 +- .../staticMembersUsingClassTypeParameter.js | 6 +- .../staticMethodReferencingTypeArgument1.js | 2 +- ...dWithTypeParameterExtendsClauseDeclFile.js | 6 +- ...icMethodsReferencingClassTypeParameters.js | 2 +- .../reference/staticModifierAlreadySeen.js | 2 +- .../reference/staticMustPrecedePublic.js | 2 +- .../reference/staticOffOfInstance1.js | 2 +- .../reference/staticOffOfInstance2.js | 2 +- tests/baselines/reference/staticPropSuper.js | 10 +- .../staticPropertyAndFunctionWithSameName.js | 4 +- .../reference/staticPropertyNotInClassType.js | 4 +- .../reference/staticPrototypeProperty.js | 4 +- .../staticPrototypePropertyOnClass.js | 8 +- tests/baselines/reference/staticVisibility.js | 4 +- tests/baselines/reference/statics.js | 2 +- .../reference/staticsInConstructorBodies.js | 2 +- .../reference/staticsNotInScopeInClodule.js | 2 +- .../reference/strictModeInConstructor.js | 14 +- .../reference/strictModeReservedWord.js | 2 +- ...trictModeReservedWordInClassDeclaration.js | 16 +- .../strictModeUseContextualKeyword.js | 2 +- .../reference/stringIndexerAndConstructor.js | 2 +- .../reference/stringIndexerAssignments2.js | 6 +- ...ngIndexerConstrainsPropertyDeclarations.js | 2 +- ...gIndexerConstrainsPropertyDeclarations2.js | 6 +- .../reference/stringIndexingResults.js | 2 +- .../stringLiteralTypeIsSubtypeOfString.js | 2 +- ...gLiteralTypesInImplementationSignatures.js | 2 +- ...LiteralTypesInImplementationSignatures2.js | 2 +- .../reference/stringNamedPropertyAccess.js | 2 +- .../stringNamedPropertyDuplicates.js | 2 +- tests/baselines/reference/stripInternal1.js | 2 +- tests/baselines/reference/subtypesOfAny.js | 6 +- .../reference/subtypesOfTypeParameter.js | 10 +- .../subtypesOfTypeParameterWithConstraints.js | 60 ++--- ...subtypesOfTypeParameterWithConstraints2.js | 6 +- ...subtypesOfTypeParameterWithConstraints4.js | 22 +- ...OfTypeParameterWithRecursiveConstraints.js | 42 ++-- tests/baselines/reference/subtypesOfUnion.js | 6 +- .../reference/subtypingTransitivity.js | 6 +- .../reference/subtypingWithCallSignatures2.js | 8 +- .../reference/subtypingWithCallSignatures3.js | 8 +- .../reference/subtypingWithCallSignatures4.js | 8 +- .../subtypingWithConstructSignatures2.js | 8 +- .../subtypingWithConstructSignatures3.js | 8 +- .../subtypingWithConstructSignatures4.js | 8 +- .../subtypingWithConstructSignatures5.js | 8 +- .../subtypingWithConstructSignatures6.js | 8 +- .../reference/subtypingWithNumericIndexer.js | 16 +- .../reference/subtypingWithNumericIndexer3.js | 18 +- .../reference/subtypingWithNumericIndexer4.js | 10 +- .../reference/subtypingWithNumericIndexer5.js | 14 +- .../reference/subtypingWithObjectMembers.js | 30 +-- .../reference/subtypingWithObjectMembers4.js | 16 +- .../reference/subtypingWithObjectMembers5.js | 12 +- ...subtypingWithObjectMembersAccessibility.js | 16 +- ...ubtypingWithObjectMembersAccessibility2.js | 28 +-- .../reference/subtypingWithStringIndexer.js | 16 +- .../reference/subtypingWithStringIndexer3.js | 18 +- .../reference/subtypingWithStringIndexer4.js | 10 +- tests/baselines/reference/super.js | 8 +- tests/baselines/reference/super1.js | 20 +- tests/baselines/reference/super2.js | 12 +- tests/baselines/reference/superAccess.js | 4 +- tests/baselines/reference/superAccess2.js | 4 +- .../reference/superAccessInFatArrow1.js | 4 +- .../reference/superCallArgsMustMatch.js | 4 +- .../reference/superCallAssignResult.js | 4 +- ...allFromClassThatDerivesFromGenericType1.js | 2 +- ...allFromClassThatDerivesFromGenericType2.js | 2 +- ...eButWithIncorrectNumberOfTypeArguments1.js | 4 +- ...sFromGenericTypeButWithNoTypeArguments1.js | 4 +- ...ivesNonGenericTypeButWithTypeArguments1.js | 4 +- .../superCallFromClassThatHasNoBaseType1.js | 4 +- .../superCallInConstructorWithNoBaseType.js | 4 +- .../reference/superCallInNonStaticMethod.js | 4 +- .../reference/superCallInStaticMethod.js | 4 +- .../superCallInsideClassDeclaration.js | 8 +- .../superCallInsideClassExpression.js | 8 +- .../superCallInsideObjectLiteralExpression.js | 4 +- .../reference/superCallOutsideConstructor.js | 4 +- .../superCallParameterContextualTyping1.js | 4 +- .../superCallParameterContextualTyping2.js | 4 +- .../superCallParameterContextualTyping3.js | 4 +- .../superCallWithMissingBaseClass.js | 2 +- tests/baselines/reference/superCalls.js | 8 +- .../reference/superCallsInConstructor.js | 6 +- tests/baselines/reference/superErrors.js | 4 +- .../baselines/reference/superInCatchBlock1.js | 4 +- .../reference/superInConstructorParam1.js | 4 +- tests/baselines/reference/superInLambdas.js | 10 +- tests/baselines/reference/superNewCall1.js | 4 +- .../reference/superPropertyAccess.js | 4 +- .../reference/superPropertyAccess1.js | 4 +- .../reference/superPropertyAccess2.js | 4 +- .../reference/superPropertyAccessNoError.js | 4 +- .../reference/superSymbolIndexedAccess5.js | 4 +- .../reference/superSymbolIndexedAccess6.js | 4 +- .../superWithGenericSpecialization.js | 4 +- .../baselines/reference/superWithGenerics.js | 2 +- .../reference/superWithTypeArgument.js | 4 +- .../reference/superWithTypeArgument2.js | 4 +- .../reference/superWithTypeArgument3.js | 4 +- ...side-object-literal-getters-and-setters.js | 4 +- .../reference/switchAssignmentCompat.js | 2 +- .../switchCasesExpressionTypeMismatch.js | 2 +- tests/baselines/reference/switchStatements.js | 4 +- tests/baselines/reference/systemModule17.js | 2 +- tests/baselines/reference/systemModule3.js | 4 +- tests/baselines/reference/systemModule6.js | 2 +- .../systemModuleDeclarationMerging.js | 2 +- .../reference/systemModuleExportDefault.js | 4 +- .../systemModuleNonTopLevelModuleMembers.js | 4 +- .../reference/systemModuleWithSuperClass.js | 4 +- .../reference/targetTypeBaseCalls.js | 4 +- ...emplateStringsArrayTypeDefinedInES5Mode.js | 2 +- .../baselines/reference/testContainerList.js | 2 +- tests/baselines/reference/thisBinding.js | 4 +- tests/baselines/reference/thisBinding2.js | 2 +- tests/baselines/reference/thisCapture1.js | 2 +- ...essionInCallExpressionWithTypeArguments.js | 2 +- .../thisExpressionOfGenericObject.js | 2 +- tests/baselines/reference/thisInAccessors.js | 6 +- ...thisInArrowFunctionInStaticInitializer1.js | 2 +- .../reference/thisInConstructorParameter1.js | 2 +- .../reference/thisInConstructorParameter2.js | 2 +- .../reference/thisInGenericStaticMembers.js | 4 +- .../reference/thisInInnerFunctions.js | 2 +- .../thisInInstanceMemberInitializer.js | 4 +- .../reference/thisInInvalidContexts.js | 10 +- .../thisInInvalidContextsExternalModule.js | 10 +- tests/baselines/reference/thisInLambda.js | 4 +- .../reference/thisInObjectLiterals.js | 2 +- .../reference/thisInOuterClassBody.js | 2 +- .../thisInPropertyBoundDeclarations.js | 6 +- .../reference/thisInStaticMethod1.js | 2 +- tests/baselines/reference/thisInStatics.js | 2 +- tests/baselines/reference/thisInSuperCall.js | 8 +- tests/baselines/reference/thisInSuperCall1.js | 4 +- tests/baselines/reference/thisInSuperCall2.js | 6 +- tests/baselines/reference/thisInSuperCall3.js | 4 +- .../reference/thisTypeAndConstraints.js | 4 +- tests/baselines/reference/thisTypeErrors.js | 6 +- tests/baselines/reference/thisTypeErrors2.js | 6 +- .../baselines/reference/thisTypeInClasses.js | 8 +- .../reference/thisWhenTypeCheckFails.js | 2 +- .../reference/throwInEnclosingStatements.js | 2 +- tests/baselines/reference/throwStatements.js | 6 +- .../reference/tooManyTypeParameters1.js | 2 +- tests/baselines/reference/topLevel.js | 2 +- ...railingCommaInHeterogenousArrayLiteral1.js | 2 +- .../transitiveTypeArgumentInference1.js | 2 +- .../reference/tsxAttributeResolution10.js | 2 +- .../reference/tsxAttributeResolution9.js | 2 +- .../reference/tsxElementResolution.js | 6 +- .../reference/tsxElementResolution19.js | 2 +- tests/baselines/reference/tsxEmit1.js | 2 +- tests/baselines/reference/tsxEmit3.js | 4 +- .../reference/tsxEmit3.sourcemap.txt | 4 +- .../reference/tsxExternalModuleEmit1.js | 4 +- tests/baselines/reference/tsxReactEmit1.js | 2 +- .../tsxStatelessFunctionComponents2.js | 2 +- tests/baselines/reference/tsxTypeErrors.js | 2 +- .../reference/twoAccessorsWithSameName.js | 6 +- .../reference/twoAccessorsWithSameName2.js | 6 +- tests/baselines/reference/typeAliases.js | 2 +- .../reference/typeAliasesForObjectTypes.js | 2 +- .../typeArgumentInferenceOrdering.js | 2 +- ...peArgumentInferenceWithClassExpression1.js | 4 +- ...peArgumentInferenceWithClassExpression2.js | 4 +- ...peArgumentInferenceWithClassExpression3.js | 4 +- tests/baselines/reference/typeAssertions.js | 6 +- .../reference/typeCheckTypeArgument.js | 4 +- .../typeConstraintsWithConstructSignatures.js | 2 +- .../baselines/reference/typeGuardFunction.js | 8 +- .../reference/typeGuardFunctionErrors.js | 8 +- .../reference/typeGuardFunctionGenerics.js | 6 +- tests/baselines/reference/typeGuardInClass.js | 4 +- .../reference/typeGuardOfFormExpr1AndExpr2.js | 2 +- .../reference/typeGuardOfFormExpr1OrExpr2.js | 2 +- .../reference/typeGuardOfFormInstanceOf.js | 8 +- .../reference/typeGuardOfFormIsType.js | 6 +- .../reference/typeGuardOfFormTypeOfBoolean.js | 2 +- ...eGuardOfFormTypeOfEqualEqualHasNoEffect.js | 2 +- ...ypeGuardOfFormTypeOfNotEqualHasNoEffect.js | 2 +- .../reference/typeGuardOfFormTypeOfNumber.js | 2 +- .../reference/typeGuardOfFormTypeOfOther.js | 2 +- .../reference/typeGuardOfFormTypeOfString.js | 2 +- .../reference/typeGuardsInClassAccessors.js | 2 +- .../reference/typeGuardsInClassMethods.js | 2 +- .../reference/typeGuardsInProperties.js | 2 +- .../reference/typeGuardsOnClassProperty.js | 2 +- .../reference/typeIdentityConsidersBrands.js | 8 +- .../typeInferenceReturnTypeCallback.js | 4 +- tests/baselines/reference/typeMatch1.js | 4 +- tests/baselines/reference/typeMatch2.js | 4 +- tests/baselines/reference/typeName1.js | 2 +- tests/baselines/reference/typeOfPrototype.js | 2 +- tests/baselines/reference/typeOfSuperCall.js | 4 +- tests/baselines/reference/typeOfThis.js | 4 +- .../reference/typeOfThisInAccessor.js | 4 +- .../typeOfThisInConstructorParamList.js | 2 +- .../typeOfThisInFunctionExpression.js | 2 +- .../reference/typeOfThisInInstanceMember.js | 2 +- .../reference/typeOfThisInInstanceMember2.js | 2 +- .../reference/typeOfThisInMemberFunctions.js | 6 +- .../reference/typeOfThisInStaticMembers.js | 4 +- .../reference/typeOfThisInStaticMembers2.js | 4 +- .../reference/typeOfThisInStatics.js | 2 +- .../typeParamExtendsOtherTypeParam.js | 4 +- .../reference/typeParameterAsBaseClass.js | 4 +- .../reference/typeParameterAsBaseType.js | 4 +- .../reference/typeParameterAsTypeArgument.js | 2 +- .../reference/typeParameterAssignability3.js | 4 +- .../typeParameterAssignmentCompat1.js | 2 +- ...ypeParameterDirectlyConstrainedToItself.js | 4 +- .../reference/typeParameterExtendingUnion1.js | 6 +- .../reference/typeParameterExtendingUnion2.js | 6 +- .../reference/typeParameterInConstraint1.js | 2 +- ...eParameterIndirectlyConstrainedToItself.js | 6 +- .../typeParameterListWithTrailingComma1.js | 2 +- .../typeParameterUsedAsConstraint.js | 12 +- ...ParameterUsedAsTypeParameterConstraint4.js | 2 +- .../typeParameterWithInvalidConstraintType.js | 2 +- ...eParametersAndParametersInComputedNames.js | 2 +- .../typeParametersAreIdenticalToThemselves.js | 4 +- .../typeParametersAvailableInNestedScope.js | 2 +- .../typeParametersInStaticAccessors.js | 2 +- .../typeParametersInStaticMethods.js | 2 +- .../typeParametersInStaticProperties.js | 2 +- tests/baselines/reference/typeQueryOnClass.js | 4 +- .../reference/typeQueryWithReservedWords.js | 2 +- .../baselines/reference/typeRelationships.js | 4 +- tests/baselines/reference/typeResolution.js | 20 +- .../reference/typeResolution.sourcemap.txt | 20 +- .../baselines/reference/typeValueConflict1.js | 4 +- .../baselines/reference/typeValueConflict2.js | 6 +- .../reference/typedGenericPrototypeMember.js | 2 +- .../reference/typeofANonExportedType.js | 6 +- .../reference/typeofAmbientExternalModules.js | 4 +- .../reference/typeofAnExportedType.js | 6 +- tests/baselines/reference/typeofClass.js | 2 +- tests/baselines/reference/typeofClass2.js | 4 +- .../reference/typeofClassWithPrivates.js | 2 +- .../reference/typeofExternalModules.js | 4 +- .../reference/typeofInternalModules.js | 2 +- .../reference/typeofModuleWithoutExports.js | 2 +- .../typeofOperatorWithAnyOtherType.js | 2 +- .../typeofOperatorWithBooleanType.js | 2 +- .../reference/typeofOperatorWithNumberType.js | 2 +- .../reference/typeofOperatorWithStringType.js | 2 +- tests/baselines/reference/typeofProperty.js | 8 +- .../typesWithDuplicateTypeParameters.js | 4 +- .../reference/typesWithPrivateConstructor.js | 4 +- .../reference/typesWithPublicConstructor.js | 4 +- .../typesWithSpecializedCallSignatures.js | 8 +- ...typesWithSpecializedConstructSignatures.js | 8 +- tests/baselines/reference/undeclaredBase.js | 2 +- tests/baselines/reference/undeclaredMethod.js | 2 +- .../undefinedAssignableToEveryType.js | 2 +- .../undefinedIsSubtypeOfEverything.js | 48 ++-- .../reference/undefinedTypeAssignment4.js | 2 +- .../baselines/reference/underscoreMapFirst.js | 2 +- .../unexpectedStatementBlockTerminator.js | 4 +- .../unexportedInstanceClassVariables.js | 4 +- ...nSubtypeIfEveryConstituentTypeIsSubtype.js | 6 +- .../reference/unionTypeEquivalence.js | 4 +- .../reference/unionTypeFromArrayLiteral.js | 8 +- .../unionTypePropertyAccessibility.js | 8 +- ...unionTypeWithRecursiveSubtypeReduction1.js | 8 +- ...unionTypeWithRecursiveSubtypeReduction2.js | 8 +- .../reference/unionTypesAssignability.js | 6 +- .../unknownSymbolInGenericReturnType.js | 2 +- tests/baselines/reference/unknownSymbols1.js | 10 +- .../reference/unknownTypeArgOnCall.js | 2 +- .../unqualifiedCallToClassStatic1.js | 2 +- .../reference/unspecializedConstraints.js | 10 +- ...untypedFunctionCallsWithTypeParameters1.js | 4 +- .../reference/unusedImportDeclaration.js | 2 +- ...ngModuleWithExportImportInValuePosition.js | 2 +- .../reference/validNullAssignments.js | 2 +- .../reference/validUndefinedAssignments.js | 2 +- .../reference/validUseOfThisInSuper.js | 4 +- .../varArgConstructorMemberParameter.js | 6 +- .../reference/varArgsOnConstructorTypes.js | 4 +- tests/baselines/reference/varAsID.js | 4 +- tests/baselines/reference/vararg.js | 2 +- tests/baselines/reference/vardecl.js | 4 +- ...eclaratorResolvedDuringContextualTyping.js | 4 +- tests/baselines/reference/visSyntax.js | 2 +- .../reference/visibilityOfTypeParameters.js | 2 +- .../reference/voidOperatorWithAnyOtherType.js | 2 +- .../reference/voidOperatorWithBooleanType.js | 2 +- .../reference/voidOperatorWithNumberType.js | 2 +- .../reference/voidOperatorWithStringType.js | 2 +- tests/baselines/reference/withImportDecl.js | 2 +- .../reference/withStatementErrors.js | 2 +- tests/baselines/reference/witness.js | 8 +- .../wrappedAndRecursiveConstraints.js | 2 +- .../wrappedAndRecursiveConstraints2.js | 2 +- .../wrappedAndRecursiveConstraints3.js | 2 +- .../wrappedAndRecursiveConstraints4.js | 2 +- 2340 files changed, 5653 insertions(+), 5653 deletions(-) diff --git a/tests/baselines/reference/2dArrays.js b/tests/baselines/reference/2dArrays.js index fe8ab380ba7..62133e770ff 100644 --- a/tests/baselines/reference/2dArrays.js +++ b/tests/baselines/reference/2dArrays.js @@ -20,12 +20,12 @@ var Cell = (function () { function Cell() { } return Cell; -})(); +}()); var Ship = (function () { function Ship() { } return Ship; -})(); +}()); var Board = (function () { function Board() { } @@ -33,4 +33,4 @@ var Board = (function () { return this.ships.every(function (val) { return val.isSunk; }); }; return Board; -})(); +}()); diff --git a/tests/baselines/reference/AmbientModuleAndNonAmbientClassWithSameNameAndCommonRoot.js b/tests/baselines/reference/AmbientModuleAndNonAmbientClassWithSameNameAndCommonRoot.js index c72ca4b114b..ca67e5a70c2 100644 --- a/tests/baselines/reference/AmbientModuleAndNonAmbientClassWithSameNameAndCommonRoot.js +++ b/tests/baselines/reference/AmbientModuleAndNonAmbientClassWithSameNameAndCommonRoot.js @@ -31,7 +31,7 @@ var A; this.y = y; } return Point; - })(); + }()); A.Point = Point; })(A || (A = {})); //// [test.js] diff --git a/tests/baselines/reference/ClassAndModuleThatMergeWithModuleMemberThatUsesClassTypeParameter.js b/tests/baselines/reference/ClassAndModuleThatMergeWithModuleMemberThatUsesClassTypeParameter.js index b27c2ce5a30..bf9875efe30 100644 --- a/tests/baselines/reference/ClassAndModuleThatMergeWithModuleMemberThatUsesClassTypeParameter.js +++ b/tests/baselines/reference/ClassAndModuleThatMergeWithModuleMemberThatUsesClassTypeParameter.js @@ -55,7 +55,7 @@ var clodule1 = (function () { function clodule1() { } return clodule1; -})(); +}()); var clodule1; (function (clodule1) { function f(x) { } @@ -64,7 +64,7 @@ var clodule2 = (function () { function clodule2() { } return clodule2; -})(); +}()); var clodule2; (function (clodule2) { var x; @@ -72,13 +72,13 @@ var clodule2; function D() { } return D; - })(); + }()); })(clodule2 || (clodule2 = {})); var clodule3 = (function () { function clodule3() { } return clodule3; -})(); +}()); var clodule3; (function (clodule3) { clodule3.y = { id: T }; @@ -87,12 +87,12 @@ var clodule4 = (function () { function clodule4() { } return clodule4; -})(); +}()); var clodule4; (function (clodule4) { var D = (function () { function D() { } return D; - })(); + }()); })(clodule4 || (clodule4 = {})); diff --git a/tests/baselines/reference/ClassAndModuleThatMergeWithModulesExportedGenericFunctionAndGenericClassStaticFunctionOfTheSameName.js b/tests/baselines/reference/ClassAndModuleThatMergeWithModulesExportedGenericFunctionAndGenericClassStaticFunctionOfTheSameName.js index 255e74631a3..dc6c6f6ee8e 100644 --- a/tests/baselines/reference/ClassAndModuleThatMergeWithModulesExportedGenericFunctionAndGenericClassStaticFunctionOfTheSameName.js +++ b/tests/baselines/reference/ClassAndModuleThatMergeWithModulesExportedGenericFunctionAndGenericClassStaticFunctionOfTheSameName.js @@ -21,7 +21,7 @@ var clodule = (function () { } clodule.fn = function (id) { }; return clodule; -})(); +}()); var clodule; (function (clodule) { // error: duplicate identifier expected diff --git a/tests/baselines/reference/ClassAndModuleThatMergeWithModulesExportedGenericFunctionAndNonGenericClassStaticFunctionOfTheSameName.js b/tests/baselines/reference/ClassAndModuleThatMergeWithModulesExportedGenericFunctionAndNonGenericClassStaticFunctionOfTheSameName.js index 76ba858306c..402e0e6ad09 100644 --- a/tests/baselines/reference/ClassAndModuleThatMergeWithModulesExportedGenericFunctionAndNonGenericClassStaticFunctionOfTheSameName.js +++ b/tests/baselines/reference/ClassAndModuleThatMergeWithModulesExportedGenericFunctionAndNonGenericClassStaticFunctionOfTheSameName.js @@ -21,7 +21,7 @@ var clodule = (function () { } clodule.fn = function (id) { }; return clodule; -})(); +}()); var clodule; (function (clodule) { // error: duplicate identifier expected diff --git a/tests/baselines/reference/ClassAndModuleThatMergeWithModulesExportedStaticFunctionUsingClassPrivateStatics.js b/tests/baselines/reference/ClassAndModuleThatMergeWithModulesExportedStaticFunctionUsingClassPrivateStatics.js index 5f01b6acff1..0b6c868128e 100644 --- a/tests/baselines/reference/ClassAndModuleThatMergeWithModulesExportedStaticFunctionUsingClassPrivateStatics.js +++ b/tests/baselines/reference/ClassAndModuleThatMergeWithModulesExportedStaticFunctionUsingClassPrivateStatics.js @@ -21,7 +21,7 @@ var clodule = (function () { } clodule.sfn = function (id) { return 42; }; return clodule; -})(); +}()); var clodule; (function (clodule) { // error: duplicate identifier expected diff --git a/tests/baselines/reference/ClassAndModuleThatMergeWithStaticFunctionAndExportedFunctionThatShareAName.js b/tests/baselines/reference/ClassAndModuleThatMergeWithStaticFunctionAndExportedFunctionThatShareAName.js index a86bc7d2e90..d971dd160db 100644 --- a/tests/baselines/reference/ClassAndModuleThatMergeWithStaticFunctionAndExportedFunctionThatShareAName.js +++ b/tests/baselines/reference/ClassAndModuleThatMergeWithStaticFunctionAndExportedFunctionThatShareAName.js @@ -30,7 +30,7 @@ var Point = (function () { } Point.Origin = function () { return { x: 0, y: 0 }; }; // unexpected error here bug 840246 return Point; -})(); +}()); var Point; (function (Point) { function Origin() { return null; } @@ -45,7 +45,7 @@ var A; } Point.Origin = function () { return { x: 0, y: 0 }; }; // unexpected error here bug 840246 return Point; - })(); + }()); A.Point = Point; var Point; (function (Point) { diff --git a/tests/baselines/reference/ClassAndModuleThatMergeWithStaticFunctionAndNonExportedFunctionThatShareAName.js b/tests/baselines/reference/ClassAndModuleThatMergeWithStaticFunctionAndNonExportedFunctionThatShareAName.js index f462ea9eaa9..3fcbdefdf7e 100644 --- a/tests/baselines/reference/ClassAndModuleThatMergeWithStaticFunctionAndNonExportedFunctionThatShareAName.js +++ b/tests/baselines/reference/ClassAndModuleThatMergeWithStaticFunctionAndNonExportedFunctionThatShareAName.js @@ -30,7 +30,7 @@ var Point = (function () { } Point.Origin = function () { return { x: 0, y: 0 }; }; return Point; -})(); +}()); var Point; (function (Point) { function Origin() { return ""; } // not an error, since not exported @@ -44,7 +44,7 @@ var A; } Point.Origin = function () { return { x: 0, y: 0 }; }; return Point; - })(); + }()); A.Point = Point; var Point; (function (Point) { diff --git a/tests/baselines/reference/ClassAndModuleThatMergeWithStaticVariableAndExportedVarThatShareAName.js b/tests/baselines/reference/ClassAndModuleThatMergeWithStaticVariableAndExportedVarThatShareAName.js index 45958ad62d4..a0cb50e7382 100644 --- a/tests/baselines/reference/ClassAndModuleThatMergeWithStaticVariableAndExportedVarThatShareAName.js +++ b/tests/baselines/reference/ClassAndModuleThatMergeWithStaticVariableAndExportedVarThatShareAName.js @@ -30,7 +30,7 @@ var Point = (function () { } Point.Origin = { x: 0, y: 0 }; return Point; -})(); +}()); var Point; (function (Point) { Point.Origin = ""; //expected duplicate identifier error @@ -44,7 +44,7 @@ var A; } Point.Origin = { x: 0, y: 0 }; return Point; - })(); + }()); A.Point = Point; var Point; (function (Point) { diff --git a/tests/baselines/reference/ClassAndModuleThatMergeWithStaticVariableAndNonExportedVarThatShareAName.js b/tests/baselines/reference/ClassAndModuleThatMergeWithStaticVariableAndNonExportedVarThatShareAName.js index ae56fd1acdc..3bbf3b98d6e 100644 --- a/tests/baselines/reference/ClassAndModuleThatMergeWithStaticVariableAndNonExportedVarThatShareAName.js +++ b/tests/baselines/reference/ClassAndModuleThatMergeWithStaticVariableAndNonExportedVarThatShareAName.js @@ -30,7 +30,7 @@ var Point = (function () { } Point.Origin = { x: 0, y: 0 }; return Point; -})(); +}()); var Point; (function (Point) { var Origin = ""; // not an error, since not exported @@ -44,7 +44,7 @@ var A; } Point.Origin = { x: 0, y: 0 }; return Point; - })(); + }()); A.Point = Point; var Point; (function (Point) { diff --git a/tests/baselines/reference/ClassAndModuleWithSameNameAndCommonRoot.js b/tests/baselines/reference/ClassAndModuleWithSameNameAndCommonRoot.js index 54666ca7aff..247dc4fe62d 100644 --- a/tests/baselines/reference/ClassAndModuleWithSameNameAndCommonRoot.js +++ b/tests/baselines/reference/ClassAndModuleWithSameNameAndCommonRoot.js @@ -51,7 +51,7 @@ var X; this.y = y; } return Point; - })(); + }()); Y.Point = Point; })(Y = X.Y || (X.Y = {})); })(X || (X = {})); @@ -75,7 +75,7 @@ var A = (function () { function A() { } return A; -})(); +}()); var A; (function (A) { A.Instance = new A(); diff --git a/tests/baselines/reference/ClassDeclaration10.js b/tests/baselines/reference/ClassDeclaration10.js index 3b1ae507e87..6c560009489 100644 --- a/tests/baselines/reference/ClassDeclaration10.js +++ b/tests/baselines/reference/ClassDeclaration10.js @@ -9,4 +9,4 @@ var C = (function () { function C() { } return C; -})(); +}()); diff --git a/tests/baselines/reference/ClassDeclaration11.js b/tests/baselines/reference/ClassDeclaration11.js index 6284af07676..28705f5dfe0 100644 --- a/tests/baselines/reference/ClassDeclaration11.js +++ b/tests/baselines/reference/ClassDeclaration11.js @@ -10,4 +10,4 @@ var C = (function () { } C.prototype.foo = function () { }; return C; -})(); +}()); diff --git a/tests/baselines/reference/ClassDeclaration13.js b/tests/baselines/reference/ClassDeclaration13.js index 7791b77eae6..faabbb3b3c2 100644 --- a/tests/baselines/reference/ClassDeclaration13.js +++ b/tests/baselines/reference/ClassDeclaration13.js @@ -10,4 +10,4 @@ var C = (function () { } C.prototype.bar = function () { }; return C; -})(); +}()); diff --git a/tests/baselines/reference/ClassDeclaration14.js b/tests/baselines/reference/ClassDeclaration14.js index 7ae79132b9e..ab08fd56c34 100644 --- a/tests/baselines/reference/ClassDeclaration14.js +++ b/tests/baselines/reference/ClassDeclaration14.js @@ -9,4 +9,4 @@ var C = (function () { function C() { } return C; -})(); +}()); diff --git a/tests/baselines/reference/ClassDeclaration15.js b/tests/baselines/reference/ClassDeclaration15.js index d40b5855bba..39c2b728049 100644 --- a/tests/baselines/reference/ClassDeclaration15.js +++ b/tests/baselines/reference/ClassDeclaration15.js @@ -9,4 +9,4 @@ var C = (function () { function C() { } return C; -})(); +}()); diff --git a/tests/baselines/reference/ClassDeclaration21.js b/tests/baselines/reference/ClassDeclaration21.js index b5144b607d1..00bd52cf0ba 100644 --- a/tests/baselines/reference/ClassDeclaration21.js +++ b/tests/baselines/reference/ClassDeclaration21.js @@ -10,4 +10,4 @@ var C = (function () { } C.prototype[1] = function () { }; return C; -})(); +}()); diff --git a/tests/baselines/reference/ClassDeclaration22.js b/tests/baselines/reference/ClassDeclaration22.js index 0074813e77e..2e9c98d8da3 100644 --- a/tests/baselines/reference/ClassDeclaration22.js +++ b/tests/baselines/reference/ClassDeclaration22.js @@ -10,4 +10,4 @@ var C = (function () { } C.prototype["bar"] = function () { }; return C; -})(); +}()); diff --git a/tests/baselines/reference/ClassDeclaration24.js b/tests/baselines/reference/ClassDeclaration24.js index 2043c6c163c..25bf0d14487 100644 --- a/tests/baselines/reference/ClassDeclaration24.js +++ b/tests/baselines/reference/ClassDeclaration24.js @@ -7,4 +7,4 @@ var any = (function () { function any() { } return any; -})(); +}()); diff --git a/tests/baselines/reference/ClassDeclaration25.js b/tests/baselines/reference/ClassDeclaration25.js index c39aa39eeed..26c2988ab47 100644 --- a/tests/baselines/reference/ClassDeclaration25.js +++ b/tests/baselines/reference/ClassDeclaration25.js @@ -14,4 +14,4 @@ var List = (function () { function List() { } return List; -})(); +}()); diff --git a/tests/baselines/reference/ClassDeclaration26.js b/tests/baselines/reference/ClassDeclaration26.js index b0879502119..97e1428132e 100644 --- a/tests/baselines/reference/ClassDeclaration26.js +++ b/tests/baselines/reference/ClassDeclaration26.js @@ -11,5 +11,5 @@ var C = (function () { this.foo = 10; } return C; -})(); +}()); var constructor = function () { }; diff --git a/tests/baselines/reference/ClassDeclaration8.js b/tests/baselines/reference/ClassDeclaration8.js index 320fdf76205..ec065a6cc47 100644 --- a/tests/baselines/reference/ClassDeclaration8.js +++ b/tests/baselines/reference/ClassDeclaration8.js @@ -8,4 +8,4 @@ var C = (function () { function C() { } return C; -})(); +}()); diff --git a/tests/baselines/reference/ClassDeclaration9.js b/tests/baselines/reference/ClassDeclaration9.js index 102715d8c16..30e9c66be8f 100644 --- a/tests/baselines/reference/ClassDeclaration9.js +++ b/tests/baselines/reference/ClassDeclaration9.js @@ -8,4 +8,4 @@ var C = (function () { function C() { } return C; -})(); +}()); diff --git a/tests/baselines/reference/ClassDeclarationWithInvalidConstOnPropertyDeclaration.js b/tests/baselines/reference/ClassDeclarationWithInvalidConstOnPropertyDeclaration.js index b8c4dbdf433..d5c3b3d63f4 100644 --- a/tests/baselines/reference/ClassDeclarationWithInvalidConstOnPropertyDeclaration.js +++ b/tests/baselines/reference/ClassDeclarationWithInvalidConstOnPropertyDeclaration.js @@ -9,4 +9,4 @@ var AtomicNumbers = (function () { } AtomicNumbers.H = 1; return AtomicNumbers; -})(); +}()); diff --git a/tests/baselines/reference/ClassDeclarationWithInvalidConstOnPropertyDeclaration2.js b/tests/baselines/reference/ClassDeclarationWithInvalidConstOnPropertyDeclaration2.js index bd1f1e0c674..7dda5cb832e 100644 --- a/tests/baselines/reference/ClassDeclarationWithInvalidConstOnPropertyDeclaration2.js +++ b/tests/baselines/reference/ClassDeclarationWithInvalidConstOnPropertyDeclaration2.js @@ -10,4 +10,4 @@ var C = (function () { this.x = 10; } return C; -})(); +}()); diff --git a/tests/baselines/reference/ES5For-ofTypeCheck10.js b/tests/baselines/reference/ES5For-ofTypeCheck10.js index ffef1fde8f8..0fe92e289a6 100644 --- a/tests/baselines/reference/ES5For-ofTypeCheck10.js +++ b/tests/baselines/reference/ES5For-ofTypeCheck10.js @@ -32,4 +32,4 @@ var StringIterator = (function () { return this; }; return StringIterator; -})(); +}()); diff --git a/tests/baselines/reference/ES5SymbolProperty2.js b/tests/baselines/reference/ES5SymbolProperty2.js index effd1e610f4..f04a4671d3f 100644 --- a/tests/baselines/reference/ES5SymbolProperty2.js +++ b/tests/baselines/reference/ES5SymbolProperty2.js @@ -19,7 +19,7 @@ var M; } C.prototype[Symbol.iterator] = function () { }; return C; - })(); + }()); M.C = C; (new C)[Symbol.iterator]; })(M || (M = {})); diff --git a/tests/baselines/reference/ES5SymbolProperty3.js b/tests/baselines/reference/ES5SymbolProperty3.js index 52ea7e091ee..6589858625c 100644 --- a/tests/baselines/reference/ES5SymbolProperty3.js +++ b/tests/baselines/reference/ES5SymbolProperty3.js @@ -14,5 +14,5 @@ var C = (function () { } C.prototype[Symbol.iterator] = function () { }; return C; -})(); +}()); (new C)[Symbol.iterator]; diff --git a/tests/baselines/reference/ES5SymbolProperty4.js b/tests/baselines/reference/ES5SymbolProperty4.js index ae8a539f351..eca71ac989c 100644 --- a/tests/baselines/reference/ES5SymbolProperty4.js +++ b/tests/baselines/reference/ES5SymbolProperty4.js @@ -14,5 +14,5 @@ var C = (function () { } C.prototype[Symbol.iterator] = function () { }; return C; -})(); +}()); (new C)[Symbol.iterator]; diff --git a/tests/baselines/reference/ES5SymbolProperty5.js b/tests/baselines/reference/ES5SymbolProperty5.js index 63b12667d0f..828d29abbfb 100644 --- a/tests/baselines/reference/ES5SymbolProperty5.js +++ b/tests/baselines/reference/ES5SymbolProperty5.js @@ -14,5 +14,5 @@ var C = (function () { } C.prototype[Symbol.iterator] = function () { }; return C; -})(); +}()); (new C)[Symbol.iterator](0); // Should error diff --git a/tests/baselines/reference/ES5SymbolProperty6.js b/tests/baselines/reference/ES5SymbolProperty6.js index 10eda091e5e..1a9ab273411 100644 --- a/tests/baselines/reference/ES5SymbolProperty6.js +++ b/tests/baselines/reference/ES5SymbolProperty6.js @@ -11,5 +11,5 @@ var C = (function () { } C.prototype[Symbol.iterator] = function () { }; return C; -})(); +}()); (new C)[Symbol.iterator]; diff --git a/tests/baselines/reference/ES5SymbolProperty7.js b/tests/baselines/reference/ES5SymbolProperty7.js index d3f796ce758..439a2b5bd0e 100644 --- a/tests/baselines/reference/ES5SymbolProperty7.js +++ b/tests/baselines/reference/ES5SymbolProperty7.js @@ -14,5 +14,5 @@ var C = (function () { } C.prototype[Symbol.iterator] = function () { }; return C; -})(); +}()); (new C)[Symbol.iterator]; diff --git a/tests/baselines/reference/EnumAndModuleWithSameNameAndCommonRoot.js b/tests/baselines/reference/EnumAndModuleWithSameNameAndCommonRoot.js index 4ca0b4cd5f7..e6a0eb0584d 100644 --- a/tests/baselines/reference/EnumAndModuleWithSameNameAndCommonRoot.js +++ b/tests/baselines/reference/EnumAndModuleWithSameNameAndCommonRoot.js @@ -30,7 +30,7 @@ var enumdule; this.y = y; } return Point; - })(); + }()); enumdule.Point = Point; })(enumdule || (enumdule = {})); var x; diff --git a/tests/baselines/reference/ExportAssignment7.js b/tests/baselines/reference/ExportAssignment7.js index ae534c9255b..d6b37101619 100644 --- a/tests/baselines/reference/ExportAssignment7.js +++ b/tests/baselines/reference/ExportAssignment7.js @@ -10,5 +10,5 @@ var C = (function () { function C() { } return C; -})(); +}()); exports.C = C; diff --git a/tests/baselines/reference/ExportAssignment8.js b/tests/baselines/reference/ExportAssignment8.js index be95e669483..8cdff41505e 100644 --- a/tests/baselines/reference/ExportAssignment8.js +++ b/tests/baselines/reference/ExportAssignment8.js @@ -10,5 +10,5 @@ var C = (function () { function C() { } return C; -})(); +}()); exports.C = C; diff --git a/tests/baselines/reference/ExportClassWhichExtendsInterfaceWithInaccessibleType.js b/tests/baselines/reference/ExportClassWhichExtendsInterfaceWithInaccessibleType.js index 5ee537f568e..0d8fbb8eb30 100644 --- a/tests/baselines/reference/ExportClassWhichExtendsInterfaceWithInaccessibleType.js +++ b/tests/baselines/reference/ExportClassWhichExtendsInterfaceWithInaccessibleType.js @@ -31,6 +31,6 @@ var A; return 1; }; return Point2d; - })(); + }()); A.Point2d = Point2d; })(A || (A = {})); diff --git a/tests/baselines/reference/ExportClassWithAccessibleTypesInTypeParameterConstraintsClassHeritageListMemberTypeAnnotations.js b/tests/baselines/reference/ExportClassWithAccessibleTypesInTypeParameterConstraintsClassHeritageListMemberTypeAnnotations.js index 3e48462062d..7dcbfef1d72 100644 --- a/tests/baselines/reference/ExportClassWithAccessibleTypesInTypeParameterConstraintsClassHeritageListMemberTypeAnnotations.js +++ b/tests/baselines/reference/ExportClassWithAccessibleTypesInTypeParameterConstraintsClassHeritageListMemberTypeAnnotations.js @@ -32,7 +32,7 @@ var A; function Point() { } return Point; - })(); + }()); A.Point = Point; A.Origin = { x: 0, y: 0 }; var Point3d = (function (_super) { @@ -41,7 +41,7 @@ var A; _super.apply(this, arguments); } return Point3d; - })(Point); + }(Point)); A.Point3d = Point3d; A.Origin3d = { x: 0, y: 0, z: 0 }; var Line = (function () { @@ -50,6 +50,6 @@ var A; this.end = end; } return Line; - })(); + }()); A.Line = Line; })(A || (A = {})); diff --git a/tests/baselines/reference/ExportClassWithInaccessibleTypeInIndexerTypeAnnotations.js b/tests/baselines/reference/ExportClassWithInaccessibleTypeInIndexerTypeAnnotations.js index 687600364fc..0496e349fa6 100644 --- a/tests/baselines/reference/ExportClassWithInaccessibleTypeInIndexerTypeAnnotations.js +++ b/tests/baselines/reference/ExportClassWithInaccessibleTypeInIndexerTypeAnnotations.js @@ -22,11 +22,11 @@ var A; function Point() { } return Point; - })(); + }()); var points = (function () { function points() { } return points; - })(); + }()); A.points = points; })(A || (A = {})); diff --git a/tests/baselines/reference/ExportClassWithInaccessibleTypeInTypeParameterConstraint.js b/tests/baselines/reference/ExportClassWithInaccessibleTypeInTypeParameterConstraint.js index a1386033e9f..8f175621af4 100644 --- a/tests/baselines/reference/ExportClassWithInaccessibleTypeInTypeParameterConstraint.js +++ b/tests/baselines/reference/ExportClassWithInaccessibleTypeInTypeParameterConstraint.js @@ -36,7 +36,7 @@ var A; function Point() { } return Point; - })(); + }()); A.Origin = { x: 0, y: 0 }; var Point3d = (function (_super) { __extends(Point3d, _super); @@ -44,7 +44,7 @@ var A; _super.apply(this, arguments); } return Point3d; - })(Point); + }(Point)); A.Point3d = Point3d; A.Origin3d = { x: 0, y: 0, z: 0 }; var Line = (function () { @@ -56,6 +56,6 @@ var A; return null; }; return Line; - })(); + }()); A.Line = Line; })(A || (A = {})); diff --git a/tests/baselines/reference/ExportFunctionWithAccessibleTypesInParameterAndReturnTypeAnnotation.js b/tests/baselines/reference/ExportFunctionWithAccessibleTypesInParameterAndReturnTypeAnnotation.js index 21d969d242c..421c896539b 100644 --- a/tests/baselines/reference/ExportFunctionWithAccessibleTypesInParameterAndReturnTypeAnnotation.js +++ b/tests/baselines/reference/ExportFunctionWithAccessibleTypesInParameterAndReturnTypeAnnotation.js @@ -22,7 +22,7 @@ var A; function Point() { } return Point; - })(); + }()); A.Point = Point; var Line = (function () { function Line(start, end) { @@ -30,7 +30,7 @@ var A; this.end = end; } return Line; - })(); + }()); A.Line = Line; function fromOrigin(p) { return new Line({ x: 0, y: 0 }, p); diff --git a/tests/baselines/reference/ExportFunctionWithInaccessibleTypesInParameterTypeAnnotation.js b/tests/baselines/reference/ExportFunctionWithInaccessibleTypesInParameterTypeAnnotation.js index 99831f10629..d33bcba793d 100644 --- a/tests/baselines/reference/ExportFunctionWithInaccessibleTypesInParameterTypeAnnotation.js +++ b/tests/baselines/reference/ExportFunctionWithInaccessibleTypesInParameterTypeAnnotation.js @@ -22,14 +22,14 @@ var A; function Point() { } return Point; - })(); + }()); var Line = (function () { function Line(start, end) { this.start = start; this.end = end; } return Line; - })(); + }()); A.Line = Line; function fromOrigin(p) { return new Line({ x: 0, y: 0 }, p); diff --git a/tests/baselines/reference/ExportFunctionWithInaccessibleTypesInReturnTypeAnnotation.js b/tests/baselines/reference/ExportFunctionWithInaccessibleTypesInReturnTypeAnnotation.js index 3037e33d880..dbd21ebe9e6 100644 --- a/tests/baselines/reference/ExportFunctionWithInaccessibleTypesInReturnTypeAnnotation.js +++ b/tests/baselines/reference/ExportFunctionWithInaccessibleTypesInReturnTypeAnnotation.js @@ -22,7 +22,7 @@ var A; function Point() { } return Point; - })(); + }()); A.Point = Point; var Line = (function () { function Line(start, end) { @@ -30,7 +30,7 @@ var A; this.end = end; } return Line; - })(); + }()); function fromOrigin(p) { return new Line({ x: 0, y: 0 }, p); } diff --git a/tests/baselines/reference/ExportModuleWithAccessibleTypesOnItsExportedMembers.js b/tests/baselines/reference/ExportModuleWithAccessibleTypesOnItsExportedMembers.js index df6645df3b3..b06288ae093 100644 --- a/tests/baselines/reference/ExportModuleWithAccessibleTypesOnItsExportedMembers.js +++ b/tests/baselines/reference/ExportModuleWithAccessibleTypesOnItsExportedMembers.js @@ -29,7 +29,7 @@ var A; this.y = y; } return Point; - })(); + }()); A.Point = Point; var B; (function (B) { @@ -41,7 +41,7 @@ var A; return new Line({ x: 0, y: 0 }, p); }; return Line; - })(); + }()); B.Line = Line; })(B = A.B || (A.B = {})); })(A || (A = {})); diff --git a/tests/baselines/reference/ExportObjectLiteralAndObjectTypeLiteralWithAccessibleTypesInMemberTypeAnnotations.js b/tests/baselines/reference/ExportObjectLiteralAndObjectTypeLiteralWithAccessibleTypesInMemberTypeAnnotations.js index 46361dd41bb..e9f3c10e189 100644 --- a/tests/baselines/reference/ExportObjectLiteralAndObjectTypeLiteralWithAccessibleTypesInMemberTypeAnnotations.js +++ b/tests/baselines/reference/ExportObjectLiteralAndObjectTypeLiteralWithAccessibleTypesInMemberTypeAnnotations.js @@ -20,7 +20,7 @@ var A; this.y = y; } return Point; - })(); + }()); A.Origin = { x: 0, y: 0 }; A.Unity = { start: new Point(0, 0), end: new Point(1, 0) }; })(A || (A = {})); diff --git a/tests/baselines/reference/ExportObjectLiteralAndObjectTypeLiteralWithAccessibleTypesInNestedMemberTypeAnnotations.js b/tests/baselines/reference/ExportObjectLiteralAndObjectTypeLiteralWithAccessibleTypesInNestedMemberTypeAnnotations.js index 44c19685743..7a480ed4473 100644 --- a/tests/baselines/reference/ExportObjectLiteralAndObjectTypeLiteralWithAccessibleTypesInNestedMemberTypeAnnotations.js +++ b/tests/baselines/reference/ExportObjectLiteralAndObjectTypeLiteralWithAccessibleTypesInNestedMemberTypeAnnotations.js @@ -20,6 +20,6 @@ var A; this.y = y; } return Point; - })(); + }()); A.UnitSquare = null; })(A || (A = {})); diff --git a/tests/baselines/reference/ExportVariableOfGenericTypeWithInaccessibleTypeAsTypeArgument.js b/tests/baselines/reference/ExportVariableOfGenericTypeWithInaccessibleTypeAsTypeArgument.js index b1769ba25f9..3c4b5bad16b 100644 --- a/tests/baselines/reference/ExportVariableOfGenericTypeWithInaccessibleTypeAsTypeArgument.js +++ b/tests/baselines/reference/ExportVariableOfGenericTypeWithInaccessibleTypeAsTypeArgument.js @@ -15,6 +15,6 @@ var A; function B() { } return B; - })(); + }()); A.beez2 = new Array(); })(A || (A = {})); diff --git a/tests/baselines/reference/MemberAccessorDeclaration15.js b/tests/baselines/reference/MemberAccessorDeclaration15.js index 85bbfa62238..e2db7b2527e 100644 --- a/tests/baselines/reference/MemberAccessorDeclaration15.js +++ b/tests/baselines/reference/MemberAccessorDeclaration15.js @@ -13,4 +13,4 @@ var C = (function () { configurable: true }); return C; -})(); +}()); diff --git a/tests/baselines/reference/MemberFunctionDeclaration1_es6.js b/tests/baselines/reference/MemberFunctionDeclaration1_es6.js index 121376d5265..c69316783bd 100644 --- a/tests/baselines/reference/MemberFunctionDeclaration1_es6.js +++ b/tests/baselines/reference/MemberFunctionDeclaration1_es6.js @@ -9,4 +9,4 @@ var C = (function () { } C.prototype.foo = function () { }; return C; -})(); +}()); diff --git a/tests/baselines/reference/MemberFunctionDeclaration2_es6.js b/tests/baselines/reference/MemberFunctionDeclaration2_es6.js index dcb494b3d13..ce1781fcac2 100644 --- a/tests/baselines/reference/MemberFunctionDeclaration2_es6.js +++ b/tests/baselines/reference/MemberFunctionDeclaration2_es6.js @@ -9,4 +9,4 @@ var C = (function () { } C.prototype.foo = function () { }; return C; -})(); +}()); diff --git a/tests/baselines/reference/MemberFunctionDeclaration3_es6.js b/tests/baselines/reference/MemberFunctionDeclaration3_es6.js index e858ab15582..b32bd6bc57e 100644 --- a/tests/baselines/reference/MemberFunctionDeclaration3_es6.js +++ b/tests/baselines/reference/MemberFunctionDeclaration3_es6.js @@ -9,4 +9,4 @@ var C = (function () { } C.prototype[foo] = function () { }; return C; -})(); +}()); diff --git a/tests/baselines/reference/MemberFunctionDeclaration4_es6.js b/tests/baselines/reference/MemberFunctionDeclaration4_es6.js index 26b08681441..abca2775ea0 100644 --- a/tests/baselines/reference/MemberFunctionDeclaration4_es6.js +++ b/tests/baselines/reference/MemberFunctionDeclaration4_es6.js @@ -9,4 +9,4 @@ var C = (function () { } C.prototype. = function () { }; return C; -})(); +}()); diff --git a/tests/baselines/reference/MemberFunctionDeclaration5_es6.js b/tests/baselines/reference/MemberFunctionDeclaration5_es6.js index 6b43b18fe39..2303c5e0f62 100644 --- a/tests/baselines/reference/MemberFunctionDeclaration5_es6.js +++ b/tests/baselines/reference/MemberFunctionDeclaration5_es6.js @@ -8,4 +8,4 @@ var C = (function () { function C() { } return C; -})(); +}()); diff --git a/tests/baselines/reference/MemberFunctionDeclaration6_es6.js b/tests/baselines/reference/MemberFunctionDeclaration6_es6.js index ef9c9248763..b2a753d7ce0 100644 --- a/tests/baselines/reference/MemberFunctionDeclaration6_es6.js +++ b/tests/baselines/reference/MemberFunctionDeclaration6_es6.js @@ -8,4 +8,4 @@ var C = (function () { function C() { } return C; -})(); +}()); diff --git a/tests/baselines/reference/MemberFunctionDeclaration7_es6.js b/tests/baselines/reference/MemberFunctionDeclaration7_es6.js index 8f942d87f9f..a7d80ae974b 100644 --- a/tests/baselines/reference/MemberFunctionDeclaration7_es6.js +++ b/tests/baselines/reference/MemberFunctionDeclaration7_es6.js @@ -9,4 +9,4 @@ var C = (function () { } C.prototype.foo = function () { }; return C; -})(); +}()); diff --git a/tests/baselines/reference/MemberFunctionDeclaration8_es6.js b/tests/baselines/reference/MemberFunctionDeclaration8_es6.js index 8e23a5ec995..8000a2d5c42 100644 --- a/tests/baselines/reference/MemberFunctionDeclaration8_es6.js +++ b/tests/baselines/reference/MemberFunctionDeclaration8_es6.js @@ -19,4 +19,4 @@ var C = (function () { return bar; }; return C; -})(); +}()); diff --git a/tests/baselines/reference/ModuleAndClassWithSameNameAndCommonRoot.js b/tests/baselines/reference/ModuleAndClassWithSameNameAndCommonRoot.js index e443596d483..cf266049527 100644 --- a/tests/baselines/reference/ModuleAndClassWithSameNameAndCommonRoot.js +++ b/tests/baselines/reference/ModuleAndClassWithSameNameAndCommonRoot.js @@ -54,7 +54,7 @@ var X; this.y = y; } return Point; - })(); + }()); Y.Point = Point; })(Y = X.Y || (X.Y = {})); })(X || (X = {})); @@ -68,4 +68,4 @@ var A = (function () { function A() { } return A; -})(); +}()); diff --git a/tests/baselines/reference/ModuleAndEnumWithSameNameAndCommonRoot.js b/tests/baselines/reference/ModuleAndEnumWithSameNameAndCommonRoot.js index 96df9812bc6..6928e189a07 100644 --- a/tests/baselines/reference/ModuleAndEnumWithSameNameAndCommonRoot.js +++ b/tests/baselines/reference/ModuleAndEnumWithSameNameAndCommonRoot.js @@ -25,7 +25,7 @@ var enumdule; this.y = y; } return Point; - })(); + }()); enumdule.Point = Point; })(enumdule || (enumdule = {})); var enumdule; diff --git a/tests/baselines/reference/ModuleWithExportedAndNonExportedClasses.js b/tests/baselines/reference/ModuleWithExportedAndNonExportedClasses.js index 06e5427a879..185aa3c580e 100644 --- a/tests/baselines/reference/ModuleWithExportedAndNonExportedClasses.js +++ b/tests/baselines/reference/ModuleWithExportedAndNonExportedClasses.js @@ -40,24 +40,24 @@ var A; function A() { } return A; - })(); + }()); A_1.A = A; var AG = (function () { function AG() { } return AG; - })(); + }()); A_1.AG = AG; var A2 = (function () { function A2() { } return A2; - })(); + }()); var AG2 = (function () { function AG2() { } return AG2; - })(); + }()); })(A || (A = {})); // no errors expected, these are all exported var a; diff --git a/tests/baselines/reference/ModuleWithExportedAndNonExportedImportAlias.js b/tests/baselines/reference/ModuleWithExportedAndNonExportedImportAlias.js index e31ca5d5885..bdaff287a97 100644 --- a/tests/baselines/reference/ModuleWithExportedAndNonExportedImportAlias.js +++ b/tests/baselines/reference/ModuleWithExportedAndNonExportedImportAlias.js @@ -48,7 +48,7 @@ var B; this.end = end; } return Line; - })(); + }()); B.Line = Line; })(B || (B = {})); var Geometry; diff --git a/tests/baselines/reference/NonInitializedExportInInternalModule.js b/tests/baselines/reference/NonInitializedExportInInternalModule.js index e49bb20d3f0..aa1c84664ad 100644 --- a/tests/baselines/reference/NonInitializedExportInInternalModule.js +++ b/tests/baselines/reference/NonInitializedExportInInternalModule.js @@ -45,7 +45,7 @@ var Inner; function A() { } return A; - })(); + }()); var B; (function (B) { B.a = 1, B.c = 2; @@ -63,7 +63,7 @@ var Inner; function D() { } return D; - })(); + }()); Inner.e1 = new D; Inner.f1 = new D; Inner.g1 = new D; diff --git a/tests/baselines/reference/ParameterList6.js b/tests/baselines/reference/ParameterList6.js index 824b288572f..e6238e3f0b8 100644 --- a/tests/baselines/reference/ParameterList6.js +++ b/tests/baselines/reference/ParameterList6.js @@ -9,4 +9,4 @@ var C = (function () { function C(C) { } return C; -})(); +}()); diff --git a/tests/baselines/reference/ParameterList7.js b/tests/baselines/reference/ParameterList7.js index 76adf8352b9..394d2cb733c 100644 --- a/tests/baselines/reference/ParameterList7.js +++ b/tests/baselines/reference/ParameterList7.js @@ -11,4 +11,4 @@ var C1 = (function () { this.p3 = p3; } // OK return C1; -})(); +}()); diff --git a/tests/baselines/reference/Protected1.js b/tests/baselines/reference/Protected1.js index eebce2f4ecc..57bd4175632 100644 --- a/tests/baselines/reference/Protected1.js +++ b/tests/baselines/reference/Protected1.js @@ -7,4 +7,4 @@ var C = (function () { function C() { } return C; -})(); +}()); diff --git a/tests/baselines/reference/Protected3.js b/tests/baselines/reference/Protected3.js index 4c4d5e2a12c..4171d64df7a 100644 --- a/tests/baselines/reference/Protected3.js +++ b/tests/baselines/reference/Protected3.js @@ -8,4 +8,4 @@ var C = (function () { function C() { } return C; -})(); +}()); diff --git a/tests/baselines/reference/Protected4.js b/tests/baselines/reference/Protected4.js index 9c23a1be884..098fe70118d 100644 --- a/tests/baselines/reference/Protected4.js +++ b/tests/baselines/reference/Protected4.js @@ -9,4 +9,4 @@ var C = (function () { } C.prototype.m = function () { }; return C; -})(); +}()); diff --git a/tests/baselines/reference/Protected5.js b/tests/baselines/reference/Protected5.js index 8426a8765d7..fe79c7399a3 100644 --- a/tests/baselines/reference/Protected5.js +++ b/tests/baselines/reference/Protected5.js @@ -9,4 +9,4 @@ var C = (function () { } C.m = function () { }; return C; -})(); +}()); diff --git a/tests/baselines/reference/Protected6.js b/tests/baselines/reference/Protected6.js index 10b59551737..65a1eea3d6b 100644 --- a/tests/baselines/reference/Protected6.js +++ b/tests/baselines/reference/Protected6.js @@ -9,4 +9,4 @@ var C = (function () { } C.m = function () { }; return C; -})(); +}()); diff --git a/tests/baselines/reference/Protected7.js b/tests/baselines/reference/Protected7.js index 16c24edb8cb..5232d932e9d 100644 --- a/tests/baselines/reference/Protected7.js +++ b/tests/baselines/reference/Protected7.js @@ -9,4 +9,4 @@ var C = (function () { } C.prototype.m = function () { }; return C; -})(); +}()); diff --git a/tests/baselines/reference/Protected9.js b/tests/baselines/reference/Protected9.js index f747f18e8e8..d7c0d8eae2a 100644 --- a/tests/baselines/reference/Protected9.js +++ b/tests/baselines/reference/Protected9.js @@ -9,4 +9,4 @@ var C = (function () { this.p = p; } return C; -})(); +}()); diff --git a/tests/baselines/reference/TwoInternalModulesThatMergeEachWithExportedAndNonExportedClassesOfTheSameName.js b/tests/baselines/reference/TwoInternalModulesThatMergeEachWithExportedAndNonExportedClassesOfTheSameName.js index deb2f3aa59d..dd29b88421c 100644 --- a/tests/baselines/reference/TwoInternalModulesThatMergeEachWithExportedAndNonExportedClassesOfTheSameName.js +++ b/tests/baselines/reference/TwoInternalModulesThatMergeEachWithExportedAndNonExportedClassesOfTheSameName.js @@ -47,7 +47,7 @@ var A; function Point() { } return Point; - })(); + }()); A.Point = Point; })(A || (A = {})); var A; @@ -59,7 +59,7 @@ var A; return { x: p.x, y: p.y }; }; return Point; - })(); + }()); })(A || (A = {})); // ensure merges as expected var p; @@ -74,7 +74,7 @@ var X; function Line() { } return Line; - })(); + }()); Z.Line = Line; })(Z = Y.Z || (Y.Z = {})); })(Y = X.Y || (X.Y = {})); @@ -89,7 +89,7 @@ var X; function Line() { } return Line; - })(); + }()); })(Z = Y.Z || (Y.Z = {})); })(Y = X.Y || (X.Y = {})); })(X || (X = {})); diff --git a/tests/baselines/reference/TwoInternalModulesThatMergeEachWithExportedAndNonExportedLocalVarsOfTheSameName.js b/tests/baselines/reference/TwoInternalModulesThatMergeEachWithExportedAndNonExportedLocalVarsOfTheSameName.js index 125a803ff39..028934ae99f 100644 --- a/tests/baselines/reference/TwoInternalModulesThatMergeEachWithExportedAndNonExportedLocalVarsOfTheSameName.js +++ b/tests/baselines/reference/TwoInternalModulesThatMergeEachWithExportedAndNonExportedLocalVarsOfTheSameName.js @@ -66,7 +66,7 @@ var A; this.br = br; } return Plane; - })(); + }()); Utils.Plane = Plane; })(Utils = A.Utils || (A.Utils = {})); })(A || (A = {})); diff --git a/tests/baselines/reference/TwoInternalModulesThatMergeEachWithExportedClassesOfTheSameName.js b/tests/baselines/reference/TwoInternalModulesThatMergeEachWithExportedClassesOfTheSameName.js index d2d5a15bde0..2a75b92e2db 100644 --- a/tests/baselines/reference/TwoInternalModulesThatMergeEachWithExportedClassesOfTheSameName.js +++ b/tests/baselines/reference/TwoInternalModulesThatMergeEachWithExportedClassesOfTheSameName.js @@ -39,7 +39,7 @@ var A; function Point() { } return Point; - })(); + }()); A.Point = Point; })(A || (A = {})); var A; @@ -49,7 +49,7 @@ var A; function Point() { } return Point; - })(); + }()); A.Point = Point; })(A || (A = {})); var X; @@ -62,7 +62,7 @@ var X; function Line() { } return Line; - })(); + }()); Z.Line = Line; })(Z = Y.Z || (Y.Z = {})); })(Y = X.Y || (X.Y = {})); @@ -78,7 +78,7 @@ var X; function Line() { } return Line; - })(); + }()); Z.Line = Line; })(Z = Y.Z || (Y.Z = {})); })(Y = X.Y || (X.Y = {})); diff --git a/tests/baselines/reference/TwoInternalModulesThatMergeEachWithExportedLocalVarsOfTheSameName.js b/tests/baselines/reference/TwoInternalModulesThatMergeEachWithExportedLocalVarsOfTheSameName.js index d6bcc741542..03a504a888a 100644 --- a/tests/baselines/reference/TwoInternalModulesThatMergeEachWithExportedLocalVarsOfTheSameName.js +++ b/tests/baselines/reference/TwoInternalModulesThatMergeEachWithExportedLocalVarsOfTheSameName.js @@ -56,7 +56,7 @@ var A; this.br = br; } return Plane; - })(); + }()); Utils.Plane = Plane; })(Utils = A.Utils || (A.Utils = {})); })(A = exports.A || (exports.A = {})); diff --git a/tests/baselines/reference/TwoInternalModulesThatMergeEachWithExportedModulesOfTheSameName.js b/tests/baselines/reference/TwoInternalModulesThatMergeEachWithExportedModulesOfTheSameName.js index de9f86084bc..54ffef5a084 100644 --- a/tests/baselines/reference/TwoInternalModulesThatMergeEachWithExportedModulesOfTheSameName.js +++ b/tests/baselines/reference/TwoInternalModulesThatMergeEachWithExportedModulesOfTheSameName.js @@ -60,7 +60,7 @@ var X; function Line() { } return Line; - })(); + }()); Z.Line = Line; })(Z = Y.Z || (Y.Z = {})); })(Y = X.Y || (X.Y = {})); @@ -75,7 +75,7 @@ var X; function Line() { } return Line; - })(); + }()); Z.Line = Line; })(Z || (Z = {})); })(Y = X.Y || (X.Y = {})); diff --git a/tests/baselines/reference/TwoInternalModulesWithTheSameNameAndDifferentCommonRoot.js b/tests/baselines/reference/TwoInternalModulesWithTheSameNameAndDifferentCommonRoot.js index a854dff15c6..86a1190ed06 100644 --- a/tests/baselines/reference/TwoInternalModulesWithTheSameNameAndDifferentCommonRoot.js +++ b/tests/baselines/reference/TwoInternalModulesWithTheSameNameAndDifferentCommonRoot.js @@ -59,7 +59,7 @@ var otherRoot; this.br = br; } return Plane; - })(); + }()); Utils.Plane = Plane; })(Utils = A.Utils || (A.Utils = {})); })(A = otherRoot.A || (otherRoot.A = {})); diff --git a/tests/baselines/reference/TwoInternalModulesWithTheSameNameAndSameCommonRoot.js b/tests/baselines/reference/TwoInternalModulesWithTheSameNameAndSameCommonRoot.js index 82c9afd0787..c5c4cfdb2ca 100644 --- a/tests/baselines/reference/TwoInternalModulesWithTheSameNameAndSameCommonRoot.js +++ b/tests/baselines/reference/TwoInternalModulesWithTheSameNameAndSameCommonRoot.js @@ -62,7 +62,7 @@ var A; this.br = br; } return Plane; - })(); + }()); Utils.Plane = Plane; })(Utils = A.Utils || (A.Utils = {})); })(A || (A = {})); diff --git a/tests/baselines/reference/TypeGuardWithArrayUnion.js b/tests/baselines/reference/TypeGuardWithArrayUnion.js index cf98d2c2453..8dc7207e9db 100644 --- a/tests/baselines/reference/TypeGuardWithArrayUnion.js +++ b/tests/baselines/reference/TypeGuardWithArrayUnion.js @@ -15,7 +15,7 @@ var Message = (function () { function Message() { } return Message; -})(); +}()); function saySize(message) { if (message instanceof Array) { return message.length; // Should have type Message[] here diff --git a/tests/baselines/reference/YieldExpression11_es6.js b/tests/baselines/reference/YieldExpression11_es6.js index 07af8462a85..6260309473d 100644 --- a/tests/baselines/reference/YieldExpression11_es6.js +++ b/tests/baselines/reference/YieldExpression11_es6.js @@ -13,4 +13,4 @@ var C = (function () { yield (foo); }; return C; -})(); +}()); diff --git a/tests/baselines/reference/YieldExpression12_es6.js b/tests/baselines/reference/YieldExpression12_es6.js index ed9f8130bb3..7211d41cb86 100644 --- a/tests/baselines/reference/YieldExpression12_es6.js +++ b/tests/baselines/reference/YieldExpression12_es6.js @@ -11,4 +11,4 @@ var C = (function () { yield foo; } return C; -})(); +}()); diff --git a/tests/baselines/reference/YieldExpression14_es6.js b/tests/baselines/reference/YieldExpression14_es6.js index a03d31998ff..e8c33c2085e 100644 --- a/tests/baselines/reference/YieldExpression14_es6.js +++ b/tests/baselines/reference/YieldExpression14_es6.js @@ -13,4 +13,4 @@ var C = (function () { yield foo; }; return C; -})(); +}()); diff --git a/tests/baselines/reference/accessOverriddenBaseClassMember1.js b/tests/baselines/reference/accessOverriddenBaseClassMember1.js index e3a4d0602b8..c04532078e9 100644 --- a/tests/baselines/reference/accessOverriddenBaseClassMember1.js +++ b/tests/baselines/reference/accessOverriddenBaseClassMember1.js @@ -30,7 +30,7 @@ var Point = (function () { return "x=" + this.x + " y=" + this.y; }; return Point; -})(); +}()); var ColoredPoint = (function (_super) { __extends(ColoredPoint, _super); function ColoredPoint(x, y, color) { @@ -41,4 +41,4 @@ var ColoredPoint = (function (_super) { return _super.prototype.toString.call(this) + " color=" + this.color; }; return ColoredPoint; -})(Point); +}(Point)); diff --git a/tests/baselines/reference/accessibilityModifiers.js b/tests/baselines/reference/accessibilityModifiers.js index ebc801ac136..c50092d1459 100644 --- a/tests/baselines/reference/accessibilityModifiers.js +++ b/tests/baselines/reference/accessibilityModifiers.js @@ -84,7 +84,7 @@ var C = (function () { configurable: true }); return C; -})(); +}()); // Errors, accessibility modifiers must precede static var D = (function () { function D() { @@ -123,7 +123,7 @@ var D = (function () { configurable: true }); return D; -})(); +}()); // Errors, multiple accessibility modifier var E = (function () { function E() { @@ -140,4 +140,4 @@ var E = (function () { configurable: true }); return E; -})(); +}()); diff --git a/tests/baselines/reference/accessorParameterAccessibilityModifier.js b/tests/baselines/reference/accessorParameterAccessibilityModifier.js index 8b5ee6196e0..4aa8451feed 100644 --- a/tests/baselines/reference/accessorParameterAccessibilityModifier.js +++ b/tests/baselines/reference/accessorParameterAccessibilityModifier.js @@ -20,4 +20,4 @@ var C = (function () { configurable: true }); return C; -})(); +}()); diff --git a/tests/baselines/reference/accessorWithES3.js b/tests/baselines/reference/accessorWithES3.js index 1eecaa68d64..6384712fc9d 100644 --- a/tests/baselines/reference/accessorWithES3.js +++ b/tests/baselines/reference/accessorWithES3.js @@ -34,7 +34,7 @@ var C = (function () { configurable: true }); return C; -})(); +}()); var D = (function () { function D() { } @@ -45,7 +45,7 @@ var D = (function () { configurable: true }); return D; -})(); +}()); var x = { get a() { return 1; } }; diff --git a/tests/baselines/reference/accessorWithES5.js b/tests/baselines/reference/accessorWithES5.js index 746703bce52..3a94de76988 100644 --- a/tests/baselines/reference/accessorWithES5.js +++ b/tests/baselines/reference/accessorWithES5.js @@ -31,7 +31,7 @@ var C = (function () { configurable: true }); return C; -})(); +}()); var D = (function () { function D() { } @@ -42,7 +42,7 @@ var D = (function () { configurable: true }); return D; -})(); +}()); var x = { get a() { return 1; } }; diff --git a/tests/baselines/reference/accessorWithInitializer.js b/tests/baselines/reference/accessorWithInitializer.js index 26e72fe7d7d..d4562e635dc 100644 --- a/tests/baselines/reference/accessorWithInitializer.js +++ b/tests/baselines/reference/accessorWithInitializer.js @@ -24,4 +24,4 @@ var C = (function () { configurable: true }); return C; -})(); +}()); diff --git a/tests/baselines/reference/accessorWithMismatchedAccessibilityModifiers.js b/tests/baselines/reference/accessorWithMismatchedAccessibilityModifiers.js index 548d679776e..9dc206971a1 100644 --- a/tests/baselines/reference/accessorWithMismatchedAccessibilityModifiers.js +++ b/tests/baselines/reference/accessorWithMismatchedAccessibilityModifiers.js @@ -46,7 +46,7 @@ var C = (function () { configurable: true }); return C; -})(); +}()); var D = (function () { function D() { } @@ -60,7 +60,7 @@ var D = (function () { configurable: true }); return D; -})(); +}()); var E = (function () { function E() { } @@ -74,7 +74,7 @@ var E = (function () { configurable: true }); return E; -})(); +}()); var F = (function () { function F() { } @@ -88,4 +88,4 @@ var F = (function () { configurable: true }); return F; -})(); +}()); diff --git a/tests/baselines/reference/accessorWithRestParam.js b/tests/baselines/reference/accessorWithRestParam.js index 9feafe1904d..a58a7db1c52 100644 --- a/tests/baselines/reference/accessorWithRestParam.js +++ b/tests/baselines/reference/accessorWithRestParam.js @@ -30,4 +30,4 @@ var C = (function () { configurable: true }); return C; -})(); +}()); diff --git a/tests/baselines/reference/accessorsAreNotContextuallyTyped.js b/tests/baselines/reference/accessorsAreNotContextuallyTyped.js index 8c01173a13c..9047eebae66 100644 --- a/tests/baselines/reference/accessorsAreNotContextuallyTyped.js +++ b/tests/baselines/reference/accessorsAreNotContextuallyTyped.js @@ -28,6 +28,6 @@ var C = (function () { configurable: true }); return C; -})(); +}()); var c; var r = c.x(''); // string diff --git a/tests/baselines/reference/accessorsEmit.js b/tests/baselines/reference/accessorsEmit.js index e2c097e263f..7276c04e28e 100644 --- a/tests/baselines/reference/accessorsEmit.js +++ b/tests/baselines/reference/accessorsEmit.js @@ -20,7 +20,7 @@ var Result = (function () { function Result() { } return Result; -})(); +}()); var Test = (function () { function Test() { } @@ -33,7 +33,7 @@ var Test = (function () { configurable: true }); return Test; -})(); +}()); var Test2 = (function () { function Test2() { } @@ -46,4 +46,4 @@ var Test2 = (function () { configurable: true }); return Test2; -})(); +}()); diff --git a/tests/baselines/reference/accessorsNotAllowedInES3.js b/tests/baselines/reference/accessorsNotAllowedInES3.js index 0843a39191c..e348771b8f6 100644 --- a/tests/baselines/reference/accessorsNotAllowedInES3.js +++ b/tests/baselines/reference/accessorsNotAllowedInES3.js @@ -16,5 +16,5 @@ var C = (function () { configurable: true }); return C; -})(); +}()); var y = { get foo() { return 3; } }; diff --git a/tests/baselines/reference/accessors_spec_section-4.5_error-cases.js b/tests/baselines/reference/accessors_spec_section-4.5_error-cases.js index 5e527aef3e9..2832e70e138 100644 --- a/tests/baselines/reference/accessors_spec_section-4.5_error-cases.js +++ b/tests/baselines/reference/accessors_spec_section-4.5_error-cases.js @@ -42,4 +42,4 @@ var LanguageSpec_section_4_5_error_cases = (function () { configurable: true }); return LanguageSpec_section_4_5_error_cases; -})(); +}()); diff --git a/tests/baselines/reference/accessors_spec_section-4.5_inference.js b/tests/baselines/reference/accessors_spec_section-4.5_inference.js index 808019448b7..7294aa1aff7 100644 --- a/tests/baselines/reference/accessors_spec_section-4.5_inference.js +++ b/tests/baselines/reference/accessors_spec_section-4.5_inference.js @@ -34,14 +34,14 @@ var A = (function () { function A() { } return A; -})(); +}()); var B = (function (_super) { __extends(B, _super); function B() { _super.apply(this, arguments); } return B; -})(A); +}(A)); var LanguageSpec_section_4_5_inference = (function () { function LanguageSpec_section_4_5_inference() { } @@ -82,4 +82,4 @@ var LanguageSpec_section_4_5_inference = (function () { configurable: true }); return LanguageSpec_section_4_5_inference; -})(); +}()); diff --git a/tests/baselines/reference/additionOperatorWithAnyAndEveryType.js b/tests/baselines/reference/additionOperatorWithAnyAndEveryType.js index ed6c82bddd8..c9525693042 100644 --- a/tests/baselines/reference/additionOperatorWithAnyAndEveryType.js +++ b/tests/baselines/reference/additionOperatorWithAnyAndEveryType.js @@ -46,7 +46,7 @@ var C = (function () { } C.foo = function () { }; return C; -})(); +}()); var E; (function (E) { E[E["a"] = 0] = "a"; diff --git a/tests/baselines/reference/additionOperatorWithInvalidOperands.js b/tests/baselines/reference/additionOperatorWithInvalidOperands.js index 3eadd013849..897559b5cf3 100644 --- a/tests/baselines/reference/additionOperatorWithInvalidOperands.js +++ b/tests/baselines/reference/additionOperatorWithInvalidOperands.js @@ -47,7 +47,7 @@ var C = (function () { } C.foo = function () { }; return C; -})(); +}()); var E; (function (E) { E[E["a"] = 0] = "a"; diff --git a/tests/baselines/reference/aliasAssignments.js b/tests/baselines/reference/aliasAssignments.js index 0c6ac09a382..7aef6de22e6 100644 --- a/tests/baselines/reference/aliasAssignments.js +++ b/tests/baselines/reference/aliasAssignments.js @@ -19,7 +19,7 @@ var someClass = (function () { function someClass() { } return someClass; -})(); +}()); exports.someClass = someClass; //// [aliasAssignments_1.js] "use strict"; diff --git a/tests/baselines/reference/aliasBug.js b/tests/baselines/reference/aliasBug.js index 870060fc5ed..be7201a8ea7 100644 --- a/tests/baselines/reference/aliasBug.js +++ b/tests/baselines/reference/aliasBug.js @@ -27,7 +27,7 @@ var foo; function Provide() { } return Provide; - })(); + }()); foo.Provide = Provide; var bar; (function (bar) { @@ -37,7 +37,7 @@ var foo; function boo() { } return boo; - })(); + }()); baz.boo = boo; })(baz = bar.baz || (bar.baz = {})); })(bar = foo.bar || (foo.bar = {})); diff --git a/tests/baselines/reference/aliasErrors.js b/tests/baselines/reference/aliasErrors.js index e61ca167661..1e93d22c3fb 100644 --- a/tests/baselines/reference/aliasErrors.js +++ b/tests/baselines/reference/aliasErrors.js @@ -37,7 +37,7 @@ var foo; function Provide() { } return Provide; - })(); + }()); foo.Provide = Provide; var bar; (function (bar) { @@ -47,7 +47,7 @@ var foo; function boo() { } return boo; - })(); + }()); baz.boo = boo; })(baz = bar.baz || (bar.baz = {})); })(bar = foo.bar || (foo.bar = {})); diff --git a/tests/baselines/reference/aliasInaccessibleModule2.js b/tests/baselines/reference/aliasInaccessibleModule2.js index b8b824d92ad..b16bcf6cd72 100644 --- a/tests/baselines/reference/aliasInaccessibleModule2.js +++ b/tests/baselines/reference/aliasInaccessibleModule2.js @@ -18,7 +18,7 @@ var M; function C() { } return C; - })(); + }()); })(N || (N = {})); var R = N; M.X = R; diff --git a/tests/baselines/reference/aliasUsageInAccessorsOfClass.js b/tests/baselines/reference/aliasUsageInAccessorsOfClass.js index d067ca1c00a..905ed9bce0e 100644 --- a/tests/baselines/reference/aliasUsageInAccessorsOfClass.js +++ b/tests/baselines/reference/aliasUsageInAccessorsOfClass.js @@ -33,7 +33,7 @@ var Model = (function () { function Model() { } return Model; -})(); +}()); exports.Model = Model; //// [aliasUsage1_moduleA.js] "use strict"; @@ -49,7 +49,7 @@ var VisualizationModel = (function (_super) { _super.apply(this, arguments); } return VisualizationModel; -})(Backbone.Model); +}(Backbone.Model)); exports.VisualizationModel = VisualizationModel; //// [aliasUsage1_main.js] "use strict"; @@ -68,4 +68,4 @@ var C2 = (function () { configurable: true }); return C2; -})(); +}()); diff --git a/tests/baselines/reference/aliasUsageInArray.js b/tests/baselines/reference/aliasUsageInArray.js index 183a885b3c6..2d9f7cfed6e 100644 --- a/tests/baselines/reference/aliasUsageInArray.js +++ b/tests/baselines/reference/aliasUsageInArray.js @@ -27,7 +27,7 @@ var Model = (function () { function Model() { } return Model; -})(); +}()); exports.Model = Model; //// [aliasUsageInArray_moduleA.js] "use strict"; @@ -43,7 +43,7 @@ var VisualizationModel = (function (_super) { _super.apply(this, arguments); } return VisualizationModel; -})(Backbone.Model); +}(Backbone.Model)); exports.VisualizationModel = VisualizationModel; //// [aliasUsageInArray_main.js] "use strict"; diff --git a/tests/baselines/reference/aliasUsageInFunctionExpression.js b/tests/baselines/reference/aliasUsageInFunctionExpression.js index 584c894cbad..21565dc99fc 100644 --- a/tests/baselines/reference/aliasUsageInFunctionExpression.js +++ b/tests/baselines/reference/aliasUsageInFunctionExpression.js @@ -26,7 +26,7 @@ var Model = (function () { function Model() { } return Model; -})(); +}()); exports.Model = Model; //// [aliasUsageInFunctionExpression_moduleA.js] "use strict"; @@ -42,7 +42,7 @@ var VisualizationModel = (function (_super) { _super.apply(this, arguments); } return VisualizationModel; -})(Backbone.Model); +}(Backbone.Model)); exports.VisualizationModel = VisualizationModel; //// [aliasUsageInFunctionExpression_main.js] "use strict"; diff --git a/tests/baselines/reference/aliasUsageInGenericFunction.js b/tests/baselines/reference/aliasUsageInGenericFunction.js index fe52d71bf3f..af24b61cf33 100644 --- a/tests/baselines/reference/aliasUsageInGenericFunction.js +++ b/tests/baselines/reference/aliasUsageInGenericFunction.js @@ -30,7 +30,7 @@ var Model = (function () { function Model() { } return Model; -})(); +}()); exports.Model = Model; //// [aliasUsageInGenericFunction_moduleA.js] "use strict"; @@ -46,7 +46,7 @@ var VisualizationModel = (function (_super) { _super.apply(this, arguments); } return VisualizationModel; -})(Backbone.Model); +}(Backbone.Model)); exports.VisualizationModel = VisualizationModel; //// [aliasUsageInGenericFunction_main.js] "use strict"; diff --git a/tests/baselines/reference/aliasUsageInIndexerOfClass.js b/tests/baselines/reference/aliasUsageInIndexerOfClass.js index e4448ef220f..3b21f15777c 100644 --- a/tests/baselines/reference/aliasUsageInIndexerOfClass.js +++ b/tests/baselines/reference/aliasUsageInIndexerOfClass.js @@ -32,7 +32,7 @@ var Model = (function () { function Model() { } return Model; -})(); +}()); exports.Model = Model; //// [aliasUsageInIndexerOfClass_moduleA.js] "use strict"; @@ -48,7 +48,7 @@ var VisualizationModel = (function (_super) { _super.apply(this, arguments); } return VisualizationModel; -})(Backbone.Model); +}(Backbone.Model)); exports.VisualizationModel = VisualizationModel; //// [aliasUsageInIndexerOfClass_main.js] "use strict"; @@ -58,9 +58,9 @@ var N = (function () { this.x = moduleA; } return N; -})(); +}()); var N2 = (function () { function N2() { } return N2; -})(); +}()); diff --git a/tests/baselines/reference/aliasUsageInObjectLiteral.js b/tests/baselines/reference/aliasUsageInObjectLiteral.js index b0abd11b189..b380104b461 100644 --- a/tests/baselines/reference/aliasUsageInObjectLiteral.js +++ b/tests/baselines/reference/aliasUsageInObjectLiteral.js @@ -27,7 +27,7 @@ var Model = (function () { function Model() { } return Model; -})(); +}()); exports.Model = Model; //// [aliasUsageInObjectLiteral_moduleA.js] "use strict"; @@ -43,7 +43,7 @@ var VisualizationModel = (function (_super) { _super.apply(this, arguments); } return VisualizationModel; -})(Backbone.Model); +}(Backbone.Model)); exports.VisualizationModel = VisualizationModel; //// [aliasUsageInObjectLiteral_main.js] "use strict"; diff --git a/tests/baselines/reference/aliasUsageInOrExpression.js b/tests/baselines/reference/aliasUsageInOrExpression.js index ff8543bca76..1e9a5420345 100644 --- a/tests/baselines/reference/aliasUsageInOrExpression.js +++ b/tests/baselines/reference/aliasUsageInOrExpression.js @@ -30,7 +30,7 @@ var Model = (function () { function Model() { } return Model; -})(); +}()); exports.Model = Model; //// [aliasUsageInOrExpression_moduleA.js] "use strict"; @@ -46,7 +46,7 @@ var VisualizationModel = (function (_super) { _super.apply(this, arguments); } return VisualizationModel; -})(Backbone.Model); +}(Backbone.Model)); exports.VisualizationModel = VisualizationModel; //// [aliasUsageInOrExpression_main.js] "use strict"; diff --git a/tests/baselines/reference/aliasUsageInTypeArgumentOfExtendsClause.js b/tests/baselines/reference/aliasUsageInTypeArgumentOfExtendsClause.js index cf256e010ee..76b90c01bf0 100644 --- a/tests/baselines/reference/aliasUsageInTypeArgumentOfExtendsClause.js +++ b/tests/baselines/reference/aliasUsageInTypeArgumentOfExtendsClause.js @@ -30,7 +30,7 @@ var Model = (function () { function Model() { } return Model; -})(); +}()); exports.Model = Model; //// [aliasUsageInTypeArgumentOfExtendsClause_moduleA.js] "use strict"; @@ -46,7 +46,7 @@ var VisualizationModel = (function (_super) { _super.apply(this, arguments); } return VisualizationModel; -})(Backbone.Model); +}(Backbone.Model)); exports.VisualizationModel = VisualizationModel; //// [aliasUsageInTypeArgumentOfExtendsClause_main.js] "use strict"; @@ -60,7 +60,7 @@ var C = (function () { function C() { } return C; -})(); +}()); var D = (function (_super) { __extends(D, _super); function D() { @@ -68,4 +68,4 @@ var D = (function (_super) { this.x = moduleA; } return D; -})(C); +}(C)); diff --git a/tests/baselines/reference/aliasUsageInVarAssignment.js b/tests/baselines/reference/aliasUsageInVarAssignment.js index 8117aca8c35..7c73fac2d67 100644 --- a/tests/baselines/reference/aliasUsageInVarAssignment.js +++ b/tests/baselines/reference/aliasUsageInVarAssignment.js @@ -26,7 +26,7 @@ var Model = (function () { function Model() { } return Model; -})(); +}()); exports.Model = Model; //// [aliasUsageInVarAssignment_moduleA.js] "use strict"; @@ -42,7 +42,7 @@ var VisualizationModel = (function (_super) { _super.apply(this, arguments); } return VisualizationModel; -})(Backbone.Model); +}(Backbone.Model)); exports.VisualizationModel = VisualizationModel; //// [aliasUsageInVarAssignment_main.js] "use strict"; diff --git a/tests/baselines/reference/allowSyntheticDefaultImports1.js b/tests/baselines/reference/allowSyntheticDefaultImports1.js index 699880f930c..3789410a54b 100644 --- a/tests/baselines/reference/allowSyntheticDefaultImports1.js +++ b/tests/baselines/reference/allowSyntheticDefaultImports1.js @@ -16,7 +16,7 @@ var Foo = (function () { function Foo() { } return Foo; -})(); +}()); exports.Foo = Foo; //// [a.js] "use strict"; diff --git a/tests/baselines/reference/allowSyntheticDefaultImports2.js b/tests/baselines/reference/allowSyntheticDefaultImports2.js index d21750c65fc..fcc029415cf 100644 --- a/tests/baselines/reference/allowSyntheticDefaultImports2.js +++ b/tests/baselines/reference/allowSyntheticDefaultImports2.js @@ -20,7 +20,7 @@ System.register([], function(exports_1) { function Foo() { } return Foo; - })(); + }()); exports_1("Foo", Foo); } } diff --git a/tests/baselines/reference/allowSyntheticDefaultImports3.js b/tests/baselines/reference/allowSyntheticDefaultImports3.js index 8864a28e796..b14d25dbd61 100644 --- a/tests/baselines/reference/allowSyntheticDefaultImports3.js +++ b/tests/baselines/reference/allowSyntheticDefaultImports3.js @@ -21,7 +21,7 @@ System.register([], function(exports_1) { function Foo() { } return Foo; - })(); + }()); exports_1("Foo", Foo); } } diff --git a/tests/baselines/reference/ambientExternalModuleInAnotherExternalModule.js b/tests/baselines/reference/ambientExternalModuleInAnotherExternalModule.js index a089cea155b..b0382205cd3 100644 --- a/tests/baselines/reference/ambientExternalModuleInAnotherExternalModule.js +++ b/tests/baselines/reference/ambientExternalModuleInAnotherExternalModule.js @@ -18,7 +18,7 @@ define(["require", "exports", "ext"], function (require, exports, ext) { function D() { } return D; - })(); + }()); var x = ext; return D; }); diff --git a/tests/baselines/reference/ambiguousCallsWhereReturnTypesAgree.js b/tests/baselines/reference/ambiguousCallsWhereReturnTypesAgree.js index 2beabb83d11..06a558d1ba5 100644 --- a/tests/baselines/reference/ambiguousCallsWhereReturnTypesAgree.js +++ b/tests/baselines/reference/ambiguousCallsWhereReturnTypesAgree.js @@ -38,7 +38,7 @@ var TestClass = (function () { this.bar(x); // should not error }; return TestClass; -})(); +}()); var TestClass2 = (function () { function TestClass2() { } @@ -49,4 +49,4 @@ var TestClass2 = (function () { return this.bar(x); // should not error }; return TestClass2; -})(); +}()); diff --git a/tests/baselines/reference/ambiguousOverloadResolution.js b/tests/baselines/reference/ambiguousOverloadResolution.js index 23c985d2f8d..275bbf67602 100644 --- a/tests/baselines/reference/ambiguousOverloadResolution.js +++ b/tests/baselines/reference/ambiguousOverloadResolution.js @@ -18,13 +18,13 @@ var A = (function () { function A() { } return A; -})(); +}()); var B = (function (_super) { __extends(B, _super); function B() { _super.apply(this, arguments); } return B; -})(A); +}(A)); var x; var t = f(x, x); // Not an error diff --git a/tests/baselines/reference/amdImportNotAsPrimaryExpression.js b/tests/baselines/reference/amdImportNotAsPrimaryExpression.js index 3f6bcebab53..beb91191bc0 100644 --- a/tests/baselines/reference/amdImportNotAsPrimaryExpression.js +++ b/tests/baselines/reference/amdImportNotAsPrimaryExpression.js @@ -40,7 +40,7 @@ define(["require", "exports"], function (require, exports) { } C1.s1 = true; return C1; - })(); + }()); exports.C1 = C1; (function (E1) { E1[E1["A"] = 0] = "A"; diff --git a/tests/baselines/reference/amdModuleName1.js b/tests/baselines/reference/amdModuleName1.js index ccfa8958575..f17166319c0 100644 --- a/tests/baselines/reference/amdModuleName1.js +++ b/tests/baselines/reference/amdModuleName1.js @@ -18,6 +18,6 @@ define("NamedModule", ["require", "exports"], function (require, exports) { this.x = 5; } return Foo; - })(); + }()); return Foo; }); diff --git a/tests/baselines/reference/amdModuleName2.js b/tests/baselines/reference/amdModuleName2.js index ff547dd6c3b..4143183c6f5 100644 --- a/tests/baselines/reference/amdModuleName2.js +++ b/tests/baselines/reference/amdModuleName2.js @@ -20,6 +20,6 @@ define("SecondModuleName", ["require", "exports"], function (require, exports) { this.x = 5; } return Foo; - })(); + }()); return Foo; }); diff --git a/tests/baselines/reference/anonterface.js b/tests/baselines/reference/anonterface.js index 12bfbc4ec9d..041b90cb56c 100644 --- a/tests/baselines/reference/anonterface.js +++ b/tests/baselines/reference/anonterface.js @@ -24,7 +24,7 @@ var M; return fn(n2); }; return C; - })(); + }()); M.C = C; })(M || (M = {})); var c = new M.C(); diff --git a/tests/baselines/reference/anonymousClassExpression1.js b/tests/baselines/reference/anonymousClassExpression1.js index 5ced5120979..6774665ae6e 100644 --- a/tests/baselines/reference/anonymousClassExpression1.js +++ b/tests/baselines/reference/anonymousClassExpression1.js @@ -9,5 +9,5 @@ function f() { function class_1() { } return class_1; - })() === "function"; + }()) === "function"; } diff --git a/tests/baselines/reference/anyAsGenericFunctionCall.js b/tests/baselines/reference/anyAsGenericFunctionCall.js index 64097f4e3c7..3c3eddccb1e 100644 --- a/tests/baselines/reference/anyAsGenericFunctionCall.js +++ b/tests/baselines/reference/anyAsGenericFunctionCall.js @@ -20,6 +20,6 @@ var C = (function () { function C() { } return C; -})(); +}()); var c = x(x); var d = x(x); diff --git a/tests/baselines/reference/anyAssignabilityInInheritance.js b/tests/baselines/reference/anyAssignabilityInInheritance.js index 04e3e91761d..f73228a464b 100644 --- a/tests/baselines/reference/anyAssignabilityInInheritance.js +++ b/tests/baselines/reference/anyAssignabilityInInheritance.js @@ -103,13 +103,13 @@ var A = (function () { function A() { } return A; -})(); +}()); var r3 = foo3(a); // any var A2 = (function () { function A2() { } return A2; -})(); +}()); var r3 = foo3(a); // any var r3 = foo3(a); // any var r3 = foo3(a); // any @@ -128,7 +128,7 @@ var CC = (function () { function CC() { } return CC; -})(); +}()); var CC; (function (CC) { CC.bar = 1; diff --git a/tests/baselines/reference/anyAssignableToEveryType.js b/tests/baselines/reference/anyAssignableToEveryType.js index 75d847709a5..f02660e17ec 100644 --- a/tests/baselines/reference/anyAssignableToEveryType.js +++ b/tests/baselines/reference/anyAssignableToEveryType.js @@ -51,7 +51,7 @@ var C = (function () { function C() { } return C; -})(); +}()); var ac; var ai; var E; diff --git a/tests/baselines/reference/anyAssignableToEveryType2.js b/tests/baselines/reference/anyAssignableToEveryType2.js index 530d8eb0439..c5fefb60042 100644 --- a/tests/baselines/reference/anyAssignableToEveryType2.js +++ b/tests/baselines/reference/anyAssignableToEveryType2.js @@ -136,12 +136,12 @@ var A = (function () { function A() { } return A; -})(); +}()); var A2 = (function () { function A2() { } return A2; -})(); +}()); var E; (function (E) { E[E["A"] = 0] = "A"; @@ -155,7 +155,7 @@ var c = (function () { function c() { } return c; -})(); +}()); var c; (function (c) { c.bar = 1; diff --git a/tests/baselines/reference/anyIdenticalToItself.js b/tests/baselines/reference/anyIdenticalToItself.js index b7b9b25e418..cfbaff6585c 100644 --- a/tests/baselines/reference/anyIdenticalToItself.js +++ b/tests/baselines/reference/anyIdenticalToItself.js @@ -28,4 +28,4 @@ var C = (function () { configurable: true }); return C; -})(); +}()); diff --git a/tests/baselines/reference/apparentTypeSubtyping.js b/tests/baselines/reference/apparentTypeSubtyping.js index edc0f21323a..2d04b059a9a 100644 --- a/tests/baselines/reference/apparentTypeSubtyping.js +++ b/tests/baselines/reference/apparentTypeSubtyping.js @@ -33,7 +33,7 @@ var Base = (function () { function Base() { } return Base; -})(); +}()); // is String (S) a subtype of U extends String (T)? Would only be true if we used the apparent type of U (T) var Derived = (function (_super) { __extends(Derived, _super); @@ -41,12 +41,12 @@ var Derived = (function (_super) { _super.apply(this, arguments); } return Derived; -})(Base); +}(Base)); var Base2 = (function () { function Base2() { } return Base2; -})(); +}()); // is U extends String (S) a subtype of String (T)? Apparent type of U is String so it succeeds var Derived2 = (function (_super) { __extends(Derived2, _super); @@ -54,4 +54,4 @@ var Derived2 = (function (_super) { _super.apply(this, arguments); } return Derived2; -})(Base2); +}(Base2)); diff --git a/tests/baselines/reference/apparentTypeSupertype.js b/tests/baselines/reference/apparentTypeSupertype.js index 2ab84c89513..de1b1ba11bd 100644 --- a/tests/baselines/reference/apparentTypeSupertype.js +++ b/tests/baselines/reference/apparentTypeSupertype.js @@ -23,7 +23,7 @@ var Base = (function () { function Base() { } return Base; -})(); +}()); // is String (S) a subtype of U extends String (T)? Would only be true if we used the apparent type of U (T) var Derived = (function (_super) { __extends(Derived, _super); @@ -31,4 +31,4 @@ var Derived = (function (_super) { _super.apply(this, arguments); } return Derived; -})(Base); +}(Base)); diff --git a/tests/baselines/reference/argsInScope.js b/tests/baselines/reference/argsInScope.js index 76b7ab0e99f..90906426d24 100644 --- a/tests/baselines/reference/argsInScope.js +++ b/tests/baselines/reference/argsInScope.js @@ -20,6 +20,6 @@ var C = (function () { } }; return C; -})(); +}()); var c = new C(); c.P(1, 2, 3); diff --git a/tests/baselines/reference/argumentsUsedInObjectLiteralProperty.js b/tests/baselines/reference/argumentsUsedInObjectLiteralProperty.js index 47edef44ef0..753afb809a2 100644 --- a/tests/baselines/reference/argumentsUsedInObjectLiteralProperty.js +++ b/tests/baselines/reference/argumentsUsedInObjectLiteralProperty.js @@ -17,4 +17,4 @@ var A = (function () { }; }; return A; -})(); +}()); diff --git a/tests/baselines/reference/arithAssignTyping.js b/tests/baselines/reference/arithAssignTyping.js index 10e60bfb1f2..38f6718175b 100644 --- a/tests/baselines/reference/arithAssignTyping.js +++ b/tests/baselines/reference/arithAssignTyping.js @@ -19,7 +19,7 @@ var f = (function () { function f() { } return f; -})(); +}()); f += ''; // error f += 1; // error f -= 1; // error diff --git a/tests/baselines/reference/arrayAssignmentTest1.js b/tests/baselines/reference/arrayAssignmentTest1.js index 70177b4cba2..e2ca36cbd1d 100644 --- a/tests/baselines/reference/arrayAssignmentTest1.js +++ b/tests/baselines/reference/arrayAssignmentTest1.js @@ -97,7 +97,7 @@ var C1 = (function () { C1.prototype.IM1 = function () { return null; }; C1.prototype.C1M1 = function () { return null; }; return C1; -})(); +}()); var C2 = (function (_super) { __extends(C2, _super); function C2() { @@ -105,13 +105,13 @@ var C2 = (function (_super) { } C2.prototype.C2M1 = function () { return null; }; return C2; -})(C1); +}(C1)); var C3 = (function () { function C3() { } C3.prototype.CM3M1 = function () { return 3; }; return C3; -})(); +}()); /* This behaves unexpectedly with the following types: diff --git a/tests/baselines/reference/arrayAssignmentTest2.js b/tests/baselines/reference/arrayAssignmentTest2.js index 61bddd7e8e4..a15df1b14b7 100644 --- a/tests/baselines/reference/arrayAssignmentTest2.js +++ b/tests/baselines/reference/arrayAssignmentTest2.js @@ -71,7 +71,7 @@ var C1 = (function () { C1.prototype.IM1 = function () { return null; }; C1.prototype.C1M1 = function () { return null; }; return C1; -})(); +}()); var C2 = (function (_super) { __extends(C2, _super); function C2() { @@ -79,13 +79,13 @@ var C2 = (function (_super) { } C2.prototype.C2M1 = function () { return null; }; return C2; -})(C1); +}(C1)); var C3 = (function () { function C3() { } C3.prototype.CM3M1 = function () { return 3; }; return C3; -})(); +}()); /* This behaves unexpectedly with the following types: diff --git a/tests/baselines/reference/arrayAssignmentTest3.js b/tests/baselines/reference/arrayAssignmentTest3.js index 74cd6662623..6e586c738d7 100644 --- a/tests/baselines/reference/arrayAssignmentTest3.js +++ b/tests/baselines/reference/arrayAssignmentTest3.js @@ -22,12 +22,12 @@ var B = (function () { function B() { } return B; -})(); +}()); var a = (function () { function a(x, y, z) { this.x = x; this.y = y; } return a; -})(); +}()); var xx = new a(null, 7, new B()); diff --git a/tests/baselines/reference/arrayAssignmentTest4.js b/tests/baselines/reference/arrayAssignmentTest4.js index c38cdebc06c..6cc59bdece4 100644 --- a/tests/baselines/reference/arrayAssignmentTest4.js +++ b/tests/baselines/reference/arrayAssignmentTest4.js @@ -32,7 +32,7 @@ var C3 = (function () { } C3.prototype.CM3M1 = function () { return 3; }; return C3; -})(); +}()); /* This behaves unexpectedly with teh following types: diff --git a/tests/baselines/reference/arrayAssignmentTest5.js b/tests/baselines/reference/arrayAssignmentTest5.js index a4775536783..f5bd3e882b5 100644 --- a/tests/baselines/reference/arrayAssignmentTest5.js +++ b/tests/baselines/reference/arrayAssignmentTest5.js @@ -50,6 +50,6 @@ var Test; return null; }; return Bug; - })(); + }()); Test.Bug = Bug; })(Test || (Test = {})); diff --git a/tests/baselines/reference/arrayAssignmentTest6.js b/tests/baselines/reference/arrayAssignmentTest6.js index b8ee0c31946..1e24137ddba 100644 --- a/tests/baselines/reference/arrayAssignmentTest6.js +++ b/tests/baselines/reference/arrayAssignmentTest6.js @@ -30,6 +30,6 @@ var Test; return null; }; return Bug; - })(); + }()); Test.Bug = Bug; })(Test || (Test = {})); diff --git a/tests/baselines/reference/arrayBestCommonTypes.js b/tests/baselines/reference/arrayBestCommonTypes.js index 95dd299ad43..f45f67a8765 100644 --- a/tests/baselines/reference/arrayBestCommonTypes.js +++ b/tests/baselines/reference/arrayBestCommonTypes.js @@ -119,19 +119,19 @@ var EmptyTypes; function base() { } return base; - })(); + }()); var base2 = (function () { function base2() { } return base2; - })(); + }()); var derived = (function (_super) { __extends(derived, _super); function derived() { _super.apply(this, arguments); } return derived; - })(base); + }(base)); var f = (function () { function f() { } @@ -170,7 +170,7 @@ var EmptyTypes; var b4 = [ifaceObj, baseObj, base2Obj]; }; return f; - })(); + }()); })(EmptyTypes || (EmptyTypes = {})); var NonEmptyTypes; (function (NonEmptyTypes) { @@ -178,19 +178,19 @@ var NonEmptyTypes; function base() { } return base; - })(); + }()); var base2 = (function () { function base2() { } return base2; - })(); + }()); var derived = (function (_super) { __extends(derived, _super); function derived() { _super.apply(this, arguments); } return derived; - })(base); + }(base)); var f = (function () { function f() { } @@ -229,5 +229,5 @@ var NonEmptyTypes; var b4 = [ifaceObj, baseObj, base2Obj]; }; return f; - })(); + }()); })(NonEmptyTypes || (NonEmptyTypes = {})); diff --git a/tests/baselines/reference/arrayLiteralContextualType.js b/tests/baselines/reference/arrayLiteralContextualType.js index 0edf5c45164..8d42bc20928 100644 --- a/tests/baselines/reference/arrayLiteralContextualType.js +++ b/tests/baselines/reference/arrayLiteralContextualType.js @@ -36,14 +36,14 @@ var Giraffe = (function () { this.neckLength = "3m"; } return Giraffe; -})(); +}()); var Elephant = (function () { function Elephant() { this.name = "Elephant"; this.trunkDiameter = "20cm"; } return Elephant; -})(); +}()); function foo(animals) { } function bar(animals) { } foo([ diff --git a/tests/baselines/reference/arrayLiteralTypeInference.js b/tests/baselines/reference/arrayLiteralTypeInference.js index fc573aa390e..f54dec83c9c 100644 --- a/tests/baselines/reference/arrayLiteralTypeInference.js +++ b/tests/baselines/reference/arrayLiteralTypeInference.js @@ -61,21 +61,21 @@ var Action = (function () { function Action() { } return Action; -})(); +}()); var ActionA = (function (_super) { __extends(ActionA, _super); function ActionA() { _super.apply(this, arguments); } return ActionA; -})(Action); +}(Action)); var ActionB = (function (_super) { __extends(ActionB, _super); function ActionB() { _super.apply(this, arguments); } return ActionB; -})(Action); +}(Action)); var x1 = [ { id: 2, trueness: false }, { id: 3, name: "three" } diff --git a/tests/baselines/reference/arrayLiterals.js b/tests/baselines/reference/arrayLiterals.js index 0f86b7a7f2a..4dbf88f8688 100644 --- a/tests/baselines/reference/arrayLiterals.js +++ b/tests/baselines/reference/arrayLiterals.js @@ -54,7 +54,7 @@ var C = (function () { function C() { } return C; -})(); +}()); var classArr = [new C(), new C()]; var classTypeArray = [C, C, C]; var classTypeArray; // Should OK, not be a parse error @@ -66,14 +66,14 @@ var Base = (function () { function Base() { } return Base; -})(); +}()); var Derived1 = (function (_super) { __extends(Derived1, _super); function Derived1() { _super.apply(this, arguments); } return Derived1; -})(Base); +}(Base)); ; var Derived2 = (function (_super) { __extends(Derived2, _super); @@ -81,7 +81,7 @@ var Derived2 = (function (_super) { _super.apply(this, arguments); } return Derived2; -})(Base); +}(Base)); ; var context3 = [new Derived1(), new Derived2()]; // Contextual type C with numeric index signature of type Base makes array literal of Derived1 and Derived2 have type Base[] diff --git a/tests/baselines/reference/arrayLiteralsWithRecursiveGenerics.js b/tests/baselines/reference/arrayLiteralsWithRecursiveGenerics.js index e303415df08..c15782a8e20 100644 --- a/tests/baselines/reference/arrayLiteralsWithRecursiveGenerics.js +++ b/tests/baselines/reference/arrayLiteralsWithRecursiveGenerics.js @@ -35,19 +35,19 @@ var List = (function () { function List() { } return List; -})(); +}()); var DerivedList = (function (_super) { __extends(DerivedList, _super); function DerivedList() { _super.apply(this, arguments); } return DerivedList; -})(List); +}(List)); var MyList = (function () { function MyList() { } return MyList; -})(); +}()); var list; var list2; var myList; diff --git a/tests/baselines/reference/arrayOfExportedClass.js b/tests/baselines/reference/arrayOfExportedClass.js index e86a83ee95d..f305aacbe65 100644 --- a/tests/baselines/reference/arrayOfExportedClass.js +++ b/tests/baselines/reference/arrayOfExportedClass.js @@ -30,7 +30,7 @@ var Car = (function () { function Car() { } return Car; -})(); +}()); module.exports = Car; //// [arrayOfExportedClass_1.js] "use strict"; @@ -41,5 +41,5 @@ var Road = (function () { this.cars = cars; }; return Road; -})(); +}()); module.exports = Road; diff --git a/tests/baselines/reference/arrayOfFunctionTypes3.js b/tests/baselines/reference/arrayOfFunctionTypes3.js index c0829418dd7..5a822e67508 100644 --- a/tests/baselines/reference/arrayOfFunctionTypes3.js +++ b/tests/baselines/reference/arrayOfFunctionTypes3.js @@ -34,7 +34,7 @@ var C = (function () { function C() { } return C; -})(); +}()); var y = [C, C]; var r3 = new y[0](); var a; diff --git a/tests/baselines/reference/arrayReferenceWithoutTypeArgs.js b/tests/baselines/reference/arrayReferenceWithoutTypeArgs.js index 6fcdae657e9..3d427bfa9b4 100644 --- a/tests/baselines/reference/arrayReferenceWithoutTypeArgs.js +++ b/tests/baselines/reference/arrayReferenceWithoutTypeArgs.js @@ -9,4 +9,4 @@ var X = (function () { } X.prototype.f = function (a) { }; return X; -})(); +}()); diff --git a/tests/baselines/reference/arrayconcat.js b/tests/baselines/reference/arrayconcat.js index fd527d87c3c..76250642a59 100644 --- a/tests/baselines/reference/arrayconcat.js +++ b/tests/baselines/reference/arrayconcat.js @@ -48,4 +48,4 @@ var parser = (function () { }); }; return parser; -})(); +}()); diff --git a/tests/baselines/reference/arrowFunctionContexts.js b/tests/baselines/reference/arrowFunctionContexts.js index 5d862dcec8c..7b424107bd1 100644 --- a/tests/baselines/reference/arrowFunctionContexts.js +++ b/tests/baselines/reference/arrowFunctionContexts.js @@ -111,7 +111,7 @@ var Base = (function () { function Base(n) { } return Base; -})(); +}()); var Derived = (function (_super) { __extends(Derived, _super); function Derived() { @@ -119,7 +119,7 @@ var Derived = (function (_super) { _super.call(this, function () { return _this; }); } return Derived; -})(Base); +}(Base)); // Arrow function as function argument window.setTimeout(function () { return null; }, 100); // Arrow function as value in array literal @@ -151,7 +151,7 @@ var M2; function Base(n) { } return Base; - })(); + }()); var Derived = (function (_super) { __extends(Derived, _super); function Derived() { @@ -159,7 +159,7 @@ var M2; _super.call(this, function () { return _this; }); } return Derived; - })(Base); + }(Base)); // Arrow function as function argument window.setTimeout(function () { return null; }, 100); // Arrow function as value in array literal diff --git a/tests/baselines/reference/arrowFunctionExpressions.js b/tests/baselines/reference/arrowFunctionExpressions.js index 5e365291da7..66f53d32dba 100644 --- a/tests/baselines/reference/arrowFunctionExpressions.js +++ b/tests/baselines/reference/arrowFunctionExpressions.js @@ -156,7 +156,7 @@ var MyClass = (function () { var p = function (n) { return n && _this; }; }; return MyClass; -})(); +}()); // Arrow function used in arrow function var arrrr = function () { return function (m) { return function () { return function (n) { return m + n; }; }; }; }; var e = arrrr()(3)()(4); diff --git a/tests/baselines/reference/arrowFunctionInConstructorArgument1.js b/tests/baselines/reference/arrowFunctionInConstructorArgument1.js index 0f9c3f81b3b..9d1c8f9d995 100644 --- a/tests/baselines/reference/arrowFunctionInConstructorArgument1.js +++ b/tests/baselines/reference/arrowFunctionInConstructorArgument1.js @@ -10,5 +10,5 @@ var C = (function () { function C(x) { } return C; -})(); +}()); var c = new C(function () { return asdf; }); // should error diff --git a/tests/baselines/reference/asOperatorASI.js b/tests/baselines/reference/asOperatorASI.js index 1df39b36e50..10b6f90f714 100644 --- a/tests/baselines/reference/asOperatorASI.js +++ b/tests/baselines/reference/asOperatorASI.js @@ -16,7 +16,7 @@ var Foo = (function () { function Foo() { } return Foo; -})(); +}()); // Example 1 var x = 10; (_a = ["Hello world"], _a.raw = ["Hello world"], as(_a)); // should not error diff --git a/tests/baselines/reference/asiAbstract.js b/tests/baselines/reference/asiAbstract.js index 8d5b412d022..c17e1911e4e 100644 --- a/tests/baselines/reference/asiAbstract.js +++ b/tests/baselines/reference/asiAbstract.js @@ -21,16 +21,16 @@ var NonAbstractClass = (function () { function NonAbstractClass() { } return NonAbstractClass; -})(); +}()); var C2 = (function () { function C2() { } C2.prototype.nonAbstractFunction = function () { }; return C2; -})(); +}()); var C3 = (function () { function C3() { } return C3; -})(); +}()); diff --git a/tests/baselines/reference/asiInES6Classes.js b/tests/baselines/reference/asiInES6Classes.js index df4b0288d8a..d315809d256 100644 --- a/tests/baselines/reference/asiInES6Classes.js +++ b/tests/baselines/reference/asiInES6Classes.js @@ -33,4 +33,4 @@ var Foo = (function () { return 3; }; return Foo; -})(); +}()); diff --git a/tests/baselines/reference/asiPublicPrivateProtected.js b/tests/baselines/reference/asiPublicPrivateProtected.js index a17bcb7509a..12faef5316b 100644 --- a/tests/baselines/reference/asiPublicPrivateProtected.js +++ b/tests/baselines/reference/asiPublicPrivateProtected.js @@ -48,14 +48,14 @@ var NonPublicClass = (function () { NonPublicClass.prototype.s = function () { }; return NonPublicClass; -})(); +}()); var NonPublicClass2 = (function () { function NonPublicClass2() { } NonPublicClass2.prototype.nonPublicFunction = function () { }; return NonPublicClass2; -})(); +}()); private; var NonPrivateClass = (function () { function NonPrivateClass() { @@ -63,14 +63,14 @@ var NonPrivateClass = (function () { NonPrivateClass.prototype.s = function () { }; return NonPrivateClass; -})(); +}()); var NonPrivateClass2 = (function () { function NonPrivateClass2() { } NonPrivateClass2.prototype.nonPrivateFunction = function () { }; return NonPrivateClass2; -})(); +}()); protected; var NonProtectedClass = (function () { function NonProtectedClass() { @@ -78,16 +78,16 @@ var NonProtectedClass = (function () { NonProtectedClass.prototype.s = function () { }; return NonProtectedClass; -})(); +}()); var NonProtectedClass2 = (function () { function NonProtectedClass2() { } NonProtectedClass2.prototype.nonProtectedFunction = function () { }; return NonProtectedClass2; -})(); +}()); var ClassWithThreeMembers = (function () { function ClassWithThreeMembers() { } return ClassWithThreeMembers; -})(); +}()); diff --git a/tests/baselines/reference/assertInWrapSomeTypeParameter.js b/tests/baselines/reference/assertInWrapSomeTypeParameter.js index efb7d31a86a..698ba439ab7 100644 --- a/tests/baselines/reference/assertInWrapSomeTypeParameter.js +++ b/tests/baselines/reference/assertInWrapSomeTypeParameter.js @@ -13,4 +13,4 @@ var C = (function () { return null; }; return C; -})(); +}()); diff --git a/tests/baselines/reference/assignAnyToEveryType.js b/tests/baselines/reference/assignAnyToEveryType.js index 94b8067ddd7..3feade2c911 100644 --- a/tests/baselines/reference/assignAnyToEveryType.js +++ b/tests/baselines/reference/assignAnyToEveryType.js @@ -67,7 +67,7 @@ var C = (function () { function C() { } return C; -})(); +}()); var h = x; var i = x; var j = x; diff --git a/tests/baselines/reference/assignEveryTypeToAny.js b/tests/baselines/reference/assignEveryTypeToAny.js index bbe622b3300..408d7992913 100644 --- a/tests/baselines/reference/assignEveryTypeToAny.js +++ b/tests/baselines/reference/assignEveryTypeToAny.js @@ -86,7 +86,7 @@ var C = (function () { function C() { } return C; -})(); +}()); var h; x = h; var i; diff --git a/tests/baselines/reference/assignToExistingClass.js b/tests/baselines/reference/assignToExistingClass.js index f12979f3142..3e21479186d 100644 --- a/tests/baselines/reference/assignToExistingClass.js +++ b/tests/baselines/reference/assignToExistingClass.js @@ -22,7 +22,7 @@ var Test; function Mocked() { } return Mocked; - })(); + }()); var Tester = (function () { function Tester() { } @@ -32,5 +32,5 @@ var Test; }; }; return Tester; - })(); + }()); })(Test || (Test = {})); diff --git a/tests/baselines/reference/assignToObjectTypeWithPrototypeProperty.js b/tests/baselines/reference/assignToObjectTypeWithPrototypeProperty.js index 487591bc81e..48bb9f1131a 100644 --- a/tests/baselines/reference/assignToObjectTypeWithPrototypeProperty.js +++ b/tests/baselines/reference/assignToObjectTypeWithPrototypeProperty.js @@ -8,6 +8,6 @@ var XEvent = (function () { function XEvent() { } return XEvent; -})(); +}()); var p = XEvent.prototype; var x = XEvent; diff --git a/tests/baselines/reference/assignmentCompatBug3.js b/tests/baselines/reference/assignmentCompatBug3.js index 049e7090335..a72ea1d439e 100644 --- a/tests/baselines/reference/assignmentCompatBug3.js +++ b/tests/baselines/reference/assignmentCompatBug3.js @@ -48,7 +48,7 @@ var C = (function () { configurable: true }); return C; -})(); +}()); function foo(test) { } var x; var y; diff --git a/tests/baselines/reference/assignmentCompatInterfaceWithStringIndexSignature.js b/tests/baselines/reference/assignmentCompatInterfaceWithStringIndexSignature.js index bb6817bb60e..68d14d9f0c8 100644 --- a/tests/baselines/reference/assignmentCompatInterfaceWithStringIndexSignature.js +++ b/tests/baselines/reference/assignmentCompatInterfaceWithStringIndexSignature.js @@ -22,6 +22,6 @@ var Foo = (function () { } Foo.prototype.Boz = function () { }; return Foo; -})(); +}()); function Biz(map) { } Biz(new Foo()); diff --git a/tests/baselines/reference/assignmentCompatOnNew.js b/tests/baselines/reference/assignmentCompatOnNew.js index 1b8cfdcc3bf..6b553fef446 100644 --- a/tests/baselines/reference/assignmentCompatOnNew.js +++ b/tests/baselines/reference/assignmentCompatOnNew.js @@ -11,7 +11,7 @@ var Foo = (function () { function Foo() { } return Foo; -})(); +}()); ; function bar(x) { } bar(Foo); // Error, but should be allowed diff --git a/tests/baselines/reference/assignmentCompatWithCallSignatures3.js b/tests/baselines/reference/assignmentCompatWithCallSignatures3.js index 6f2eaf4d5cc..24f95ec61ea 100644 --- a/tests/baselines/reference/assignmentCompatWithCallSignatures3.js +++ b/tests/baselines/reference/assignmentCompatWithCallSignatures3.js @@ -110,28 +110,28 @@ var Base = (function () { function Base() { } return Base; -})(); +}()); var Derived = (function (_super) { __extends(Derived, _super); function Derived() { _super.apply(this, arguments); } return Derived; -})(Base); +}(Base)); var Derived2 = (function (_super) { __extends(Derived2, _super); function Derived2() { _super.apply(this, arguments); } return Derived2; -})(Derived); +}(Derived)); var OtherDerived = (function (_super) { __extends(OtherDerived, _super); function OtherDerived() { _super.apply(this, arguments); } return OtherDerived; -})(Base); +}(Base)); var a; var a2; var a3; diff --git a/tests/baselines/reference/assignmentCompatWithCallSignatures4.js b/tests/baselines/reference/assignmentCompatWithCallSignatures4.js index fc6ca05ad30..43608565039 100644 --- a/tests/baselines/reference/assignmentCompatWithCallSignatures4.js +++ b/tests/baselines/reference/assignmentCompatWithCallSignatures4.js @@ -111,28 +111,28 @@ var Errors; function Base() { } return Base; - })(); + }()); var Derived = (function (_super) { __extends(Derived, _super); function Derived() { _super.apply(this, arguments); } return Derived; - })(Base); + }(Base)); var Derived2 = (function (_super) { __extends(Derived2, _super); function Derived2() { _super.apply(this, arguments); } return Derived2; - })(Derived); + }(Derived)); var OtherDerived = (function (_super) { __extends(OtherDerived, _super); function OtherDerived() { _super.apply(this, arguments); } return OtherDerived; - })(Base); + }(Base)); var WithNonGenericSignaturesInBaseType; (function (WithNonGenericSignaturesInBaseType) { // target type with non-generic call signatures diff --git a/tests/baselines/reference/assignmentCompatWithCallSignatures5.js b/tests/baselines/reference/assignmentCompatWithCallSignatures5.js index ddf16c23f48..b3318dd53e8 100644 --- a/tests/baselines/reference/assignmentCompatWithCallSignatures5.js +++ b/tests/baselines/reference/assignmentCompatWithCallSignatures5.js @@ -76,28 +76,28 @@ var Base = (function () { function Base() { } return Base; -})(); +}()); var Derived = (function (_super) { __extends(Derived, _super); function Derived() { _super.apply(this, arguments); } return Derived; -})(Base); +}(Base)); var Derived2 = (function (_super) { __extends(Derived2, _super); function Derived2() { _super.apply(this, arguments); } return Derived2; -})(Derived); +}(Derived)); var OtherDerived = (function (_super) { __extends(OtherDerived, _super); function OtherDerived() { _super.apply(this, arguments); } return OtherDerived; -})(Base); +}(Base)); var a; var a2; var a3; diff --git a/tests/baselines/reference/assignmentCompatWithCallSignatures6.js b/tests/baselines/reference/assignmentCompatWithCallSignatures6.js index e57a5ac07a0..becbfea57a0 100644 --- a/tests/baselines/reference/assignmentCompatWithCallSignatures6.js +++ b/tests/baselines/reference/assignmentCompatWithCallSignatures6.js @@ -53,28 +53,28 @@ var Base = (function () { function Base() { } return Base; -})(); +}()); var Derived = (function (_super) { __extends(Derived, _super); function Derived() { _super.apply(this, arguments); } return Derived; -})(Base); +}(Base)); var Derived2 = (function (_super) { __extends(Derived2, _super); function Derived2() { _super.apply(this, arguments); } return Derived2; -})(Derived); +}(Derived)); var OtherDerived = (function (_super) { __extends(OtherDerived, _super); function OtherDerived() { _super.apply(this, arguments); } return OtherDerived; -})(Base); +}(Base)); var x; var b; x.a = b; diff --git a/tests/baselines/reference/assignmentCompatWithConstructSignatures3.js b/tests/baselines/reference/assignmentCompatWithConstructSignatures3.js index d02c635c584..d062a563a4d 100644 --- a/tests/baselines/reference/assignmentCompatWithConstructSignatures3.js +++ b/tests/baselines/reference/assignmentCompatWithConstructSignatures3.js @@ -110,28 +110,28 @@ var Base = (function () { function Base() { } return Base; -})(); +}()); var Derived = (function (_super) { __extends(Derived, _super); function Derived() { _super.apply(this, arguments); } return Derived; -})(Base); +}(Base)); var Derived2 = (function (_super) { __extends(Derived2, _super); function Derived2() { _super.apply(this, arguments); } return Derived2; -})(Derived); +}(Derived)); var OtherDerived = (function (_super) { __extends(OtherDerived, _super); function OtherDerived() { _super.apply(this, arguments); } return OtherDerived; -})(Base); +}(Base)); var a; var a2; var a3; diff --git a/tests/baselines/reference/assignmentCompatWithConstructSignatures4.js b/tests/baselines/reference/assignmentCompatWithConstructSignatures4.js index 6f9f20333f2..5744424f878 100644 --- a/tests/baselines/reference/assignmentCompatWithConstructSignatures4.js +++ b/tests/baselines/reference/assignmentCompatWithConstructSignatures4.js @@ -111,28 +111,28 @@ var Errors; function Base() { } return Base; - })(); + }()); var Derived = (function (_super) { __extends(Derived, _super); function Derived() { _super.apply(this, arguments); } return Derived; - })(Base); + }(Base)); var Derived2 = (function (_super) { __extends(Derived2, _super); function Derived2() { _super.apply(this, arguments); } return Derived2; - })(Derived); + }(Derived)); var OtherDerived = (function (_super) { __extends(OtherDerived, _super); function OtherDerived() { _super.apply(this, arguments); } return OtherDerived; - })(Base); + }(Base)); var WithNonGenericSignaturesInBaseType; (function (WithNonGenericSignaturesInBaseType) { // target type with non-generic call signatures diff --git a/tests/baselines/reference/assignmentCompatWithConstructSignatures5.js b/tests/baselines/reference/assignmentCompatWithConstructSignatures5.js index bd4c73e65dd..de42671c9f1 100644 --- a/tests/baselines/reference/assignmentCompatWithConstructSignatures5.js +++ b/tests/baselines/reference/assignmentCompatWithConstructSignatures5.js @@ -76,28 +76,28 @@ var Base = (function () { function Base() { } return Base; -})(); +}()); var Derived = (function (_super) { __extends(Derived, _super); function Derived() { _super.apply(this, arguments); } return Derived; -})(Base); +}(Base)); var Derived2 = (function (_super) { __extends(Derived2, _super); function Derived2() { _super.apply(this, arguments); } return Derived2; -})(Derived); +}(Derived)); var OtherDerived = (function (_super) { __extends(OtherDerived, _super); function OtherDerived() { _super.apply(this, arguments); } return OtherDerived; -})(Base); +}(Base)); var a; var a2; var a3; diff --git a/tests/baselines/reference/assignmentCompatWithConstructSignatures6.js b/tests/baselines/reference/assignmentCompatWithConstructSignatures6.js index 98477fa1523..206ae7768ba 100644 --- a/tests/baselines/reference/assignmentCompatWithConstructSignatures6.js +++ b/tests/baselines/reference/assignmentCompatWithConstructSignatures6.js @@ -53,28 +53,28 @@ var Base = (function () { function Base() { } return Base; -})(); +}()); var Derived = (function (_super) { __extends(Derived, _super); function Derived() { _super.apply(this, arguments); } return Derived; -})(Base); +}(Base)); var Derived2 = (function (_super) { __extends(Derived2, _super); function Derived2() { _super.apply(this, arguments); } return Derived2; -})(Derived); +}(Derived)); var OtherDerived = (function (_super) { __extends(OtherDerived, _super); function OtherDerived() { _super.apply(this, arguments); } return OtherDerived; -})(Base); +}(Base)); var x; var b; x.a = b; diff --git a/tests/baselines/reference/assignmentCompatWithGenericCallSignaturesWithOptionalParameters.js b/tests/baselines/reference/assignmentCompatWithGenericCallSignaturesWithOptionalParameters.js index f5a3499c8cc..87977de1ab9 100644 --- a/tests/baselines/reference/assignmentCompatWithGenericCallSignaturesWithOptionalParameters.js +++ b/tests/baselines/reference/assignmentCompatWithGenericCallSignaturesWithOptionalParameters.js @@ -159,7 +159,7 @@ var ClassTypeParam; }; } return Base; - })(); + }()); })(ClassTypeParam || (ClassTypeParam = {})); var GenericSignaturesInvalid; (function (GenericSignaturesInvalid) { @@ -167,12 +167,12 @@ var GenericSignaturesInvalid; function Base2() { } return Base2; - })(); + }()); var Target = (function () { function Target() { } return Target; - })(); + }()); function foo() { var b; var t; @@ -231,5 +231,5 @@ var GenericSignaturesValid; }; } return Base2; - })(); + }()); })(GenericSignaturesValid || (GenericSignaturesValid = {})); diff --git a/tests/baselines/reference/assignmentCompatWithNumericIndexer.js b/tests/baselines/reference/assignmentCompatWithNumericIndexer.js index 617d136bbb2..56b206786f1 100644 --- a/tests/baselines/reference/assignmentCompatWithNumericIndexer.js +++ b/tests/baselines/reference/assignmentCompatWithNumericIndexer.js @@ -54,7 +54,7 @@ var A = (function () { function A() { } return A; -})(); +}()); var a; var b; a = b; @@ -68,14 +68,14 @@ var Generics; function A() { } return A; - })(); + }()); var B = (function (_super) { __extends(B, _super); function B() { _super.apply(this, arguments); } return B; - })(A); + }(A)); function foo() { var a; var b; diff --git a/tests/baselines/reference/assignmentCompatWithNumericIndexer3.js b/tests/baselines/reference/assignmentCompatWithNumericIndexer3.js index 0c5b0be038f..53f92dd3b59 100644 --- a/tests/baselines/reference/assignmentCompatWithNumericIndexer3.js +++ b/tests/baselines/reference/assignmentCompatWithNumericIndexer3.js @@ -51,7 +51,7 @@ var A = (function () { function A() { } return A; -})(); +}()); var a; var b; a = b; // error @@ -62,7 +62,7 @@ var B2 = (function (_super) { _super.apply(this, arguments); } return B2; -})(A); +}(A)); var b2; a = b2; // ok b2 = a; // error @@ -72,7 +72,7 @@ var Generics; function A() { } return A; - })(); + }()); function foo() { var a; var b; diff --git a/tests/baselines/reference/assignmentCompatWithObjectMembers.js b/tests/baselines/reference/assignmentCompatWithObjectMembers.js index 3bd457f19d3..2bef0f9f5c4 100644 --- a/tests/baselines/reference/assignmentCompatWithObjectMembers.js +++ b/tests/baselines/reference/assignmentCompatWithObjectMembers.js @@ -94,12 +94,12 @@ var SimpleTypes; function S() { } return S; - })(); + }()); var T = (function () { function T() { } return T; - })(); + }()); var s; var t; var s2; @@ -134,12 +134,12 @@ var ObjectTypes; function S() { } return S; - })(); + }()); var T = (function () { function T() { } return T; - })(); + }()); var s; var t; var s2; diff --git a/tests/baselines/reference/assignmentCompatWithObjectMembers2.js b/tests/baselines/reference/assignmentCompatWithObjectMembers2.js index ea565e9545c..d1eda3808fe 100644 --- a/tests/baselines/reference/assignmentCompatWithObjectMembers2.js +++ b/tests/baselines/reference/assignmentCompatWithObjectMembers2.js @@ -49,12 +49,12 @@ var S = (function () { function S() { } return S; -})(); +}()); var T = (function () { function T() { } return T; -})(); +}()); var s; var t; var s2; diff --git a/tests/baselines/reference/assignmentCompatWithObjectMembers3.js b/tests/baselines/reference/assignmentCompatWithObjectMembers3.js index 091a1e53d15..82b72c84485 100644 --- a/tests/baselines/reference/assignmentCompatWithObjectMembers3.js +++ b/tests/baselines/reference/assignmentCompatWithObjectMembers3.js @@ -49,12 +49,12 @@ var S = (function () { function S() { } return S; -})(); +}()); var T = (function () { function T() { } return T; -})(); +}()); var s; var t; var s2; diff --git a/tests/baselines/reference/assignmentCompatWithObjectMembers4.js b/tests/baselines/reference/assignmentCompatWithObjectMembers4.js index 20279fb1dc5..092de2ca707 100644 --- a/tests/baselines/reference/assignmentCompatWithObjectMembers4.js +++ b/tests/baselines/reference/assignmentCompatWithObjectMembers4.js @@ -104,31 +104,31 @@ var OnlyDerived; function Base() { } return Base; - })(); + }()); var Derived = (function (_super) { __extends(Derived, _super); function Derived() { _super.apply(this, arguments); } return Derived; - })(Base); + }(Base)); var Derived2 = (function (_super) { __extends(Derived2, _super); function Derived2() { _super.apply(this, arguments); } return Derived2; - })(Base); + }(Base)); var S = (function () { function S() { } return S; - })(); + }()); var T = (function () { function T() { } return T; - })(); + }()); var s; var t; var s2; @@ -163,31 +163,31 @@ var WithBase; function Base() { } return Base; - })(); + }()); var Derived = (function (_super) { __extends(Derived, _super); function Derived() { _super.apply(this, arguments); } return Derived; - })(Base); + }(Base)); var Derived2 = (function (_super) { __extends(Derived2, _super); function Derived2() { _super.apply(this, arguments); } return Derived2; - })(Base); + }(Base)); var S = (function () { function S() { } return S; - })(); + }()); var T = (function () { function T() { } return T; - })(); + }()); var s; var t; var s2; diff --git a/tests/baselines/reference/assignmentCompatWithObjectMembers5.js b/tests/baselines/reference/assignmentCompatWithObjectMembers5.js index d7556298414..9ed799abdb2 100644 --- a/tests/baselines/reference/assignmentCompatWithObjectMembers5.js +++ b/tests/baselines/reference/assignmentCompatWithObjectMembers5.js @@ -19,7 +19,7 @@ var C = (function () { function C() { } return C; -})(); +}()); var c; var i; c = i; // error diff --git a/tests/baselines/reference/assignmentCompatWithObjectMembersAccessibility.js b/tests/baselines/reference/assignmentCompatWithObjectMembersAccessibility.js index 3363ed70890..e876ba575be 100644 --- a/tests/baselines/reference/assignmentCompatWithObjectMembersAccessibility.js +++ b/tests/baselines/reference/assignmentCompatWithObjectMembersAccessibility.js @@ -118,7 +118,7 @@ var TargetIsPublic; function Base() { } return Base; - })(); + }()); var a; var b; var i; @@ -127,12 +127,12 @@ var TargetIsPublic; function D() { } return D; - })(); + }()); var E = (function () { function E() { } return E; - })(); + }()); var d; var e; a = b; @@ -164,7 +164,7 @@ var TargetIsPublic; function Base() { } return Base; - })(); + }()); var a; var b; var i; @@ -173,12 +173,12 @@ var TargetIsPublic; function D() { } return D; - })(); + }()); var E = (function () { function E() { } return E; - })(); + }()); var d; var e; a = b; // error diff --git a/tests/baselines/reference/assignmentCompatWithObjectMembersNumericNames.js b/tests/baselines/reference/assignmentCompatWithObjectMembersNumericNames.js index 2a1a08a97ed..92f088c2f10 100644 --- a/tests/baselines/reference/assignmentCompatWithObjectMembersNumericNames.js +++ b/tests/baselines/reference/assignmentCompatWithObjectMembersNumericNames.js @@ -49,12 +49,12 @@ var S = (function () { function S() { } return S; -})(); +}()); var T = (function () { function T() { } return T; -})(); +}()); var s; var t; var s2; diff --git a/tests/baselines/reference/assignmentCompatWithObjectMembersOptionality.js b/tests/baselines/reference/assignmentCompatWithObjectMembersOptionality.js index 6675fab6d69..791ae494ab2 100644 --- a/tests/baselines/reference/assignmentCompatWithObjectMembersOptionality.js +++ b/tests/baselines/reference/assignmentCompatWithObjectMembersOptionality.js @@ -99,21 +99,21 @@ var Base = (function () { function Base() { } return Base; -})(); +}()); var Derived = (function (_super) { __extends(Derived, _super); function Derived() { _super.apply(this, arguments); } return Derived; -})(Base); +}(Base)); var Derived2 = (function (_super) { __extends(Derived2, _super); function Derived2() { _super.apply(this, arguments); } return Derived2; -})(Derived); +}(Derived)); var TargetHasOptional; (function (TargetHasOptional) { var c; diff --git a/tests/baselines/reference/assignmentCompatWithObjectMembersOptionality2.js b/tests/baselines/reference/assignmentCompatWithObjectMembersOptionality2.js index b89106eba2b..d93ddf8b3a4 100644 --- a/tests/baselines/reference/assignmentCompatWithObjectMembersOptionality2.js +++ b/tests/baselines/reference/assignmentCompatWithObjectMembersOptionality2.js @@ -101,21 +101,21 @@ var Base = (function () { function Base() { } return Base; -})(); +}()); var Derived = (function (_super) { __extends(Derived, _super); function Derived() { _super.apply(this, arguments); } return Derived; -})(Base); +}(Base)); var Derived2 = (function (_super) { __extends(Derived2, _super); function Derived2() { _super.apply(this, arguments); } return Derived2; -})(Derived); +}(Derived)); var TargetHasOptional; (function (TargetHasOptional) { var c; diff --git a/tests/baselines/reference/assignmentCompatWithObjectMembersStringNumericNames.js b/tests/baselines/reference/assignmentCompatWithObjectMembersStringNumericNames.js index a042897ba57..80d0ac84de7 100644 --- a/tests/baselines/reference/assignmentCompatWithObjectMembersStringNumericNames.js +++ b/tests/baselines/reference/assignmentCompatWithObjectMembersStringNumericNames.js @@ -94,12 +94,12 @@ var JustStrings; function S() { } return S; - })(); + }()); var T = (function () { function T() { } return T; - })(); + }()); var s; var t; var s2; @@ -134,12 +134,12 @@ var NumbersAndStrings; function S() { } return S; - })(); + }()); var T = (function () { function T() { } return T; - })(); + }()); var s; var t; var s2; diff --git a/tests/baselines/reference/assignmentCompatWithOverloads.js b/tests/baselines/reference/assignmentCompatWithOverloads.js index ca3dc0e2294..68dd818e4a8 100644 --- a/tests/baselines/reference/assignmentCompatWithOverloads.js +++ b/tests/baselines/reference/assignmentCompatWithOverloads.js @@ -44,6 +44,6 @@ var C = (function () { function C(x) { } return C; -})(); +}()); var d; d = C; // Error diff --git a/tests/baselines/reference/assignmentCompatWithStringIndexer.js b/tests/baselines/reference/assignmentCompatWithStringIndexer.js index 3391ac5773a..ef6befe268e 100644 --- a/tests/baselines/reference/assignmentCompatWithStringIndexer.js +++ b/tests/baselines/reference/assignmentCompatWithStringIndexer.js @@ -64,7 +64,7 @@ var A = (function () { function A() { } return A; -})(); +}()); var a; var b; a = b; // ok @@ -78,14 +78,14 @@ var Generics; function A() { } return A; - })(); + }()); var B = (function (_super) { __extends(B, _super); function B() { _super.apply(this, arguments); } return B; - })(A); + }(A)); var b1; var a1; a1 = b1; // ok @@ -96,7 +96,7 @@ var Generics; _super.apply(this, arguments); } return B2; - })(A); + }(A)); var b2; a1 = b2; // ok b2 = a1; // error diff --git a/tests/baselines/reference/assignmentCompatWithStringIndexer3.js b/tests/baselines/reference/assignmentCompatWithStringIndexer3.js index 15263428884..f0a3439f25f 100644 --- a/tests/baselines/reference/assignmentCompatWithStringIndexer3.js +++ b/tests/baselines/reference/assignmentCompatWithStringIndexer3.js @@ -35,7 +35,7 @@ var Generics; function A() { } return A; - })(); + }()); function foo() { var a; var b; diff --git a/tests/baselines/reference/assignmentCompatability10.js b/tests/baselines/reference/assignmentCompatability10.js index bbcc8e879e3..bde7af81e2c 100644 --- a/tests/baselines/reference/assignmentCompatability10.js +++ b/tests/baselines/reference/assignmentCompatability10.js @@ -25,7 +25,7 @@ var __test2__; this.two = two; } return classWithPublicAndOptional; - })(); + }()); __test2__.classWithPublicAndOptional = classWithPublicAndOptional; var x4 = new classWithPublicAndOptional(1); ; diff --git a/tests/baselines/reference/assignmentCompatability39.js b/tests/baselines/reference/assignmentCompatability39.js index 70e8a692290..3dfdbee632d 100644 --- a/tests/baselines/reference/assignmentCompatability39.js +++ b/tests/baselines/reference/assignmentCompatability39.js @@ -25,7 +25,7 @@ var __test2__; this.two = two; } return classWithTwoPublic; - })(); + }()); __test2__.classWithTwoPublic = classWithTwoPublic; var x2 = new classWithTwoPublic(1, "a"); ; diff --git a/tests/baselines/reference/assignmentCompatability40.js b/tests/baselines/reference/assignmentCompatability40.js index 801ddfe7596..c7e671dfdd3 100644 --- a/tests/baselines/reference/assignmentCompatability40.js +++ b/tests/baselines/reference/assignmentCompatability40.js @@ -24,7 +24,7 @@ var __test2__; this.one = one; } return classWithPrivate; - })(); + }()); __test2__.classWithPrivate = classWithPrivate; var x5 = new classWithPrivate(1); ; diff --git a/tests/baselines/reference/assignmentCompatability41.js b/tests/baselines/reference/assignmentCompatability41.js index 2ebd35a6caa..21b36ce92f1 100644 --- a/tests/baselines/reference/assignmentCompatability41.js +++ b/tests/baselines/reference/assignmentCompatability41.js @@ -25,7 +25,7 @@ var __test2__; this.two = two; } return classWithTwoPrivate; - })(); + }()); __test2__.classWithTwoPrivate = classWithTwoPrivate; var x6 = new classWithTwoPrivate(1, "a"); ; diff --git a/tests/baselines/reference/assignmentCompatability42.js b/tests/baselines/reference/assignmentCompatability42.js index 39dab170d35..c6baff46170 100644 --- a/tests/baselines/reference/assignmentCompatability42.js +++ b/tests/baselines/reference/assignmentCompatability42.js @@ -25,7 +25,7 @@ var __test2__; this.two = two; } return classWithPublicPrivate; - })(); + }()); __test2__.classWithPublicPrivate = classWithPublicPrivate; var x7 = new classWithPublicPrivate(1, "a"); ; diff --git a/tests/baselines/reference/assignmentCompatability8.js b/tests/baselines/reference/assignmentCompatability8.js index 65e4240aac5..38459e41cfa 100644 --- a/tests/baselines/reference/assignmentCompatability8.js +++ b/tests/baselines/reference/assignmentCompatability8.js @@ -24,7 +24,7 @@ var __test2__; this.one = one; } return classWithPublic; - })(); + }()); __test2__.classWithPublic = classWithPublic; var x1 = new classWithPublic(1); ; diff --git a/tests/baselines/reference/assignmentCompatability9.js b/tests/baselines/reference/assignmentCompatability9.js index 98932380b3e..051155ad1dd 100644 --- a/tests/baselines/reference/assignmentCompatability9.js +++ b/tests/baselines/reference/assignmentCompatability9.js @@ -24,7 +24,7 @@ var __test2__; this.one = one; } return classWithOptional; - })(); + }()); __test2__.classWithOptional = classWithOptional; var x3 = new classWithOptional(); ; diff --git a/tests/baselines/reference/assignmentLHSIsValue.js b/tests/baselines/reference/assignmentLHSIsValue.js index 127f85512ac..8a3b4b35d0b 100644 --- a/tests/baselines/reference/assignmentLHSIsValue.js +++ b/tests/baselines/reference/assignmentLHSIsValue.js @@ -86,7 +86,7 @@ var C = (function () { C.prototype.foo = function () { this = value; }; C.sfoo = function () { this = value; }; return C; -})(); +}()); function foo() { this = value; } this = value; // identifiers: module, class, enum, function @@ -124,7 +124,7 @@ var Derived = (function (_super) { Derived.prototype.foo = function () { _super.prototype. = value; }; Derived.sfoo = function () { _super. = value; }; return Derived; -})(C); +}(C)); // function expression function bar() { } value; diff --git a/tests/baselines/reference/assignmentNonObjectTypeConstraints.js b/tests/baselines/reference/assignmentNonObjectTypeConstraints.js index c9d3cec38f6..7bce8d5443e 100644 --- a/tests/baselines/reference/assignmentNonObjectTypeConstraints.js +++ b/tests/baselines/reference/assignmentNonObjectTypeConstraints.js @@ -29,12 +29,12 @@ var A = (function () { function A() { } return A; -})(); +}()); var B = (function () { function B() { } return B; -})(); +}()); function bar(x) { var y = x; // Ok } diff --git a/tests/baselines/reference/assignmentToParenthesizedIdentifiers.js b/tests/baselines/reference/assignmentToParenthesizedIdentifiers.js index d28dd76fcf6..67d0c25f45f 100644 --- a/tests/baselines/reference/assignmentToParenthesizedIdentifiers.js +++ b/tests/baselines/reference/assignmentToParenthesizedIdentifiers.js @@ -130,6 +130,6 @@ var C = (function () { function C() { } return C; -})(); +}()); C = undefined; // Error (C) = undefined; // Error diff --git a/tests/baselines/reference/assignmentToReferenceTypes.js b/tests/baselines/reference/assignmentToReferenceTypes.js index 1aec3c2051d..e201b0bacab 100644 --- a/tests/baselines/reference/assignmentToReferenceTypes.js +++ b/tests/baselines/reference/assignmentToReferenceTypes.js @@ -30,7 +30,7 @@ var C = (function () { function C() { } return C; -})(); +}()); C = null; var E; (function (E) { diff --git a/tests/baselines/reference/assignments.js b/tests/baselines/reference/assignments.js index e2c9c90d375..739c8bd2795 100644 --- a/tests/baselines/reference/assignments.js +++ b/tests/baselines/reference/assignments.js @@ -45,7 +45,7 @@ var C = (function () { function C() { } return C; -})(); +}()); C = null; // Error var E; (function (E) { diff --git a/tests/baselines/reference/augmentedTypesClass.js b/tests/baselines/reference/augmentedTypesClass.js index 30b75483d80..48cc4ef05de 100644 --- a/tests/baselines/reference/augmentedTypesClass.js +++ b/tests/baselines/reference/augmentedTypesClass.js @@ -14,7 +14,7 @@ var c1 = (function () { } c1.prototype.foo = function () { }; return c1; -})(); +}()); var c1 = 1; // error //// class then enum var c4 = (function () { @@ -22,7 +22,7 @@ var c4 = (function () { } c4.prototype.foo = function () { }; return c4; -})(); +}()); var c4; (function (c4) { c4[c4["One"] = 0] = "One"; diff --git a/tests/baselines/reference/augmentedTypesClass2.js b/tests/baselines/reference/augmentedTypesClass2.js index 4a919913ce0..ee87a2396ad 100644 --- a/tests/baselines/reference/augmentedTypesClass2.js +++ b/tests/baselines/reference/augmentedTypesClass2.js @@ -40,7 +40,7 @@ var c11 = (function () { return 1; }; return c11; -})(); +}()); // class then class - covered // class then enum var c33 = (function () { @@ -50,7 +50,7 @@ var c33 = (function () { return 1; }; return c33; -})(); +}()); var c33; (function (c33) { c33[c33["One"] = 0] = "One"; @@ -64,4 +64,4 @@ var c44 = (function () { return 1; }; return c44; -})(); +}()); diff --git a/tests/baselines/reference/augmentedTypesClass2a.js b/tests/baselines/reference/augmentedTypesClass2a.js index b2c6fa1e373..ba1f26c775d 100644 --- a/tests/baselines/reference/augmentedTypesClass2a.js +++ b/tests/baselines/reference/augmentedTypesClass2a.js @@ -11,6 +11,6 @@ var c2 = (function () { } c2.prototype.foo = function () { }; return c2; -})(); // error +}()); // error function c2() { } // error var c2 = function () { }; diff --git a/tests/baselines/reference/augmentedTypesClass3.js b/tests/baselines/reference/augmentedTypesClass3.js index 11d3f0a0d9f..216cd118ee6 100644 --- a/tests/baselines/reference/augmentedTypesClass3.js +++ b/tests/baselines/reference/augmentedTypesClass3.js @@ -20,13 +20,13 @@ var c5 = (function () { } c5.prototype.foo = function () { }; return c5; -})(); +}()); var c5a = (function () { function c5a() { } c5a.prototype.foo = function () { }; return c5a; -})(); +}()); var c5a; (function (c5a) { var y = 2; @@ -36,7 +36,7 @@ var c5b = (function () { } c5b.prototype.foo = function () { }; return c5b; -})(); +}()); var c5b; (function (c5b) { c5b.y = 2; @@ -47,5 +47,5 @@ var c5c = (function () { } c5c.prototype.foo = function () { }; return c5c; -})(); +}()); //import c5c = require(''); diff --git a/tests/baselines/reference/augmentedTypesClass4.js b/tests/baselines/reference/augmentedTypesClass4.js index f178567d843..e476beadf74 100644 --- a/tests/baselines/reference/augmentedTypesClass4.js +++ b/tests/baselines/reference/augmentedTypesClass4.js @@ -11,10 +11,10 @@ var c3 = (function () { } c3.prototype.foo = function () { }; return c3; -})(); // error +}()); // error var c3 = (function () { function c3() { } c3.prototype.bar = function () { }; return c3; -})(); // error +}()); // error diff --git a/tests/baselines/reference/augmentedTypesEnum.js b/tests/baselines/reference/augmentedTypesEnum.js index cb1ec3e844f..3d2bb0b7d25 100644 --- a/tests/baselines/reference/augmentedTypesEnum.js +++ b/tests/baselines/reference/augmentedTypesEnum.js @@ -63,7 +63,7 @@ var e4 = (function () { } e4.prototype.foo = function () { }; return e4; -})(); // error +}()); // error // enum then enum var e5; (function (e5) { diff --git a/tests/baselines/reference/augmentedTypesEnum2.js b/tests/baselines/reference/augmentedTypesEnum2.js index f0c86e5640b..be174423d1d 100644 --- a/tests/baselines/reference/augmentedTypesEnum2.js +++ b/tests/baselines/reference/augmentedTypesEnum2.js @@ -39,6 +39,6 @@ var e2 = (function () { return 1; }; return e2; -})(); +}()); //enum then enum - covered //enum then import - covered diff --git a/tests/baselines/reference/augmentedTypesExternalModule1.js b/tests/baselines/reference/augmentedTypesExternalModule1.js index 7965aa671ae..65525e8187e 100644 --- a/tests/baselines/reference/augmentedTypesExternalModule1.js +++ b/tests/baselines/reference/augmentedTypesExternalModule1.js @@ -12,5 +12,5 @@ define(["require", "exports"], function (require, exports) { } c5.prototype.foo = function () { }; return c5; - })(); + }()); }); diff --git a/tests/baselines/reference/augmentedTypesFunction.js b/tests/baselines/reference/augmentedTypesFunction.js index 1cd1423b7c4..72f36aeeccc 100644 --- a/tests/baselines/reference/augmentedTypesFunction.js +++ b/tests/baselines/reference/augmentedTypesFunction.js @@ -53,14 +53,14 @@ var y3 = (function () { function y3() { } return y3; -})(); // error +}()); // error function y3a() { } // error var y3a = (function () { function y3a() { } y3a.prototype.foo = function () { }; return y3a; -})(); // error +}()); // error // function then enum function y4() { } // error var y4; diff --git a/tests/baselines/reference/augmentedTypesInterface.js b/tests/baselines/reference/augmentedTypesInterface.js index 330fc035a9e..fb8608aca95 100644 --- a/tests/baselines/reference/augmentedTypesInterface.js +++ b/tests/baselines/reference/augmentedTypesInterface.js @@ -42,7 +42,7 @@ var i2 = (function () { return 1; }; return i2; -})(); +}()); var i3; (function (i3) { i3[i3["One"] = 0] = "One"; diff --git a/tests/baselines/reference/augmentedTypesModules.js b/tests/baselines/reference/augmentedTypesModules.js index 558ea6609f5..39a4c17454b 100644 --- a/tests/baselines/reference/augmentedTypesModules.js +++ b/tests/baselines/reference/augmentedTypesModules.js @@ -117,7 +117,7 @@ var m1d; } I.prototype.foo = function () { }; return I; - })(); + }()); m1d.I = I; })(m1d || (m1d = {})); var m1d = 1; // error @@ -153,14 +153,14 @@ var m2g; } C.prototype.foo = function () { }; return C; - })(); + }()); m2g.C = C; })(m2g || (m2g = {})); var m3 = (function () { function m3() { } return m3; -})(); // ok since the module is not instantiated +}()); // ok since the module is not instantiated var m3a; (function (m3a) { var y = 2; @@ -170,13 +170,13 @@ var m3a = (function () { } m3a.prototype.foo = function () { }; return m3a; -})(); // error, class isn't ambient or declared before the module +}()); // error, class isn't ambient or declared before the module var m3b = (function () { function m3b() { } m3b.prototype.foo = function () { }; return m3b; -})(); +}()); var m3b; (function (m3b) { var y = 2; @@ -186,7 +186,7 @@ var m3c = (function () { } m3c.prototype.foo = function () { }; return m3c; -})(); +}()); var m3c; (function (m3c) { m3c.y = 2; @@ -206,7 +206,7 @@ var m3g; } C.prototype.foo = function () { }; return C; - })(); + }()); m3g.C = C; })(m3g || (m3g = {})); var m4; @@ -239,7 +239,7 @@ var m4d; } C.prototype.foo = function () { }; return C; - })(); + }()); })(m4d || (m4d = {})); var m4d; (function (m4d) { diff --git a/tests/baselines/reference/augmentedTypesModules2.js b/tests/baselines/reference/augmentedTypesModules2.js index 5cc805a848f..82bba357bba 100644 --- a/tests/baselines/reference/augmentedTypesModules2.js +++ b/tests/baselines/reference/augmentedTypesModules2.js @@ -66,6 +66,6 @@ var m2g; } C.prototype.foo = function () { }; return C; - })(); + }()); m2g.C = C; })(m2g || (m2g = {})); diff --git a/tests/baselines/reference/augmentedTypesModules3.js b/tests/baselines/reference/augmentedTypesModules3.js index fb1c7ef6e70..cb63acd0d35 100644 --- a/tests/baselines/reference/augmentedTypesModules3.js +++ b/tests/baselines/reference/augmentedTypesModules3.js @@ -11,7 +11,7 @@ var m3 = (function () { function m3() { } return m3; -})(); // ok since the module is not instantiated +}()); // ok since the module is not instantiated var m3a; (function (m3a) { var y = 2; @@ -21,4 +21,4 @@ var m3a = (function () { } m3a.prototype.foo = function () { }; return m3a; -})(); // error, class isn't ambient or declared before the module +}()); // error, class isn't ambient or declared before the module diff --git a/tests/baselines/reference/augmentedTypesModules3b.js b/tests/baselines/reference/augmentedTypesModules3b.js index 080a5e72ada..a422ad79973 100644 --- a/tests/baselines/reference/augmentedTypesModules3b.js +++ b/tests/baselines/reference/augmentedTypesModules3b.js @@ -24,7 +24,7 @@ var m3b = (function () { } m3b.prototype.foo = function () { }; return m3b; -})(); +}()); var m3b; (function (m3b) { var y = 2; @@ -34,7 +34,7 @@ var m3c = (function () { } m3c.prototype.foo = function () { }; return m3c; -})(); +}()); var m3c; (function (m3c) { m3c.y = 2; @@ -54,6 +54,6 @@ var m3g; } C.prototype.foo = function () { }; return C; - })(); + }()); m3g.C = C; })(m3g || (m3g = {})); diff --git a/tests/baselines/reference/augmentedTypesModules4.js b/tests/baselines/reference/augmentedTypesModules4.js index 82f08851efd..ed86c057462 100644 --- a/tests/baselines/reference/augmentedTypesModules4.js +++ b/tests/baselines/reference/augmentedTypesModules4.js @@ -53,7 +53,7 @@ var m4d; } C.prototype.foo = function () { }; return C; - })(); + }()); })(m4d || (m4d = {})); var m4d; (function (m4d) { diff --git a/tests/baselines/reference/augmentedTypesVar.js b/tests/baselines/reference/augmentedTypesVar.js index b4e412acc05..f01cfa2e52f 100644 --- a/tests/baselines/reference/augmentedTypesVar.js +++ b/tests/baselines/reference/augmentedTypesVar.js @@ -51,14 +51,14 @@ var x4 = (function () { function x4() { } return x4; -})(); // error +}()); // error var x4a = 1; // error var x4a = (function () { function x4a() { } x4a.prototype.foo = function () { }; return x4a; -})(); // error +}()); // error // var then enum var x5 = 1; var x5; diff --git a/tests/baselines/reference/autoAsiForStaticsInClassDeclaration.js b/tests/baselines/reference/autoAsiForStaticsInClassDeclaration.js index 27b56e4ff88..5c64b8fc23f 100644 --- a/tests/baselines/reference/autoAsiForStaticsInClassDeclaration.js +++ b/tests/baselines/reference/autoAsiForStaticsInClassDeclaration.js @@ -9,4 +9,4 @@ var C = (function () { function C() { } return C; -})(); +}()); diff --git a/tests/baselines/reference/autoLift2.js b/tests/baselines/reference/autoLift2.js index cf840277d70..ab2d2107f6c 100644 --- a/tests/baselines/reference/autoLift2.js +++ b/tests/baselines/reference/autoLift2.js @@ -47,6 +47,6 @@ var A = (function () { [1, 2].forEach(function (p) { return _this.bar; }); }; return A; -})(); +}()); var a = new A(); a.baz(); diff --git a/tests/baselines/reference/autolift3.js b/tests/baselines/reference/autolift3.js index e04501daf46..21be70763fe 100644 --- a/tests/baselines/reference/autolift3.js +++ b/tests/baselines/reference/autolift3.js @@ -49,6 +49,6 @@ var B = (function () { })(); } return B; -})(); +}()); var b = new B(); b.foo(); diff --git a/tests/baselines/reference/autolift4.js b/tests/baselines/reference/autolift4.js index f4bbad50c60..8ee1f397d43 100644 --- a/tests/baselines/reference/autolift4.js +++ b/tests/baselines/reference/autolift4.js @@ -39,7 +39,7 @@ var Point = (function () { }; Point.origin = new Point(0, 0); return Point; -})(); +}()); var Point3D = (function (_super) { __extends(Point3D, _super); function Point3D(x, y, z, m) { @@ -50,4 +50,4 @@ var Point3D = (function (_super) { return Math.sqrt(this.x * this.x + this.y * this.y + this.z * this.m); }; return Point3D; -})(Point); +}(Point)); diff --git a/tests/baselines/reference/avoid.js b/tests/baselines/reference/avoid.js index ad10d2ac9bc..391dab5e985 100644 --- a/tests/baselines/reference/avoid.js +++ b/tests/baselines/reference/avoid.js @@ -33,6 +33,6 @@ var C = (function () { C.prototype.g = function () { }; return C; -})(); +}()); var z = new C().g(); // error void fn var N = new f(); // ok with void fn diff --git a/tests/baselines/reference/badArraySyntax.js b/tests/baselines/reference/badArraySyntax.js index f5ca1e0c0ba..8cc5f1cfeda 100644 --- a/tests/baselines/reference/badArraySyntax.js +++ b/tests/baselines/reference/badArraySyntax.js @@ -17,7 +17,7 @@ var Z = (function () { this.x = ""; } return Z; -})(); +}()); var a1 = []; var a2 = new Z[]; var a3 = new Z[](); diff --git a/tests/baselines/reference/badThisBinding.js b/tests/baselines/reference/badThisBinding.js index 115759411bf..06465711859 100644 --- a/tests/baselines/reference/badThisBinding.js +++ b/tests/baselines/reference/badThisBinding.js @@ -24,4 +24,4 @@ var Greeter = (function () { }); } return Greeter; -})(); +}()); diff --git a/tests/baselines/reference/baseCheck.js b/tests/baselines/reference/baseCheck.js index 49038f37b18..c4210f3f6a5 100644 --- a/tests/baselines/reference/baseCheck.js +++ b/tests/baselines/reference/baseCheck.js @@ -39,14 +39,14 @@ var C = (function () { function C(x, y) { } return C; -})(); +}()); var ELoc = (function (_super) { __extends(ELoc, _super); function ELoc(x) { _super.call(this, 0, x); } return ELoc; -})(C); +}(C)); var ELocVar = (function (_super) { __extends(ELocVar, _super); function ELocVar(x) { @@ -56,7 +56,7 @@ var ELocVar = (function (_super) { var loc = 10; }; return ELocVar; -})(C); +}(C)); var D = (function (_super) { __extends(D, _super); function D(z) { @@ -64,7 +64,7 @@ var D = (function (_super) { this.z = z; } return D; -})(C); // too few params +}(C)); // too few params var E = (function (_super) { __extends(E, _super); function E(z) { @@ -72,7 +72,7 @@ var E = (function (_super) { this.z = z; } return E; -})(C); +}(C)); var F = (function (_super) { __extends(F, _super); function F(z) { @@ -80,7 +80,7 @@ var F = (function (_super) { this.z = z; } return F; -})(C); // first param type +}(C)); // first param type function f() { if (x < 10) { x = 11; diff --git a/tests/baselines/reference/baseIndexSignatureResolution.js b/tests/baselines/reference/baseIndexSignatureResolution.js index 8463ed58a53..3f3fa3cc0b9 100644 --- a/tests/baselines/reference/baseIndexSignatureResolution.js +++ b/tests/baselines/reference/baseIndexSignatureResolution.js @@ -34,14 +34,14 @@ var Base = (function () { function Base() { } return Base; -})(); +}()); var Derived = (function (_super) { __extends(Derived, _super); function Derived() { _super.apply(this, arguments); } return Derived; -})(Base); +}(Base)); var x = null; var y = x[0]; /* diff --git a/tests/baselines/reference/baseTypeAfterDerivedType.js b/tests/baselines/reference/baseTypeAfterDerivedType.js index c64239ac0c8..b80b62712f5 100644 --- a/tests/baselines/reference/baseTypeAfterDerivedType.js +++ b/tests/baselines/reference/baseTypeAfterDerivedType.js @@ -27,4 +27,4 @@ var Derived2 = (function () { } }; return Derived2; -})(); +}()); diff --git a/tests/baselines/reference/baseTypeOrderChecking.js b/tests/baselines/reference/baseTypeOrderChecking.js index 4c5fe22ea08..66d2135f01d 100644 --- a/tests/baselines/reference/baseTypeOrderChecking.js +++ b/tests/baselines/reference/baseTypeOrderChecking.js @@ -47,23 +47,23 @@ var Class1 = (function () { function Class1() { } return Class1; -})(); +}()); var Class2 = (function (_super) { __extends(Class2, _super); function Class2() { _super.apply(this, arguments); } return Class2; -})(Class1); +}(Class1)); var Class3 = (function () { function Class3() { } return Class3; -})(); +}()); var Class4 = (function (_super) { __extends(Class4, _super); function Class4() { _super.apply(this, arguments); } return Class4; -})(Class3); +}(Class3)); diff --git a/tests/baselines/reference/baseTypePrivateMemberClash.js b/tests/baselines/reference/baseTypePrivateMemberClash.js index 79a44ee44d4..35eafe5543a 100644 --- a/tests/baselines/reference/baseTypePrivateMemberClash.js +++ b/tests/baselines/reference/baseTypePrivateMemberClash.js @@ -13,9 +13,9 @@ var X = (function () { function X() { } return X; -})(); +}()); var Y = (function () { function Y() { } return Y; -})(); +}()); diff --git a/tests/baselines/reference/baseTypeWrappingInstantiationChain.js b/tests/baselines/reference/baseTypeWrappingInstantiationChain.js index 1de1ebd4bfb..62d995c225e 100644 --- a/tests/baselines/reference/baseTypeWrappingInstantiationChain.js +++ b/tests/baselines/reference/baseTypeWrappingInstantiationChain.js @@ -45,27 +45,27 @@ var C = (function (_super) { }; C.prototype.method = function (t) { }; return C; -})(CBase); +}(CBase)); var CBase = (function (_super) { __extends(CBase, _super); function CBase() { _super.apply(this, arguments); } return CBase; -})(CBaseBase); +}(CBaseBase)); var CBaseBase = (function () { function CBaseBase(x) { } return CBaseBase; -})(); +}()); var Parameter = (function () { function Parameter() { } Parameter.prototype.method = function (t) { }; return Parameter; -})(); +}()); var Wrapper = (function () { function Wrapper() { } return Wrapper; -})(); +}()); diff --git a/tests/baselines/reference/bases.js b/tests/baselines/reference/bases.js index 0275c225dac..f67f754d063 100644 --- a/tests/baselines/reference/bases.js +++ b/tests/baselines/reference/bases.js @@ -32,7 +32,7 @@ var B = (function () { any; } return B; -})(); +}()); var C = (function (_super) { __extends(C, _super); function C() { @@ -40,6 +40,6 @@ var C = (function (_super) { any; } return C; -})(B); +}(B)); new C().x; new C().y; diff --git a/tests/baselines/reference/bestCommonTypeOfConditionalExpressions.js b/tests/baselines/reference/bestCommonTypeOfConditionalExpressions.js index abd2cc5e874..1c2fc896a6a 100644 --- a/tests/baselines/reference/bestCommonTypeOfConditionalExpressions.js +++ b/tests/baselines/reference/bestCommonTypeOfConditionalExpressions.js @@ -40,21 +40,21 @@ var Base = (function () { function Base() { } return Base; -})(); +}()); var Derived = (function (_super) { __extends(Derived, _super); function Derived() { _super.apply(this, arguments); } return Derived; -})(Base); +}(Base)); var Derived2 = (function (_super) { __extends(Derived2, _super); function Derived2() { _super.apply(this, arguments); } return Derived2; -})(Base); +}(Base)); var base; var derived; var derived2; diff --git a/tests/baselines/reference/bestCommonTypeOfConditionalExpressions2.js b/tests/baselines/reference/bestCommonTypeOfConditionalExpressions2.js index e0e7bc3f324..21a69f517fc 100644 --- a/tests/baselines/reference/bestCommonTypeOfConditionalExpressions2.js +++ b/tests/baselines/reference/bestCommonTypeOfConditionalExpressions2.js @@ -36,21 +36,21 @@ var Base = (function () { function Base() { } return Base; -})(); +}()); var Derived = (function (_super) { __extends(Derived, _super); function Derived() { _super.apply(this, arguments); } return Derived; -})(Base); +}(Base)); var Derived2 = (function (_super) { __extends(Derived2, _super); function Derived2() { _super.apply(this, arguments); } return Derived2; -})(Base); +}(Base)); var base; var derived; var derived2; diff --git a/tests/baselines/reference/bestCommonTypeOfTuple2.js b/tests/baselines/reference/bestCommonTypeOfTuple2.js index ed0b0ecb328..e38ce2854bd 100644 --- a/tests/baselines/reference/bestCommonTypeOfTuple2.js +++ b/tests/baselines/reference/bestCommonTypeOfTuple2.js @@ -32,30 +32,30 @@ var C = (function () { function C() { } return C; -})(); +}()); var D = (function () { function D() { } return D; -})(); +}()); var E = (function () { function E() { } return E; -})(); +}()); var F = (function (_super) { __extends(F, _super); function F() { _super.apply(this, arguments); } return F; -})(C); +}(C)); var C1 = (function () { function C1() { this.i = "foo"; } return C1; -})(); +}()); var D1 = (function (_super) { __extends(D1, _super); function D1() { @@ -63,7 +63,7 @@ var D1 = (function (_super) { this.i = "bar"; } return D1; -})(C1); +}(C1)); var t1; var t2; var t3; diff --git a/tests/baselines/reference/bind1.js b/tests/baselines/reference/bind1.js index 5027e8a03e0..c658384db85 100644 --- a/tests/baselines/reference/bind1.js +++ b/tests/baselines/reference/bind1.js @@ -12,6 +12,6 @@ var M; function C() { } return C; - })(); + }()); M.C = C; // this should be an unresolved symbol I error })(M || (M = {})); diff --git a/tests/baselines/reference/binopAssignmentShouldHaveType.js b/tests/baselines/reference/binopAssignmentShouldHaveType.js index e47b6dea875..c590efbcb5a 100644 --- a/tests/baselines/reference/binopAssignmentShouldHaveType.js +++ b/tests/baselines/reference/binopAssignmentShouldHaveType.js @@ -36,6 +36,6 @@ var Test; } }; return Bug; - })(); + }()); Test.Bug = Bug; })(Test || (Test = {})); diff --git a/tests/baselines/reference/bitwiseNotOperatorWithAnyOtherType.js b/tests/baselines/reference/bitwiseNotOperatorWithAnyOtherType.js index a4012731356..0236bd736ee 100644 --- a/tests/baselines/reference/bitwiseNotOperatorWithAnyOtherType.js +++ b/tests/baselines/reference/bitwiseNotOperatorWithAnyOtherType.js @@ -81,7 +81,7 @@ var A = (function () { return a; }; return A; -})(); +}()); var M; (function (M) { })(M || (M = {})); diff --git a/tests/baselines/reference/bitwiseNotOperatorWithBooleanType.js b/tests/baselines/reference/bitwiseNotOperatorWithBooleanType.js index d3f8c76c6ca..b35a5e4ba12 100644 --- a/tests/baselines/reference/bitwiseNotOperatorWithBooleanType.js +++ b/tests/baselines/reference/bitwiseNotOperatorWithBooleanType.js @@ -47,7 +47,7 @@ var A = (function () { } A.foo = function () { return false; }; return A; -})(); +}()); var M; (function (M) { })(M || (M = {})); diff --git a/tests/baselines/reference/bitwiseNotOperatorWithNumberType.js b/tests/baselines/reference/bitwiseNotOperatorWithNumberType.js index 370400a7dff..aab04be6dfc 100644 --- a/tests/baselines/reference/bitwiseNotOperatorWithNumberType.js +++ b/tests/baselines/reference/bitwiseNotOperatorWithNumberType.js @@ -54,7 +54,7 @@ var A = (function () { } A.foo = function () { return 1; }; return A; -})(); +}()); var M; (function (M) { })(M || (M = {})); diff --git a/tests/baselines/reference/bitwiseNotOperatorWithStringType.js b/tests/baselines/reference/bitwiseNotOperatorWithStringType.js index 071d52e7c18..366af5ecea8 100644 --- a/tests/baselines/reference/bitwiseNotOperatorWithStringType.js +++ b/tests/baselines/reference/bitwiseNotOperatorWithStringType.js @@ -53,7 +53,7 @@ var A = (function () { } A.foo = function () { return ""; }; return A; -})(); +}()); var M; (function (M) { })(M || (M = {})); diff --git a/tests/baselines/reference/blockScopedVariablesUseBeforeDef.js b/tests/baselines/reference/blockScopedVariablesUseBeforeDef.js index 5ed3ac62e6a..06eaa9916e3 100644 --- a/tests/baselines/reference/blockScopedVariablesUseBeforeDef.js +++ b/tests/baselines/reference/blockScopedVariablesUseBeforeDef.js @@ -122,7 +122,7 @@ function foo3() { } X.prototype.m = function () { return x; }; return X; - })(); + }()); var x; } function foo4() { @@ -131,7 +131,7 @@ function foo4() { } class_1.prototype.m = function () { return x; }; return class_1; - })(); + }()); var x; } function foo5() { @@ -150,7 +150,7 @@ function foo7() { this.a = x; } return A; - })(); + }()); var x; } function foo8() { @@ -159,7 +159,7 @@ function foo8() { this.a = x; } return class_2; - })(); + }()); var x; } function foo9() { @@ -168,7 +168,7 @@ function foo9() { } class_3.a = x; return class_3; - })(); + }()); var x; } function foo10() { @@ -177,7 +177,7 @@ function foo10() { } A.a = x; return A; - })(); + }()); var x; } function foo11() { @@ -187,7 +187,7 @@ function foo11() { } class_4.a = x; return class_4; - })(); + }()); } var x; } @@ -198,7 +198,7 @@ function foo12() { this.a = x; } return class_5; - })(); + }()); } var x; } diff --git a/tests/baselines/reference/callGenericFunctionWithIncorrectNumberOfTypeArguments.js b/tests/baselines/reference/callGenericFunctionWithIncorrectNumberOfTypeArguments.js index f1028956e16..c40948273a6 100644 --- a/tests/baselines/reference/callGenericFunctionWithIncorrectNumberOfTypeArguments.js +++ b/tests/baselines/reference/callGenericFunctionWithIncorrectNumberOfTypeArguments.js @@ -63,7 +63,7 @@ var C = (function () { return null; }; return C; -})(); +}()); var r4 = (new C()).f(1, ''); var r4b = (new C()).f(1, ''); var i; @@ -76,7 +76,7 @@ var C2 = (function () { return null; }; return C2; -})(); +}()); var r6 = (new C2()).f(1, ''); var r6b = (new C2()).f(1, ''); var i2; diff --git a/tests/baselines/reference/callGenericFunctionWithZeroTypeArguments.js b/tests/baselines/reference/callGenericFunctionWithZeroTypeArguments.js index 26b9d33a55d..e78ee62edc5 100644 --- a/tests/baselines/reference/callGenericFunctionWithZeroTypeArguments.js +++ b/tests/baselines/reference/callGenericFunctionWithZeroTypeArguments.js @@ -51,7 +51,7 @@ var C = (function () { return null; }; return C; -})(); +}()); var r4 = (new C()).f(1); var i; var r5 = i.f(1); @@ -62,7 +62,7 @@ var C2 = (function () { return null; }; return C2; -})(); +}()); var r6 = (new C2()).f(1); var i2; var r7 = i2.f(1); diff --git a/tests/baselines/reference/callNonGenericFunctionWithTypeArguments.js b/tests/baselines/reference/callNonGenericFunctionWithTypeArguments.js index 7b0355533e3..dd9a2082510 100644 --- a/tests/baselines/reference/callNonGenericFunctionWithTypeArguments.js +++ b/tests/baselines/reference/callNonGenericFunctionWithTypeArguments.js @@ -59,7 +59,7 @@ var C = (function () { return null; }; return C; -})(); +}()); var r4 = (new C()).f(1); var i; var r5 = i.f(1); @@ -70,7 +70,7 @@ var C2 = (function () { return null; }; return C2; -})(); +}()); var r6 = (new C2()).f(1); var i2; var r7 = i2.f(1); diff --git a/tests/baselines/reference/callOnClass.js b/tests/baselines/reference/callOnClass.js index 18127dca56c..fbcedb9ba1a 100644 --- a/tests/baselines/reference/callOnClass.js +++ b/tests/baselines/reference/callOnClass.js @@ -9,5 +9,5 @@ var C = (function () { function C() { } return C; -})(); +}()); var c = C(); diff --git a/tests/baselines/reference/callOverloadViaElementAccessExpression.js b/tests/baselines/reference/callOverloadViaElementAccessExpression.js index 2e35c72e780..48f3771206e 100644 --- a/tests/baselines/reference/callOverloadViaElementAccessExpression.js +++ b/tests/baselines/reference/callOverloadViaElementAccessExpression.js @@ -19,7 +19,7 @@ var C = (function () { return null; }; return C; -})(); +}()); var c = new C(); var r = c['foo'](1); var r2 = c['foo'](''); diff --git a/tests/baselines/reference/callOverloads1.js b/tests/baselines/reference/callOverloads1.js index b1148c12420..756a9099e44 100644 --- a/tests/baselines/reference/callOverloads1.js +++ b/tests/baselines/reference/callOverloads1.js @@ -24,7 +24,7 @@ var Foo = (function () { } Foo.prototype.bar1 = function () { }; return Foo; -})(); +}()); function F1(a) { return a; } var f1 = new Foo("hey"); f1.bar1(); diff --git a/tests/baselines/reference/callOverloads2.js b/tests/baselines/reference/callOverloads2.js index b336911eeb0..b890ee8bde9 100644 --- a/tests/baselines/reference/callOverloads2.js +++ b/tests/baselines/reference/callOverloads2.js @@ -32,7 +32,7 @@ var Foo = (function () { } Foo.prototype.bar1 = function () { }; return Foo; -})(); +}()); function F1(s) { return s; } // error function F1(a) { return a; } // error var f1 = new Foo("hey"); diff --git a/tests/baselines/reference/callOverloads3.js b/tests/baselines/reference/callOverloads3.js index 3b615438ccd..e5d678543c6 100644 --- a/tests/baselines/reference/callOverloads3.js +++ b/tests/baselines/reference/callOverloads3.js @@ -25,7 +25,7 @@ var Foo = (function () { } Foo.prototype.bar1 = function () { }; return Foo; -})(); +}()); //class Foo(s: String); var f1 = new Foo("hey"); f1.bar1(); diff --git a/tests/baselines/reference/callOverloads4.js b/tests/baselines/reference/callOverloads4.js index 529b63ad3b8..dfb274dfb6e 100644 --- a/tests/baselines/reference/callOverloads4.js +++ b/tests/baselines/reference/callOverloads4.js @@ -25,7 +25,7 @@ var Foo = (function () { } Foo.prototype.bar1 = function () { }; return Foo; -})(); +}()); var f1 = new Foo("hey"); f1.bar1(); Foo(); diff --git a/tests/baselines/reference/callOverloads5.js b/tests/baselines/reference/callOverloads5.js index dc508b3b8ed..cf159d309b0 100644 --- a/tests/baselines/reference/callOverloads5.js +++ b/tests/baselines/reference/callOverloads5.js @@ -26,7 +26,7 @@ var Foo = (function () { } Foo.prototype.bar1 = function (a) { }; return Foo; -})(); +}()); //class Foo(s: String); var f1 = new Foo("hey"); f1.bar1("a"); diff --git a/tests/baselines/reference/callSignatureAssignabilityInInheritance2.js b/tests/baselines/reference/callSignatureAssignabilityInInheritance2.js index e43c22fab75..6b3bf8e125e 100644 --- a/tests/baselines/reference/callSignatureAssignabilityInInheritance2.js +++ b/tests/baselines/reference/callSignatureAssignabilityInInheritance2.js @@ -80,25 +80,25 @@ var Base = (function () { function Base() { } return Base; -})(); +}()); var Derived = (function (_super) { __extends(Derived, _super); function Derived() { _super.apply(this, arguments); } return Derived; -})(Base); +}(Base)); var Derived2 = (function (_super) { __extends(Derived2, _super); function Derived2() { _super.apply(this, arguments); } return Derived2; -})(Derived); +}(Derived)); var OtherDerived = (function (_super) { __extends(OtherDerived, _super); function OtherDerived() { _super.apply(this, arguments); } return OtherDerived; -})(Base); +}(Base)); diff --git a/tests/baselines/reference/callSignatureAssignabilityInInheritance3.js b/tests/baselines/reference/callSignatureAssignabilityInInheritance3.js index 6105ddf23fa..a823047fc0d 100644 --- a/tests/baselines/reference/callSignatureAssignabilityInInheritance3.js +++ b/tests/baselines/reference/callSignatureAssignabilityInInheritance3.js @@ -127,26 +127,26 @@ var Errors; function Base() { } return Base; - })(); + }()); var Derived = (function (_super) { __extends(Derived, _super); function Derived() { _super.apply(this, arguments); } return Derived; - })(Base); + }(Base)); var Derived2 = (function (_super) { __extends(Derived2, _super); function Derived2() { _super.apply(this, arguments); } return Derived2; - })(Derived); + }(Derived)); var OtherDerived = (function (_super) { __extends(OtherDerived, _super); function OtherDerived() { _super.apply(this, arguments); } return OtherDerived; - })(Base); + }(Base)); })(Errors || (Errors = {})); diff --git a/tests/baselines/reference/callSignatureAssignabilityInInheritance4.js b/tests/baselines/reference/callSignatureAssignabilityInInheritance4.js index aee3af6f740..b60cf2014f1 100644 --- a/tests/baselines/reference/callSignatureAssignabilityInInheritance4.js +++ b/tests/baselines/reference/callSignatureAssignabilityInInheritance4.js @@ -60,25 +60,25 @@ var Base = (function () { function Base() { } return Base; -})(); +}()); var Derived = (function (_super) { __extends(Derived, _super); function Derived() { _super.apply(this, arguments); } return Derived; -})(Base); +}(Base)); var Derived2 = (function (_super) { __extends(Derived2, _super); function Derived2() { _super.apply(this, arguments); } return Derived2; -})(Derived); +}(Derived)); var OtherDerived = (function (_super) { __extends(OtherDerived, _super); function OtherDerived() { _super.apply(this, arguments); } return OtherDerived; -})(Base); +}(Base)); diff --git a/tests/baselines/reference/callSignatureAssignabilityInInheritance5.js b/tests/baselines/reference/callSignatureAssignabilityInInheritance5.js index c72a77e4020..434af36123e 100644 --- a/tests/baselines/reference/callSignatureAssignabilityInInheritance5.js +++ b/tests/baselines/reference/callSignatureAssignabilityInInheritance5.js @@ -60,25 +60,25 @@ var Base = (function () { function Base() { } return Base; -})(); +}()); var Derived = (function (_super) { __extends(Derived, _super); function Derived() { _super.apply(this, arguments); } return Derived; -})(Base); +}(Base)); var Derived2 = (function (_super) { __extends(Derived2, _super); function Derived2() { _super.apply(this, arguments); } return Derived2; -})(Derived); +}(Derived)); var OtherDerived = (function (_super) { __extends(OtherDerived, _super); function OtherDerived() { _super.apply(this, arguments); } return OtherDerived; -})(Base); +}(Base)); diff --git a/tests/baselines/reference/callSignatureAssignabilityInInheritance6.js b/tests/baselines/reference/callSignatureAssignabilityInInheritance6.js index e22bb1189ed..9776d14612e 100644 --- a/tests/baselines/reference/callSignatureAssignabilityInInheritance6.js +++ b/tests/baselines/reference/callSignatureAssignabilityInInheritance6.js @@ -63,25 +63,25 @@ var Base = (function () { function Base() { } return Base; -})(); +}()); var Derived = (function (_super) { __extends(Derived, _super); function Derived() { _super.apply(this, arguments); } return Derived; -})(Base); +}(Base)); var Derived2 = (function (_super) { __extends(Derived2, _super); function Derived2() { _super.apply(this, arguments); } return Derived2; -})(Derived); +}(Derived)); var OtherDerived = (function (_super) { __extends(OtherDerived, _super); function OtherDerived() { _super.apply(this, arguments); } return OtherDerived; -})(Base); +}(Base)); diff --git a/tests/baselines/reference/callSignatureWithOptionalParameterAndInitializer.js b/tests/baselines/reference/callSignatureWithOptionalParameterAndInitializer.js index 0f8a033067d..14442dd6e22 100644 --- a/tests/baselines/reference/callSignatureWithOptionalParameterAndInitializer.js +++ b/tests/baselines/reference/callSignatureWithOptionalParameterAndInitializer.js @@ -79,7 +79,7 @@ var C = (function () { if (x === void 0) { x = 1; } }; return C; -})(); +}()); var c; c.foo(); c.foo(1); diff --git a/tests/baselines/reference/callSignatureWithoutReturnTypeAnnotationInference.js b/tests/baselines/reference/callSignatureWithoutReturnTypeAnnotationInference.js index 73270c240cb..baa7f6c2c95 100644 --- a/tests/baselines/reference/callSignatureWithoutReturnTypeAnnotationInference.js +++ b/tests/baselines/reference/callSignatureWithoutReturnTypeAnnotationInference.js @@ -178,7 +178,7 @@ var C = (function () { function C() { } return C; -})(); +}()); function foo10(x) { var c; return c; @@ -191,7 +191,7 @@ var M; function C() { } return C; - })(); + }()); M.C = C; })(M || (M = {})); function foo11() { @@ -216,7 +216,7 @@ var c1 = (function () { function c1(x) { } return c1; -})(); +}()); var c1; (function (c1) { c1.x = 1; diff --git a/tests/baselines/reference/callSignaturesWithAccessibilityModifiersOnParameters.js b/tests/baselines/reference/callSignaturesWithAccessibilityModifiersOnParameters.js index 5584dd7b216..dba88c4951e 100644 --- a/tests/baselines/reference/callSignaturesWithAccessibilityModifiersOnParameters.js +++ b/tests/baselines/reference/callSignaturesWithAccessibilityModifiersOnParameters.js @@ -57,7 +57,7 @@ var C = (function () { C.prototype.foo2 = function (x, y) { }; C.prototype.foo3 = function (x, y) { }; return C; -})(); +}()); var a; var b = { foo: function (x, y) { }, diff --git a/tests/baselines/reference/callSignaturesWithDuplicateParameters.js b/tests/baselines/reference/callSignaturesWithDuplicateParameters.js index 6ed7f6f7fe5..add9e07ea4b 100644 --- a/tests/baselines/reference/callSignaturesWithDuplicateParameters.js +++ b/tests/baselines/reference/callSignaturesWithDuplicateParameters.js @@ -57,7 +57,7 @@ var C = (function () { C.prototype.foo2 = function (x, x) { }; C.prototype.foo3 = function (x, x) { }; return C; -})(); +}()); var a; var b = { foo: function (x, x) { }, diff --git a/tests/baselines/reference/callSignaturesWithOptionalParameters.js b/tests/baselines/reference/callSignaturesWithOptionalParameters.js index 2f4876fb2de..a0a3835c943 100644 --- a/tests/baselines/reference/callSignaturesWithOptionalParameters.js +++ b/tests/baselines/reference/callSignaturesWithOptionalParameters.js @@ -71,7 +71,7 @@ var C = (function () { } C.prototype.foo = function (x) { }; return C; -})(); +}()); var c; c.foo(); c.foo(1); diff --git a/tests/baselines/reference/callSignaturesWithOptionalParameters2.js b/tests/baselines/reference/callSignaturesWithOptionalParameters2.js index a3fb2fe7a85..973b0466a79 100644 --- a/tests/baselines/reference/callSignaturesWithOptionalParameters2.js +++ b/tests/baselines/reference/callSignaturesWithOptionalParameters2.js @@ -73,7 +73,7 @@ var C = (function () { C.prototype.foo = function (x) { }; C.prototype.foo2 = function (x, y) { }; return C; -})(); +}()); var c; c.foo(); c.foo(1); diff --git a/tests/baselines/reference/callSignaturesWithParameterInitializers.js b/tests/baselines/reference/callSignaturesWithParameterInitializers.js index c95a558e4c8..8b53d5b29d5 100644 --- a/tests/baselines/reference/callSignaturesWithParameterInitializers.js +++ b/tests/baselines/reference/callSignaturesWithParameterInitializers.js @@ -81,7 +81,7 @@ var C = (function () { if (x === void 0) { x = 1; } }; return C; -})(); +}()); var c; c.foo(); c.foo(1); diff --git a/tests/baselines/reference/callSignaturesWithParameterInitializers2.js b/tests/baselines/reference/callSignaturesWithParameterInitializers2.js index 0524db42f65..fd1dd369010 100644 --- a/tests/baselines/reference/callSignaturesWithParameterInitializers2.js +++ b/tests/baselines/reference/callSignaturesWithParameterInitializers2.js @@ -40,7 +40,7 @@ var C = (function () { if (x === void 0) { x = 1; } }; return C; -})(); +}()); var c; c.foo(); c.foo(1); diff --git a/tests/baselines/reference/callWithSpread.js b/tests/baselines/reference/callWithSpread.js index 50840abfbb7..e89e9d9345b 100644 --- a/tests/baselines/reference/callWithSpread.js +++ b/tests/baselines/reference/callWithSpread.js @@ -95,7 +95,7 @@ var C = (function () { } }; return C; -})(); +}()); var D = (function (_super) { __extends(D, _super); function D() { @@ -107,5 +107,5 @@ var D = (function (_super) { _super.prototype.foo.apply(this, [1, 2].concat(a)); }; return D; -})(C); +}(C)); var _a, _b, _c; diff --git a/tests/baselines/reference/cannotInvokeNewOnErrorExpression.js b/tests/baselines/reference/cannotInvokeNewOnErrorExpression.js index 2b05f8d3389..4b25c75b0aa 100644 --- a/tests/baselines/reference/cannotInvokeNewOnErrorExpression.js +++ b/tests/baselines/reference/cannotInvokeNewOnErrorExpression.js @@ -12,6 +12,6 @@ var M; function ClassA() { } return ClassA; - })(); + }()); })(M || (M = {})); var t = new M.ClassA[]; diff --git a/tests/baselines/reference/captureThisInSuperCall.js b/tests/baselines/reference/captureThisInSuperCall.js index 611ad93f531..791b6f4c979 100644 --- a/tests/baselines/reference/captureThisInSuperCall.js +++ b/tests/baselines/reference/captureThisInSuperCall.js @@ -18,7 +18,7 @@ var A = (function () { function A(p) { } return A; -})(); +}()); var B = (function (_super) { __extends(B, _super); function B() { @@ -27,4 +27,4 @@ var B = (function (_super) { } B.prototype.someMethod = function () { }; return B; -})(A); +}(A)); diff --git a/tests/baselines/reference/capturedLetConstInLoop10.js b/tests/baselines/reference/capturedLetConstInLoop10.js index 36b2ab9453f..b493dcbd288 100644 --- a/tests/baselines/reference/capturedLetConstInLoop10.js +++ b/tests/baselines/reference/capturedLetConstInLoop10.js @@ -101,7 +101,7 @@ var A = (function () { } }; return A; -})(); +}()); var B = (function () { function B() { } @@ -121,4 +121,4 @@ var B = (function () { B.prototype.bar = function (a) { }; return B; -})(); +}()); diff --git a/tests/baselines/reference/capturedLetConstInLoop9.js b/tests/baselines/reference/capturedLetConstInLoop9.js index 93aef628f8a..9b31218a1e3 100644 --- a/tests/baselines/reference/capturedLetConstInLoop9.js +++ b/tests/baselines/reference/capturedLetConstInLoop9.js @@ -171,7 +171,7 @@ var _loop_1 = function(x) { return x_1 + 1; }; return A; - })(); + }()); }; for (var x = 0; x < 1; ++x) { _loop_1(x); @@ -280,7 +280,7 @@ var C = (function () { } }; return C; -})(); +}()); function foo3() { var x = arguments.length; var _loop_6 = function(y) { diff --git a/tests/baselines/reference/castParentheses.js b/tests/baselines/reference/castParentheses.js index 8ee31be63f9..936b2e7af07 100644 --- a/tests/baselines/reference/castParentheses.js +++ b/tests/baselines/reference/castParentheses.js @@ -16,7 +16,7 @@ var a = (function () { function a() { } return a; -})(); +}()); var b = a; var b = a.b; var b = a.b.c; diff --git a/tests/baselines/reference/castingTuple.js b/tests/baselines/reference/castingTuple.js index 0102d1310a3..bcff0938157 100644 --- a/tests/baselines/reference/castingTuple.js +++ b/tests/baselines/reference/castingTuple.js @@ -43,18 +43,18 @@ var A = (function () { this.a = 10; } return A; -})(); +}()); var C = (function () { function C() { } return C; -})(); +}()); ; var D = (function () { function D() { } return D; -})(); +}()); ; var E = (function (_super) { __extends(E, _super); @@ -62,7 +62,7 @@ var E = (function (_super) { _super.apply(this, arguments); } return E; -})(A); +}(A)); ; var F = (function (_super) { __extends(F, _super); @@ -70,7 +70,7 @@ var F = (function (_super) { _super.apply(this, arguments); } return F; -})(A); +}(A)); ; var E1; (function (E1) { diff --git a/tests/baselines/reference/chainedAssignment1.js b/tests/baselines/reference/chainedAssignment1.js index ac637b7def2..8f13477bdef 100644 --- a/tests/baselines/reference/chainedAssignment1.js +++ b/tests/baselines/reference/chainedAssignment1.js @@ -28,18 +28,18 @@ var X = (function () { this.z = z; } return X; -})(); +}()); var Y = (function () { function Y(z) { this.z = z; } return Y; -})(); +}()); var Z = (function () { function Z() { } return Z; -})(); +}()); var c1 = new X(3); var c2 = new Y(5); var c3 = new Z(); diff --git a/tests/baselines/reference/chainedAssignment3.js b/tests/baselines/reference/chainedAssignment3.js index 04c328031cd..b4b6330a7cf 100644 --- a/tests/baselines/reference/chainedAssignment3.js +++ b/tests/baselines/reference/chainedAssignment3.js @@ -32,14 +32,14 @@ var A = (function () { function A() { } return A; -})(); +}()); var B = (function (_super) { __extends(B, _super); function B() { _super.apply(this, arguments); } return B; -})(A); +}(A)); var a; var b; a = b = null; diff --git a/tests/baselines/reference/chainedAssignmentChecking.js b/tests/baselines/reference/chainedAssignmentChecking.js index e9c66ab3681..4d9fbfa48a1 100644 --- a/tests/baselines/reference/chainedAssignmentChecking.js +++ b/tests/baselines/reference/chainedAssignmentChecking.js @@ -28,18 +28,18 @@ var X = (function () { this.z = z; } return X; -})(); +}()); var Y = (function () { function Y(z) { this.z = z; } return Y; -})(); +}()); var Z = (function () { function Z() { } return Z; -})(); +}()); var c1 = new X(3); var c2 = new Y(5); var c3 = new Z(); diff --git a/tests/baselines/reference/chainedCallsWithTypeParameterConstrainedToOtherTypeParameter.js b/tests/baselines/reference/chainedCallsWithTypeParameterConstrainedToOtherTypeParameter.js index e7e1a3a871b..c53910e00ac 100644 --- a/tests/baselines/reference/chainedCallsWithTypeParameterConstrainedToOtherTypeParameter.js +++ b/tests/baselines/reference/chainedCallsWithTypeParameterConstrainedToOtherTypeParameter.js @@ -33,25 +33,25 @@ var Chain = (function () { return null; }; return Chain; -})(); +}()); var A = (function () { function A() { } return A; -})(); +}()); var B = (function (_super) { __extends(B, _super); function B() { _super.apply(this, arguments); } return B; -})(A); +}(A)); var C = (function (_super) { __extends(C, _super); function C() { _super.apply(this, arguments); } return C; -})(B); +}(B)); // Ok to go down the chain, but error to try to climb back up (new Chain(new A)).then(function (a) { return new B; }).then(function (b) { return new C; }).then(function (c) { return new B; }).then(function (b) { return new A; }); diff --git a/tests/baselines/reference/chainedCallsWithTypeParameterConstrainedToOtherTypeParameter2.js b/tests/baselines/reference/chainedCallsWithTypeParameterConstrainedToOtherTypeParameter2.js index 3b9b8b80ecf..8aa5594701f 100644 --- a/tests/baselines/reference/chainedCallsWithTypeParameterConstrainedToOtherTypeParameter2.js +++ b/tests/baselines/reference/chainedCallsWithTypeParameterConstrainedToOtherTypeParameter2.js @@ -59,7 +59,7 @@ var Chain = (function () { return null; }; return Chain; -})(); +}()); var Chain2 = (function () { function Chain2(value) { this.value = value; @@ -78,4 +78,4 @@ var Chain2 = (function () { return null; }; return Chain2; -})(); +}()); diff --git a/tests/baselines/reference/checkForObjectTooStrict.js b/tests/baselines/reference/checkForObjectTooStrict.js index d8f40a3f1d9..cdc19a5688d 100644 --- a/tests/baselines/reference/checkForObjectTooStrict.js +++ b/tests/baselines/reference/checkForObjectTooStrict.js @@ -43,7 +43,7 @@ var Foo; function Object() { } return Object; - })(); + }()); Foo.Object = Object; })(Foo || (Foo = {})); var Bar = (function (_super) { @@ -52,11 +52,11 @@ var Bar = (function (_super) { _super.call(this); } return Bar; -})(Foo.Object); +}(Foo.Object)); var Baz = (function (_super) { __extends(Baz, _super); function Baz() { _super.call(this); } return Baz; -})(Object); +}(Object)); diff --git a/tests/baselines/reference/checkSwitchStatementIfCaseTypeIsString.js b/tests/baselines/reference/checkSwitchStatementIfCaseTypeIsString.js index 64ea4e67fa8..a5eb24c6716 100644 --- a/tests/baselines/reference/checkSwitchStatementIfCaseTypeIsString.js +++ b/tests/baselines/reference/checkSwitchStatementIfCaseTypeIsString.js @@ -24,4 +24,4 @@ var A = (function () { }); }; return A; -})(); +}()); diff --git a/tests/baselines/reference/circularImportAlias.js b/tests/baselines/reference/circularImportAlias.js index 8b908a97ee6..19c156176bf 100644 --- a/tests/baselines/reference/circularImportAlias.js +++ b/tests/baselines/reference/circularImportAlias.js @@ -35,7 +35,7 @@ var B; _super.apply(this, arguments); } return D; - })(B.a.C); + }(B.a.C)); B.D = D; })(B || (B = {})); var A; @@ -44,7 +44,7 @@ var A; function C() { } return C; - })(); + }()); A.C = C; A.b = B; })(A || (A = {})); diff --git a/tests/baselines/reference/circularReference.js b/tests/baselines/reference/circularReference.js index ca072952b53..52fe5f3ef54 100644 --- a/tests/baselines/reference/circularReference.js +++ b/tests/baselines/reference/circularReference.js @@ -45,7 +45,7 @@ var M1; this.m1.x = 20; // Error } return C1; - })(); + }()); M1.C1 = C1; })(M1 = exports.M1 || (exports.M1 = {})); //// [foo2.js] @@ -63,6 +63,6 @@ var M1; tmp.x = 20; // Error } return C1; - })(); + }()); M1.C1 = C1; })(M1 = exports.M1 || (exports.M1 = {})); diff --git a/tests/baselines/reference/circularTypeAliasForUnionWithClass.js b/tests/baselines/reference/circularTypeAliasForUnionWithClass.js index 90a11364897..bac0eb66b26 100644 --- a/tests/baselines/reference/circularTypeAliasForUnionWithClass.js +++ b/tests/baselines/reference/circularTypeAliasForUnionWithClass.js @@ -24,16 +24,16 @@ var I0 = (function () { function I0() { } return I0; -})(); +}()); var v3; var I3 = (function () { function I3() { } return I3; -})(); +}()); var v4; var I4 = (function () { function I4() { } return I4; -})(); +}()); diff --git a/tests/baselines/reference/class2.js b/tests/baselines/reference/class2.js index 03b60ac8dc5..6ef78ed46ee 100644 --- a/tests/baselines/reference/class2.js +++ b/tests/baselines/reference/class2.js @@ -7,4 +7,4 @@ var foo = (function () { } foo.f = 3; return foo; -})(); +}()); diff --git a/tests/baselines/reference/classAbstractAsIdentifier.js b/tests/baselines/reference/classAbstractAsIdentifier.js index 6adadd346b5..44a2b0d3312 100644 --- a/tests/baselines/reference/classAbstractAsIdentifier.js +++ b/tests/baselines/reference/classAbstractAsIdentifier.js @@ -11,5 +11,5 @@ var abstract = (function () { } abstract.prototype.foo = function () { return 1; }; return abstract; -})(); +}()); new abstract; diff --git a/tests/baselines/reference/classAbstractAssignabilityConstructorFunction.js b/tests/baselines/reference/classAbstractAssignabilityConstructorFunction.js index 3d8fd404afc..523f87e5a64 100644 --- a/tests/baselines/reference/classAbstractAssignabilityConstructorFunction.js +++ b/tests/baselines/reference/classAbstractAssignabilityConstructorFunction.js @@ -13,7 +13,7 @@ var A = (function () { function A() { } return A; -})(); +}()); // var AA: typeof A; var AAA; // AA = A; // okay diff --git a/tests/baselines/reference/classAbstractClinterfaceAssignability.js b/tests/baselines/reference/classAbstractClinterfaceAssignability.js index cbcf9dd189c..f61fb1dbbd5 100644 --- a/tests/baselines/reference/classAbstractClinterfaceAssignability.js +++ b/tests/baselines/reference/classAbstractClinterfaceAssignability.js @@ -29,7 +29,7 @@ var A = (function () { function A() { } return A; -})(); +}()); var AA; AA = I; var AAA; diff --git a/tests/baselines/reference/classAbstractConstructor.js b/tests/baselines/reference/classAbstractConstructor.js index fa88b0c7d37..4dd4ee042f0 100644 --- a/tests/baselines/reference/classAbstractConstructor.js +++ b/tests/baselines/reference/classAbstractConstructor.js @@ -8,4 +8,4 @@ var A = (function () { function A() { } return A; -})(); +}()); diff --git a/tests/baselines/reference/classAbstractConstructorAssignability.js b/tests/baselines/reference/classAbstractConstructorAssignability.js index 04357a44554..5695e6c79d3 100644 --- a/tests/baselines/reference/classAbstractConstructorAssignability.js +++ b/tests/baselines/reference/classAbstractConstructorAssignability.js @@ -24,21 +24,21 @@ var A = (function () { function A() { } return A; -})(); +}()); var B = (function (_super) { __extends(B, _super); function B() { _super.apply(this, arguments); } return B; -})(A); +}(A)); var C = (function (_super) { __extends(C, _super); function C() { _super.apply(this, arguments); } return C; -})(B); +}(B)); var AA = B; var BB = A; var CC = B; diff --git a/tests/baselines/reference/classAbstractCrashedOnce.js b/tests/baselines/reference/classAbstractCrashedOnce.js index f4268a4a13c..46f0a8938c4 100644 --- a/tests/baselines/reference/classAbstractCrashedOnce.js +++ b/tests/baselines/reference/classAbstractCrashedOnce.js @@ -20,7 +20,7 @@ var foo = (function () { function foo() { } return foo; -})(); +}()); var bar = (function (_super) { __extends(bar, _super); function bar() { @@ -31,5 +31,5 @@ var bar = (function (_super) { ; }; return bar; -})(foo); +}(foo)); var x = new bar(); diff --git a/tests/baselines/reference/classAbstractExtends.js b/tests/baselines/reference/classAbstractExtends.js index 58e49de2c77..8d7128cc03d 100644 --- a/tests/baselines/reference/classAbstractExtends.js +++ b/tests/baselines/reference/classAbstractExtends.js @@ -27,28 +27,28 @@ var A = (function () { } A.prototype.foo = function () { }; return A; -})(); +}()); var B = (function (_super) { __extends(B, _super); function B() { _super.apply(this, arguments); } return B; -})(A); +}(A)); var C = (function (_super) { __extends(C, _super); function C() { _super.apply(this, arguments); } return C; -})(B); +}(B)); var D = (function (_super) { __extends(D, _super); function D() { _super.apply(this, arguments); } return D; -})(B); +}(B)); var E = (function (_super) { __extends(E, _super); function E() { @@ -56,4 +56,4 @@ var E = (function (_super) { } E.prototype.bar = function () { }; return E; -})(B); +}(B)); diff --git a/tests/baselines/reference/classAbstractFactoryFunction.js b/tests/baselines/reference/classAbstractFactoryFunction.js index b1d89ba385d..d5b0417f995 100644 --- a/tests/baselines/reference/classAbstractFactoryFunction.js +++ b/tests/baselines/reference/classAbstractFactoryFunction.js @@ -27,14 +27,14 @@ var A = (function () { function A() { } return A; -})(); +}()); var B = (function (_super) { __extends(B, _super); function B() { _super.apply(this, arguments); } return B; -})(A); +}(A)); function NewA(Factory) { return new A; } diff --git a/tests/baselines/reference/classAbstractGeneric.js b/tests/baselines/reference/classAbstractGeneric.js index 5af7da1601a..c9409e97466 100644 --- a/tests/baselines/reference/classAbstractGeneric.js +++ b/tests/baselines/reference/classAbstractGeneric.js @@ -35,28 +35,28 @@ var A = (function () { function A() { } return A; -})(); +}()); var B = (function (_super) { __extends(B, _super); function B() { _super.apply(this, arguments); } return B; -})(A); +}(A)); var C = (function (_super) { __extends(C, _super); function C() { _super.apply(this, arguments); } return C; -})(A); // error -- inherits abstract methods +}(A)); // error -- inherits abstract methods var D = (function (_super) { __extends(D, _super); function D() { _super.apply(this, arguments); } return D; -})(A); // error -- inherits abstract methods +}(A)); // error -- inherits abstract methods var E = (function (_super) { __extends(E, _super); function E() { @@ -64,7 +64,7 @@ var E = (function (_super) { } E.prototype.foo = function () { return this.t; }; return E; -})(A); +}(A)); var F = (function (_super) { __extends(F, _super); function F() { @@ -72,7 +72,7 @@ var F = (function (_super) { } F.prototype.bar = function (t) { }; return F; -})(A); +}(A)); var G = (function (_super) { __extends(G, _super); function G() { @@ -81,4 +81,4 @@ var G = (function (_super) { G.prototype.foo = function () { return this.t; }; G.prototype.bar = function (t) { }; return G; -})(A); +}(A)); diff --git a/tests/baselines/reference/classAbstractImportInstantiation.js b/tests/baselines/reference/classAbstractImportInstantiation.js index bb25181f20d..4c837d67f38 100644 --- a/tests/baselines/reference/classAbstractImportInstantiation.js +++ b/tests/baselines/reference/classAbstractImportInstantiation.js @@ -17,7 +17,7 @@ var M; function A() { } return A; - })(); + }()); M.A = A; new A; })(M || (M = {})); diff --git a/tests/baselines/reference/classAbstractInAModule.js b/tests/baselines/reference/classAbstractInAModule.js index e7ecd66b5bd..17fbf568601 100644 --- a/tests/baselines/reference/classAbstractInAModule.js +++ b/tests/baselines/reference/classAbstractInAModule.js @@ -19,7 +19,7 @@ var M; function A() { } return A; - })(); + }()); M.A = A; var B = (function (_super) { __extends(B, _super); @@ -27,7 +27,7 @@ var M; _super.apply(this, arguments); } return B; - })(A); + }(A)); M.B = B; })(M || (M = {})); new M.A; diff --git a/tests/baselines/reference/classAbstractInheritance.js b/tests/baselines/reference/classAbstractInheritance.js index 6656e4687d2..4d5c804e557 100644 --- a/tests/baselines/reference/classAbstractInheritance.js +++ b/tests/baselines/reference/classAbstractInheritance.js @@ -31,65 +31,65 @@ var A = (function () { function A() { } return A; -})(); +}()); var B = (function (_super) { __extends(B, _super); function B() { _super.apply(this, arguments); } return B; -})(A); +}(A)); var C = (function (_super) { __extends(C, _super); function C() { _super.apply(this, arguments); } return C; -})(A); +}(A)); var AA = (function () { function AA() { } return AA; -})(); +}()); var BB = (function (_super) { __extends(BB, _super); function BB() { _super.apply(this, arguments); } return BB; -})(AA); +}(AA)); var CC = (function (_super) { __extends(CC, _super); function CC() { _super.apply(this, arguments); } return CC; -})(AA); +}(AA)); var DD = (function (_super) { __extends(DD, _super); function DD() { _super.apply(this, arguments); } return DD; -})(BB); +}(BB)); var EE = (function (_super) { __extends(EE, _super); function EE() { _super.apply(this, arguments); } return EE; -})(BB); +}(BB)); var FF = (function (_super) { __extends(FF, _super); function FF() { _super.apply(this, arguments); } return FF; -})(CC); +}(CC)); var GG = (function (_super) { __extends(GG, _super); function GG() { _super.apply(this, arguments); } return GG; -})(CC); +}(CC)); diff --git a/tests/baselines/reference/classAbstractInstantiations1.js b/tests/baselines/reference/classAbstractInstantiations1.js index 689a78f1a06..0263e9e97b3 100644 --- a/tests/baselines/reference/classAbstractInstantiations1.js +++ b/tests/baselines/reference/classAbstractInstantiations1.js @@ -37,21 +37,21 @@ var A = (function () { function A() { } return A; -})(); +}()); var B = (function (_super) { __extends(B, _super); function B() { _super.apply(this, arguments); } return B; -})(A); +}(A)); var C = (function (_super) { __extends(C, _super); function C() { _super.apply(this, arguments); } return C; -})(B); +}(B)); new A; new A(1); // should report 1 error new B; diff --git a/tests/baselines/reference/classAbstractInstantiations2.js b/tests/baselines/reference/classAbstractInstantiations2.js index 1f45f02da0b..379e0b18ccc 100644 --- a/tests/baselines/reference/classAbstractInstantiations2.js +++ b/tests/baselines/reference/classAbstractInstantiations2.js @@ -61,13 +61,13 @@ var A = (function () { function A() { } return A; -})(); +}()); var B = (function () { function B() { } B.prototype.foo = function () { return this.bar(); }; return B; -})(); +}()); new B; // error var BB = B; var AA = BB; // error, AA is not of abstract type. @@ -85,14 +85,14 @@ var C = (function (_super) { _super.apply(this, arguments); } return C; -})(B); // error -- not declared abstract +}(B)); // error -- not declared abstract var D = (function (_super) { __extends(D, _super); function D() { _super.apply(this, arguments); } return D; -})(B); // okay +}(B)); // okay var E = (function (_super) { __extends(E, _super); function E() { @@ -100,7 +100,7 @@ var E = (function (_super) { } E.prototype.bar = function () { return 1; }; return E; -})(B); +}(B)); var F = (function (_super) { __extends(F, _super); function F() { @@ -108,14 +108,14 @@ var F = (function (_super) { } F.prototype.bar = function () { return 2; }; return F; -})(B); +}(B)); var G = (function () { function G() { } return G; -})(); +}()); var H = (function () { function H() { } return H; -})(); +}()); diff --git a/tests/baselines/reference/classAbstractManyKeywords.js b/tests/baselines/reference/classAbstractManyKeywords.js index 1be5a06195c..2708806a0d1 100644 --- a/tests/baselines/reference/classAbstractManyKeywords.js +++ b/tests/baselines/reference/classAbstractManyKeywords.js @@ -10,20 +10,20 @@ var A = (function () { function A() { } return A; -})(); +}()); var B = (function () { function B() { } return B; -})(); +}()); exports.B = B; var C = (function () { function C() { } return C; -})(); +}()); var D = (function () { function D() { } return D; -})(); +}()); diff --git a/tests/baselines/reference/classAbstractMergedDeclaration.js b/tests/baselines/reference/classAbstractMergedDeclaration.js index f6a91f870d2..d89138bd3ff 100644 --- a/tests/baselines/reference/classAbstractMergedDeclaration.js +++ b/tests/baselines/reference/classAbstractMergedDeclaration.js @@ -45,42 +45,42 @@ var CM = (function () { function CM() { } return CM; -})(); +}()); var MC = (function () { function MC() { } return MC; -})(); +}()); var CI = (function () { function CI() { } return CI; -})(); +}()); var IC = (function () { function IC() { } return IC; -})(); +}()); var CC1 = (function () { function CC1() { } return CC1; -})(); +}()); var CC1 = (function () { function CC1() { } return CC1; -})(); +}()); var CC2 = (function () { function CC2() { } return CC2; -})(); +}()); var CC2 = (function () { function CC2() { } return CC2; -})(); +}()); new CM; new MC; new CI; diff --git a/tests/baselines/reference/classAbstractMethodInNonAbstractClass.js b/tests/baselines/reference/classAbstractMethodInNonAbstractClass.js index 6a38440cf41..b4bf0595a3e 100644 --- a/tests/baselines/reference/classAbstractMethodInNonAbstractClass.js +++ b/tests/baselines/reference/classAbstractMethodInNonAbstractClass.js @@ -12,10 +12,10 @@ var A = (function () { function A() { } return A; -})(); +}()); var B = (function () { function B() { } B.prototype.foo = function () { }; return B; -})(); +}()); diff --git a/tests/baselines/reference/classAbstractMethodWithImplementation.js b/tests/baselines/reference/classAbstractMethodWithImplementation.js index d9319012712..aa373d1d204 100644 --- a/tests/baselines/reference/classAbstractMethodWithImplementation.js +++ b/tests/baselines/reference/classAbstractMethodWithImplementation.js @@ -9,4 +9,4 @@ var A = (function () { } A.prototype.foo = function () { }; return A; -})(); +}()); diff --git a/tests/baselines/reference/classAbstractMixedWithModifiers.js b/tests/baselines/reference/classAbstractMixedWithModifiers.js index 71eb4c61c04..5343d4a3947 100644 --- a/tests/baselines/reference/classAbstractMixedWithModifiers.js +++ b/tests/baselines/reference/classAbstractMixedWithModifiers.js @@ -20,4 +20,4 @@ var A = (function () { function A() { } return A; -})(); +}()); diff --git a/tests/baselines/reference/classAbstractOverloads.js b/tests/baselines/reference/classAbstractOverloads.js index 1bdff73d5b7..11a694484f3 100644 --- a/tests/baselines/reference/classAbstractOverloads.js +++ b/tests/baselines/reference/classAbstractOverloads.js @@ -30,9 +30,9 @@ var A = (function () { } A.prototype.baz = function () { }; return A; -})(); +}()); var B = (function () { function B() { } return B; -})(); +}()); diff --git a/tests/baselines/reference/classAbstractOverrideWithAbstract.js b/tests/baselines/reference/classAbstractOverrideWithAbstract.js index fb03192f35e..d613dd1fe31 100644 --- a/tests/baselines/reference/classAbstractOverrideWithAbstract.js +++ b/tests/baselines/reference/classAbstractOverrideWithAbstract.js @@ -34,20 +34,20 @@ var A = (function () { } A.prototype.foo = function () { }; return A; -})(); +}()); var B = (function (_super) { __extends(B, _super); function B() { _super.apply(this, arguments); } return B; -})(A); +}(A)); var AA = (function () { function AA() { } AA.prototype.foo = function () { }; return AA; -})(); +}()); var BB = (function (_super) { __extends(BB, _super); function BB() { @@ -55,14 +55,14 @@ var BB = (function (_super) { } BB.prototype.bar = function () { }; return BB; -})(AA); +}(AA)); var CC = (function (_super) { __extends(CC, _super); function CC() { _super.apply(this, arguments); } return CC; -})(BB); // error +}(BB)); // error var DD = (function (_super) { __extends(DD, _super); function DD() { @@ -70,4 +70,4 @@ var DD = (function (_super) { } DD.prototype.foo = function () { }; return DD; -})(BB); +}(BB)); diff --git a/tests/baselines/reference/classAbstractProperties.js b/tests/baselines/reference/classAbstractProperties.js index 0cbebcf0de0..b5097bc3f0d 100644 --- a/tests/baselines/reference/classAbstractProperties.js +++ b/tests/baselines/reference/classAbstractProperties.js @@ -18,4 +18,4 @@ var A = (function () { function A() { } return A; -})(); +}()); diff --git a/tests/baselines/reference/classAbstractSingleLineDecl.js b/tests/baselines/reference/classAbstractSingleLineDecl.js index 772ed564a66..5dfd7081339 100644 --- a/tests/baselines/reference/classAbstractSingleLineDecl.js +++ b/tests/baselines/reference/classAbstractSingleLineDecl.js @@ -17,19 +17,19 @@ var A = (function () { function A() { } return A; -})(); +}()); abstract; var B = (function () { function B() { } return B; -})(); +}()); abstract; var C = (function () { function C() { } return C; -})(); +}()); new A; new B; new C; diff --git a/tests/baselines/reference/classAbstractSuperCalls.js b/tests/baselines/reference/classAbstractSuperCalls.js index deccaa50ccf..7ada903974c 100644 --- a/tests/baselines/reference/classAbstractSuperCalls.js +++ b/tests/baselines/reference/classAbstractSuperCalls.js @@ -38,7 +38,7 @@ var A = (function () { } A.prototype.foo = function () { return 1; }; return A; -})(); +}()); var B = (function (_super) { __extends(B, _super); function B() { @@ -47,7 +47,7 @@ var B = (function (_super) { B.prototype.bar = function () { _super.prototype.foo.call(this); }; B.prototype.baz = function () { return this.foo; }; return B; -})(A); +}(A)); var C = (function (_super) { __extends(C, _super); function C() { @@ -57,18 +57,18 @@ var C = (function (_super) { C.prototype.qux = function () { return _super.prototype.foo.call(this) || _super.prototype.foo; }; // 2 errors, foo is abstract C.prototype.norf = function () { return _super.prototype.bar.call(this); }; return C; -})(B); +}(B)); var AA = (function () { function AA() { } AA.prototype.foo = function () { return 1; }; AA.prototype.bar = function () { return this.foo(); }; return AA; -})(); +}()); var BB = (function (_super) { __extends(BB, _super); function BB() { _super.apply(this, arguments); } return BB; -})(AA); +}(AA)); diff --git a/tests/baselines/reference/classAbstractUsingAbstractMethod1.js b/tests/baselines/reference/classAbstractUsingAbstractMethod1.js index 18d22803a7d..457195f5449 100644 --- a/tests/baselines/reference/classAbstractUsingAbstractMethod1.js +++ b/tests/baselines/reference/classAbstractUsingAbstractMethod1.js @@ -27,7 +27,7 @@ var A = (function () { function A() { } return A; -})(); +}()); var B = (function (_super) { __extends(B, _super); function B() { @@ -35,14 +35,14 @@ var B = (function (_super) { } B.prototype.foo = function () { return 1; }; return B; -})(A); +}(A)); var C = (function (_super) { __extends(C, _super); function C() { _super.apply(this, arguments); } return C; -})(A); +}(A)); var a = new B; a.foo(); a = new C; // error, cannot instantiate abstract class. diff --git a/tests/baselines/reference/classAbstractUsingAbstractMethods2.js b/tests/baselines/reference/classAbstractUsingAbstractMethods2.js index d5797232929..dc025b11dde 100644 --- a/tests/baselines/reference/classAbstractUsingAbstractMethods2.js +++ b/tests/baselines/reference/classAbstractUsingAbstractMethods2.js @@ -37,21 +37,21 @@ var A = (function () { function A() { } return A; -})(); +}()); var B = (function (_super) { __extends(B, _super); function B() { _super.apply(this, arguments); } return B; -})(A); +}(A)); var C = (function (_super) { __extends(C, _super); function C() { _super.apply(this, arguments); } return C; -})(A); +}(A)); var D = (function (_super) { __extends(D, _super); function D() { @@ -59,7 +59,7 @@ var D = (function (_super) { } D.prototype.foo = function () { }; return D; -})(A); +}(A)); var E = (function (_super) { __extends(E, _super); function E() { @@ -67,26 +67,26 @@ var E = (function (_super) { } E.prototype.foo = function () { }; return E; -})(A); +}(A)); var AA = (function () { function AA() { } return AA; -})(); +}()); var BB = (function (_super) { __extends(BB, _super); function BB() { _super.apply(this, arguments); } return BB; -})(AA); +}(AA)); var CC = (function (_super) { __extends(CC, _super); function CC() { _super.apply(this, arguments); } return CC; -})(AA); +}(AA)); var DD = (function (_super) { __extends(DD, _super); function DD() { @@ -94,4 +94,4 @@ var DD = (function (_super) { } DD.prototype.foo = function () { }; return DD; -})(AA); +}(AA)); diff --git a/tests/baselines/reference/classAndInterfaceWithSameName.js b/tests/baselines/reference/classAndInterfaceWithSameName.js index bca0c96892c..4a5c64ee553 100644 --- a/tests/baselines/reference/classAndInterfaceWithSameName.js +++ b/tests/baselines/reference/classAndInterfaceWithSameName.js @@ -17,12 +17,12 @@ var C = (function () { function C() { } return C; -})(); +}()); var M; (function (M) { var D = (function () { function D() { } return D; - })(); + }()); })(M || (M = {})); diff --git a/tests/baselines/reference/classAndVariableWithSameName.js b/tests/baselines/reference/classAndVariableWithSameName.js index 1d547dc5508..1a88efcf19b 100644 --- a/tests/baselines/reference/classAndVariableWithSameName.js +++ b/tests/baselines/reference/classAndVariableWithSameName.js @@ -15,7 +15,7 @@ var C = (function () { function C() { } return C; -})(); // error +}()); // error var C = ''; // error var M; (function (M) { @@ -23,6 +23,6 @@ var M; function D() { } return D; - })(); + }()); var D = 1; // error })(M || (M = {})); diff --git a/tests/baselines/reference/classAppearsToHaveMembersOfObject.js b/tests/baselines/reference/classAppearsToHaveMembersOfObject.js index e33b2b79fa8..e8f15583ebc 100644 --- a/tests/baselines/reference/classAppearsToHaveMembersOfObject.js +++ b/tests/baselines/reference/classAppearsToHaveMembersOfObject.js @@ -13,7 +13,7 @@ var C = (function () { function C() { } return C; -})(); +}()); var c; var r = c.toString(); var r2 = c.hasOwnProperty(''); diff --git a/tests/baselines/reference/classBodyWithStatements.js b/tests/baselines/reference/classBodyWithStatements.js index 2324fe0d791..a40d27e14ec 100644 --- a/tests/baselines/reference/classBodyWithStatements.js +++ b/tests/baselines/reference/classBodyWithStatements.js @@ -18,13 +18,13 @@ var C = (function () { function C() { } return C; -})(); +}()); var x = 1; var C2 = (function () { function C2() { } return C2; -})(); +}()); function foo() { } var x = 1; var y = 2; @@ -33,4 +33,4 @@ var C3 = (function () { this.x = y + 1; // ok, need a var in the statement production } return C3; -})(); +}()); diff --git a/tests/baselines/reference/classCannotExtendVar.js b/tests/baselines/reference/classCannotExtendVar.js index 46e89c19418..a126a07a2eb 100644 --- a/tests/baselines/reference/classCannotExtendVar.js +++ b/tests/baselines/reference/classCannotExtendVar.js @@ -13,4 +13,4 @@ var Markup = (function () { function Markup() { } return Markup; -})(); +}()); diff --git a/tests/baselines/reference/classConstructorAccessibility.js b/tests/baselines/reference/classConstructorAccessibility.js index 15b12190392..fed96385845 100644 --- a/tests/baselines/reference/classConstructorAccessibility.js +++ b/tests/baselines/reference/classConstructorAccessibility.js @@ -40,19 +40,19 @@ var C = (function () { this.x = x; } return C; -})(); +}()); var D = (function () { function D(x) { this.x = x; } // error return D; -})(); +}()); var E = (function () { function E(x) { this.x = x; } // error return E; -})(); +}()); var c = new C(1); var d = new D(1); var e = new E(1); @@ -63,19 +63,19 @@ var Generic; this.x = x; } return C; - })(); + }()); var D = (function () { function D(x) { this.x = x; } // error return D; - })(); + }()); var E = (function () { function E(x) { this.x = x; } // error return E; - })(); + }()); var c = new C(1); var d = new D(1); var e = new E(1); diff --git a/tests/baselines/reference/classConstructorParametersAccessibility.js b/tests/baselines/reference/classConstructorParametersAccessibility.js index a5538b66ecc..c31fd8bf9dd 100644 --- a/tests/baselines/reference/classConstructorParametersAccessibility.js +++ b/tests/baselines/reference/classConstructorParametersAccessibility.js @@ -37,7 +37,7 @@ var C1 = (function () { this.x = x; } return C1; -})(); +}()); var c1; c1.x; // OK var C2 = (function () { @@ -45,7 +45,7 @@ var C2 = (function () { this.p = p; } return C2; -})(); +}()); var c2; c2.p; // private, error var C3 = (function () { @@ -53,7 +53,7 @@ var C3 = (function () { this.p = p; } return C3; -})(); +}()); var c3; c3.p; // protected, error var Derived = (function (_super) { @@ -63,4 +63,4 @@ var Derived = (function (_super) { this.p; // OK } return Derived; -})(C3); +}(C3)); diff --git a/tests/baselines/reference/classConstructorParametersAccessibility2.js b/tests/baselines/reference/classConstructorParametersAccessibility2.js index 581746a180b..7f52a6a581f 100644 --- a/tests/baselines/reference/classConstructorParametersAccessibility2.js +++ b/tests/baselines/reference/classConstructorParametersAccessibility2.js @@ -37,7 +37,7 @@ var C1 = (function () { this.x = x; } return C1; -})(); +}()); var c1; c1.x; // OK var C2 = (function () { @@ -45,7 +45,7 @@ var C2 = (function () { this.p = p; } return C2; -})(); +}()); var c2; c2.p; // private, error var C3 = (function () { @@ -53,7 +53,7 @@ var C3 = (function () { this.p = p; } return C3; -})(); +}()); var c3; c3.p; // protected, error var Derived = (function (_super) { @@ -63,4 +63,4 @@ var Derived = (function (_super) { this.p; // OK } return Derived; -})(C3); +}(C3)); diff --git a/tests/baselines/reference/classConstructorParametersAccessibility3.js b/tests/baselines/reference/classConstructorParametersAccessibility3.js index d98b094ccdb..0da9449a3a7 100644 --- a/tests/baselines/reference/classConstructorParametersAccessibility3.js +++ b/tests/baselines/reference/classConstructorParametersAccessibility3.js @@ -24,7 +24,7 @@ var Base = (function () { this.p = p; } return Base; -})(); +}()); var Derived = (function (_super) { __extends(Derived, _super); function Derived(p) { @@ -33,6 +33,6 @@ var Derived = (function (_super) { this.p; // OK } return Derived; -})(Base); +}(Base)); var d; d.p; // public, OK diff --git a/tests/baselines/reference/classDeclarationBlockScoping1.js b/tests/baselines/reference/classDeclarationBlockScoping1.js index 4c7f9d8e24a..ac3195af696 100644 --- a/tests/baselines/reference/classDeclarationBlockScoping1.js +++ b/tests/baselines/reference/classDeclarationBlockScoping1.js @@ -12,11 +12,11 @@ var C = (function () { function C() { } return C; -})(); +}()); { var C_1 = (function () { function C_1() { } return C_1; - })(); + }()); } diff --git a/tests/baselines/reference/classDeclarationBlockScoping2.js b/tests/baselines/reference/classDeclarationBlockScoping2.js index 57001d0d287..c3e3a89677a 100644 --- a/tests/baselines/reference/classDeclarationBlockScoping2.js +++ b/tests/baselines/reference/classDeclarationBlockScoping2.js @@ -15,14 +15,14 @@ function f() { function C() { } return C; - })(); + }()); var c1 = C; { var C_1 = (function () { function C_1() { } return C_1; - })(); + }()); var c2 = C_1; } return C === c1; diff --git a/tests/baselines/reference/classDeclarationMergedInModuleWithContinuation.js b/tests/baselines/reference/classDeclarationMergedInModuleWithContinuation.js index a8d6fcd88e0..7ab6cb2ceca 100644 --- a/tests/baselines/reference/classDeclarationMergedInModuleWithContinuation.js +++ b/tests/baselines/reference/classDeclarationMergedInModuleWithContinuation.js @@ -23,7 +23,7 @@ var M; function N() { } return N; - })(); + }()); M.N = N; var N; (function (N) { @@ -38,6 +38,6 @@ var M; _super.apply(this, arguments); } return O; - })(M.N); + }(M.N)); M.O = O; })(M || (M = {})); diff --git a/tests/baselines/reference/classDoesNotDependOnBaseTypes.js b/tests/baselines/reference/classDoesNotDependOnBaseTypes.js index 8515e1d98eb..5a455edc082 100644 --- a/tests/baselines/reference/classDoesNotDependOnBaseTypes.js +++ b/tests/baselines/reference/classDoesNotDependOnBaseTypes.js @@ -27,11 +27,11 @@ var StringTreeCollectionBase = (function () { function StringTreeCollectionBase() { } return StringTreeCollectionBase; -})(); +}()); var StringTreeCollection = (function (_super) { __extends(StringTreeCollection, _super); function StringTreeCollection() { _super.apply(this, arguments); } return StringTreeCollection; -})(StringTreeCollectionBase); +}(StringTreeCollectionBase)); diff --git a/tests/baselines/reference/classDoesNotDependOnPrivateMember.js b/tests/baselines/reference/classDoesNotDependOnPrivateMember.js index 548c94b0ea7..3fe2c592070 100644 --- a/tests/baselines/reference/classDoesNotDependOnPrivateMember.js +++ b/tests/baselines/reference/classDoesNotDependOnPrivateMember.js @@ -13,7 +13,7 @@ var M; function C() { } return C; - })(); + }()); M.C = C; })(M || (M = {})); diff --git a/tests/baselines/reference/classExpression.js b/tests/baselines/reference/classExpression.js index 8f3270d13e7..d30ddd39be8 100644 --- a/tests/baselines/reference/classExpression.js +++ b/tests/baselines/reference/classExpression.js @@ -17,13 +17,13 @@ var x = (function () { function C() { } return C; -})(); +}()); var y = { foo: (function () { function C2() { } return C2; - })() + }()) }; var M; (function (M) { @@ -31,5 +31,5 @@ var M; function C4() { } return C4; - })(); + }()); })(M || (M = {})); diff --git a/tests/baselines/reference/classExpression1.js b/tests/baselines/reference/classExpression1.js index 68c7bc5e1e7..05375bb810b 100644 --- a/tests/baselines/reference/classExpression1.js +++ b/tests/baselines/reference/classExpression1.js @@ -6,4 +6,4 @@ var v = (function () { function C() { } return C; -})(); +}()); diff --git a/tests/baselines/reference/classExpression2.js b/tests/baselines/reference/classExpression2.js index f74bb8bd5e2..ed9497c8729 100644 --- a/tests/baselines/reference/classExpression2.js +++ b/tests/baselines/reference/classExpression2.js @@ -12,11 +12,11 @@ var D = (function () { function D() { } return D; -})(); +}()); var v = (function (_super) { __extends(C, _super); function C() { _super.apply(this, arguments); } return C; -})(D); +}(D)); diff --git a/tests/baselines/reference/classExpression3.js b/tests/baselines/reference/classExpression3.js index ec9581eaf39..508dc039387 100644 --- a/tests/baselines/reference/classExpression3.js +++ b/tests/baselines/reference/classExpression3.js @@ -19,19 +19,19 @@ var C = (function (_super) { this.c = 3; } return class_1; -})((function (_super) { +}((function (_super) { __extends(class_2, _super); function class_2() { _super.apply(this, arguments); this.b = 2; } return class_2; -})((function () { +}((function () { function class_3() { this.a = 1; } return class_3; -})())); +}()))))); var c = new C(); c.a; c.b; diff --git a/tests/baselines/reference/classExpression4.js b/tests/baselines/reference/classExpression4.js index c2ead0474e2..7bdc8bd06ef 100644 --- a/tests/baselines/reference/classExpression4.js +++ b/tests/baselines/reference/classExpression4.js @@ -15,5 +15,5 @@ var C = (function () { return new C(); }; return class_1; -})(); +}()); var x = (new C).foo(); diff --git a/tests/baselines/reference/classExpressionExtendingAbstractClass.js b/tests/baselines/reference/classExpressionExtendingAbstractClass.js index a5149538da2..c4da02cb321 100644 --- a/tests/baselines/reference/classExpressionExtendingAbstractClass.js +++ b/tests/baselines/reference/classExpressionExtendingAbstractClass.js @@ -18,11 +18,11 @@ var A = (function () { function A() { } return A; -})(); +}()); var C = (function (_super) { __extends(class_1, _super); function class_1() { _super.apply(this, arguments); } return class_1; -})(A); +}(A)); diff --git a/tests/baselines/reference/classExpressionTest1.js b/tests/baselines/reference/classExpressionTest1.js index e91cdebb8c1..6b799c12f04 100644 --- a/tests/baselines/reference/classExpressionTest1.js +++ b/tests/baselines/reference/classExpressionTest1.js @@ -23,7 +23,7 @@ function M() { return { t: t, x: x }; }; return C; - })(); + }()); var v = new C(); return v.f(); } diff --git a/tests/baselines/reference/classExpressionTest2.js b/tests/baselines/reference/classExpressionTest2.js index ebb5c1e21b6..761af899759 100644 --- a/tests/baselines/reference/classExpressionTest2.js +++ b/tests/baselines/reference/classExpressionTest2.js @@ -23,7 +23,7 @@ function M() { return { t: t, x: x }; }; return C; - })(); + }()); var v = new m(); return v.f(); } diff --git a/tests/baselines/reference/classExpressionWithDecorator1.js b/tests/baselines/reference/classExpressionWithDecorator1.js index 8494ec32cda..e051e05251b 100644 --- a/tests/baselines/reference/classExpressionWithDecorator1.js +++ b/tests/baselines/reference/classExpressionWithDecorator1.js @@ -17,5 +17,5 @@ var C = (function () { decorate ], C); return C; -})(); +}()); ; diff --git a/tests/baselines/reference/classExpressionWithResolutionOfNamespaceOfSameName01.js b/tests/baselines/reference/classExpressionWithResolutionOfNamespaceOfSameName01.js index 7c9f25cdfe6..e13e0de6b78 100644 --- a/tests/baselines/reference/classExpressionWithResolutionOfNamespaceOfSameName01.js +++ b/tests/baselines/reference/classExpressionWithResolutionOfNamespaceOfSameName01.js @@ -13,4 +13,4 @@ var x = (function () { function C() { } return C; -})(); +}()); diff --git a/tests/baselines/reference/classExpressionWithStaticProperties1.js b/tests/baselines/reference/classExpressionWithStaticProperties1.js index 344dbff50ed..cfe85d97a71 100644 --- a/tests/baselines/reference/classExpressionWithStaticProperties1.js +++ b/tests/baselines/reference/classExpressionWithStaticProperties1.js @@ -8,4 +8,4 @@ var v = (function () { C.a = 1; C.b = 2; return C; -})(); +}()); diff --git a/tests/baselines/reference/classExpressionWithStaticProperties2.js b/tests/baselines/reference/classExpressionWithStaticProperties2.js index 9ff9c06ffe4..134441e0ad9 100644 --- a/tests/baselines/reference/classExpressionWithStaticProperties2.js +++ b/tests/baselines/reference/classExpressionWithStaticProperties2.js @@ -7,4 +7,4 @@ var v = (function () { } C.a = 1; return C; -})(); +}()); diff --git a/tests/baselines/reference/classExtendingBuiltinType.js b/tests/baselines/reference/classExtendingBuiltinType.js index 8a4b0dd3849..ace4cf19fee 100644 --- a/tests/baselines/reference/classExtendingBuiltinType.js +++ b/tests/baselines/reference/classExtendingBuiltinType.js @@ -23,67 +23,67 @@ var C1 = (function (_super) { _super.apply(this, arguments); } return C1; -})(Object); +}(Object)); var C2 = (function (_super) { __extends(C2, _super); function C2() { _super.apply(this, arguments); } return C2; -})(Function); +}(Function)); var C3 = (function (_super) { __extends(C3, _super); function C3() { _super.apply(this, arguments); } return C3; -})(String); +}(String)); var C4 = (function (_super) { __extends(C4, _super); function C4() { _super.apply(this, arguments); } return C4; -})(Boolean); +}(Boolean)); var C5 = (function (_super) { __extends(C5, _super); function C5() { _super.apply(this, arguments); } return C5; -})(Number); +}(Number)); var C6 = (function (_super) { __extends(C6, _super); function C6() { _super.apply(this, arguments); } return C6; -})(Date); +}(Date)); var C7 = (function (_super) { __extends(C7, _super); function C7() { _super.apply(this, arguments); } return C7; -})(RegExp); +}(RegExp)); var C8 = (function (_super) { __extends(C8, _super); function C8() { _super.apply(this, arguments); } return C8; -})(Error); +}(Error)); var C9 = (function (_super) { __extends(C9, _super); function C9() { _super.apply(this, arguments); } return C9; -})(Array); +}(Array)); var C10 = (function (_super) { __extends(C10, _super); function C10() { _super.apply(this, arguments); } return C10; -})(Array); +}(Array)); diff --git a/tests/baselines/reference/classExtendingClass.js b/tests/baselines/reference/classExtendingClass.js index 6168cb3418d..8073271b5ea 100644 --- a/tests/baselines/reference/classExtendingClass.js +++ b/tests/baselines/reference/classExtendingClass.js @@ -43,14 +43,14 @@ var C = (function () { C.prototype.thing = function () { }; C.other = function () { }; return C; -})(); +}()); var D = (function (_super) { __extends(D, _super); function D() { _super.apply(this, arguments); } return D; -})(C); +}(C)); var d; var r = d.foo; var r2 = d.bar; @@ -62,14 +62,14 @@ var C2 = (function () { C2.prototype.thing = function (x) { }; C2.other = function (x) { }; return C2; -})(); +}()); var D2 = (function (_super) { __extends(D2, _super); function D2() { _super.apply(this, arguments); } return D2; -})(C2); +}(C2)); var d2; var r5 = d2.foo; var r6 = d2.bar; diff --git a/tests/baselines/reference/classExtendingClassLikeType.js b/tests/baselines/reference/classExtendingClassLikeType.js index 4634b22e493..a41bb14451a 100644 --- a/tests/baselines/reference/classExtendingClassLikeType.js +++ b/tests/baselines/reference/classExtendingClassLikeType.js @@ -71,7 +71,7 @@ var D0 = (function (_super) { _super.apply(this, arguments); } return D0; -})(Base); +}(Base)); var D1 = (function (_super) { __extends(D1, _super); function D1() { @@ -80,7 +80,7 @@ var D1 = (function (_super) { this.y = "y"; } return D1; -})(getBase()); +}(getBase())); var D2 = (function (_super) { __extends(D2, _super); function D2() { @@ -90,7 +90,7 @@ var D2 = (function (_super) { this.y = 2; } return D2; -})(getBase()); +}(getBase())); var D3 = (function (_super) { __extends(D3, _super); function D3() { @@ -99,7 +99,7 @@ var D3 = (function (_super) { this.y = 2; } return D3; -})(getBase()); +}(getBase())); // Error, no constructors with three type arguments var D4 = (function (_super) { __extends(D4, _super); @@ -107,7 +107,7 @@ var D4 = (function (_super) { _super.apply(this, arguments); } return D4; -})(getBase()); +}(getBase())); // Error, constructor return types differ var D5 = (function (_super) { __extends(D5, _super); @@ -115,4 +115,4 @@ var D5 = (function (_super) { _super.apply(this, arguments); } return D5; -})(getBadBase()); +}(getBadBase())); diff --git a/tests/baselines/reference/classExtendingNonConstructor.js b/tests/baselines/reference/classExtendingNonConstructor.js index dff2fdf9ca9..c46e3c5ddbe 100644 --- a/tests/baselines/reference/classExtendingNonConstructor.js +++ b/tests/baselines/reference/classExtendingNonConstructor.js @@ -30,46 +30,46 @@ var C1 = (function (_super) { _super.apply(this, arguments); } return C1; -})(undefined); +}(undefined)); var C2 = (function (_super) { __extends(C2, _super); function C2() { _super.apply(this, arguments); } return C2; -})(true); +}(true)); var C3 = (function (_super) { __extends(C3, _super); function C3() { _super.apply(this, arguments); } return C3; -})(false); +}(false)); var C4 = (function (_super) { __extends(C4, _super); function C4() { _super.apply(this, arguments); } return C4; -})(42); +}(42)); var C5 = (function (_super) { __extends(C5, _super); function C5() { _super.apply(this, arguments); } return C5; -})("hello"); +}("hello")); var C6 = (function (_super) { __extends(C6, _super); function C6() { _super.apply(this, arguments); } return C6; -})(x); +}(x)); var C7 = (function (_super) { __extends(C7, _super); function C7() { _super.apply(this, arguments); } return C7; -})(foo); +}(foo)); diff --git a/tests/baselines/reference/classExtendingNull.js b/tests/baselines/reference/classExtendingNull.js index ac8009b9cd9..fa6f0357b0d 100644 --- a/tests/baselines/reference/classExtendingNull.js +++ b/tests/baselines/reference/classExtendingNull.js @@ -15,11 +15,11 @@ var C1 = (function (_super) { _super.apply(this, arguments); } return C1; -})(null); +}(null)); var C2 = (function (_super) { __extends(C2, _super); function C2() { _super.apply(this, arguments); } return C2; -})((null)); +}((null))); diff --git a/tests/baselines/reference/classExtendingPrimitive.js b/tests/baselines/reference/classExtendingPrimitive.js index cafa4eebcd1..8ecad9c24a5 100644 --- a/tests/baselines/reference/classExtendingPrimitive.js +++ b/tests/baselines/reference/classExtendingPrimitive.js @@ -27,33 +27,33 @@ var C = (function (_super) { _super.apply(this, arguments); } return C; -})(number); +}(number)); var C2 = (function (_super) { __extends(C2, _super); function C2() { _super.apply(this, arguments); } return C2; -})(string); +}(string)); var C3 = (function (_super) { __extends(C3, _super); function C3() { _super.apply(this, arguments); } return C3; -})(boolean); +}(boolean)); var C4 = (function (_super) { __extends(C4, _super); function C4() { _super.apply(this, arguments); } return C4; -})(Void); +}(Void)); var C4a = (function () { function C4a() { } return C4a; -})(); +}()); void {}; var C5 = (function (_super) { __extends(C5, _super); @@ -61,28 +61,28 @@ var C5 = (function (_super) { _super.apply(this, arguments); } return C5; -})(Null); +}(Null)); var C5a = (function (_super) { __extends(C5a, _super); function C5a() { _super.apply(this, arguments); } return C5a; -})(null); +}(null)); var C6 = (function (_super) { __extends(C6, _super); function C6() { _super.apply(this, arguments); } return C6; -})(undefined); +}(undefined)); var C7 = (function (_super) { __extends(C7, _super); function C7() { _super.apply(this, arguments); } return C7; -})(Undefined); +}(Undefined)); var E; (function (E) { E[E["A"] = 0] = "A"; @@ -93,4 +93,4 @@ var C8 = (function (_super) { _super.apply(this, arguments); } return C8; -})(E); +}(E)); diff --git a/tests/baselines/reference/classExtendingPrimitive2.js b/tests/baselines/reference/classExtendingPrimitive2.js index 4661ab961c9..af766977967 100644 --- a/tests/baselines/reference/classExtendingPrimitive2.js +++ b/tests/baselines/reference/classExtendingPrimitive2.js @@ -15,7 +15,7 @@ var C4a = (function () { function C4a() { } return C4a; -})(); +}()); void {}; var C5a = (function (_super) { __extends(C5a, _super); @@ -23,4 +23,4 @@ var C5a = (function (_super) { _super.apply(this, arguments); } return C5a; -})(null); +}(null)); diff --git a/tests/baselines/reference/classExtendingQualifiedName.js b/tests/baselines/reference/classExtendingQualifiedName.js index 44a4fbe2bd6..17d888834ec 100644 --- a/tests/baselines/reference/classExtendingQualifiedName.js +++ b/tests/baselines/reference/classExtendingQualifiedName.js @@ -19,12 +19,12 @@ var M; function C() { } return C; - })(); + }()); var D = (function (_super) { __extends(D, _super); function D() { _super.apply(this, arguments); } return D; - })(M.C); + }(M.C)); })(M || (M = {})); diff --git a/tests/baselines/reference/classExtendingQualifiedName2.js b/tests/baselines/reference/classExtendingQualifiedName2.js index afd432180d4..4f1d872e753 100644 --- a/tests/baselines/reference/classExtendingQualifiedName2.js +++ b/tests/baselines/reference/classExtendingQualifiedName2.js @@ -19,7 +19,7 @@ var M; function C() { } return C; - })(); + }()); M.C = C; var D = (function (_super) { __extends(D, _super); @@ -27,5 +27,5 @@ var M; _super.apply(this, arguments); } return D; - })(M.C); + }(M.C)); })(M || (M = {})); diff --git a/tests/baselines/reference/classExtendsClauseClassMergedWithModuleNotReferingConstructor.js b/tests/baselines/reference/classExtendsClauseClassMergedWithModuleNotReferingConstructor.js index fe8dc79b864..80b4b7c175d 100644 --- a/tests/baselines/reference/classExtendsClauseClassMergedWithModuleNotReferingConstructor.js +++ b/tests/baselines/reference/classExtendsClauseClassMergedWithModuleNotReferingConstructor.js @@ -23,7 +23,7 @@ var A = (function () { function A() { } return A; -})(); +}()); var A; (function (A) { })(A || (A = {})); @@ -36,5 +36,5 @@ var Foo; _super.apply(this, arguments); } return B; - })(A); + }(A)); })(Foo || (Foo = {})); diff --git a/tests/baselines/reference/classExtendsClauseClassNotReferringConstructor.js b/tests/baselines/reference/classExtendsClauseClassNotReferringConstructor.js index 94c50679151..4c593761f00 100644 --- a/tests/baselines/reference/classExtendsClauseClassNotReferringConstructor.js +++ b/tests/baselines/reference/classExtendsClauseClassNotReferringConstructor.js @@ -16,7 +16,7 @@ var A = (function () { function A() { } return A; -})(); +}()); var Foo; (function (Foo) { var A = 1; @@ -26,5 +26,5 @@ var Foo; _super.apply(this, arguments); } return B; - })(A); + }(A)); })(Foo || (Foo = {})); diff --git a/tests/baselines/reference/classExtendsEveryObjectType.js b/tests/baselines/reference/classExtendsEveryObjectType.js index 92414c7e6c3..8b4663ad2cb 100644 --- a/tests/baselines/reference/classExtendsEveryObjectType.js +++ b/tests/baselines/reference/classExtendsEveryObjectType.js @@ -28,14 +28,14 @@ var C = (function (_super) { _super.apply(this, arguments); } return C; -})(I); // error +}(I)); // error var C2 = (function (_super) { __extends(C2, _super); function C2() { _super.apply(this, arguments); } return C2; -})({ foo: string }); // error +}({ foo: string })); // error var x; var C3 = (function (_super) { __extends(C3, _super); @@ -43,7 +43,7 @@ var C3 = (function (_super) { _super.apply(this, arguments); } return C3; -})(x); // error +}(x)); // error var M; (function (M) { M.x = 1; @@ -54,7 +54,7 @@ var C4 = (function (_super) { _super.apply(this, arguments); } return C4; -})(M); // error +}(M)); // error function foo() { } var C5 = (function (_super) { __extends(C5, _super); @@ -62,11 +62,11 @@ var C5 = (function (_super) { _super.apply(this, arguments); } return C5; -})(foo); // error +}(foo)); // error var C6 = (function (_super) { __extends(C6, _super); function C6() { _super.apply(this, arguments); } return C6; -})([]); // error +}([])); // error diff --git a/tests/baselines/reference/classExtendsEveryObjectType2.js b/tests/baselines/reference/classExtendsEveryObjectType2.js index 2735032f3c4..6aceb0ffebf 100644 --- a/tests/baselines/reference/classExtendsEveryObjectType2.js +++ b/tests/baselines/reference/classExtendsEveryObjectType2.js @@ -15,11 +15,11 @@ var C2 = (function (_super) { _super.apply(this, arguments); } return C2; -})({ foo: string }); // error +}({ foo: string })); // error var C6 = (function (_super) { __extends(C6, _super); function C6() { _super.apply(this, arguments); } return C6; -})([]); // error +}([])); // error diff --git a/tests/baselines/reference/classExtendsInterface.js b/tests/baselines/reference/classExtendsInterface.js index 9b78cde35e9..c06c4e66d8b 100644 --- a/tests/baselines/reference/classExtendsInterface.js +++ b/tests/baselines/reference/classExtendsInterface.js @@ -20,21 +20,21 @@ var A = (function (_super) { _super.apply(this, arguments); } return A; -})(Comparable); +}(Comparable)); var B = (function () { function B() { } return B; -})(); +}()); var A2 = (function (_super) { __extends(A2, _super); function A2() { _super.apply(this, arguments); } return A2; -})(Comparable2); +}(Comparable2)); var B2 = (function () { function B2() { } return B2; -})(); +}()); diff --git a/tests/baselines/reference/classExtendsInterfaceThatExtendsClassWithPrivates1.js b/tests/baselines/reference/classExtendsInterfaceThatExtendsClassWithPrivates1.js index 907b6bd6fd2..aab40d145c4 100644 --- a/tests/baselines/reference/classExtendsInterfaceThatExtendsClassWithPrivates1.js +++ b/tests/baselines/reference/classExtendsInterfaceThatExtendsClassWithPrivates1.js @@ -21,7 +21,7 @@ var C = (function () { } C.prototype.foo = function (x) { return x; }; return C; -})(); +}()); var D2 = (function () { function D2() { this.x = 3; @@ -29,4 +29,4 @@ var D2 = (function () { D2.prototype.foo = function (x) { return x; }; D2.prototype.other = function (x) { return x; }; return D2; -})(); +}()); diff --git a/tests/baselines/reference/classExtendsItself.js b/tests/baselines/reference/classExtendsItself.js index c370e797a57..279d0ad6899 100644 --- a/tests/baselines/reference/classExtendsItself.js +++ b/tests/baselines/reference/classExtendsItself.js @@ -17,18 +17,18 @@ var C = (function (_super) { _super.apply(this, arguments); } return C; -})(C); // error +}(C)); // error var D = (function (_super) { __extends(D, _super); function D() { _super.apply(this, arguments); } return D; -})(D); // error +}(D)); // error var E = (function (_super) { __extends(E, _super); function E() { _super.apply(this, arguments); } return E; -})(E); // error +}(E)); // error diff --git a/tests/baselines/reference/classExtendsItselfIndirectly.js b/tests/baselines/reference/classExtendsItselfIndirectly.js index 65cd72ce3c8..f8ea40ee69c 100644 --- a/tests/baselines/reference/classExtendsItselfIndirectly.js +++ b/tests/baselines/reference/classExtendsItselfIndirectly.js @@ -23,39 +23,39 @@ var C = (function (_super) { _super.apply(this, arguments); } return C; -})(E); // error +}(E)); // error var D = (function (_super) { __extends(D, _super); function D() { _super.apply(this, arguments); } return D; -})(C); +}(C)); var E = (function (_super) { __extends(E, _super); function E() { _super.apply(this, arguments); } return E; -})(D); +}(D)); var C2 = (function (_super) { __extends(C2, _super); function C2() { _super.apply(this, arguments); } return C2; -})(E2); // error +}(E2)); // error var D2 = (function (_super) { __extends(D2, _super); function D2() { _super.apply(this, arguments); } return D2; -})(C2); +}(C2)); var E2 = (function (_super) { __extends(E2, _super); function E2() { _super.apply(this, arguments); } return E2; -})(D2); +}(D2)); diff --git a/tests/baselines/reference/classExtendsItselfIndirectly2.js b/tests/baselines/reference/classExtendsItselfIndirectly2.js index c0b46e6cbb6..269edb851e9 100644 --- a/tests/baselines/reference/classExtendsItselfIndirectly2.js +++ b/tests/baselines/reference/classExtendsItselfIndirectly2.js @@ -34,7 +34,7 @@ var C = (function (_super) { _super.apply(this, arguments); } return C; -})(N.E); // error +}(N.E)); // error var M; (function (M) { var D = (function (_super) { @@ -43,7 +43,7 @@ var M; _super.apply(this, arguments); } return D; - })(C); + }(C)); M.D = D; })(M || (M = {})); var N; @@ -54,7 +54,7 @@ var N; _super.apply(this, arguments); } return E; - })(M.D); + }(M.D)); N.E = E; })(N || (N = {})); var O; @@ -65,7 +65,7 @@ var O; _super.apply(this, arguments); } return C2; - })(Q.E2); // error + }(Q.E2)); // error var P; (function (P) { var D2 = (function (_super) { @@ -74,7 +74,7 @@ var O; _super.apply(this, arguments); } return D2; - })(C2); + }(C2)); P.D2 = D2; })(P || (P = {})); var Q; @@ -85,7 +85,7 @@ var O; _super.apply(this, arguments); } return E2; - })(P.D2); + }(P.D2)); Q.E2 = E2; })(Q || (Q = {})); })(O || (O = {})); diff --git a/tests/baselines/reference/classExtendsItselfIndirectly3.js b/tests/baselines/reference/classExtendsItselfIndirectly3.js index 9241403a7ce..2d2cf938156 100644 --- a/tests/baselines/reference/classExtendsItselfIndirectly3.js +++ b/tests/baselines/reference/classExtendsItselfIndirectly3.js @@ -30,7 +30,7 @@ var C = (function (_super) { _super.apply(this, arguments); } return C; -})(E); // error +}(E)); // error //// [classExtendsItselfIndirectly_file2.js] var __extends = (this && this.__extends) || function (d, b) { for (var p in b) if (b.hasOwnProperty(p)) d[p] = b[p]; @@ -43,7 +43,7 @@ var D = (function (_super) { _super.apply(this, arguments); } return D; -})(C); +}(C)); //// [classExtendsItselfIndirectly_file3.js] var __extends = (this && this.__extends) || function (d, b) { for (var p in b) if (b.hasOwnProperty(p)) d[p] = b[p]; @@ -56,7 +56,7 @@ var E = (function (_super) { _super.apply(this, arguments); } return E; -})(D); +}(D)); //// [classExtendsItselfIndirectly_file4.js] var __extends = (this && this.__extends) || function (d, b) { for (var p in b) if (b.hasOwnProperty(p)) d[p] = b[p]; @@ -69,7 +69,7 @@ var C2 = (function (_super) { _super.apply(this, arguments); } return C2; -})(E2); // error +}(E2)); // error //// [classExtendsItselfIndirectly_file5.js] var __extends = (this && this.__extends) || function (d, b) { for (var p in b) if (b.hasOwnProperty(p)) d[p] = b[p]; @@ -82,7 +82,7 @@ var D2 = (function (_super) { _super.apply(this, arguments); } return D2; -})(C2); +}(C2)); //// [classExtendsItselfIndirectly_file6.js] var __extends = (this && this.__extends) || function (d, b) { for (var p in b) if (b.hasOwnProperty(p)) d[p] = b[p]; @@ -95,4 +95,4 @@ var E2 = (function (_super) { _super.apply(this, arguments); } return E2; -})(D2); +}(D2)); diff --git a/tests/baselines/reference/classExtendsMultipleBaseClasses.js b/tests/baselines/reference/classExtendsMultipleBaseClasses.js index d1ffee30415..61db0a41a5c 100644 --- a/tests/baselines/reference/classExtendsMultipleBaseClasses.js +++ b/tests/baselines/reference/classExtendsMultipleBaseClasses.js @@ -13,16 +13,16 @@ var A = (function () { function A() { } return A; -})(); +}()); var B = (function () { function B() { } return B; -})(); +}()); var C = (function (_super) { __extends(C, _super); function C() { _super.apply(this, arguments); } return C; -})(A); +}(A)); diff --git a/tests/baselines/reference/classExtendsNull.js b/tests/baselines/reference/classExtendsNull.js index 5627f10dca6..afb2be21c68 100644 --- a/tests/baselines/reference/classExtendsNull.js +++ b/tests/baselines/reference/classExtendsNull.js @@ -25,11 +25,11 @@ var C = (function (_super) { return Object.create(null); } return C; -})(null); +}(null)); var D = (function (_super) { __extends(D, _super); function D() { return Object.create(null); } return D; -})(null); +}(null)); diff --git a/tests/baselines/reference/classExtendsShadowedConstructorFunction.js b/tests/baselines/reference/classExtendsShadowedConstructorFunction.js index 164ffdc8493..ae2f73cadc1 100644 --- a/tests/baselines/reference/classExtendsShadowedConstructorFunction.js +++ b/tests/baselines/reference/classExtendsShadowedConstructorFunction.js @@ -18,7 +18,7 @@ var C = (function () { function C() { } return C; -})(); +}()); var M; (function (M) { var C = 1; @@ -28,5 +28,5 @@ var M; _super.apply(this, arguments); } return D; - })(C); + }(C)); })(M || (M = {})); diff --git a/tests/baselines/reference/classExtendsValidConstructorFunction.js b/tests/baselines/reference/classExtendsValidConstructorFunction.js index 448db68db9f..00cd35693f1 100644 --- a/tests/baselines/reference/classExtendsValidConstructorFunction.js +++ b/tests/baselines/reference/classExtendsValidConstructorFunction.js @@ -19,4 +19,4 @@ var C = (function (_super) { _super.apply(this, arguments); } return C; -})(foo); // error, cannot extend it though +}(foo)); // error, cannot extend it though diff --git a/tests/baselines/reference/classHeritageWithTrailingSeparator.js b/tests/baselines/reference/classHeritageWithTrailingSeparator.js index 2d5b12d5201..7f85e4e25d7 100644 --- a/tests/baselines/reference/classHeritageWithTrailingSeparator.js +++ b/tests/baselines/reference/classHeritageWithTrailingSeparator.js @@ -13,11 +13,11 @@ var C = (function () { function C() { } return C; -})(); +}()); var D = (function (_super) { __extends(D, _super); function D() { _super.apply(this, arguments); } return D; -})(C); +}(C)); diff --git a/tests/baselines/reference/classImplementingInterfaceIndexer.js b/tests/baselines/reference/classImplementingInterfaceIndexer.js index dffd9063e87..532ac93d17e 100644 --- a/tests/baselines/reference/classImplementingInterfaceIndexer.js +++ b/tests/baselines/reference/classImplementingInterfaceIndexer.js @@ -11,4 +11,4 @@ var A = (function () { function A() { } return A; -})(); +}()); diff --git a/tests/baselines/reference/classImplementsClass1.js b/tests/baselines/reference/classImplementsClass1.js index 8a0be66cda6..847dc5ba531 100644 --- a/tests/baselines/reference/classImplementsClass1.js +++ b/tests/baselines/reference/classImplementsClass1.js @@ -7,9 +7,9 @@ var A = (function () { function A() { } return A; -})(); +}()); var C = (function () { function C() { } return C; -})(); +}()); diff --git a/tests/baselines/reference/classImplementsClass2.js b/tests/baselines/reference/classImplementsClass2.js index 490d2706b48..09cdd5c779b 100644 --- a/tests/baselines/reference/classImplementsClass2.js +++ b/tests/baselines/reference/classImplementsClass2.js @@ -24,12 +24,12 @@ var A = (function () { } A.prototype.foo = function () { return 1; }; return A; -})(); +}()); var C = (function () { function C() { } return C; -})(); // error +}()); // error var C2 = (function (_super) { __extends(C2, _super); function C2() { @@ -39,7 +39,7 @@ var C2 = (function (_super) { return 1; }; return C2; -})(A); +}(A)); var c; var c2; c = c2; diff --git a/tests/baselines/reference/classImplementsClass3.js b/tests/baselines/reference/classImplementsClass3.js index 00cb49e2da3..b47514b1286 100644 --- a/tests/baselines/reference/classImplementsClass3.js +++ b/tests/baselines/reference/classImplementsClass3.js @@ -25,7 +25,7 @@ var A = (function () { } A.prototype.foo = function () { return 1; }; return A; -})(); +}()); var C = (function () { function C() { } @@ -33,14 +33,14 @@ var C = (function () { return 1; }; return C; -})(); +}()); var C2 = (function (_super) { __extends(C2, _super); function C2() { _super.apply(this, arguments); } return C2; -})(A); +}(A)); // no errors var c; var c2; diff --git a/tests/baselines/reference/classImplementsClass4.js b/tests/baselines/reference/classImplementsClass4.js index 0d7508b723b..32ae1ef3e88 100644 --- a/tests/baselines/reference/classImplementsClass4.js +++ b/tests/baselines/reference/classImplementsClass4.js @@ -28,7 +28,7 @@ var A = (function () { } A.prototype.foo = function () { return 1; }; return A; -})(); +}()); var C = (function () { function C() { } @@ -36,14 +36,14 @@ var C = (function () { return 1; }; return C; -})(); +}()); var C2 = (function (_super) { __extends(C2, _super); function C2() { _super.apply(this, arguments); } return C2; -})(A); +}(A)); var c; var c2; c = c2; diff --git a/tests/baselines/reference/classImplementsClass5.js b/tests/baselines/reference/classImplementsClass5.js index caacb7b3044..923ac9c9829 100644 --- a/tests/baselines/reference/classImplementsClass5.js +++ b/tests/baselines/reference/classImplementsClass5.js @@ -29,7 +29,7 @@ var A = (function () { } A.prototype.foo = function () { return 1; }; return A; -})(); +}()); var C = (function () { function C() { this.x = 1; @@ -38,14 +38,14 @@ var C = (function () { return 1; }; return C; -})(); +}()); var C2 = (function (_super) { __extends(C2, _super); function C2() { _super.apply(this, arguments); } return C2; -})(A); +}(A)); var c; var c2; c = c2; diff --git a/tests/baselines/reference/classImplementsClass6.js b/tests/baselines/reference/classImplementsClass6.js index 2e8d765be89..a807590749e 100644 --- a/tests/baselines/reference/classImplementsClass6.js +++ b/tests/baselines/reference/classImplementsClass6.js @@ -35,7 +35,7 @@ var A = (function () { }; A.prototype.foo = function () { return 1; }; return A; -})(); +}()); var C = (function () { function C() { } @@ -43,14 +43,14 @@ var C = (function () { return 1; }; return C; -})(); +}()); var C2 = (function (_super) { __extends(C2, _super); function C2() { _super.apply(this, arguments); } return C2; -})(A); +}(A)); var c; var c2; c = c2; diff --git a/tests/baselines/reference/classImplementsImportedInterface.js b/tests/baselines/reference/classImplementsImportedInterface.js index a2af2083a2a..d9d7d9eed2e 100644 --- a/tests/baselines/reference/classImplementsImportedInterface.js +++ b/tests/baselines/reference/classImplementsImportedInterface.js @@ -20,5 +20,5 @@ var M2; } C.prototype.foo = function () { }; return C; - })(); + }()); })(M2 || (M2 = {})); diff --git a/tests/baselines/reference/classImplementsMergedClassInterface.js b/tests/baselines/reference/classImplementsMergedClassInterface.js index 64a0198cc16..67381a02467 100644 --- a/tests/baselines/reference/classImplementsMergedClassInterface.js +++ b/tests/baselines/reference/classImplementsMergedClassInterface.js @@ -28,19 +28,19 @@ var C2 = (function () { function C2() { } return C2; -})(); +}()); var C3 = (function () { function C3() { } return C3; -})(); +}()); var C4 = (function () { function C4() { } return C4; -})(); +}()); var C5 = (function () { function C5() { } return C5; -})(); +}()); diff --git a/tests/baselines/reference/classIndexer.js b/tests/baselines/reference/classIndexer.js index bed13e3f431..dfdc6274511 100644 --- a/tests/baselines/reference/classIndexer.js +++ b/tests/baselines/reference/classIndexer.js @@ -10,4 +10,4 @@ var C123 = (function () { function C123() { } return C123; -})(); +}()); diff --git a/tests/baselines/reference/classIndexer2.js b/tests/baselines/reference/classIndexer2.js index 6ed7098e755..eb83ba397dc 100644 --- a/tests/baselines/reference/classIndexer2.js +++ b/tests/baselines/reference/classIndexer2.js @@ -12,4 +12,4 @@ var C123 = (function () { function C123() { } return C123; -})(); +}()); diff --git a/tests/baselines/reference/classIndexer3.js b/tests/baselines/reference/classIndexer3.js index e962c7295f2..39fb844613e 100644 --- a/tests/baselines/reference/classIndexer3.js +++ b/tests/baselines/reference/classIndexer3.js @@ -20,11 +20,11 @@ var C123 = (function () { function C123() { } return C123; -})(); +}()); var D123 = (function (_super) { __extends(D123, _super); function D123() { _super.apply(this, arguments); } return D123; -})(C123); +}(C123)); diff --git a/tests/baselines/reference/classIndexer4.js b/tests/baselines/reference/classIndexer4.js index 419f785f26e..f5258d8b5e1 100644 --- a/tests/baselines/reference/classIndexer4.js +++ b/tests/baselines/reference/classIndexer4.js @@ -15,4 +15,4 @@ var C123 = (function () { function C123() { } return C123; -})(); +}()); diff --git a/tests/baselines/reference/classInheritence.js b/tests/baselines/reference/classInheritence.js index 1e463dd195d..e6e7a1eaf42 100644 --- a/tests/baselines/reference/classInheritence.js +++ b/tests/baselines/reference/classInheritence.js @@ -14,11 +14,11 @@ var B = (function (_super) { _super.apply(this, arguments); } return B; -})(A); +}(A)); var A = (function (_super) { __extends(A, _super); function A() { _super.apply(this, arguments); } return A; -})(A); +}(A)); diff --git a/tests/baselines/reference/classInsideBlock.js b/tests/baselines/reference/classInsideBlock.js index 55b3b0bbead..e21695b9745 100644 --- a/tests/baselines/reference/classInsideBlock.js +++ b/tests/baselines/reference/classInsideBlock.js @@ -9,5 +9,5 @@ function foo() { function C() { } return C; - })(); + }()); } diff --git a/tests/baselines/reference/classIsSubtypeOfBaseType.js b/tests/baselines/reference/classIsSubtypeOfBaseType.js index a92cfb430bf..b51488dbe1e 100644 --- a/tests/baselines/reference/classIsSubtypeOfBaseType.js +++ b/tests/baselines/reference/classIsSubtypeOfBaseType.js @@ -25,18 +25,18 @@ var Base = (function () { function Base() { } return Base; -})(); +}()); var Derived = (function (_super) { __extends(Derived, _super); function Derived() { _super.apply(this, arguments); } return Derived; -})(Base); +}(Base)); var Derived2 = (function (_super) { __extends(Derived2, _super); function Derived2() { _super.apply(this, arguments); } return Derived2; -})(Base); +}(Base)); diff --git a/tests/baselines/reference/classMemberInitializerScoping.js b/tests/baselines/reference/classMemberInitializerScoping.js index db8d6a1bede..8f78cfb9ac6 100644 --- a/tests/baselines/reference/classMemberInitializerScoping.js +++ b/tests/baselines/reference/classMemberInitializerScoping.js @@ -29,7 +29,7 @@ var CCC = (function () { } CCC.staticY = aaa; // This shouldnt be error return CCC; -})(); +}()); // above is equivalent to this: var aaaa = 1; var CCCC = (function () { @@ -38,4 +38,4 @@ var CCCC = (function () { this.y = ''; } return CCCC; -})(); +}()); diff --git a/tests/baselines/reference/classMemberInitializerWithLamdaScoping.js b/tests/baselines/reference/classMemberInitializerWithLamdaScoping.js index a431f6aceb8..752220a4cbc 100644 --- a/tests/baselines/reference/classMemberInitializerWithLamdaScoping.js +++ b/tests/baselines/reference/classMemberInitializerWithLamdaScoping.js @@ -45,7 +45,7 @@ var Test = (function () { console.log(field); // Using field here shouldnt be error }; return Test; -})(); +}()); var field1; var Test1 = (function () { function Test1(field1) { @@ -60,4 +60,4 @@ var Test1 = (function () { console.log(field1); // This shouldnt be error as its a static property }; return Test1; -})(); +}()); diff --git a/tests/baselines/reference/classMemberInitializerWithLamdaScoping2.js b/tests/baselines/reference/classMemberInitializerWithLamdaScoping2.js index 8509d60de7c..4cfee11b57d 100644 --- a/tests/baselines/reference/classMemberInitializerWithLamdaScoping2.js +++ b/tests/baselines/reference/classMemberInitializerWithLamdaScoping2.js @@ -30,4 +30,4 @@ var Test1 = (function () { }; } return Test1; -})(); +}()); diff --git a/tests/baselines/reference/classMemberInitializerWithLamdaScoping3.js b/tests/baselines/reference/classMemberInitializerWithLamdaScoping3.js index ae6bd9fe730..d310ccd53bc 100644 --- a/tests/baselines/reference/classMemberInitializerWithLamdaScoping3.js +++ b/tests/baselines/reference/classMemberInitializerWithLamdaScoping3.js @@ -31,5 +31,5 @@ var Test1 = (function () { }; } return Test1; -})(); +}()); exports.Test1 = Test1; diff --git a/tests/baselines/reference/classMemberInitializerWithLamdaScoping4.js b/tests/baselines/reference/classMemberInitializerWithLamdaScoping4.js index a88e2e98a43..161bceca04d 100644 --- a/tests/baselines/reference/classMemberInitializerWithLamdaScoping4.js +++ b/tests/baselines/reference/classMemberInitializerWithLamdaScoping4.js @@ -27,5 +27,5 @@ var Test1 = (function () { }; } return Test1; -})(); +}()); exports.Test1 = Test1; diff --git a/tests/baselines/reference/classMemberInitializerWithLamdaScoping5.js b/tests/baselines/reference/classMemberInitializerWithLamdaScoping5.js index 3e7649210ba..8af2b702271 100644 --- a/tests/baselines/reference/classMemberInitializerWithLamdaScoping5.js +++ b/tests/baselines/reference/classMemberInitializerWithLamdaScoping5.js @@ -19,4 +19,4 @@ var Greeter = (function () { }; } return Greeter; -})(); +}()); diff --git a/tests/baselines/reference/classMemberWithMissingIdentifier.js b/tests/baselines/reference/classMemberWithMissingIdentifier.js index cd1825d0da0..a7f1e6ffe4f 100644 --- a/tests/baselines/reference/classMemberWithMissingIdentifier.js +++ b/tests/baselines/reference/classMemberWithMissingIdentifier.js @@ -9,4 +9,4 @@ var C = (function () { this. = {}; } return C; -})(); +}()); diff --git a/tests/baselines/reference/classMemberWithMissingIdentifier2.js b/tests/baselines/reference/classMemberWithMissingIdentifier2.js index e8494755b22..6d364369335 100644 --- a/tests/baselines/reference/classMemberWithMissingIdentifier2.js +++ b/tests/baselines/reference/classMemberWithMissingIdentifier2.js @@ -10,4 +10,4 @@ var C = (function () { var _a; } return C; -})(); +}()); diff --git a/tests/baselines/reference/classMethodWithKeywordName1.js b/tests/baselines/reference/classMethodWithKeywordName1.js index ba5bb72632a..6e1faee005c 100644 --- a/tests/baselines/reference/classMethodWithKeywordName1.js +++ b/tests/baselines/reference/classMethodWithKeywordName1.js @@ -9,4 +9,4 @@ var C = (function () { } C.try = function () { }; return C; -})(); +}()); diff --git a/tests/baselines/reference/classOrder1.js b/tests/baselines/reference/classOrder1.js index 68bf1cd2a45..0d6d47891ea 100644 --- a/tests/baselines/reference/classOrder1.js +++ b/tests/baselines/reference/classOrder1.js @@ -19,6 +19,6 @@ var A = (function () { /*WScript.Echo("Here!");*/ }; return A; -})(); +}()); var a = new A(); a.foo(); diff --git a/tests/baselines/reference/classOrder2.js b/tests/baselines/reference/classOrder2.js index fd3fee2e037..ec49320b4be 100644 --- a/tests/baselines/reference/classOrder2.js +++ b/tests/baselines/reference/classOrder2.js @@ -32,12 +32,12 @@ var A = (function (_super) { } A.prototype.foo = function () { this.bar(); }; return A; -})(B); +}(B)); var B = (function () { function B() { } B.prototype.bar = function () { }; return B; -})(); +}()); var a = new A(); a.foo(); diff --git a/tests/baselines/reference/classOrderBug.js b/tests/baselines/reference/classOrderBug.js index bc3f0e739c4..d937197fad5 100644 --- a/tests/baselines/reference/classOrderBug.js +++ b/tests/baselines/reference/classOrderBug.js @@ -26,16 +26,16 @@ var bar = (function () { this.baz = new foo(); } return bar; -})(); +}()); var baz = (function () { function baz() { } return baz; -})(); +}()); var foo = (function (_super) { __extends(foo, _super); function foo() { _super.apply(this, arguments); } return foo; -})(baz); +}(baz)); diff --git a/tests/baselines/reference/classOverloadForFunction.js b/tests/baselines/reference/classOverloadForFunction.js index 40f076b0f2c..3916289f9a5 100644 --- a/tests/baselines/reference/classOverloadForFunction.js +++ b/tests/baselines/reference/classOverloadForFunction.js @@ -8,6 +8,6 @@ var foo = (function () { function foo() { } return foo; -})(); +}()); ; function foo() { } diff --git a/tests/baselines/reference/classOverloadForFunction2.js b/tests/baselines/reference/classOverloadForFunction2.js index 13eb0f6c533..0571774534d 100644 --- a/tests/baselines/reference/classOverloadForFunction2.js +++ b/tests/baselines/reference/classOverloadForFunction2.js @@ -7,4 +7,4 @@ var bar = (function () { function bar() { } return bar; -})(); +}()); diff --git a/tests/baselines/reference/classPropertyAsPrivate.js b/tests/baselines/reference/classPropertyAsPrivate.js index 51d08b48ec5..3db4b7acce4 100644 --- a/tests/baselines/reference/classPropertyAsPrivate.js +++ b/tests/baselines/reference/classPropertyAsPrivate.js @@ -42,7 +42,7 @@ var C = (function () { }); C.foo = function () { }; return C; -})(); +}()); var c; // all errors c.x; diff --git a/tests/baselines/reference/classPropertyAsProtected.js b/tests/baselines/reference/classPropertyAsProtected.js index 1cd74089816..da0e1665135 100644 --- a/tests/baselines/reference/classPropertyAsProtected.js +++ b/tests/baselines/reference/classPropertyAsProtected.js @@ -42,7 +42,7 @@ var C = (function () { }); C.foo = function () { }; return C; -})(); +}()); var c; // all errors c.x; diff --git a/tests/baselines/reference/classPropertyIsPublicByDefault.js b/tests/baselines/reference/classPropertyIsPublicByDefault.js index a0b61a08922..5a5bfa7afe8 100644 --- a/tests/baselines/reference/classPropertyIsPublicByDefault.js +++ b/tests/baselines/reference/classPropertyIsPublicByDefault.js @@ -41,7 +41,7 @@ var C = (function () { }); C.foo = function () { }; return C; -})(); +}()); var c; c.x; c.y; diff --git a/tests/baselines/reference/classSideInheritance1.js b/tests/baselines/reference/classSideInheritance1.js index 6d217149b83..0e3897a4f46 100644 --- a/tests/baselines/reference/classSideInheritance1.js +++ b/tests/baselines/reference/classSideInheritance1.js @@ -29,14 +29,14 @@ var A = (function () { }; A.prototype.foo = function () { return 1; }; return A; -})(); +}()); var C2 = (function (_super) { __extends(C2, _super); function C2() { _super.apply(this, arguments); } return C2; -})(A); +}(A)); var a; var c; a.bar(); // static off an instance - should be an error diff --git a/tests/baselines/reference/classSideInheritance2.js b/tests/baselines/reference/classSideInheritance2.js index fb6f0d8cbb9..72fd4af1eed 100644 --- a/tests/baselines/reference/classSideInheritance2.js +++ b/tests/baselines/reference/classSideInheritance2.js @@ -32,7 +32,7 @@ var SubText = (function (_super) { _super.call(this); } return SubText; -})(TextBase); +}(TextBase)); var TextBase = (function () { function TextBase() { } @@ -40,4 +40,4 @@ var TextBase = (function () { return new SubText(this, span); }; return TextBase; -})(); +}()); diff --git a/tests/baselines/reference/classSideInheritance3.js b/tests/baselines/reference/classSideInheritance3.js index 0891a7c9e74..b708489c518 100644 --- a/tests/baselines/reference/classSideInheritance3.js +++ b/tests/baselines/reference/classSideInheritance3.js @@ -29,7 +29,7 @@ var A = (function () { this.x = x; } return A; -})(); +}()); var B = (function (_super) { __extends(B, _super); function B(x, data) { @@ -37,14 +37,14 @@ var B = (function (_super) { this.data = data; } return B; -})(A); +}(A)); var C = (function (_super) { __extends(C, _super); function C(x) { _super.call(this, x); } return C; -})(A); +}(A)); var r1 = B; // error var r2 = B; // error var r3 = C; // ok diff --git a/tests/baselines/reference/classTypeParametersInStatics.js b/tests/baselines/reference/classTypeParametersInStatics.js index 8790ad9bceb..e538c5ee2e3 100644 --- a/tests/baselines/reference/classTypeParametersInStatics.js +++ b/tests/baselines/reference/classTypeParametersInStatics.js @@ -60,6 +60,6 @@ var Editor; return entry; }; return List; - })(); + }()); Editor.List = List; })(Editor || (Editor = {})); diff --git a/tests/baselines/reference/classUpdateTests.js b/tests/baselines/reference/classUpdateTests.js index 95db2680a1c..581575d0d46 100644 --- a/tests/baselines/reference/classUpdateTests.js +++ b/tests/baselines/reference/classUpdateTests.js @@ -128,14 +128,14 @@ var A = (function () { this.p2 = 0; } return A; -})(); +}()); var B = (function () { function B() { this.p1 = 0; this.p2 = 0; } return B; -})(); +}()); var C = (function () { function C(p1, p2, p3) { if (p1 === void 0) { p1 = 0; } @@ -145,7 +145,7 @@ var C = (function () { this.p2 = p2; } return C; -})(); +}()); // // test requirements for super calls // @@ -153,7 +153,7 @@ var D = (function () { function D() { } return D; -})(); +}()); var E = (function (_super) { __extends(E, _super); function E() { @@ -161,13 +161,13 @@ var E = (function (_super) { this.p1 = 0; } return E; -})(D); +}(D)); var F = (function (_super) { __extends(F, _super); function F() { } // ERROR - super call required return F; -})(E); +}(E)); var G = (function (_super) { __extends(G, _super); function G() { @@ -175,20 +175,20 @@ var G = (function (_super) { this.p1 = 0; } // NO ERROR return G; -})(D); +}(D)); var H = (function () { function H() { _super.call(this); } // ERROR - no super call allowed return H; -})(); +}()); var I = (function (_super) { __extends(I, _super); function I() { _super.call(this); } // ERROR - no super call allowed return I; -})(Object); +}(Object)); var J = (function (_super) { __extends(J, _super); function J(p1) { @@ -196,7 +196,7 @@ var J = (function (_super) { this.p1 = p1; } return J; -})(G); +}(G)); var K = (function (_super) { __extends(K, _super); function K(p1) { @@ -205,7 +205,7 @@ var K = (function (_super) { _super.call(this); } return K; -})(G); +}(G)); var L = (function (_super) { __extends(L, _super); function L(p1) { @@ -213,7 +213,7 @@ var L = (function (_super) { this.p1 = p1; } return L; -})(G); +}(G)); var M = (function (_super) { __extends(M, _super); function M(p1) { @@ -222,7 +222,7 @@ var M = (function (_super) { _super.call(this); } return M; -})(G); +}(G)); // // test this reference in field initializers // @@ -233,7 +233,7 @@ var N = (function () { this.p2 = 0; } return N; -})(); +}()); // // test error on property declarations within class constructors // @@ -242,22 +242,22 @@ var O = (function () { this.p1 = 0; // ERROR } return O; -})(); +}()); var P = (function () { function P() { this.p1 = 0; // ERROR } return P; -})(); +}()); var Q = (function () { function Q() { this.p1 = 0; // ERROR } return Q; -})(); +}()); var R = (function () { function R() { this.p1 = 0; // ERROR } return R; -})(); +}()); diff --git a/tests/baselines/reference/classWithBaseClassButNoConstructor.js b/tests/baselines/reference/classWithBaseClassButNoConstructor.js index 44e5d39c376..e94a4700506 100644 --- a/tests/baselines/reference/classWithBaseClassButNoConstructor.js +++ b/tests/baselines/reference/classWithBaseClassButNoConstructor.js @@ -50,14 +50,14 @@ var Base = (function () { function Base(x) { } return Base; -})(); +}()); var C = (function (_super) { __extends(C, _super); function C() { _super.apply(this, arguments); } return C; -})(Base); +}(Base)); var r = C; var c = new C(); // error var c2 = new C(1); // ok @@ -65,14 +65,14 @@ var Base2 = (function () { function Base2(x) { } return Base2; -})(); +}()); var D = (function (_super) { __extends(D, _super); function D() { _super.apply(this, arguments); } return D; -})(Base2); +}(Base2)); var r2 = D; var d = new D(); // error var d2 = new D(1); // ok @@ -83,7 +83,7 @@ var D2 = (function (_super) { _super.apply(this, arguments); } return D2; -})(Base2); +}(Base2)); var r3 = D2; var d3 = new D(); // error var d4 = new D(1); // ok @@ -93,7 +93,7 @@ var D3 = (function (_super) { _super.apply(this, arguments); } return D3; -})(Base2); +}(Base2)); var r4 = D3; var d5 = new D(); // error var d6 = new D(1); // ok diff --git a/tests/baselines/reference/classWithConstructors.js b/tests/baselines/reference/classWithConstructors.js index a36db6ee745..04dcfa2325c 100644 --- a/tests/baselines/reference/classWithConstructors.js +++ b/tests/baselines/reference/classWithConstructors.js @@ -61,14 +61,14 @@ var NonGeneric; function C(x) { } return C; - })(); + }()); var c = new C(); // error var c2 = new C(''); // ok var C2 = (function () { function C2(x) { } return C2; - })(); + }()); var c3 = new C2(); // error var c4 = new C2(''); // ok var c5 = new C2(1); // ok @@ -78,7 +78,7 @@ var NonGeneric; _super.apply(this, arguments); } return D; - })(C2); + }(C2)); var d = new D(); // error var d2 = new D(1); // ok var d3 = new D(''); // ok @@ -89,14 +89,14 @@ var Generics; function C(x) { } return C; - })(); + }()); var c = new C(); // error var c2 = new C(''); // ok var C2 = (function () { function C2(x) { } return C2; - })(); + }()); var c3 = new C2(); // error var c4 = new C2(''); // ok var c5 = new C2(1, 2); // ok @@ -106,7 +106,7 @@ var Generics; _super.apply(this, arguments); } return D; - })(C2); + }(C2)); var d = new D(); // error var d2 = new D(1); // ok var d3 = new D(''); // ok diff --git a/tests/baselines/reference/classWithEmptyBody.js b/tests/baselines/reference/classWithEmptyBody.js index 16c50ccec77..73654afc07b 100644 --- a/tests/baselines/reference/classWithEmptyBody.js +++ b/tests/baselines/reference/classWithEmptyBody.js @@ -25,7 +25,7 @@ var C = (function () { function C() { } return C; -})(); +}()); var c; var o = c; c = 1; @@ -36,7 +36,7 @@ var D = (function () { return 1; } return D; -})(); +}()); var d; var o = d; d = 1; diff --git a/tests/baselines/reference/classWithMultipleBaseClasses.js b/tests/baselines/reference/classWithMultipleBaseClasses.js index 0e101d61dc9..4f1170f000e 100644 --- a/tests/baselines/reference/classWithMultipleBaseClasses.js +++ b/tests/baselines/reference/classWithMultipleBaseClasses.js @@ -30,17 +30,17 @@ var A = (function () { } A.prototype.foo = function () { }; return A; -})(); +}()); var B = (function () { function B() { } B.prototype.bar = function () { }; return B; -})(); +}()); var D = (function () { function D() { } D.prototype.baz = function () { }; D.prototype.bat = function () { }; return D; -})(); +}()); diff --git a/tests/baselines/reference/classWithNoConstructorOrBaseClass.js b/tests/baselines/reference/classWithNoConstructorOrBaseClass.js index 7898b3217fd..908c5c43532 100644 --- a/tests/baselines/reference/classWithNoConstructorOrBaseClass.js +++ b/tests/baselines/reference/classWithNoConstructorOrBaseClass.js @@ -21,14 +21,14 @@ var C = (function () { function C() { } return C; -})(); +}()); var c = new C(); var r = C; var D = (function () { function D() { } return D; -})(); +}()); var d = new D(); var d2 = new D(); var r2 = D; diff --git a/tests/baselines/reference/classWithOnlyPublicMembersEquivalentToInterface.js b/tests/baselines/reference/classWithOnlyPublicMembersEquivalentToInterface.js index 1c07449c994..c2942b8571f 100644 --- a/tests/baselines/reference/classWithOnlyPublicMembersEquivalentToInterface.js +++ b/tests/baselines/reference/classWithOnlyPublicMembersEquivalentToInterface.js @@ -38,7 +38,7 @@ var C = (function () { configurable: true }); return C; -})(); +}()); var c; var i; c = i; diff --git a/tests/baselines/reference/classWithOnlyPublicMembersEquivalentToInterface2.js b/tests/baselines/reference/classWithOnlyPublicMembersEquivalentToInterface2.js index 78e5cb05861..b97269527be 100644 --- a/tests/baselines/reference/classWithOnlyPublicMembersEquivalentToInterface2.js +++ b/tests/baselines/reference/classWithOnlyPublicMembersEquivalentToInterface2.js @@ -40,7 +40,7 @@ var C = (function () { configurable: true }); return C; -})(); +}()); var c; var i; c = i; diff --git a/tests/baselines/reference/classWithOptionalParameter.js b/tests/baselines/reference/classWithOptionalParameter.js index 2f11f15febe..53f6bcedd99 100644 --- a/tests/baselines/reference/classWithOptionalParameter.js +++ b/tests/baselines/reference/classWithOptionalParameter.js @@ -18,10 +18,10 @@ var C = (function () { } C.prototype.f = function () { }; return C; -})(); +}()); var C2 = (function () { function C2() { } C2.prototype.f = function (x) { }; return C2; -})(); +}()); diff --git a/tests/baselines/reference/classWithOverloadImplementationOfWrongName.js b/tests/baselines/reference/classWithOverloadImplementationOfWrongName.js index 4ac6548483e..1bc9f197450 100644 --- a/tests/baselines/reference/classWithOverloadImplementationOfWrongName.js +++ b/tests/baselines/reference/classWithOverloadImplementationOfWrongName.js @@ -11,4 +11,4 @@ var C = (function () { } C.prototype.bar = function (x) { }; return C; -})(); +}()); diff --git a/tests/baselines/reference/classWithOverloadImplementationOfWrongName2.js b/tests/baselines/reference/classWithOverloadImplementationOfWrongName2.js index fd28ae3d9eb..8e3d9eee62c 100644 --- a/tests/baselines/reference/classWithOverloadImplementationOfWrongName2.js +++ b/tests/baselines/reference/classWithOverloadImplementationOfWrongName2.js @@ -11,4 +11,4 @@ var C = (function () { } C.prototype.bar = function (x) { }; return C; -})(); +}()); diff --git a/tests/baselines/reference/classWithPredefinedTypesAsNames.js b/tests/baselines/reference/classWithPredefinedTypesAsNames.js index d7c458de41b..ed2677145fb 100644 --- a/tests/baselines/reference/classWithPredefinedTypesAsNames.js +++ b/tests/baselines/reference/classWithPredefinedTypesAsNames.js @@ -12,19 +12,19 @@ var any = (function () { function any() { } return any; -})(); +}()); var number = (function () { function number() { } return number; -})(); +}()); var boolean = (function () { function boolean() { } return boolean; -})(); +}()); var string = (function () { function string() { } return string; -})(); +}()); diff --git a/tests/baselines/reference/classWithPredefinedTypesAsNames2.js b/tests/baselines/reference/classWithPredefinedTypesAsNames2.js index 91ff735accc..3a788caff8b 100644 --- a/tests/baselines/reference/classWithPredefinedTypesAsNames2.js +++ b/tests/baselines/reference/classWithPredefinedTypesAsNames2.js @@ -9,5 +9,5 @@ var default_1 = (function () { function default_1() { } return default_1; -})(); +}()); void {}; diff --git a/tests/baselines/reference/classWithPrivateProperty.js b/tests/baselines/reference/classWithPrivateProperty.js index 0529fd8d694..6e75797523f 100644 --- a/tests/baselines/reference/classWithPrivateProperty.js +++ b/tests/baselines/reference/classWithPrivateProperty.js @@ -34,7 +34,7 @@ var C = (function () { C.f = function () { return ''; }; C.g = function () { return ''; }; return C; -})(); +}()); var c = new C(); var r1 = c.x; var r2 = c.a; diff --git a/tests/baselines/reference/classWithProtectedProperty.js b/tests/baselines/reference/classWithProtectedProperty.js index ec8a203d200..75eadaf4010 100644 --- a/tests/baselines/reference/classWithProtectedProperty.js +++ b/tests/baselines/reference/classWithProtectedProperty.js @@ -44,7 +44,7 @@ var C = (function () { C.f = function () { return ''; }; C.g = function () { return ''; }; return C; -})(); +}()); var D = (function (_super) { __extends(D, _super); function D() { @@ -63,4 +63,4 @@ var D = (function (_super) { var r8 = C.g(); }; return D; -})(C); +}(C)); diff --git a/tests/baselines/reference/classWithPublicProperty.js b/tests/baselines/reference/classWithPublicProperty.js index cc1b0aad64f..054713264bd 100644 --- a/tests/baselines/reference/classWithPublicProperty.js +++ b/tests/baselines/reference/classWithPublicProperty.js @@ -32,7 +32,7 @@ var C = (function () { C.f = function () { return ''; }; C.g = function () { return ''; }; return C; -})(); +}()); // all of these are valid var c = new C(); var r1 = c.x; diff --git a/tests/baselines/reference/classWithSemicolonClassElement1.js b/tests/baselines/reference/classWithSemicolonClassElement1.js index 3838316e113..8eb904ef786 100644 --- a/tests/baselines/reference/classWithSemicolonClassElement1.js +++ b/tests/baselines/reference/classWithSemicolonClassElement1.js @@ -9,4 +9,4 @@ var C = (function () { } ; return C; -})(); +}()); diff --git a/tests/baselines/reference/classWithSemicolonClassElement2.js b/tests/baselines/reference/classWithSemicolonClassElement2.js index 77af51bce60..22b6fa1075e 100644 --- a/tests/baselines/reference/classWithSemicolonClassElement2.js +++ b/tests/baselines/reference/classWithSemicolonClassElement2.js @@ -11,4 +11,4 @@ var C = (function () { ; ; return C; -})(); +}()); diff --git a/tests/baselines/reference/classWithStaticMembers.js b/tests/baselines/reference/classWithStaticMembers.js index 34928c37abd..327adead6b8 100644 --- a/tests/baselines/reference/classWithStaticMembers.js +++ b/tests/baselines/reference/classWithStaticMembers.js @@ -38,7 +38,7 @@ var C = (function () { configurable: true }); return C; -})(); +}()); var r = C.fn(); var r2 = r.x; var r3 = r.foo; @@ -48,7 +48,7 @@ var D = (function (_super) { _super.apply(this, arguments); } return D; -})(C); +}(C)); var r = D.fn(); var r2 = r.x; var r3 = r.foo; diff --git a/tests/baselines/reference/classWithTwoConstructorDefinitions.js b/tests/baselines/reference/classWithTwoConstructorDefinitions.js index 31e5498cfc9..397a7c82529 100644 --- a/tests/baselines/reference/classWithTwoConstructorDefinitions.js +++ b/tests/baselines/reference/classWithTwoConstructorDefinitions.js @@ -14,9 +14,9 @@ var C = (function () { function C() { } // error return C; -})(); +}()); var D = (function () { function D(x) { } // error return D; -})(); +}()); diff --git a/tests/baselines/reference/classWithoutExplicitConstructor.js b/tests/baselines/reference/classWithoutExplicitConstructor.js index fed448a2459..6b835eb35a0 100644 --- a/tests/baselines/reference/classWithoutExplicitConstructor.js +++ b/tests/baselines/reference/classWithoutExplicitConstructor.js @@ -22,7 +22,7 @@ var C = (function () { this.y = 'hello'; } return C; -})(); +}()); var c = new C(); var c2 = new C(null); // error var D = (function () { @@ -31,6 +31,6 @@ var D = (function () { this.y = null; } return D; -})(); +}()); var d = new D(); var d2 = new D(null); // error diff --git a/tests/baselines/reference/classdecl.js b/tests/baselines/reference/classdecl.js index b424243c164..710c5166d30 100644 --- a/tests/baselines/reference/classdecl.js +++ b/tests/baselines/reference/classdecl.js @@ -132,27 +132,27 @@ var a = (function () { return ns.toString(); }; return a; -})(); +}()); var b = (function (_super) { __extends(b, _super); function b() { _super.apply(this, arguments); } return b; -})(a); +}(a)); var m1; (function (m1) { var b = (function () { function b() { } return b; - })(); + }()); m1.b = b; var d = (function () { function d() { } return d; - })(); + }()); })(m1 || (m1 = {})); var m2; (function (m2) { @@ -164,13 +164,13 @@ var m2; _super.apply(this, arguments); } return c; - })(b); + }(b)); m3.c = c; var ib2 = (function () { function ib2() { } return ib2; - })(); + }()); m3.ib2 = ib2; })(m3 = m2.m3 || (m2.m3 = {})); })(m2 || (m2 = {})); @@ -180,12 +180,12 @@ var c = (function (_super) { _super.apply(this, arguments); } return c; -})(m1.b); +}(m1.b)); var ib2 = (function () { function ib2() { } return ib2; -})(); +}()); var d = (function () { function d() { } @@ -193,7 +193,7 @@ var d = (function () { return ns.toString(); }; return d; -})(); +}()); var e = (function () { function e() { } @@ -201,7 +201,7 @@ var e = (function () { return ns.toString(); }; return e; -})(); +}()); //// [classdecl.d.ts] diff --git a/tests/baselines/reference/clinterfaces.js b/tests/baselines/reference/clinterfaces.js index 26f4efde61c..ed3ea1f6523 100644 --- a/tests/baselines/reference/clinterfaces.js +++ b/tests/baselines/reference/clinterfaces.js @@ -33,21 +33,21 @@ var M; function C() { } return C; - })(); + }()); var D = (function () { function D() { } return D; - })(); + }()); })(M || (M = {})); var Foo = (function () { function Foo() { } return Foo; -})(); +}()); var Bar = (function () { function Bar() { } return Bar; -})(); +}()); module.exports = Foo; diff --git a/tests/baselines/reference/cloduleAcrossModuleDefinitions.js b/tests/baselines/reference/cloduleAcrossModuleDefinitions.js index c877de38a00..f0f31325aed 100644 --- a/tests/baselines/reference/cloduleAcrossModuleDefinitions.js +++ b/tests/baselines/reference/cloduleAcrossModuleDefinitions.js @@ -24,7 +24,7 @@ var A; B.prototype.foo = function () { }; B.bar = function () { }; return B; - })(); + }()); A.B = B; })(A || (A = {})); var A; diff --git a/tests/baselines/reference/cloduleAndTypeParameters.js b/tests/baselines/reference/cloduleAndTypeParameters.js index 28d89b59cf2..2d47ce1ef75 100644 --- a/tests/baselines/reference/cloduleAndTypeParameters.js +++ b/tests/baselines/reference/cloduleAndTypeParameters.js @@ -18,13 +18,13 @@ var Foo = (function () { function Foo() { } return Foo; -})(); +}()); var Foo; (function (Foo) { var Baz = (function () { function Baz() { } return Baz; - })(); + }()); Foo.Baz = Baz; })(Foo || (Foo = {})); diff --git a/tests/baselines/reference/cloduleSplitAcrossFiles.js b/tests/baselines/reference/cloduleSplitAcrossFiles.js index 6bc8cfddb6f..f509df7e9ce 100644 --- a/tests/baselines/reference/cloduleSplitAcrossFiles.js +++ b/tests/baselines/reference/cloduleSplitAcrossFiles.js @@ -14,7 +14,7 @@ var D = (function () { function D() { } return D; -})(); +}()); //// [cloduleSplitAcrossFiles_module.js] var D; (function (D) { diff --git a/tests/baselines/reference/cloduleStaticMembers.js b/tests/baselines/reference/cloduleStaticMembers.js index 518ef43fe40..6095442b629 100644 --- a/tests/baselines/reference/cloduleStaticMembers.js +++ b/tests/baselines/reference/cloduleStaticMembers.js @@ -19,7 +19,7 @@ var Clod = (function () { Clod.x = 10; Clod.y = 10; return Clod; -})(); +}()); var Clod; (function (Clod) { var p = Clod.x; diff --git a/tests/baselines/reference/cloduleWithDuplicateMember1.js b/tests/baselines/reference/cloduleWithDuplicateMember1.js index e3cb8f83fed..6f4a2809b8e 100644 --- a/tests/baselines/reference/cloduleWithDuplicateMember1.js +++ b/tests/baselines/reference/cloduleWithDuplicateMember1.js @@ -33,7 +33,7 @@ var C = (function () { }); C.foo = function () { }; return C; -})(); +}()); var C; (function (C) { C.x = 1; diff --git a/tests/baselines/reference/cloduleWithDuplicateMember2.js b/tests/baselines/reference/cloduleWithDuplicateMember2.js index c16c6c9af8a..f0e8af0e3d2 100644 --- a/tests/baselines/reference/cloduleWithDuplicateMember2.js +++ b/tests/baselines/reference/cloduleWithDuplicateMember2.js @@ -26,7 +26,7 @@ var C = (function () { configurable: true }); return C; -})(); +}()); var C; (function (C) { C.x = 1; diff --git a/tests/baselines/reference/cloduleWithPriorInstantiatedModule.js b/tests/baselines/reference/cloduleWithPriorInstantiatedModule.js index 601ab0a7536..00040923627 100644 --- a/tests/baselines/reference/cloduleWithPriorInstantiatedModule.js +++ b/tests/baselines/reference/cloduleWithPriorInstantiatedModule.js @@ -26,7 +26,7 @@ var Moclodule = (function () { function Moclodule() { } return Moclodule; -})(); +}()); // Instantiated module. var Moclodule; (function (Moclodule) { @@ -34,6 +34,6 @@ var Moclodule; function Manager() { } return Manager; - })(); + }()); Moclodule.Manager = Manager; })(Moclodule || (Moclodule = {})); diff --git a/tests/baselines/reference/cloduleWithPriorUninstantiatedModule.js b/tests/baselines/reference/cloduleWithPriorUninstantiatedModule.js index cf06f1134fb..ba29858c5dd 100644 --- a/tests/baselines/reference/cloduleWithPriorUninstantiatedModule.js +++ b/tests/baselines/reference/cloduleWithPriorUninstantiatedModule.js @@ -20,7 +20,7 @@ var Moclodule = (function () { function Moclodule() { } return Moclodule; -})(); +}()); // Instantiated module. var Moclodule; (function (Moclodule) { @@ -28,6 +28,6 @@ var Moclodule; function Manager() { } return Manager; - })(); + }()); Moclodule.Manager = Manager; })(Moclodule || (Moclodule = {})); diff --git a/tests/baselines/reference/cloduleWithRecursiveReference.js b/tests/baselines/reference/cloduleWithRecursiveReference.js index 1a688712270..d07af909cc7 100644 --- a/tests/baselines/reference/cloduleWithRecursiveReference.js +++ b/tests/baselines/reference/cloduleWithRecursiveReference.js @@ -14,7 +14,7 @@ var M; function C() { } return C; - })(); + }()); M.C = C; var C; (function (C_1) { diff --git a/tests/baselines/reference/clodulesDerivedClasses.js b/tests/baselines/reference/clodulesDerivedClasses.js index 652b3f7bac6..7e6f26ad591 100644 --- a/tests/baselines/reference/clodulesDerivedClasses.js +++ b/tests/baselines/reference/clodulesDerivedClasses.js @@ -32,7 +32,7 @@ var Shape = (function () { function Shape() { } return Shape; -})(); +}()); var Shape; (function (Shape) { var Utils; @@ -47,7 +47,7 @@ var Path = (function (_super) { _super.apply(this, arguments); } return Path; -})(Shape); +}(Shape)); var Path; (function (Path) { var Utils; diff --git a/tests/baselines/reference/collisionArgumentsClassConstructor.js b/tests/baselines/reference/collisionArgumentsClassConstructor.js index ca743777b39..570b10d39d3 100644 --- a/tests/baselines/reference/collisionArgumentsClassConstructor.js +++ b/tests/baselines/reference/collisionArgumentsClassConstructor.js @@ -97,7 +97,7 @@ var c1 = (function () { var arguments; // no error } return c1; -})(); +}()); var c12 = (function () { function c12(arguments) { var rest = []; @@ -107,13 +107,13 @@ var c12 = (function () { var arguments = 10; // no error } return c12; -})(); +}()); var c1NoError = (function () { function c1NoError(arguments) { var arguments = 10; // no error } return c1NoError; -})(); +}()); var c2 = (function () { function c2() { var restParameters = []; @@ -123,13 +123,13 @@ var c2 = (function () { var arguments = 10; // no error } return c2; -})(); +}()); var c2NoError = (function () { function c2NoError() { var arguments = 10; // no error } return c2NoError; -})(); +}()); var c3 = (function () { function c3(arguments) { var restParameters = []; @@ -140,14 +140,14 @@ var c3 = (function () { var arguments = 10; // no error } return c3; -})(); +}()); var c3NoError = (function () { function c3NoError(arguments) { this.arguments = arguments; var arguments = 10; // no error } return c3NoError; -})(); +}()); var c5 = (function () { function c5(i) { var arguments = []; @@ -157,7 +157,7 @@ var c5 = (function () { var arguments; // no error } return c5; -})(); +}()); var c52 = (function () { function c52(arguments) { var rest = []; @@ -167,10 +167,10 @@ var c52 = (function () { var arguments; // no error } return c52; -})(); +}()); var c5NoError = (function () { function c5NoError(arguments) { var arguments; // no error } return c5NoError; -})(); +}()); diff --git a/tests/baselines/reference/collisionArgumentsClassMethod.js b/tests/baselines/reference/collisionArgumentsClassMethod.js index 10c9b288544..a20e0385e6a 100644 --- a/tests/baselines/reference/collisionArgumentsClassMethod.js +++ b/tests/baselines/reference/collisionArgumentsClassMethod.js @@ -87,7 +87,7 @@ var c1 = (function () { var arguments; // no error }; return c1; -})(); +}()); var c3 = (function () { function c3() { } @@ -102,4 +102,4 @@ var c3 = (function () { var arguments = 10; // no error }; return c3; -})(); +}()); diff --git a/tests/baselines/reference/collisionCodeGenModuleWithAccessorChildren.js b/tests/baselines/reference/collisionCodeGenModuleWithAccessorChildren.js index 8152a9c2721..fd502b32ccf 100644 --- a/tests/baselines/reference/collisionCodeGenModuleWithAccessorChildren.js +++ b/tests/baselines/reference/collisionCodeGenModuleWithAccessorChildren.js @@ -60,7 +60,7 @@ var M; configurable: true }); return c; - })(); + }()); })(M || (M = {})); var M; (function (M_2) { @@ -76,7 +76,7 @@ var M; configurable: true }); return d; - })(); + }()); })(M || (M = {})); var M; (function (M) { @@ -91,7 +91,7 @@ var M; configurable: true }); return e; - })(); + }()); })(M || (M = {})); var M; (function (M_3) { @@ -107,7 +107,7 @@ var M; configurable: true }); return f; - })(); + }()); })(M || (M = {})); var M; (function (M) { @@ -122,5 +122,5 @@ var M; configurable: true }); return e; - })(); + }()); })(M || (M = {})); diff --git a/tests/baselines/reference/collisionCodeGenModuleWithConstructorChildren.js b/tests/baselines/reference/collisionCodeGenModuleWithConstructorChildren.js index 2aa705c9141..24332a84797 100644 --- a/tests/baselines/reference/collisionCodeGenModuleWithConstructorChildren.js +++ b/tests/baselines/reference/collisionCodeGenModuleWithConstructorChildren.js @@ -32,7 +32,7 @@ var M; if (p === void 0) { p = M_1.x; } } return c; - })(); + }()); })(M || (M = {})); var M; (function (M_2) { @@ -42,7 +42,7 @@ var M; this.M = M; } return d; - })(); + }()); })(M || (M = {})); var M; (function (M_3) { @@ -52,5 +52,5 @@ var M; var p = M_3.x; } return d2; - })(); + }()); })(M || (M = {})); diff --git a/tests/baselines/reference/collisionCodeGenModuleWithMemberClassConflict.js b/tests/baselines/reference/collisionCodeGenModuleWithMemberClassConflict.js index 05ae475e7d2..cf0fd765e56 100644 --- a/tests/baselines/reference/collisionCodeGenModuleWithMemberClassConflict.js +++ b/tests/baselines/reference/collisionCodeGenModuleWithMemberClassConflict.js @@ -22,7 +22,7 @@ var m1; function m1() { } return m1; - })(); + }()); m1_1.m1 = m1; })(m1 || (m1 = {})); var foo = new m1.m1(); @@ -32,13 +32,13 @@ var m2; function m2() { } return m2; - })(); + }()); m2_1.m2 = m2; var _m2 = (function () { function _m2() { } return _m2; - })(); + }()); m2_1._m2 = _m2; })(m2 || (m2 = {})); var foo = new m2.m2(); diff --git a/tests/baselines/reference/collisionCodeGenModuleWithMemberInterfaceConflict.js b/tests/baselines/reference/collisionCodeGenModuleWithMemberInterfaceConflict.js index d511a86d1fe..594a8dc2295 100644 --- a/tests/baselines/reference/collisionCodeGenModuleWithMemberInterfaceConflict.js +++ b/tests/baselines/reference/collisionCodeGenModuleWithMemberInterfaceConflict.js @@ -14,7 +14,7 @@ var m1; function m2() { } return m2; - })(); + }()); m1.m2 = m2; })(m1 || (m1 = {})); var foo = new m1.m2(); diff --git a/tests/baselines/reference/collisionCodeGenModuleWithMethodChildren.js b/tests/baselines/reference/collisionCodeGenModuleWithMethodChildren.js index 53807f1cabd..a42b6502483 100644 --- a/tests/baselines/reference/collisionCodeGenModuleWithMethodChildren.js +++ b/tests/baselines/reference/collisionCodeGenModuleWithMethodChildren.js @@ -43,7 +43,7 @@ var M; if (p === void 0) { p = M_1.x; } }; return c; - })(); + }()); })(M || (M = {})); var M; (function (M_2) { @@ -55,7 +55,7 @@ var M; var p = M_2.x; }; return d; - })(); + }()); })(M || (M = {})); var M; (function (M_3) { @@ -68,7 +68,7 @@ var M; } }; return e; - })(); + }()); })(M || (M = {})); var M; (function (M) { @@ -78,5 +78,5 @@ var M; f.prototype.M = function () { }; return f; - })(); + }()); })(M || (M = {})); diff --git a/tests/baselines/reference/collisionCodeGenModuleWithModuleChildren.js b/tests/baselines/reference/collisionCodeGenModuleWithModuleChildren.js index 2862a844067..6726d32d77d 100644 --- a/tests/baselines/reference/collisionCodeGenModuleWithModuleChildren.js +++ b/tests/baselines/reference/collisionCodeGenModuleWithModuleChildren.js @@ -60,7 +60,7 @@ var M; function M() { } return M; - })(); + }()); var p = M_2.x; var p2 = new M(); })(m2 || (m2 = {})); diff --git a/tests/baselines/reference/collisionCodeGenModuleWithModuleReopening.js b/tests/baselines/reference/collisionCodeGenModuleWithModuleReopening.js index 710c09e4558..eed1095cdc3 100644 --- a/tests/baselines/reference/collisionCodeGenModuleWithModuleReopening.js +++ b/tests/baselines/reference/collisionCodeGenModuleWithModuleReopening.js @@ -36,7 +36,7 @@ var m1; function m1() { } return m1; - })(); + }()); m1_1.m1 = m1; })(m1 || (m1 = {})); var foo = new m1.m1(); @@ -46,7 +46,7 @@ var m1; function c1() { } return c1; - })(); + }()); m1.c1 = c1; var b = new c1(); var c = new m1.m1(); @@ -58,7 +58,7 @@ var m2; function c1() { } return c1; - })(); + }()); m2.c1 = c1; m2.b10 = 10; var x = new c1(); @@ -70,7 +70,7 @@ var m2; function m2() { } return m2; - })(); + }()); m2_1.m2 = m2; var b = new m2(); var d = m2_1.b10; diff --git a/tests/baselines/reference/collisionCodeGenModuleWithPrivateMember.js b/tests/baselines/reference/collisionCodeGenModuleWithPrivateMember.js index 4b4d6aa7afb..ca9420197fb 100644 --- a/tests/baselines/reference/collisionCodeGenModuleWithPrivateMember.js +++ b/tests/baselines/reference/collisionCodeGenModuleWithPrivateMember.js @@ -15,13 +15,13 @@ var m1; function m1() { } return m1; - })(); + }()); var x = new m1(); var c1 = (function () { function c1() { } return c1; - })(); + }()); m1_1.c1 = c1; })(m1 || (m1 = {})); var foo = new m1.c1(); diff --git a/tests/baselines/reference/collisionCodeGenModuleWithUnicodeNames.js b/tests/baselines/reference/collisionCodeGenModuleWithUnicodeNames.js index 3204a05bc75..50eff733912 100644 --- a/tests/baselines/reference/collisionCodeGenModuleWithUnicodeNames.js +++ b/tests/baselines/reference/collisionCodeGenModuleWithUnicodeNames.js @@ -16,7 +16,7 @@ var 才能ソЫⅨ蒤郳र्क्ड्राüışğİliيونيكودöÄü function 才能ソЫⅨ蒤郳र्क्ड्राüışğİliيونيكودöÄüß才能ソЫⅨ蒤郳र्क्ड्राüışğİliيونيكودöÄüßAbcd123() { } return 才能ソЫⅨ蒤郳र्क्ड्राüışğİliيونيكودöÄüß才能ソЫⅨ蒤郳र्क्ड्राüışğİliيونيكودöÄüßAbcd123; - })(); + }()); 才能ソЫⅨ蒤郳र्क्ड्राüışğİliيونيكودöÄüß才能ソЫⅨ蒤郳र्क्ड्राüışğİliيونيكودöÄüßAbcd123_1.才能ソЫⅨ蒤郳र्क्ड्राüışğİliيونيكودöÄüß才能ソЫⅨ蒤郳र्क्ड्राüışğİliيونيكودöÄüßAbcd123 = 才能ソЫⅨ蒤郳र्क्ड्राüışğİliيونيكودöÄüß才能ソЫⅨ蒤郳र्क्ड्राüışğİliيونيكودöÄüßAbcd123; })(才能ソЫⅨ蒤郳र्क्ड्राüışğİliيونيكودöÄüß才能ソЫⅨ蒤郳र्क्ड्राüışğİliيونيكودöÄüßAbcd123 || (才能ソЫⅨ蒤郳र्क्ड्राüışğİliيونيكودöÄüß才能ソЫⅨ蒤郳र्क्ड्राüışğİliيونيكودöÄüßAbcd123 = {})); var x = new 才能ソЫⅨ蒤郳र्क्ड्राüışğİliيونيكودöÄüß才能ソЫⅨ蒤郳र्क्ड्राüışğİliيونيكودöÄüßAbcd123.才能ソЫⅨ蒤郳र्क्ड्राüışğİliيونيكودöÄüß才能ソЫⅨ蒤郳र्क्ड्राüışğİliيونيكودöÄüßAbcd123(); diff --git a/tests/baselines/reference/collisionExportsRequireAndClass.js b/tests/baselines/reference/collisionExportsRequireAndClass.js index b993f9a23c5..962df0344ed 100644 --- a/tests/baselines/reference/collisionExportsRequireAndClass.js +++ b/tests/baselines/reference/collisionExportsRequireAndClass.js @@ -43,13 +43,13 @@ define(["require", "exports"], function (require, exports) { function require() { } return require; - })(); + }()); exports.require = require; var exports = (function () { function exports() { } return exports; - })(); + }()); exports.exports = exports; var m1; (function (m1) { @@ -57,12 +57,12 @@ define(["require", "exports"], function (require, exports) { function require() { } return require; - })(); + }()); var exports = (function () { function exports() { } return exports; - })(); + }()); })(m1 || (m1 = {})); var m2; (function (m2) { @@ -70,13 +70,13 @@ define(["require", "exports"], function (require, exports) { function require() { } return require; - })(); + }()); m2.require = require; var exports = (function () { function exports() { } return exports; - })(); + }()); m2.exports = exports; })(m2 || (m2 = {})); }); @@ -85,24 +85,24 @@ var require = (function () { function require() { } return require; -})(); +}()); var exports = (function () { function exports() { } return exports; -})(); +}()); var m3; (function (m3) { var require = (function () { function require() { } return require; - })(); + }()); var exports = (function () { function exports() { } return exports; - })(); + }()); })(m3 || (m3 = {})); var m4; (function (m4) { @@ -110,12 +110,12 @@ var m4; function require() { } return require; - })(); + }()); m4.require = require; var exports = (function () { function exports() { } return exports; - })(); + }()); m4.exports = exports; })(m4 || (m4 = {})); diff --git a/tests/baselines/reference/collisionExportsRequireAndInternalModuleAlias.js b/tests/baselines/reference/collisionExportsRequireAndInternalModuleAlias.js index 71432241b00..1842e415d88 100644 --- a/tests/baselines/reference/collisionExportsRequireAndInternalModuleAlias.js +++ b/tests/baselines/reference/collisionExportsRequireAndInternalModuleAlias.js @@ -31,7 +31,7 @@ define(["require", "exports"], function (require, exports) { function c() { } return c; - })(); + }()); m.c = c; })(m = exports.m || (exports.m = {})); var exports = m.c; diff --git a/tests/baselines/reference/collisionExportsRequireAndInternalModuleAliasInGlobalFile.js b/tests/baselines/reference/collisionExportsRequireAndInternalModuleAliasInGlobalFile.js index c6a6e234ee9..b90d2236601 100644 --- a/tests/baselines/reference/collisionExportsRequireAndInternalModuleAliasInGlobalFile.js +++ b/tests/baselines/reference/collisionExportsRequireAndInternalModuleAliasInGlobalFile.js @@ -29,7 +29,7 @@ var mOfGloalFile; function c() { } return c; - })(); + }()); mOfGloalFile.c = c; })(mOfGloalFile || (mOfGloalFile = {})); var exports = mOfGloalFile.c; diff --git a/tests/baselines/reference/collisionExportsRequireAndModule.js b/tests/baselines/reference/collisionExportsRequireAndModule.js index 3c31c944370..b29364aebe3 100644 --- a/tests/baselines/reference/collisionExportsRequireAndModule.js +++ b/tests/baselines/reference/collisionExportsRequireAndModule.js @@ -100,7 +100,7 @@ define(["require", "exports"], function (require, exports) { function C() { } return C; - })(); + }()); require.C = C; })(require = exports.require || (exports.require = {})); function foo() { @@ -113,7 +113,7 @@ define(["require", "exports"], function (require, exports) { function C() { } return C; - })(); + }()); exports.C = C; })(exports = exports.exports || (exports.exports = {})); function foo2() { @@ -128,7 +128,7 @@ define(["require", "exports"], function (require, exports) { function C() { } return C; - })(); + }()); require.C = C; })(require || (require = {})); var exports; @@ -137,7 +137,7 @@ define(["require", "exports"], function (require, exports) { function C() { } return C; - })(); + }()); exports.C = C; })(exports || (exports = {})); })(m1 || (m1 = {})); @@ -149,7 +149,7 @@ define(["require", "exports"], function (require, exports) { function C() { } return C; - })(); + }()); require.C = C; })(require = m2.require || (m2.require = {})); var exports; @@ -158,7 +158,7 @@ define(["require", "exports"], function (require, exports) { function C() { } return C; - })(); + }()); exports.C = C; })(exports = m2.exports || (m2.exports = {})); })(m2 || (m2 = {})); @@ -170,7 +170,7 @@ var require; function C() { } return C; - })(); + }()); require.C = C; })(require || (require = {})); var exports; @@ -179,7 +179,7 @@ var exports; function C() { } return C; - })(); + }()); exports.C = C; })(exports || (exports = {})); var m3; @@ -190,7 +190,7 @@ var m3; function C() { } return C; - })(); + }()); require.C = C; })(require || (require = {})); var exports; @@ -199,7 +199,7 @@ var m3; function C() { } return C; - })(); + }()); exports.C = C; })(exports || (exports = {})); })(m3 || (m3 = {})); @@ -211,7 +211,7 @@ var m4; function C() { } return C; - })(); + }()); require.C = C; })(require = m4.require || (m4.require = {})); var exports; @@ -220,7 +220,7 @@ var m4; function C() { } return C; - })(); + }()); exports.C = C; })(exports = m4.exports || (m4.exports = {})); })(m4 || (m4 = {})); diff --git a/tests/baselines/reference/collisionRestParameterClassConstructor.js b/tests/baselines/reference/collisionRestParameterClassConstructor.js index fc6e400668c..82d2ddc0896 100644 --- a/tests/baselines/reference/collisionRestParameterClassConstructor.js +++ b/tests/baselines/reference/collisionRestParameterClassConstructor.js @@ -77,13 +77,13 @@ var c1 = (function () { var _i = 10; // no error } return c1; -})(); +}()); var c1NoError = (function () { function c1NoError(_i) { var _i = 10; // no error } return c1NoError; -})(); +}()); var c2 = (function () { function c2() { var restParameters = []; @@ -93,13 +93,13 @@ var c2 = (function () { var _i = 10; // no error } return c2; -})(); +}()); var c2NoError = (function () { function c2NoError() { var _i = 10; // no error } return c2NoError; -})(); +}()); var c3 = (function () { function c3(_i) { var restParameters = []; @@ -110,14 +110,14 @@ var c3 = (function () { var _i = 10; // no error } return c3; -})(); +}()); var c3NoError = (function () { function c3NoError(_i) { this._i = _i; var _i = 10; // no error } return c3NoError; -})(); +}()); var c5 = (function () { function c5(_i) { var rest = []; @@ -127,10 +127,10 @@ var c5 = (function () { var _i; // no error } return c5; -})(); +}()); var c5NoError = (function () { function c5NoError(_i) { var _i; // no error } return c5NoError; -})(); +}()); diff --git a/tests/baselines/reference/collisionRestParameterClassMethod.js b/tests/baselines/reference/collisionRestParameterClassMethod.js index e3471c85f1c..eb92faa7b2a 100644 --- a/tests/baselines/reference/collisionRestParameterClassMethod.js +++ b/tests/baselines/reference/collisionRestParameterClassMethod.js @@ -63,7 +63,7 @@ var c1 = (function () { var _i; // no error }; return c1; -})(); +}()); var c3 = (function () { function c3() { } @@ -78,4 +78,4 @@ var c3 = (function () { var _i = 10; // no error }; return c3; -})(); +}()); diff --git a/tests/baselines/reference/collisionRestParameterUnderscoreIUsage.js b/tests/baselines/reference/collisionRestParameterUnderscoreIUsage.js index adc9c09de27..97e82a1523f 100644 --- a/tests/baselines/reference/collisionRestParameterUnderscoreIUsage.js +++ b/tests/baselines/reference/collisionRestParameterUnderscoreIUsage.js @@ -19,5 +19,5 @@ var Foo = (function () { console.log(_i); // This should result in error } return Foo; -})(); +}()); new Foo(); diff --git a/tests/baselines/reference/collisionSuperAndLocalFunctionInAccessors.js b/tests/baselines/reference/collisionSuperAndLocalFunctionInAccessors.js index 731f3d4f064..fc64a8012ee 100644 --- a/tests/baselines/reference/collisionSuperAndLocalFunctionInAccessors.js +++ b/tests/baselines/reference/collisionSuperAndLocalFunctionInAccessors.js @@ -64,7 +64,7 @@ var Foo = (function () { configurable: true }); return Foo; -})(); +}()); var b = (function (_super) { __extends(b, _super); function b() { @@ -84,7 +84,7 @@ var b = (function (_super) { configurable: true }); return b; -})(Foo); +}(Foo)); var c = (function (_super) { __extends(c, _super); function c() { @@ -108,4 +108,4 @@ var c = (function (_super) { configurable: true }); return c; -})(Foo); +}(Foo)); diff --git a/tests/baselines/reference/collisionSuperAndLocalFunctionInConstructor.js b/tests/baselines/reference/collisionSuperAndLocalFunctionInConstructor.js index 06acaa0e02a..b6e7cb121d6 100644 --- a/tests/baselines/reference/collisionSuperAndLocalFunctionInConstructor.js +++ b/tests/baselines/reference/collisionSuperAndLocalFunctionInConstructor.js @@ -38,7 +38,7 @@ var Foo = (function () { } } return Foo; -})(); +}()); var b = (function (_super) { __extends(b, _super); function b() { @@ -47,7 +47,7 @@ var b = (function (_super) { } } return b; -})(Foo); +}(Foo)); var c = (function (_super) { __extends(c, _super); function c() { @@ -58,4 +58,4 @@ var c = (function (_super) { }; } return c; -})(Foo); +}(Foo)); diff --git a/tests/baselines/reference/collisionSuperAndLocalFunctionInMethod.js b/tests/baselines/reference/collisionSuperAndLocalFunctionInMethod.js index 6702ba8ac3d..14b8bf46697 100644 --- a/tests/baselines/reference/collisionSuperAndLocalFunctionInMethod.js +++ b/tests/baselines/reference/collisionSuperAndLocalFunctionInMethod.js @@ -46,7 +46,7 @@ var Foo = (function () { Foo.prototype._super = function () { }; return Foo; -})(); +}()); var b = (function (_super) { __extends(b, _super); function b() { @@ -59,7 +59,7 @@ var b = (function (_super) { b.prototype._super = function () { }; return b; -})(Foo); +}(Foo)); var c = (function (_super) { __extends(c, _super); function c() { @@ -74,4 +74,4 @@ var c = (function (_super) { c.prototype._super = function () { }; return c; -})(Foo); +}(Foo)); diff --git a/tests/baselines/reference/collisionSuperAndLocalFunctionInProperty.js b/tests/baselines/reference/collisionSuperAndLocalFunctionInProperty.js index 8d13eed617b..2af7a6a870e 100644 --- a/tests/baselines/reference/collisionSuperAndLocalFunctionInProperty.js +++ b/tests/baselines/reference/collisionSuperAndLocalFunctionInProperty.js @@ -36,7 +36,7 @@ var Foo = (function () { }; } return Foo; -})(); +}()); var b = (function (_super) { __extends(b, _super); function b() { @@ -49,4 +49,4 @@ var b = (function (_super) { }; } return b; -})(Foo); +}(Foo)); diff --git a/tests/baselines/reference/collisionSuperAndLocalVarInAccessors.js b/tests/baselines/reference/collisionSuperAndLocalVarInAccessors.js index 12685727795..6887a22ae20 100644 --- a/tests/baselines/reference/collisionSuperAndLocalVarInAccessors.js +++ b/tests/baselines/reference/collisionSuperAndLocalVarInAccessors.js @@ -54,7 +54,7 @@ var Foo = (function () { configurable: true }); return Foo; -})(); +}()); var b = (function (_super) { __extends(b, _super); function b() { @@ -72,7 +72,7 @@ var b = (function (_super) { configurable: true }); return b; -})(Foo); +}(Foo)); var c = (function (_super) { __extends(c, _super); function c() { @@ -94,4 +94,4 @@ var c = (function (_super) { configurable: true }); return c; -})(Foo); +}(Foo)); diff --git a/tests/baselines/reference/collisionSuperAndLocalVarInConstructor.js b/tests/baselines/reference/collisionSuperAndLocalVarInConstructor.js index 6f543492898..d3b5e7a2030 100644 --- a/tests/baselines/reference/collisionSuperAndLocalVarInConstructor.js +++ b/tests/baselines/reference/collisionSuperAndLocalVarInConstructor.js @@ -32,7 +32,7 @@ var Foo = (function () { var _super = 10; // No error } return Foo; -})(); +}()); var b = (function (_super) { __extends(b, _super); function b() { @@ -40,7 +40,7 @@ var b = (function (_super) { var _super = 10; // Should be error } return b; -})(Foo); +}(Foo)); var c = (function (_super) { __extends(c, _super); function c() { @@ -50,4 +50,4 @@ var c = (function (_super) { }; } return c; -})(Foo); +}(Foo)); diff --git a/tests/baselines/reference/collisionSuperAndLocalVarInMethod.js b/tests/baselines/reference/collisionSuperAndLocalVarInMethod.js index 373ee270014..4553608756d 100644 --- a/tests/baselines/reference/collisionSuperAndLocalVarInMethod.js +++ b/tests/baselines/reference/collisionSuperAndLocalVarInMethod.js @@ -32,7 +32,7 @@ var Foo = (function () { var _super = 10; // No error }; return Foo; -})(); +}()); var b = (function (_super) { __extends(b, _super); function b() { @@ -42,7 +42,7 @@ var b = (function (_super) { var _super = 10; // Should be error }; return b; -})(Foo); +}(Foo)); var c = (function (_super) { __extends(c, _super); function c() { @@ -54,4 +54,4 @@ var c = (function (_super) { }; }; return c; -})(Foo); +}(Foo)); diff --git a/tests/baselines/reference/collisionSuperAndLocalVarInProperty.js b/tests/baselines/reference/collisionSuperAndLocalVarInProperty.js index 7ba9b407858..df5d812cf54 100644 --- a/tests/baselines/reference/collisionSuperAndLocalVarInProperty.js +++ b/tests/baselines/reference/collisionSuperAndLocalVarInProperty.js @@ -34,7 +34,7 @@ var Foo = (function () { this._super = 10; // No error } return Foo; -})(); +}()); var b = (function (_super) { __extends(b, _super); function b() { @@ -47,4 +47,4 @@ var b = (function (_super) { this._super = 10; // No error } return b; -})(Foo); +}(Foo)); diff --git a/tests/baselines/reference/collisionSuperAndNameResolution.js b/tests/baselines/reference/collisionSuperAndNameResolution.js index 5cddcc01845..2db90d8b026 100644 --- a/tests/baselines/reference/collisionSuperAndNameResolution.js +++ b/tests/baselines/reference/collisionSuperAndNameResolution.js @@ -23,7 +23,7 @@ var base = (function () { function base() { } return base; -})(); +}()); var Foo = (function (_super) { __extends(Foo, _super); function Foo() { @@ -33,4 +33,4 @@ var Foo = (function (_super) { console.log(_super); // Error as this doesnt not resolve to user defined _super }; return Foo; -})(base); +}(base)); diff --git a/tests/baselines/reference/collisionSuperAndParameter.js b/tests/baselines/reference/collisionSuperAndParameter.js index 965887d6d1b..29b5ad3b496 100644 --- a/tests/baselines/reference/collisionSuperAndParameter.js +++ b/tests/baselines/reference/collisionSuperAndParameter.js @@ -90,7 +90,7 @@ var Foo = (function () { configurable: true }); return Foo; -})(); +}()); var Foo2 = (function (_super) { __extends(Foo2, _super); function Foo2(_super) { @@ -119,7 +119,7 @@ var Foo2 = (function (_super) { configurable: true }); return Foo2; -})(Foo); +}(Foo)); var Foo4 = (function (_super) { __extends(Foo4, _super); function Foo4(_super) { @@ -132,4 +132,4 @@ var Foo4 = (function (_super) { }; }; return Foo4; -})(Foo); +}(Foo)); diff --git a/tests/baselines/reference/collisionSuperAndParameter1.js b/tests/baselines/reference/collisionSuperAndParameter1.js index f6d1f23947d..517c126ab44 100644 --- a/tests/baselines/reference/collisionSuperAndParameter1.js +++ b/tests/baselines/reference/collisionSuperAndParameter1.js @@ -19,7 +19,7 @@ var Foo = (function () { function Foo() { } return Foo; -})(); +}()); var Foo2 = (function (_super) { __extends(Foo2, _super); function Foo2() { @@ -30,4 +30,4 @@ var Foo2 = (function (_super) { }; }; return Foo2; -})(Foo); +}(Foo)); diff --git a/tests/baselines/reference/collisionSuperAndPropertyNameAsConstuctorParameter.js b/tests/baselines/reference/collisionSuperAndPropertyNameAsConstuctorParameter.js index f54bbef28a8..f94a9fde5f2 100644 --- a/tests/baselines/reference/collisionSuperAndPropertyNameAsConstuctorParameter.js +++ b/tests/baselines/reference/collisionSuperAndPropertyNameAsConstuctorParameter.js @@ -40,14 +40,14 @@ var a = (function () { function a() { } return a; -})(); +}()); var b1 = (function (_super) { __extends(b1, _super); function b1(_super) { _super.call(this); } return b1; -})(a); +}(a)); var b2 = (function (_super) { __extends(b2, _super); function b2(_super) { @@ -55,14 +55,14 @@ var b2 = (function (_super) { this._super = _super; } return b2; -})(a); +}(a)); var b3 = (function (_super) { __extends(b3, _super); function b3(_super) { _super.call(this); } return b3; -})(a); +}(a)); var b4 = (function (_super) { __extends(b4, _super); function b4(_super) { @@ -70,4 +70,4 @@ var b4 = (function (_super) { this._super = _super; } return b4; -})(a); +}(a)); diff --git a/tests/baselines/reference/collisionThisExpressionAndClassInGlobal.js b/tests/baselines/reference/collisionThisExpressionAndClassInGlobal.js index ccaa335d80e..09dcee3caad 100644 --- a/tests/baselines/reference/collisionThisExpressionAndClassInGlobal.js +++ b/tests/baselines/reference/collisionThisExpressionAndClassInGlobal.js @@ -9,5 +9,5 @@ var _this = (function () { function _this() { } return _this; -})(); +}()); var f = function () { return _this; }; diff --git a/tests/baselines/reference/collisionThisExpressionAndLocalVarInAccessors.js b/tests/baselines/reference/collisionThisExpressionAndLocalVarInAccessors.js index 53df2984544..e2f22cdf3e6 100644 --- a/tests/baselines/reference/collisionThisExpressionAndLocalVarInAccessors.js +++ b/tests/baselines/reference/collisionThisExpressionAndLocalVarInAccessors.js @@ -71,7 +71,7 @@ var class1 = (function () { configurable: true }); return class1; -})(); +}()); var class2 = (function () { function class2() { } @@ -99,4 +99,4 @@ var class2 = (function () { configurable: true }); return class2; -})(); +}()); diff --git a/tests/baselines/reference/collisionThisExpressionAndLocalVarInConstructor.js b/tests/baselines/reference/collisionThisExpressionAndLocalVarInConstructor.js index d0ed79da530..e4027499988 100644 --- a/tests/baselines/reference/collisionThisExpressionAndLocalVarInConstructor.js +++ b/tests/baselines/reference/collisionThisExpressionAndLocalVarInConstructor.js @@ -33,7 +33,7 @@ var class1 = (function () { }; } return class1; -})(); +}()); var class2 = (function () { function class2() { var _this = this; @@ -45,4 +45,4 @@ var class2 = (function () { }; } return class2; -})(); +}()); diff --git a/tests/baselines/reference/collisionThisExpressionAndLocalVarInMethod.js b/tests/baselines/reference/collisionThisExpressionAndLocalVarInMethod.js index 63b536bd8b6..7c71fd79ade 100644 --- a/tests/baselines/reference/collisionThisExpressionAndLocalVarInMethod.js +++ b/tests/baselines/reference/collisionThisExpressionAndLocalVarInMethod.js @@ -41,4 +41,4 @@ var a = (function () { }; }; return a; -})(); +}()); diff --git a/tests/baselines/reference/collisionThisExpressionAndLocalVarInProperty.js b/tests/baselines/reference/collisionThisExpressionAndLocalVarInProperty.js index 65d181921d5..2a54b5fd7e6 100644 --- a/tests/baselines/reference/collisionThisExpressionAndLocalVarInProperty.js +++ b/tests/baselines/reference/collisionThisExpressionAndLocalVarInProperty.js @@ -31,7 +31,7 @@ var class1 = (function () { }; } return class1; -})(); +}()); var class2 = (function () { function class2() { var _this = this; @@ -43,4 +43,4 @@ var class2 = (function () { var _this = 2; } return class2; -})(); +}()); diff --git a/tests/baselines/reference/collisionThisExpressionAndLocalVarWithSuperExperssion.js b/tests/baselines/reference/collisionThisExpressionAndLocalVarWithSuperExperssion.js index eb2ddd825fb..c71b0dcf1dd 100644 --- a/tests/baselines/reference/collisionThisExpressionAndLocalVarWithSuperExperssion.js +++ b/tests/baselines/reference/collisionThisExpressionAndLocalVarWithSuperExperssion.js @@ -30,7 +30,7 @@ var a = (function () { a.prototype.foo = function () { }; return a; -})(); +}()); var b = (function (_super) { __extends(b, _super); function b() { @@ -42,7 +42,7 @@ var b = (function (_super) { var f = function () { return _super.prototype.foo.call(_this); }; }; return b; -})(a); +}(a)); var b2 = (function (_super) { __extends(b2, _super); function b2() { @@ -56,4 +56,4 @@ var b2 = (function (_super) { }; }; return b2; -})(a); +}(a)); diff --git a/tests/baselines/reference/collisionThisExpressionAndModuleInGlobal.js b/tests/baselines/reference/collisionThisExpressionAndModuleInGlobal.js index 777f141451b..240817ac0b9 100644 --- a/tests/baselines/reference/collisionThisExpressionAndModuleInGlobal.js +++ b/tests/baselines/reference/collisionThisExpressionAndModuleInGlobal.js @@ -13,6 +13,6 @@ var _this; function c() { } return c; - })(); + }()); })(_this || (_this = {})); var f = function () { return _this; }; diff --git a/tests/baselines/reference/collisionThisExpressionAndNameResolution.js b/tests/baselines/reference/collisionThisExpressionAndNameResolution.js index 8b128d92946..130f99bcd90 100644 --- a/tests/baselines/reference/collisionThisExpressionAndNameResolution.js +++ b/tests/baselines/reference/collisionThisExpressionAndNameResolution.js @@ -26,4 +26,4 @@ var Foo = (function () { } }; return Foo; -})(); +}()); diff --git a/tests/baselines/reference/collisionThisExpressionAndParameter.js b/tests/baselines/reference/collisionThisExpressionAndParameter.js index 3a19cf20d5a..bc15e4b56b5 100644 --- a/tests/baselines/reference/collisionThisExpressionAndParameter.js +++ b/tests/baselines/reference/collisionThisExpressionAndParameter.js @@ -130,7 +130,7 @@ var Foo = (function () { }; }; return Foo; -})(); +}()); var Foo1 = (function () { function Foo1(_this) { var _this = this; @@ -141,7 +141,7 @@ var Foo1 = (function () { }; } return Foo1; -})(); +}()); function f1(_this) { var _this = this; (function (x) { console.log(_this.x); }); @@ -162,7 +162,7 @@ var Foo3 = (function () { }; }; return Foo3; -})(); +}()); function f3(_this) { var _this = this; (function (x) { console.log(_this.x); }); diff --git a/tests/baselines/reference/collisionThisExpressionAndPropertyNameAsConstuctorParameter.js b/tests/baselines/reference/collisionThisExpressionAndPropertyNameAsConstuctorParameter.js index a77098739ec..b8218cd38ff 100644 --- a/tests/baselines/reference/collisionThisExpressionAndPropertyNameAsConstuctorParameter.js +++ b/tests/baselines/reference/collisionThisExpressionAndPropertyNameAsConstuctorParameter.js @@ -44,7 +44,7 @@ var Foo2 = (function () { }; } return Foo2; -})(); +}()); var Foo3 = (function () { function Foo3(_this) { var _this = this; @@ -54,7 +54,7 @@ var Foo3 = (function () { }; } return Foo3; -})(); +}()); var Foo4 = (function () { function Foo4(_this) { var _this = this; @@ -63,7 +63,7 @@ var Foo4 = (function () { }; } return Foo4; -})(); +}()); var Foo5 = (function () { function Foo5(_this) { var _this = this; @@ -73,4 +73,4 @@ var Foo5 = (function () { }; } return Foo5; -})(); +}()); diff --git a/tests/baselines/reference/commaOperatorWithSecondOperandObjectType.js b/tests/baselines/reference/commaOperatorWithSecondOperandObjectType.js index 90c16543ff2..ef814863934 100644 --- a/tests/baselines/reference/commaOperatorWithSecondOperandObjectType.js +++ b/tests/baselines/reference/commaOperatorWithSecondOperandObjectType.js @@ -49,7 +49,7 @@ var CLASS = (function () { function CLASS() { } return CLASS; -})(); +}()); //The second operand type is Object ANY, OBJECT; BOOLEAN, OBJECT; diff --git a/tests/baselines/reference/commentBeforeStaticMethod1.js b/tests/baselines/reference/commentBeforeStaticMethod1.js index 5c45f6a8cba..2d5fb6ace2e 100644 --- a/tests/baselines/reference/commentBeforeStaticMethod1.js +++ b/tests/baselines/reference/commentBeforeStaticMethod1.js @@ -19,4 +19,4 @@ var C = (function () { return "bar"; }; return C; -})(); +}()); diff --git a/tests/baselines/reference/commentOnClassAccessor1.js b/tests/baselines/reference/commentOnClassAccessor1.js index 428e500da55..0c3e4c1848f 100644 --- a/tests/baselines/reference/commentOnClassAccessor1.js +++ b/tests/baselines/reference/commentOnClassAccessor1.js @@ -19,4 +19,4 @@ var C = (function () { configurable: true }); return C; -})(); +}()); diff --git a/tests/baselines/reference/commentOnClassAccessor2.js b/tests/baselines/reference/commentOnClassAccessor2.js index 22a6b69f6c3..3b58cc28abd 100644 --- a/tests/baselines/reference/commentOnClassAccessor2.js +++ b/tests/baselines/reference/commentOnClassAccessor2.js @@ -28,4 +28,4 @@ var C = (function () { configurable: true }); return C; -})(); +}()); diff --git a/tests/baselines/reference/commentOnClassMethod1.js b/tests/baselines/reference/commentOnClassMethod1.js index 1f924ba233f..4b909da55a4 100644 --- a/tests/baselines/reference/commentOnClassMethod1.js +++ b/tests/baselines/reference/commentOnClassMethod1.js @@ -17,4 +17,4 @@ var WebControls = (function () { WebControls.prototype.createControl = function () { }; return WebControls; -})(); +}()); diff --git a/tests/baselines/reference/commentOnSignature1.js b/tests/baselines/reference/commentOnSignature1.js index d29710c631c..38437d6fd13 100644 --- a/tests/baselines/reference/commentOnSignature1.js +++ b/tests/baselines/reference/commentOnSignature1.js @@ -50,7 +50,7 @@ var c = (function () { c.prototype.foo = function (a) { }; return c; -})(); +}()); //// [b.js] /// function foo2(a) { diff --git a/tests/baselines/reference/commentOnStaticMember1.js b/tests/baselines/reference/commentOnStaticMember1.js index b6b9628cad1..ba997369304 100644 --- a/tests/baselines/reference/commentOnStaticMember1.js +++ b/tests/baselines/reference/commentOnStaticMember1.js @@ -13,4 +13,4 @@ var Greeter = (function () { Greeter.foo = function () { }; return Greeter; -})(); +}()); diff --git a/tests/baselines/reference/commentsClass.js b/tests/baselines/reference/commentsClass.js index b42235e9afe..574fc025227 100644 --- a/tests/baselines/reference/commentsClass.js +++ b/tests/baselines/reference/commentsClass.js @@ -79,7 +79,7 @@ var c2 = (function () { function c2() { } return c2; -})(); // trailing comment1 +}()); // trailing comment1 var i2 = new c2(); var i2_c = c2; var c3 = (function () { @@ -87,7 +87,7 @@ var c3 = (function () { function c3() { } // trailing comment of constructor return c3; -})(); /* trailing comment 2 */ +}()); /* trailing comment 2 */ var i3 = new c3(); var i3_c = c3; /** Class comment*/ @@ -96,7 +96,7 @@ var c4 = (function () { function c4() { } /* trailing comment of constructor 2*/ return c4; -})(); +}()); var i4 = new c4(); var i4_c = c4; /** Class with statics*/ @@ -104,7 +104,7 @@ var c5 = (function () { function c5() { } return c5; -})(); +}()); var i5 = new c5(); var i5_c = c5; /// class with statics and constructor @@ -113,7 +113,7 @@ var c6 = (function () { function c6() { } return c6; -})(); +}()); var i6 = new c6(); var i6_c = c6; // class with statics and constructor @@ -122,7 +122,7 @@ var c7 = (function () { function c7() { } return c7; -})(); +}()); var i7 = new c7(); var i7_c = c7; /** class with statics and constructor @@ -135,7 +135,7 @@ var c8 = (function () { */ } return c8; -})(); +}()); var i8 = new c8(); var i8_c = c8; var c9 = (function () { @@ -144,7 +144,7 @@ var c9 = (function () { // should emit this leading comment of } too } return c9; -})(); +}()); //// [commentsClass.d.ts] diff --git a/tests/baselines/reference/commentsClassMembers.js b/tests/baselines/reference/commentsClassMembers.js index 298991c2eef..fe2dc0a63d0 100644 --- a/tests/baselines/reference/commentsClassMembers.js +++ b/tests/baselines/reference/commentsClassMembers.js @@ -413,7 +413,7 @@ var c1 = (function () { configurable: true }); return c1; -})(); +}()); var i1 = new c1(); var i1_p = i1.p1; var i1_f = i1.p2; @@ -473,7 +473,7 @@ var cProperties = (function () { configurable: true }); return cProperties; -})(); +}()); var cProperties_i = new cProperties(); cProperties_i.p2 = cProperties_i.p1; cProperties_i.nc_p2 = cProperties_i.nc_p1; diff --git a/tests/baselines/reference/commentsCommentParsing.js b/tests/baselines/reference/commentsCommentParsing.js index 2f2746145e5..24b2a459bf7 100644 --- a/tests/baselines/reference/commentsCommentParsing.js +++ b/tests/baselines/reference/commentsCommentParsing.js @@ -288,7 +288,7 @@ var NoQuickInfoClass = (function () { function NoQuickInfoClass() { } return NoQuickInfoClass; -})(); +}()); //// [commentsCommentParsing.d.ts] diff --git a/tests/baselines/reference/commentsDottedModuleName.js b/tests/baselines/reference/commentsDottedModuleName.js index ef3e591b55e..b4819ce9ca3 100644 --- a/tests/baselines/reference/commentsDottedModuleName.js +++ b/tests/baselines/reference/commentsDottedModuleName.js @@ -20,7 +20,7 @@ define(["require", "exports"], function (require, exports) { function b() { } return b; - })(); + }()); InnerModule.b = b; })(InnerModule = outerModule.InnerModule || (outerModule.InnerModule = {})); })(outerModule = exports.outerModule || (exports.outerModule = {})); diff --git a/tests/baselines/reference/commentsExternalModules.js b/tests/baselines/reference/commentsExternalModules.js index f1a5781d67b..1fe24c676a7 100644 --- a/tests/baselines/reference/commentsExternalModules.js +++ b/tests/baselines/reference/commentsExternalModules.js @@ -79,7 +79,7 @@ define(["require", "exports"], function (require, exports) { function c() { } return c; - })(); + }()); m2.c = c; ; /** i*/ @@ -110,7 +110,7 @@ define(["require", "exports"], function (require, exports) { function c() { } return c; - })(); + }()); m2.c = c; ; /** i */ diff --git a/tests/baselines/reference/commentsExternalModules2.js b/tests/baselines/reference/commentsExternalModules2.js index ce367a136e3..18f3564ec7f 100644 --- a/tests/baselines/reference/commentsExternalModules2.js +++ b/tests/baselines/reference/commentsExternalModules2.js @@ -79,7 +79,7 @@ define(["require", "exports"], function (require, exports) { function c() { } return c; - })(); + }()); m2.c = c; ; /** i*/ @@ -110,7 +110,7 @@ define(["require", "exports"], function (require, exports) { function c() { } return c; - })(); + }()); m2.c = c; ; /** i */ diff --git a/tests/baselines/reference/commentsExternalModules3.js b/tests/baselines/reference/commentsExternalModules3.js index 76ff906155a..85fbcfe019f 100644 --- a/tests/baselines/reference/commentsExternalModules3.js +++ b/tests/baselines/reference/commentsExternalModules3.js @@ -78,7 +78,7 @@ var m1; function c() { } return c; - })(); + }()); m2.c = c; ; /** i*/ @@ -109,7 +109,7 @@ var m4; function c() { } return c; - })(); + }()); m2.c = c; ; /** i */ diff --git a/tests/baselines/reference/commentsFormatting.js b/tests/baselines/reference/commentsFormatting.js index 6dc68b06b9f..cfee157eada 100644 --- a/tests/baselines/reference/commentsFormatting.js +++ b/tests/baselines/reference/commentsFormatting.js @@ -107,7 +107,7 @@ var m; function c() { } return c; - })(); + }()); m.c = c; /** this is first line - 4 spaces right aligned to class but in js file should be aligned to class declaration * this is 8 spaces left aligned @@ -131,7 +131,7 @@ var m; function c2() { } return c2; - })(); + }()); m.c2 = c2; /** this is comment with new lines in between @@ -163,7 +163,7 @@ this is 4 spaces left aligned but above line is empty function c3() { } return c3; - })(); + }()); m.c3 = c3; /** this is first line - aligned to class declaration * this is 0 space + tab @@ -183,7 +183,7 @@ this is 4 spaces left aligned but above line is empty function c4() { } return c4; - })(); + }()); m.c4 = c4; })(m || (m = {})); diff --git a/tests/baselines/reference/commentsInheritance.js b/tests/baselines/reference/commentsInheritance.js index 33726436189..b9d84b2475a 100644 --- a/tests/baselines/reference/commentsInheritance.js +++ b/tests/baselines/reference/commentsInheritance.js @@ -172,7 +172,7 @@ var c1 = (function () { c1.prototype.nc_f1 = function () { }; return c1; -})(); +}()); var i1_i; var c1_i = new c1(); // assign to interface @@ -223,7 +223,7 @@ var c2 = (function () { configurable: true }); return c2; -})(); +}()); var c3 = (function (_super) { __extends(c3, _super); function c3() { @@ -250,7 +250,7 @@ var c3 = (function (_super) { configurable: true }); return c3; -})(c2); +}(c2)); var c2_i = new c2(10); var c3_i = new c3(); // assign @@ -261,7 +261,7 @@ var c4 = (function (_super) { _super.apply(this, arguments); } return c4; -})(c2); +}(c2)); var c4_i = new c4(10); var i2_i; var i3_i; diff --git a/tests/baselines/reference/commentsModules.js b/tests/baselines/reference/commentsModules.js index aa5cd2fb7fa..f2574dcddfb 100644 --- a/tests/baselines/reference/commentsModules.js +++ b/tests/baselines/reference/commentsModules.js @@ -113,7 +113,7 @@ var m1; function c() { } return c; - })(); + }()); m2.c = c; ; /** i*/ @@ -152,7 +152,7 @@ var m2; function c() { } return c; - })(); + }()); m3.c = c; })(m3 = m2.m3 || (m2.m3 = {})); })(m2 || (m2 = {})); /* trailing dotted module comment*/ @@ -169,7 +169,7 @@ var m3; function c() { } return c; - })(); + }()); m5.c = c; })(m5 = m4.m5 || (m4.m5 = {})); })(m4 = m3.m4 || (m3.m4 = {})); @@ -189,7 +189,7 @@ var m4; function c() { } return c; - })(); + }()); m7.c = c; })(m7 = m6.m7 || (m6.m7 = {})); /* trailing inner module */ /* multiple comments*/ })(m6 = m5.m6 || (m5.m6 = {})); @@ -211,7 +211,7 @@ var m5; function c() { } return c; - })(); + }()); m8.c = c; })(m8 = m7.m8 || (m7.m8 = {})); })(m7 = m6.m7 || (m6.m7 = {})); @@ -229,7 +229,7 @@ var m6; function c() { } return c; - })(); + }()); m8.c = c; })(m8 = m7.m8 || (m7.m8 = {})); })(m7 = m6.m7 || (m6.m7 = {})); @@ -247,20 +247,20 @@ var m7; function c() { } return c; - })(); + }()); m9.c = c; /** class d */ var d = (function () { function d() { } return d; - })(); + }()); // class e var e = (function () { function e() { } return e; - })(); + }()); m9.e = e; })(m9 = m8.m9 || (m8.m9 = {})); })(m8 = m7.m8 || (m7.m8 = {})); diff --git a/tests/baselines/reference/commentsMultiModuleMultiFile.js b/tests/baselines/reference/commentsMultiModuleMultiFile.js index cf85a1b1c02..5b30279def5 100644 --- a/tests/baselines/reference/commentsMultiModuleMultiFile.js +++ b/tests/baselines/reference/commentsMultiModuleMultiFile.js @@ -47,7 +47,7 @@ define(["require", "exports"], function (require, exports) { function b() { } return b; - })(); + }()); multiM.b = b; })(multiM = exports.multiM || (exports.multiM = {})); /** thi is multi module 2*/ @@ -58,14 +58,14 @@ define(["require", "exports"], function (require, exports) { function c() { } return c; - })(); + }()); multiM.c = c; // class e comment var e = (function () { function e() { } return e; - })(); + }()); multiM.e = e; })(multiM = exports.multiM || (exports.multiM = {})); new multiM.b(); @@ -82,14 +82,14 @@ define(["require", "exports"], function (require, exports) { function d() { } return d; - })(); + }()); multiM.d = d; /// class f comment var f = (function () { function f() { } return f; - })(); + }()); multiM.f = f; })(multiM = exports.multiM || (exports.multiM = {})); new multiM.d(); diff --git a/tests/baselines/reference/commentsMultiModuleSingleFile.js b/tests/baselines/reference/commentsMultiModuleSingleFile.js index 133cc579889..63b6c67888b 100644 --- a/tests/baselines/reference/commentsMultiModuleSingleFile.js +++ b/tests/baselines/reference/commentsMultiModuleSingleFile.js @@ -33,14 +33,14 @@ var multiM; function b() { } return b; - })(); + }()); multiM.b = b; // class d var d = (function () { function d() { } return d; - })(); + }()); multiM.d = d; })(multiM || (multiM = {})); /// this is multi module 2 @@ -51,14 +51,14 @@ var multiM; function c() { } return c; - })(); + }()); multiM.c = c; /// class e var e = (function () { function e() { } return e; - })(); + }()); multiM.e = e; })(multiM || (multiM = {})); new multiM.b(); diff --git a/tests/baselines/reference/commentsOnReturnStatement1.js b/tests/baselines/reference/commentsOnReturnStatement1.js index c2fcb14690d..67c8462bd38 100644 --- a/tests/baselines/reference/commentsOnReturnStatement1.js +++ b/tests/baselines/reference/commentsOnReturnStatement1.js @@ -20,4 +20,4 @@ var DebugClass = (function () { return true; }; return DebugClass; -})(); +}()); diff --git a/tests/baselines/reference/commentsOnStaticMembers.js b/tests/baselines/reference/commentsOnStaticMembers.js index 867c4128940..51ed906841d 100644 --- a/tests/baselines/reference/commentsOnStaticMembers.js +++ b/tests/baselines/reference/commentsOnStaticMembers.js @@ -33,4 +33,4 @@ var test = (function () { */ test.p3 = ""; return test; -})(); +}()); diff --git a/tests/baselines/reference/commentsOverloads.js b/tests/baselines/reference/commentsOverloads.js index d55993572c0..e711a9585ce 100644 --- a/tests/baselines/reference/commentsOverloads.js +++ b/tests/baselines/reference/commentsOverloads.js @@ -219,34 +219,34 @@ var c = (function () { return 10; }; return c; -})(); +}()); var c1 = (function () { function c1(aorb) { } return c1; -})(); +}()); var c2 = (function () { function c2(aorb) { } return c2; -})(); +}()); var c3 = (function () { function c3(aorb) { } return c3; -})(); +}()); var c4 = (function () { /** c4 3 */ function c4(aorb) { } return c4; -})(); +}()); var c5 = (function () { /** c5 implementation*/ function c5(aorb) { } return c5; -})(); +}()); var c_i = new c(); var c1_i_1 = new c1(10); var c1_i_2 = new c1("hello"); diff --git a/tests/baselines/reference/commentsTypeParameters.js b/tests/baselines/reference/commentsTypeParameters.js index 768c238522a..003cafe70ad 100644 --- a/tests/baselines/reference/commentsTypeParameters.js +++ b/tests/baselines/reference/commentsTypeParameters.js @@ -28,7 +28,7 @@ var C = (function () { C.privatestaticmethod = function (a) { }; return C; -})(); +}()); function compare(a, b) { return a === b; } diff --git a/tests/baselines/reference/commentsdoNotEmitComments.js b/tests/baselines/reference/commentsdoNotEmitComments.js index 301ab56e4c0..b77f51348f0 100644 --- a/tests/baselines/reference/commentsdoNotEmitComments.js +++ b/tests/baselines/reference/commentsdoNotEmitComments.js @@ -121,7 +121,7 @@ var c = (function () { return aOrb.toString(); }; return c; -})(); +}()); var i = new c(); var i1_i; var m1; @@ -131,7 +131,7 @@ var m1; this.x = x; } return b; - })(); + }()); m1.b = b; })(m1 || (m1 = {})); var shade = 1; diff --git a/tests/baselines/reference/commentsemitComments.js b/tests/baselines/reference/commentsemitComments.js index 173d9e8fd47..442f558bcfa 100644 --- a/tests/baselines/reference/commentsemitComments.js +++ b/tests/baselines/reference/commentsemitComments.js @@ -126,7 +126,7 @@ var c = (function () { return aOrb.toString(); }; return c; -})(); +}()); /**instance comment*/ var i = new c(); /**interface instance comments*/ @@ -140,7 +140,7 @@ var m1; this.x = x; } return b; - })(); + }()); m1.b = b; })(m1 || (m1 = {})); diff --git a/tests/baselines/reference/commonJSImportAsPrimaryExpression.js b/tests/baselines/reference/commonJSImportAsPrimaryExpression.js index e43b321893a..3f49588c103 100644 --- a/tests/baselines/reference/commonJSImportAsPrimaryExpression.js +++ b/tests/baselines/reference/commonJSImportAsPrimaryExpression.js @@ -21,7 +21,7 @@ var C1 = (function () { } C1.s1 = true; return C1; -})(); +}()); exports.C1 = C1; //// [foo_1.js] "use strict"; diff --git a/tests/baselines/reference/commonJSImportNotAsPrimaryExpression.js b/tests/baselines/reference/commonJSImportNotAsPrimaryExpression.js index 8ecda412106..720554f7e32 100644 --- a/tests/baselines/reference/commonJSImportNotAsPrimaryExpression.js +++ b/tests/baselines/reference/commonJSImportNotAsPrimaryExpression.js @@ -39,7 +39,7 @@ var C1 = (function () { } C1.s1 = true; return C1; -})(); +}()); exports.C1 = C1; (function (E1) { E1[E1["A"] = 0] = "A"; diff --git a/tests/baselines/reference/comparisonOperatorWithIdenticalObjects.js b/tests/baselines/reference/comparisonOperatorWithIdenticalObjects.js index d59ec764680..0de25c15013 100644 --- a/tests/baselines/reference/comparisonOperatorWithIdenticalObjects.js +++ b/tests/baselines/reference/comparisonOperatorWithIdenticalObjects.js @@ -207,7 +207,7 @@ var A1 = (function () { return null; }; return A1; -})(); +}()); var B1 = (function () { function B1() { } @@ -215,7 +215,7 @@ var B1 = (function () { return null; }; return B1; -})(); +}()); var Base = (function () { function Base() { } @@ -223,21 +223,21 @@ var Base = (function () { return null; }; return Base; -})(); +}()); var A2 = (function (_super) { __extends(A2, _super); function A2() { _super.apply(this, arguments); } return A2; -})(Base); +}(Base)); var B2 = (function (_super) { __extends(B2, _super); function B2() { _super.apply(this, arguments); } return B2; -})(Base); +}(Base)); var a1; var a2; var a3; diff --git a/tests/baselines/reference/comparisonOperatorWithNoRelationshipObjectsOnCallSignature.js b/tests/baselines/reference/comparisonOperatorWithNoRelationshipObjectsOnCallSignature.js index 4bbc7675a31..4185af60dbc 100644 --- a/tests/baselines/reference/comparisonOperatorWithNoRelationshipObjectsOnCallSignature.js +++ b/tests/baselines/reference/comparisonOperatorWithNoRelationshipObjectsOnCallSignature.js @@ -178,19 +178,19 @@ var Base = (function () { function Base() { } return Base; -})(); +}()); var Derived = (function (_super) { __extends(Derived, _super); function Derived() { _super.apply(this, arguments); } return Derived; -})(Base); +}(Base)); var C = (function () { function C() { } return C; -})(); +}()); var a1; var b1; var a2; diff --git a/tests/baselines/reference/comparisonOperatorWithNoRelationshipObjectsOnConstructorSignature.js b/tests/baselines/reference/comparisonOperatorWithNoRelationshipObjectsOnConstructorSignature.js index 397c7e9d8e4..90c67439773 100644 --- a/tests/baselines/reference/comparisonOperatorWithNoRelationshipObjectsOnConstructorSignature.js +++ b/tests/baselines/reference/comparisonOperatorWithNoRelationshipObjectsOnConstructorSignature.js @@ -178,19 +178,19 @@ var Base = (function () { function Base() { } return Base; -})(); +}()); var Derived = (function (_super) { __extends(Derived, _super); function Derived() { _super.apply(this, arguments); } return Derived; -})(Base); +}(Base)); var C = (function () { function C() { } return C; -})(); +}()); var a1; var b1; var a2; diff --git a/tests/baselines/reference/comparisonOperatorWithNoRelationshipObjectsOnIndexSignature.js b/tests/baselines/reference/comparisonOperatorWithNoRelationshipObjectsOnIndexSignature.js index 9f3c037538d..736b57e08ba 100644 --- a/tests/baselines/reference/comparisonOperatorWithNoRelationshipObjectsOnIndexSignature.js +++ b/tests/baselines/reference/comparisonOperatorWithNoRelationshipObjectsOnIndexSignature.js @@ -121,19 +121,19 @@ var Base = (function () { function Base() { } return Base; -})(); +}()); var Derived = (function (_super) { __extends(Derived, _super); function Derived() { _super.apply(this, arguments); } return Derived; -})(Base); +}(Base)); var C = (function () { function C() { } return C; -})(); +}()); var a1; var b1; var a2; diff --git a/tests/baselines/reference/comparisonOperatorWithNoRelationshipObjectsOnInstantiatedCallSignature.js b/tests/baselines/reference/comparisonOperatorWithNoRelationshipObjectsOnInstantiatedCallSignature.js index 68ebcb9d596..ca7eea70ad6 100644 --- a/tests/baselines/reference/comparisonOperatorWithNoRelationshipObjectsOnInstantiatedCallSignature.js +++ b/tests/baselines/reference/comparisonOperatorWithNoRelationshipObjectsOnInstantiatedCallSignature.js @@ -159,19 +159,19 @@ var Base = (function () { function Base() { } return Base; -})(); +}()); var Derived = (function (_super) { __extends(Derived, _super); function Derived() { _super.apply(this, arguments); } return Derived; -})(Base); +}(Base)); var C = (function () { function C() { } return C; -})(); +}()); var a1; var b1; var a2; diff --git a/tests/baselines/reference/comparisonOperatorWithNoRelationshipObjectsOnInstantiatedConstructorSignature.js b/tests/baselines/reference/comparisonOperatorWithNoRelationshipObjectsOnInstantiatedConstructorSignature.js index 60177f0ea22..c64e33827c5 100644 --- a/tests/baselines/reference/comparisonOperatorWithNoRelationshipObjectsOnInstantiatedConstructorSignature.js +++ b/tests/baselines/reference/comparisonOperatorWithNoRelationshipObjectsOnInstantiatedConstructorSignature.js @@ -159,19 +159,19 @@ var Base = (function () { function Base() { } return Base; -})(); +}()); var Derived = (function (_super) { __extends(Derived, _super); function Derived() { _super.apply(this, arguments); } return Derived; -})(Base); +}(Base)); var C = (function () { function C() { } return C; -})(); +}()); var a1; var b1; var a2; diff --git a/tests/baselines/reference/comparisonOperatorWithNoRelationshipObjectsOnProperty.js b/tests/baselines/reference/comparisonOperatorWithNoRelationshipObjectsOnProperty.js index d6308211191..715b347846e 100644 --- a/tests/baselines/reference/comparisonOperatorWithNoRelationshipObjectsOnProperty.js +++ b/tests/baselines/reference/comparisonOperatorWithNoRelationshipObjectsOnProperty.js @@ -81,22 +81,22 @@ var A1 = (function () { function A1() { } return A1; -})(); +}()); var B1 = (function () { function B1() { } return B1; -})(); +}()); var A2 = (function () { function A2() { } return A2; -})(); +}()); var B2 = (function () { function B2() { } return B2; -})(); +}()); var a1; var b1; var a2; diff --git a/tests/baselines/reference/comparisonOperatorWithSubtypeObjectOnCallSignature.js b/tests/baselines/reference/comparisonOperatorWithSubtypeObjectOnCallSignature.js index 27d1b68c85d..dc7a12eecdc 100644 --- a/tests/baselines/reference/comparisonOperatorWithSubtypeObjectOnCallSignature.js +++ b/tests/baselines/reference/comparisonOperatorWithSubtypeObjectOnCallSignature.js @@ -269,14 +269,14 @@ var Base = (function () { function Base() { } return Base; -})(); +}()); var Derived = (function (_super) { __extends(Derived, _super); function Derived() { _super.apply(this, arguments); } return Derived; -})(Base); +}(Base)); var a1; var b1; var a2; diff --git a/tests/baselines/reference/comparisonOperatorWithSubtypeObjectOnConstructorSignature.js b/tests/baselines/reference/comparisonOperatorWithSubtypeObjectOnConstructorSignature.js index 5a98e12b001..d4be6df98dd 100644 --- a/tests/baselines/reference/comparisonOperatorWithSubtypeObjectOnConstructorSignature.js +++ b/tests/baselines/reference/comparisonOperatorWithSubtypeObjectOnConstructorSignature.js @@ -231,14 +231,14 @@ var Base = (function () { function Base() { } return Base; -})(); +}()); var Derived = (function (_super) { __extends(Derived, _super); function Derived() { _super.apply(this, arguments); } return Derived; -})(Base); +}(Base)); var a1; var b1; var a2; diff --git a/tests/baselines/reference/comparisonOperatorWithSubtypeObjectOnIndexSignature.js b/tests/baselines/reference/comparisonOperatorWithSubtypeObjectOnIndexSignature.js index 24069615e0a..ee5ad2fbd07 100644 --- a/tests/baselines/reference/comparisonOperatorWithSubtypeObjectOnIndexSignature.js +++ b/tests/baselines/reference/comparisonOperatorWithSubtypeObjectOnIndexSignature.js @@ -117,14 +117,14 @@ var Base = (function () { function Base() { } return Base; -})(); +}()); var Derived = (function (_super) { __extends(Derived, _super); function Derived() { _super.apply(this, arguments); } return Derived; -})(Base); +}(Base)); var a1; var b1; var a2; diff --git a/tests/baselines/reference/comparisonOperatorWithSubtypeObjectOnInstantiatedCallSignature.js b/tests/baselines/reference/comparisonOperatorWithSubtypeObjectOnInstantiatedCallSignature.js index f0dac057ca3..79e4bfd0bbf 100644 --- a/tests/baselines/reference/comparisonOperatorWithSubtypeObjectOnInstantiatedCallSignature.js +++ b/tests/baselines/reference/comparisonOperatorWithSubtypeObjectOnInstantiatedCallSignature.js @@ -174,14 +174,14 @@ var Base = (function () { function Base() { } return Base; -})(); +}()); var Derived = (function (_super) { __extends(Derived, _super); function Derived() { _super.apply(this, arguments); } return Derived; -})(Base); +}(Base)); var a1; var b1; var a2; diff --git a/tests/baselines/reference/comparisonOperatorWithSubtypeObjectOnInstantiatedConstructorSignature.js b/tests/baselines/reference/comparisonOperatorWithSubtypeObjectOnInstantiatedConstructorSignature.js index eaf1aca728d..31c0dd3c7c5 100644 --- a/tests/baselines/reference/comparisonOperatorWithSubtypeObjectOnInstantiatedConstructorSignature.js +++ b/tests/baselines/reference/comparisonOperatorWithSubtypeObjectOnInstantiatedConstructorSignature.js @@ -174,14 +174,14 @@ var Base = (function () { function Base() { } return Base; -})(); +}()); var Derived = (function (_super) { __extends(Derived, _super); function Derived() { _super.apply(this, arguments); } return Derived; -})(Base); +}(Base)); var a1; var b1; var a2; diff --git a/tests/baselines/reference/comparisonOperatorWithSubtypeObjectOnProperty.js b/tests/baselines/reference/comparisonOperatorWithSubtypeObjectOnProperty.js index 822d4b7520a..5decd7a21fb 100644 --- a/tests/baselines/reference/comparisonOperatorWithSubtypeObjectOnProperty.js +++ b/tests/baselines/reference/comparisonOperatorWithSubtypeObjectOnProperty.js @@ -88,36 +88,36 @@ var Base = (function () { function Base() { } return Base; -})(); +}()); var Derived = (function (_super) { __extends(Derived, _super); function Derived() { _super.apply(this, arguments); } return Derived; -})(Base); +}(Base)); var A1 = (function () { function A1() { } return A1; -})(); +}()); var B1 = (function () { function B1() { } return B1; -})(); +}()); var A2 = (function () { function A2() { } return A2; -})(); +}()); var B2 = (function (_super) { __extends(B2, _super); function B2() { _super.apply(this, arguments); } return B2; -})(A2); +}(A2)); var a1; var a2; var b1; diff --git a/tests/baselines/reference/complexClassRelationships.js b/tests/baselines/reference/complexClassRelationships.js index ca2b31a805c..46974055171 100644 --- a/tests/baselines/reference/complexClassRelationships.js +++ b/tests/baselines/reference/complexClassRelationships.js @@ -64,18 +64,18 @@ var Derived = (function (_super) { return item; }; return Derived; -})(Base); +}(Base)); var BaseCollection = (function () { function BaseCollection(f) { (function (item) { return [item.Components]; }); } return BaseCollection; -})(); +}()); var Base = (function () { function Base() { } return Base; -})(); +}()); var Thing = (function () { function Thing() { } @@ -85,7 +85,7 @@ var Thing = (function () { configurable: true }); return Thing; -})(); +}()); var ComponentCollection = (function () { function ComponentCollection() { } @@ -93,7 +93,7 @@ var ComponentCollection = (function () { return p.prop1; }; return ComponentCollection; -})(); +}()); var Foo = (function () { function Foo() { } @@ -115,16 +115,16 @@ var Foo = (function () { configurable: true }); return Foo; -})(); +}()); var GenericType = (function () { function GenericType(parent) { } return GenericType; -})(); +}()); var FooBase = (function () { function FooBase() { } FooBase.prototype.populate = function () { }; return FooBase; -})(); +}()); diff --git a/tests/baselines/reference/complicatedGenericRecursiveBaseClassReference.js b/tests/baselines/reference/complicatedGenericRecursiveBaseClassReference.js index 71c1cee164f..3d885d3eef1 100644 --- a/tests/baselines/reference/complicatedGenericRecursiveBaseClassReference.js +++ b/tests/baselines/reference/complicatedGenericRecursiveBaseClassReference.js @@ -17,5 +17,5 @@ var S18 = (function (_super) { _super.apply(this, arguments); } return S18; -})(S18); +}(S18)); (new S18(123)).S18 = 0; diff --git a/tests/baselines/reference/complicatedPrivacy.js b/tests/baselines/reference/complicatedPrivacy.js index 7f431f3d136..ffb328f2e94 100644 --- a/tests/baselines/reference/complicatedPrivacy.js +++ b/tests/baselines/reference/complicatedPrivacy.js @@ -131,7 +131,7 @@ var m1; return "Hello world"; }; return C2; - })(); + }()); m2.C2 = C2; })(m2 = m1.m2 || (m1.m2 = {})); function f2(arg1) { @@ -156,19 +156,19 @@ var m1; function C1() { } return C1; - })(); + }()); var C5 = (function () { function C5() { } return C5; - })(); + }()); m1.C5 = C5; })(m1 || (m1 = {})); var C2 = (function () { function C2() { } return C2; -})(); +}()); var m2; (function (m2) { var m3; @@ -180,7 +180,7 @@ var m2; return "Hello"; }; return c_pr; - })(); + }()); m3.c_pr = c_pr; var m4; (function (m4) { @@ -188,7 +188,7 @@ var m2; function C() { } return C; - })(); + }()); var m5; (function (m5) { var m6; diff --git a/tests/baselines/reference/compoundAssignmentLHSIsValue.js b/tests/baselines/reference/compoundAssignmentLHSIsValue.js index bf66183b70a..a55c068d4a4 100644 --- a/tests/baselines/reference/compoundAssignmentLHSIsValue.js +++ b/tests/baselines/reference/compoundAssignmentLHSIsValue.js @@ -146,7 +146,7 @@ var C = (function () { this += value; }; return C; -})(); +}()); function foo() { this *= value; this += value; @@ -210,7 +210,7 @@ var Derived = (function (_super) { _super. += value; }; return Derived; -})(C); +}(C)); // function expression function bar1() { } value; diff --git a/tests/baselines/reference/compoundExponentiationAssignmentLHSIsValue.js b/tests/baselines/reference/compoundExponentiationAssignmentLHSIsValue.js index f4e14e54242..70ebca89005 100644 --- a/tests/baselines/reference/compoundExponentiationAssignmentLHSIsValue.js +++ b/tests/baselines/reference/compoundExponentiationAssignmentLHSIsValue.js @@ -105,7 +105,7 @@ var C = (function () { this = Math.pow(this, value); }; return C; -})(); +}()); function foo() { this = Math.pow(this, value); } @@ -152,7 +152,7 @@ var Derived = (function (_super) { var _a; }; return Derived; -})(C); +}(C)); // function expression function bar1() { } value; diff --git a/tests/baselines/reference/computedPropertyNames12_ES5.js b/tests/baselines/reference/computedPropertyNames12_ES5.js index c73ea11286f..2aec8856286 100644 --- a/tests/baselines/reference/computedPropertyNames12_ES5.js +++ b/tests/baselines/reference/computedPropertyNames12_ES5.js @@ -28,4 +28,4 @@ var C = (function () { } C["hello " + a + " bye"] = 0; return C; -})(); +}()); diff --git a/tests/baselines/reference/computedPropertyNames13_ES5.js b/tests/baselines/reference/computedPropertyNames13_ES5.js index 89562162911..0b713c5c8d7 100644 --- a/tests/baselines/reference/computedPropertyNames13_ES5.js +++ b/tests/baselines/reference/computedPropertyNames13_ES5.js @@ -35,4 +35,4 @@ var C = (function () { C.prototype["hello bye"] = function () { }; C["hello " + a + " bye"] = function () { }; return C; -})(); +}()); diff --git a/tests/baselines/reference/computedPropertyNames14_ES5.js b/tests/baselines/reference/computedPropertyNames14_ES5.js index 5db5e842a2a..e08ae0fd640 100644 --- a/tests/baselines/reference/computedPropertyNames14_ES5.js +++ b/tests/baselines/reference/computedPropertyNames14_ES5.js @@ -21,4 +21,4 @@ var C = (function () { C.prototype[undefined] = function () { }; C[null] = function () { }; return C; -})(); +}()); diff --git a/tests/baselines/reference/computedPropertyNames15_ES5.js b/tests/baselines/reference/computedPropertyNames15_ES5.js index 93258b64c75..91ec9332be8 100644 --- a/tests/baselines/reference/computedPropertyNames15_ES5.js +++ b/tests/baselines/reference/computedPropertyNames15_ES5.js @@ -19,4 +19,4 @@ var C = (function () { C.prototype[p2] = function () { }; C.prototype[p3] = function () { }; return C; -})(); +}()); diff --git a/tests/baselines/reference/computedPropertyNames16_ES5.js b/tests/baselines/reference/computedPropertyNames16_ES5.js index f4d90579d63..5d8471e6560 100644 --- a/tests/baselines/reference/computedPropertyNames16_ES5.js +++ b/tests/baselines/reference/computedPropertyNames16_ES5.js @@ -69,4 +69,4 @@ var C = (function () { configurable: true }); return C; -})(); +}()); diff --git a/tests/baselines/reference/computedPropertyNames17_ES5.js b/tests/baselines/reference/computedPropertyNames17_ES5.js index 3b5c100694d..30b14ad523e 100644 --- a/tests/baselines/reference/computedPropertyNames17_ES5.js +++ b/tests/baselines/reference/computedPropertyNames17_ES5.js @@ -45,4 +45,4 @@ var C = (function () { configurable: true }); return C; -})(); +}()); diff --git a/tests/baselines/reference/computedPropertyNames21_ES5.js b/tests/baselines/reference/computedPropertyNames21_ES5.js index 81f95cd824d..655de136c34 100644 --- a/tests/baselines/reference/computedPropertyNames21_ES5.js +++ b/tests/baselines/reference/computedPropertyNames21_ES5.js @@ -15,4 +15,4 @@ var C = (function () { }; C.prototype[this.bar()] = function () { }; return C; -})(); +}()); diff --git a/tests/baselines/reference/computedPropertyNames22_ES5.js b/tests/baselines/reference/computedPropertyNames22_ES5.js index e82bf673b52..5448f4dcf8d 100644 --- a/tests/baselines/reference/computedPropertyNames22_ES5.js +++ b/tests/baselines/reference/computedPropertyNames22_ES5.js @@ -21,4 +21,4 @@ var C = (function () { var _a; }; return C; -})(); +}()); diff --git a/tests/baselines/reference/computedPropertyNames23_ES5.js b/tests/baselines/reference/computedPropertyNames23_ES5.js index 8e42a29f7e7..666807f9f8e 100644 --- a/tests/baselines/reference/computedPropertyNames23_ES5.js +++ b/tests/baselines/reference/computedPropertyNames23_ES5.js @@ -18,4 +18,4 @@ var C = (function () { C.prototype[(_a = {}, _a[this.bar()] = 1, _a)[0]] = function () { }; return C; var _a; -})(); +}()); diff --git a/tests/baselines/reference/computedPropertyNames24_ES5.js b/tests/baselines/reference/computedPropertyNames24_ES5.js index 5a4b79cf44a..24cfe77d93c 100644 --- a/tests/baselines/reference/computedPropertyNames24_ES5.js +++ b/tests/baselines/reference/computedPropertyNames24_ES5.js @@ -21,7 +21,7 @@ var Base = (function () { return 0; }; return Base; -})(); +}()); var C = (function (_super) { __extends(C, _super); function C() { @@ -29,4 +29,4 @@ var C = (function (_super) { } C.prototype[_super.bar.call(this)] = function () { }; return C; -})(Base); +}(Base)); diff --git a/tests/baselines/reference/computedPropertyNames25_ES5.js b/tests/baselines/reference/computedPropertyNames25_ES5.js index 832fad174d8..f38ac0b2e0d 100644 --- a/tests/baselines/reference/computedPropertyNames25_ES5.js +++ b/tests/baselines/reference/computedPropertyNames25_ES5.js @@ -26,7 +26,7 @@ var Base = (function () { return 0; }; return Base; -})(); +}()); var C = (function (_super) { __extends(C, _super); function C() { @@ -41,4 +41,4 @@ var C = (function (_super) { var _a; }; return C; -})(Base); +}(Base)); diff --git a/tests/baselines/reference/computedPropertyNames26_ES5.js b/tests/baselines/reference/computedPropertyNames26_ES5.js index 09a95419480..41a20ac6477 100644 --- a/tests/baselines/reference/computedPropertyNames26_ES5.js +++ b/tests/baselines/reference/computedPropertyNames26_ES5.js @@ -23,7 +23,7 @@ var Base = (function () { return 0; }; return Base; -})(); +}()); var C = (function (_super) { __extends(C, _super); function C() { @@ -32,4 +32,4 @@ var C = (function (_super) { C.prototype[(_a = {}, _a[_super.bar.call(this)] = 1, _a)[0]] = function () { }; return C; var _a; -})(Base); +}(Base)); diff --git a/tests/baselines/reference/computedPropertyNames27_ES5.js b/tests/baselines/reference/computedPropertyNames27_ES5.js index 53e2c2988c8..bdef47165b1 100644 --- a/tests/baselines/reference/computedPropertyNames27_ES5.js +++ b/tests/baselines/reference/computedPropertyNames27_ES5.js @@ -15,7 +15,7 @@ var Base = (function () { function Base() { } return Base; -})(); +}()); var C = (function (_super) { __extends(C, _super); function C() { @@ -23,4 +23,4 @@ var C = (function (_super) { } C.prototype[(_super.call(this), "prop")] = function () { }; return C; -})(Base); +}(Base)); diff --git a/tests/baselines/reference/computedPropertyNames28_ES5.js b/tests/baselines/reference/computedPropertyNames28_ES5.js index be79f22c2da..b5b1fdf77aa 100644 --- a/tests/baselines/reference/computedPropertyNames28_ES5.js +++ b/tests/baselines/reference/computedPropertyNames28_ES5.js @@ -20,7 +20,7 @@ var Base = (function () { function Base() { } return Base; -})(); +}()); var C = (function (_super) { __extends(C, _super); function C() { @@ -32,4 +32,4 @@ var C = (function (_super) { var _a; } return C; -})(Base); +}(Base)); diff --git a/tests/baselines/reference/computedPropertyNames29_ES5.js b/tests/baselines/reference/computedPropertyNames29_ES5.js index 4682ae9105e..46ba529d7a5 100644 --- a/tests/baselines/reference/computedPropertyNames29_ES5.js +++ b/tests/baselines/reference/computedPropertyNames29_ES5.js @@ -26,4 +26,4 @@ var C = (function () { return 0; }; return C; -})(); +}()); diff --git a/tests/baselines/reference/computedPropertyNames2_ES5.js b/tests/baselines/reference/computedPropertyNames2_ES5.js index 581b581d87b..9211fccb530 100644 --- a/tests/baselines/reference/computedPropertyNames2_ES5.js +++ b/tests/baselines/reference/computedPropertyNames2_ES5.js @@ -39,4 +39,4 @@ var C = (function () { configurable: true }); return C; -})(); +}()); diff --git a/tests/baselines/reference/computedPropertyNames30_ES5.js b/tests/baselines/reference/computedPropertyNames30_ES5.js index de60b5daf53..e787689d393 100644 --- a/tests/baselines/reference/computedPropertyNames30_ES5.js +++ b/tests/baselines/reference/computedPropertyNames30_ES5.js @@ -25,7 +25,7 @@ var Base = (function () { function Base() { } return Base; -})(); +}()); var C = (function (_super) { __extends(C, _super); function C() { @@ -42,4 +42,4 @@ var C = (function (_super) { }); } return C; -})(Base); +}(Base)); diff --git a/tests/baselines/reference/computedPropertyNames31_ES5.js b/tests/baselines/reference/computedPropertyNames31_ES5.js index f8e34603305..8417f103fb7 100644 --- a/tests/baselines/reference/computedPropertyNames31_ES5.js +++ b/tests/baselines/reference/computedPropertyNames31_ES5.js @@ -28,7 +28,7 @@ var Base = (function () { return 0; }; return Base; -})(); +}()); var C = (function (_super) { __extends(C, _super); function C() { @@ -46,4 +46,4 @@ var C = (function (_super) { return 0; }; return C; -})(Base); +}(Base)); diff --git a/tests/baselines/reference/computedPropertyNames32_ES5.js b/tests/baselines/reference/computedPropertyNames32_ES5.js index a0d8b066b5c..1ae07d37e42 100644 --- a/tests/baselines/reference/computedPropertyNames32_ES5.js +++ b/tests/baselines/reference/computedPropertyNames32_ES5.js @@ -17,4 +17,4 @@ var C = (function () { }; C.prototype[foo()] = function () { }; return C; -})(); +}()); diff --git a/tests/baselines/reference/computedPropertyNames33_ES5.js b/tests/baselines/reference/computedPropertyNames33_ES5.js index 38029893bb1..8db62818e22 100644 --- a/tests/baselines/reference/computedPropertyNames33_ES5.js +++ b/tests/baselines/reference/computedPropertyNames33_ES5.js @@ -23,4 +23,4 @@ var C = (function () { var _a; }; return C; -})(); +}()); diff --git a/tests/baselines/reference/computedPropertyNames34_ES5.js b/tests/baselines/reference/computedPropertyNames34_ES5.js index 4e5790c53b1..fa0af2897f7 100644 --- a/tests/baselines/reference/computedPropertyNames34_ES5.js +++ b/tests/baselines/reference/computedPropertyNames34_ES5.js @@ -23,4 +23,4 @@ var C = (function () { var _a; }; return C; -})(); +}()); diff --git a/tests/baselines/reference/computedPropertyNames36_ES5.js b/tests/baselines/reference/computedPropertyNames36_ES5.js index 4bb10ea7543..884e425e25b 100644 --- a/tests/baselines/reference/computedPropertyNames36_ES5.js +++ b/tests/baselines/reference/computedPropertyNames36_ES5.js @@ -15,12 +15,12 @@ var Foo = (function () { function Foo() { } return Foo; -})(); +}()); var Foo2 = (function () { function Foo2() { } return Foo2; -})(); +}()); var C = (function () { function C() { } @@ -32,4 +32,4 @@ var C = (function () { configurable: true }); return C; -})(); +}()); diff --git a/tests/baselines/reference/computedPropertyNames37_ES5.js b/tests/baselines/reference/computedPropertyNames37_ES5.js index c2a346608fe..8cdc0af30e7 100644 --- a/tests/baselines/reference/computedPropertyNames37_ES5.js +++ b/tests/baselines/reference/computedPropertyNames37_ES5.js @@ -15,12 +15,12 @@ var Foo = (function () { function Foo() { } return Foo; -})(); +}()); var Foo2 = (function () { function Foo2() { } return Foo2; -})(); +}()); var C = (function () { function C() { } @@ -32,4 +32,4 @@ var C = (function () { configurable: true }); return C; -})(); +}()); diff --git a/tests/baselines/reference/computedPropertyNames38_ES5.js b/tests/baselines/reference/computedPropertyNames38_ES5.js index 49af4d00d51..0bc1a4521e8 100644 --- a/tests/baselines/reference/computedPropertyNames38_ES5.js +++ b/tests/baselines/reference/computedPropertyNames38_ES5.js @@ -15,12 +15,12 @@ var Foo = (function () { function Foo() { } return Foo; -})(); +}()); var Foo2 = (function () { function Foo2() { } return Foo2; -})(); +}()); var C = (function () { function C() { } @@ -36,4 +36,4 @@ var C = (function () { configurable: true }); return C; -})(); +}()); diff --git a/tests/baselines/reference/computedPropertyNames39_ES5.js b/tests/baselines/reference/computedPropertyNames39_ES5.js index 1b8d3aab2ff..446a9a6fd77 100644 --- a/tests/baselines/reference/computedPropertyNames39_ES5.js +++ b/tests/baselines/reference/computedPropertyNames39_ES5.js @@ -15,12 +15,12 @@ var Foo = (function () { function Foo() { } return Foo; -})(); +}()); var Foo2 = (function () { function Foo2() { } return Foo2; -})(); +}()); var C = (function () { function C() { } @@ -36,4 +36,4 @@ var C = (function () { configurable: true }); return C; -})(); +}()); diff --git a/tests/baselines/reference/computedPropertyNames3_ES5.js b/tests/baselines/reference/computedPropertyNames3_ES5.js index f5a063f91e6..94821a65974 100644 --- a/tests/baselines/reference/computedPropertyNames3_ES5.js +++ b/tests/baselines/reference/computedPropertyNames3_ES5.js @@ -37,4 +37,4 @@ var C = (function () { configurable: true }); return C; -})(); +}()); diff --git a/tests/baselines/reference/computedPropertyNames40_ES5.js b/tests/baselines/reference/computedPropertyNames40_ES5.js index e8063762026..a291349d0cf 100644 --- a/tests/baselines/reference/computedPropertyNames40_ES5.js +++ b/tests/baselines/reference/computedPropertyNames40_ES5.js @@ -15,12 +15,12 @@ var Foo = (function () { function Foo() { } return Foo; -})(); +}()); var Foo2 = (function () { function Foo2() { } return Foo2; -})(); +}()); var C = (function () { function C() { } @@ -28,4 +28,4 @@ var C = (function () { C.prototype[""] = function () { return new Foo; }; C.prototype[""] = function () { return new Foo2; }; return C; -})(); +}()); diff --git a/tests/baselines/reference/computedPropertyNames41_ES5.js b/tests/baselines/reference/computedPropertyNames41_ES5.js index 7d7c390bf3e..cad02361496 100644 --- a/tests/baselines/reference/computedPropertyNames41_ES5.js +++ b/tests/baselines/reference/computedPropertyNames41_ES5.js @@ -14,16 +14,16 @@ var Foo = (function () { function Foo() { } return Foo; -})(); +}()); var Foo2 = (function () { function Foo2() { } return Foo2; -})(); +}()); var C = (function () { function C() { } // Computed properties C[""] = function () { return new Foo; }; return C; -})(); +}()); diff --git a/tests/baselines/reference/computedPropertyNames42_ES5.js b/tests/baselines/reference/computedPropertyNames42_ES5.js index f4fda8fc829..1e1dfff227b 100644 --- a/tests/baselines/reference/computedPropertyNames42_ES5.js +++ b/tests/baselines/reference/computedPropertyNames42_ES5.js @@ -14,14 +14,14 @@ var Foo = (function () { function Foo() { } return Foo; -})(); +}()); var Foo2 = (function () { function Foo2() { } return Foo2; -})(); +}()); var C = (function () { function C() { } return C; -})(); +}()); diff --git a/tests/baselines/reference/computedPropertyNames43_ES5.js b/tests/baselines/reference/computedPropertyNames43_ES5.js index 57026c3c706..9690d0b8196 100644 --- a/tests/baselines/reference/computedPropertyNames43_ES5.js +++ b/tests/baselines/reference/computedPropertyNames43_ES5.js @@ -22,17 +22,17 @@ var Foo = (function () { function Foo() { } return Foo; -})(); +}()); var Foo2 = (function () { function Foo2() { } return Foo2; -})(); +}()); var C = (function () { function C() { } return C; -})(); +}()); var D = (function (_super) { __extends(D, _super); function D() { @@ -46,4 +46,4 @@ var D = (function (_super) { configurable: true }); return D; -})(C); +}(C)); diff --git a/tests/baselines/reference/computedPropertyNames44_ES5.js b/tests/baselines/reference/computedPropertyNames44_ES5.js index 1186f0caef7..78e20a7d6a3 100644 --- a/tests/baselines/reference/computedPropertyNames44_ES5.js +++ b/tests/baselines/reference/computedPropertyNames44_ES5.js @@ -21,12 +21,12 @@ var Foo = (function () { function Foo() { } return Foo; -})(); +}()); var Foo2 = (function () { function Foo2() { } return Foo2; -})(); +}()); var C = (function () { function C() { } @@ -36,7 +36,7 @@ var C = (function () { configurable: true }); return C; -})(); +}()); var D = (function (_super) { __extends(D, _super); function D() { @@ -48,4 +48,4 @@ var D = (function (_super) { configurable: true }); return D; -})(C); +}(C)); diff --git a/tests/baselines/reference/computedPropertyNames45_ES5.js b/tests/baselines/reference/computedPropertyNames45_ES5.js index ce948e58208..9c7482a4713 100644 --- a/tests/baselines/reference/computedPropertyNames45_ES5.js +++ b/tests/baselines/reference/computedPropertyNames45_ES5.js @@ -22,12 +22,12 @@ var Foo = (function () { function Foo() { } return Foo; -})(); +}()); var Foo2 = (function () { function Foo2() { } return Foo2; -})(); +}()); var C = (function () { function C() { } @@ -37,7 +37,7 @@ var C = (function () { configurable: true }); return C; -})(); +}()); var D = (function (_super) { __extends(D, _super); function D() { @@ -49,4 +49,4 @@ var D = (function (_super) { configurable: true }); return D; -})(C); +}(C)); diff --git a/tests/baselines/reference/computedPropertyNamesDeclarationEmit1_ES5.js b/tests/baselines/reference/computedPropertyNamesDeclarationEmit1_ES5.js index 84b92f6c92d..7becf285b2a 100644 --- a/tests/baselines/reference/computedPropertyNamesDeclarationEmit1_ES5.js +++ b/tests/baselines/reference/computedPropertyNamesDeclarationEmit1_ES5.js @@ -21,7 +21,7 @@ var C = (function () { configurable: true }); return C; -})(); +}()); //// [computedPropertyNamesDeclarationEmit1_ES5.d.ts] diff --git a/tests/baselines/reference/computedPropertyNamesDeclarationEmit2_ES5.js b/tests/baselines/reference/computedPropertyNamesDeclarationEmit2_ES5.js index 9847ea8b7ef..0b665eb1d9a 100644 --- a/tests/baselines/reference/computedPropertyNamesDeclarationEmit2_ES5.js +++ b/tests/baselines/reference/computedPropertyNamesDeclarationEmit2_ES5.js @@ -21,7 +21,7 @@ var C = (function () { configurable: true }); return C; -})(); +}()); //// [computedPropertyNamesDeclarationEmit2_ES5.d.ts] diff --git a/tests/baselines/reference/computedPropertyNamesOnOverloads_ES5.js b/tests/baselines/reference/computedPropertyNamesOnOverloads_ES5.js index 1470605413a..5562e1ea73c 100644 --- a/tests/baselines/reference/computedPropertyNamesOnOverloads_ES5.js +++ b/tests/baselines/reference/computedPropertyNamesOnOverloads_ES5.js @@ -15,4 +15,4 @@ var C = (function () { } C.prototype[methodName] = function (v) { }; return C; -})(); +}()); diff --git a/tests/baselines/reference/computedPropertyNamesSourceMap1_ES5.js b/tests/baselines/reference/computedPropertyNamesSourceMap1_ES5.js index 5b99f534002..5c4be60bc6e 100644 --- a/tests/baselines/reference/computedPropertyNamesSourceMap1_ES5.js +++ b/tests/baselines/reference/computedPropertyNamesSourceMap1_ES5.js @@ -13,5 +13,5 @@ var C = (function () { debugger; }; return C; -})(); +}()); //# sourceMappingURL=computedPropertyNamesSourceMap1_ES5.js.map \ No newline at end of file diff --git a/tests/baselines/reference/computedPropertyNamesSourceMap1_ES5.sourcemap.txt b/tests/baselines/reference/computedPropertyNamesSourceMap1_ES5.sourcemap.txt index 53dce3e574c..3a64433a709 100644 --- a/tests/baselines/reference/computedPropertyNamesSourceMap1_ES5.sourcemap.txt +++ b/tests/baselines/reference/computedPropertyNamesSourceMap1_ES5.sourcemap.txt @@ -81,7 +81,7 @@ sourceFile:computedPropertyNamesSourceMap1_ES5.ts 1->Emitted(7, 5) Source(5, 1) + SourceIndex(0) 2 >Emitted(7, 13) Source(5, 2) + SourceIndex(0) --- ->>>})(); +>>>}()); 1 > 2 >^ 3 > diff --git a/tests/baselines/reference/concatClassAndString.js b/tests/baselines/reference/concatClassAndString.js index dca09ec7e58..a26a0803f01 100644 --- a/tests/baselines/reference/concatClassAndString.js +++ b/tests/baselines/reference/concatClassAndString.js @@ -11,5 +11,5 @@ var f = (function () { function f() { } return f; -})(); +}()); f += ''; diff --git a/tests/baselines/reference/conditionalOperatorConditionIsObjectType.js b/tests/baselines/reference/conditionalOperatorConditionIsObjectType.js index b2830e4d1d6..9d90b568d49 100644 --- a/tests/baselines/reference/conditionalOperatorConditionIsObjectType.js +++ b/tests/baselines/reference/conditionalOperatorConditionIsObjectType.js @@ -83,7 +83,7 @@ var C = (function () { function C() { } return C; -})(); +}()); ; //Cond is an object type variable condObject ? exprAny1 : exprAny2; diff --git a/tests/baselines/reference/conditionalOperatorWithIdenticalBCT.js b/tests/baselines/reference/conditionalOperatorWithIdenticalBCT.js index a493a5cfab0..3514965f1ce 100644 --- a/tests/baselines/reference/conditionalOperatorWithIdenticalBCT.js +++ b/tests/baselines/reference/conditionalOperatorWithIdenticalBCT.js @@ -58,7 +58,7 @@ var X = (function () { function X() { } return X; -})(); +}()); ; var A = (function (_super) { __extends(A, _super); @@ -66,7 +66,7 @@ var A = (function (_super) { _super.apply(this, arguments); } return A; -})(X); +}(X)); ; var B = (function (_super) { __extends(B, _super); @@ -74,7 +74,7 @@ var B = (function (_super) { _super.apply(this, arguments); } return B; -})(X); +}(X)); ; var x; var a; diff --git a/tests/baselines/reference/conditionalOperatorWithoutIdenticalBCT.js b/tests/baselines/reference/conditionalOperatorWithoutIdenticalBCT.js index 3d75eb0507a..8780c92fc1e 100644 --- a/tests/baselines/reference/conditionalOperatorWithoutIdenticalBCT.js +++ b/tests/baselines/reference/conditionalOperatorWithoutIdenticalBCT.js @@ -34,7 +34,7 @@ var X = (function () { function X() { } return X; -})(); +}()); ; var A = (function (_super) { __extends(A, _super); @@ -42,7 +42,7 @@ var A = (function (_super) { _super.apply(this, arguments); } return A; -})(X); +}(X)); ; var B = (function (_super) { __extends(B, _super); @@ -50,7 +50,7 @@ var B = (function (_super) { _super.apply(this, arguments); } return B; -})(X); +}(X)); ; var x; var a; diff --git a/tests/baselines/reference/conflictMarkerTrivia1.js b/tests/baselines/reference/conflictMarkerTrivia1.js index 68f1b82d38b..8d0354f9823 100644 --- a/tests/baselines/reference/conflictMarkerTrivia1.js +++ b/tests/baselines/reference/conflictMarkerTrivia1.js @@ -13,4 +13,4 @@ var C = (function () { this.v = 1; } return C; -})(); +}()); diff --git a/tests/baselines/reference/conflictMarkerTrivia2.js b/tests/baselines/reference/conflictMarkerTrivia2.js index bbf6726b994..1e58addf706 100644 --- a/tests/baselines/reference/conflictMarkerTrivia2.js +++ b/tests/baselines/reference/conflictMarkerTrivia2.js @@ -22,4 +22,4 @@ var C = (function () { }; C.prototype.bar = function () { }; return C; -})(); +}()); diff --git a/tests/baselines/reference/constDeclarationShadowedByVarDeclaration3.js b/tests/baselines/reference/constDeclarationShadowedByVarDeclaration3.js index 6f5b898c5ff..b8d4065abf4 100644 --- a/tests/baselines/reference/constDeclarationShadowedByVarDeclaration3.js +++ b/tests/baselines/reference/constDeclarationShadowedByVarDeclaration3.js @@ -18,4 +18,4 @@ var Rule = (function () { this.name = name; } return Rule; -})(); +}()); diff --git a/tests/baselines/reference/constEnumMergingWithValues2.js b/tests/baselines/reference/constEnumMergingWithValues2.js index fea628fa540..07249ddcc5f 100644 --- a/tests/baselines/reference/constEnumMergingWithValues2.js +++ b/tests/baselines/reference/constEnumMergingWithValues2.js @@ -14,6 +14,6 @@ define(["require", "exports"], function (require, exports) { function foo() { } return foo; - })(); + }()); return foo; }); diff --git a/tests/baselines/reference/constantOverloadFunction.js b/tests/baselines/reference/constantOverloadFunction.js index 45c0fe9ff0a..09ff39f582e 100644 --- a/tests/baselines/reference/constantOverloadFunction.js +++ b/tests/baselines/reference/constantOverloadFunction.js @@ -24,7 +24,7 @@ var Base = (function () { } Base.prototype.foo = function () { }; return Base; -})(); +}()); var Derived1 = (function (_super) { __extends(Derived1, _super); function Derived1() { @@ -32,7 +32,7 @@ var Derived1 = (function (_super) { } Derived1.prototype.bar = function () { }; return Derived1; -})(Base); +}(Base)); var Derived2 = (function (_super) { __extends(Derived2, _super); function Derived2() { @@ -40,7 +40,7 @@ var Derived2 = (function (_super) { } Derived2.prototype.baz = function () { }; return Derived2; -})(Base); +}(Base)); var Derived3 = (function (_super) { __extends(Derived3, _super); function Derived3() { @@ -48,7 +48,7 @@ var Derived3 = (function (_super) { } Derived3.prototype.biz = function () { }; return Derived3; -})(Base); +}(Base)); function foo(tagName) { return null; } diff --git a/tests/baselines/reference/constantOverloadFunctionNoSubtypeError.js b/tests/baselines/reference/constantOverloadFunctionNoSubtypeError.js index 946f8196372..37c1b1737cd 100644 --- a/tests/baselines/reference/constantOverloadFunctionNoSubtypeError.js +++ b/tests/baselines/reference/constantOverloadFunctionNoSubtypeError.js @@ -25,7 +25,7 @@ var Base = (function () { } Base.prototype.foo = function () { }; return Base; -})(); +}()); var Derived1 = (function (_super) { __extends(Derived1, _super); function Derived1() { @@ -33,7 +33,7 @@ var Derived1 = (function (_super) { } Derived1.prototype.bar = function () { }; return Derived1; -})(Base); +}(Base)); var Derived2 = (function (_super) { __extends(Derived2, _super); function Derived2() { @@ -41,7 +41,7 @@ var Derived2 = (function (_super) { } Derived2.prototype.baz = function () { }; return Derived2; -})(Base); +}(Base)); var Derived3 = (function (_super) { __extends(Derived3, _super); function Derived3() { @@ -49,7 +49,7 @@ var Derived3 = (function (_super) { } Derived3.prototype.biz = function () { }; return Derived3; -})(Base); +}(Base)); function foo(tagName) { return null; } diff --git a/tests/baselines/reference/constraintCheckInGenericBaseTypeReference.js b/tests/baselines/reference/constraintCheckInGenericBaseTypeReference.js index 9cf9d71f7a2..4fd63cf60d0 100644 --- a/tests/baselines/reference/constraintCheckInGenericBaseTypeReference.js +++ b/tests/baselines/reference/constraintCheckInGenericBaseTypeReference.js @@ -31,19 +31,19 @@ var Constraint = (function () { } Constraint.prototype.method = function () { }; return Constraint; -})(); +}()); var GenericBase = (function () { function GenericBase() { } return GenericBase; -})(); +}()); var Derived = (function (_super) { __extends(Derived, _super); function Derived() { _super.apply(this, arguments); } return Derived; -})(GenericBase); +}(GenericBase)); var TypeArg = (function () { function TypeArg() { } @@ -51,9 +51,9 @@ var TypeArg = (function () { Container.People.items; }; return TypeArg; -})(); +}()); var Container = (function () { function Container() { } return Container; -})(); +}()); diff --git a/tests/baselines/reference/constraintSatisfactionWithAny.js b/tests/baselines/reference/constraintSatisfactionWithAny.js index 06d8b17690a..6655a10ca45 100644 --- a/tests/baselines/reference/constraintSatisfactionWithAny.js +++ b/tests/baselines/reference/constraintSatisfactionWithAny.js @@ -76,7 +76,7 @@ var C = (function () { this.x = x; } return C; -})(); +}()); var c1 = new C(a); var c2 = new C(b); var C2 = (function () { @@ -84,7 +84,7 @@ var C2 = (function () { this.x = x; } return C2; -})(); +}()); var c3 = new C2(a); var c4 = new C2(b); //class C3 { @@ -97,6 +97,6 @@ var C4 = (function () { this.x = x; } return C4; -})(); +}()); var c7 = new C4(a); var c8 = new C4(b); diff --git a/tests/baselines/reference/constraintSatisfactionWithEmptyObject.js b/tests/baselines/reference/constraintSatisfactionWithEmptyObject.js index 7850b0ebd01..2886e26dd66 100644 --- a/tests/baselines/reference/constraintSatisfactionWithEmptyObject.js +++ b/tests/baselines/reference/constraintSatisfactionWithEmptyObject.js @@ -49,7 +49,7 @@ var C = (function () { this.x = x; } return C; -})(); +}()); var r2 = new C({}); var i; // {} constraint @@ -62,6 +62,6 @@ var C2 = (function () { this.x = x; } return C2; -})(); +}()); var r2 = new C2({}); var i2; diff --git a/tests/baselines/reference/constraintsThatReferenceOtherContstraints1.js b/tests/baselines/reference/constraintsThatReferenceOtherContstraints1.js index f137ac6baa0..15afabfe251 100644 --- a/tests/baselines/reference/constraintsThatReferenceOtherContstraints1.js +++ b/tests/baselines/reference/constraintsThatReferenceOtherContstraints1.js @@ -14,10 +14,10 @@ var Foo = (function () { function Foo() { } return Foo; -})(); +}()); var Bar = (function () { function Bar() { } return Bar; -})(); +}()); var x; // Error 2 Type '{ a: string; b: number; }' does not satisfy the constraint 'T' for type diff --git a/tests/baselines/reference/constraintsUsedInPrototypeProperty.js b/tests/baselines/reference/constraintsUsedInPrototypeProperty.js index 7f055e519c3..89ba3d0efa9 100644 --- a/tests/baselines/reference/constraintsUsedInPrototypeProperty.js +++ b/tests/baselines/reference/constraintsUsedInPrototypeProperty.js @@ -7,5 +7,5 @@ var Foo = (function () { function Foo() { } return Foo; -})(); +}()); Foo.prototype; // Foo diff --git a/tests/baselines/reference/constructSignatureAssignabilityInInheritance2.js b/tests/baselines/reference/constructSignatureAssignabilityInInheritance2.js index 38b7b7fc194..88f35f53b17 100644 --- a/tests/baselines/reference/constructSignatureAssignabilityInInheritance2.js +++ b/tests/baselines/reference/constructSignatureAssignabilityInInheritance2.js @@ -80,25 +80,25 @@ var Base = (function () { function Base() { } return Base; -})(); +}()); var Derived = (function (_super) { __extends(Derived, _super); function Derived() { _super.apply(this, arguments); } return Derived; -})(Base); +}(Base)); var Derived2 = (function (_super) { __extends(Derived2, _super); function Derived2() { _super.apply(this, arguments); } return Derived2; -})(Derived); +}(Derived)); var OtherDerived = (function (_super) { __extends(OtherDerived, _super); function OtherDerived() { _super.apply(this, arguments); } return OtherDerived; -})(Base); +}(Base)); diff --git a/tests/baselines/reference/constructSignatureAssignabilityInInheritance3.js b/tests/baselines/reference/constructSignatureAssignabilityInInheritance3.js index 7d07c1a1712..96318a0d616 100644 --- a/tests/baselines/reference/constructSignatureAssignabilityInInheritance3.js +++ b/tests/baselines/reference/constructSignatureAssignabilityInInheritance3.js @@ -125,26 +125,26 @@ var Errors; function Base() { } return Base; - })(); + }()); var Derived = (function (_super) { __extends(Derived, _super); function Derived() { _super.apply(this, arguments); } return Derived; - })(Base); + }(Base)); var Derived2 = (function (_super) { __extends(Derived2, _super); function Derived2() { _super.apply(this, arguments); } return Derived2; - })(Derived); + }(Derived)); var OtherDerived = (function (_super) { __extends(OtherDerived, _super); function OtherDerived() { _super.apply(this, arguments); } return OtherDerived; - })(Base); + }(Base)); })(Errors || (Errors = {})); diff --git a/tests/baselines/reference/constructSignatureAssignabilityInInheritance4.js b/tests/baselines/reference/constructSignatureAssignabilityInInheritance4.js index ba341eec61f..171c4bc6210 100644 --- a/tests/baselines/reference/constructSignatureAssignabilityInInheritance4.js +++ b/tests/baselines/reference/constructSignatureAssignabilityInInheritance4.js @@ -70,25 +70,25 @@ var Base = (function () { function Base() { } return Base; -})(); +}()); var Derived = (function (_super) { __extends(Derived, _super); function Derived() { _super.apply(this, arguments); } return Derived; -})(Base); +}(Base)); var Derived2 = (function (_super) { __extends(Derived2, _super); function Derived2() { _super.apply(this, arguments); } return Derived2; -})(Derived); +}(Derived)); var OtherDerived = (function (_super) { __extends(OtherDerived, _super); function OtherDerived() { _super.apply(this, arguments); } return OtherDerived; -})(Base); +}(Base)); diff --git a/tests/baselines/reference/constructSignatureAssignabilityInInheritance5.js b/tests/baselines/reference/constructSignatureAssignabilityInInheritance5.js index 304b5cafd66..26757c43def 100644 --- a/tests/baselines/reference/constructSignatureAssignabilityInInheritance5.js +++ b/tests/baselines/reference/constructSignatureAssignabilityInInheritance5.js @@ -60,25 +60,25 @@ var Base = (function () { function Base() { } return Base; -})(); +}()); var Derived = (function (_super) { __extends(Derived, _super); function Derived() { _super.apply(this, arguments); } return Derived; -})(Base); +}(Base)); var Derived2 = (function (_super) { __extends(Derived2, _super); function Derived2() { _super.apply(this, arguments); } return Derived2; -})(Derived); +}(Derived)); var OtherDerived = (function (_super) { __extends(OtherDerived, _super); function OtherDerived() { _super.apply(this, arguments); } return OtherDerived; -})(Base); +}(Base)); diff --git a/tests/baselines/reference/constructSignatureAssignabilityInInheritance6.js b/tests/baselines/reference/constructSignatureAssignabilityInInheritance6.js index 99c885f9716..ae1d0d90445 100644 --- a/tests/baselines/reference/constructSignatureAssignabilityInInheritance6.js +++ b/tests/baselines/reference/constructSignatureAssignabilityInInheritance6.js @@ -63,25 +63,25 @@ var Base = (function () { function Base() { } return Base; -})(); +}()); var Derived = (function (_super) { __extends(Derived, _super); function Derived() { _super.apply(this, arguments); } return Derived; -})(Base); +}(Base)); var Derived2 = (function (_super) { __extends(Derived2, _super); function Derived2() { _super.apply(this, arguments); } return Derived2; -})(Derived); +}(Derived)); var OtherDerived = (function (_super) { __extends(OtherDerived, _super); function OtherDerived() { _super.apply(this, arguments); } return OtherDerived; -})(Base); +}(Base)); diff --git a/tests/baselines/reference/constructSignatureWithAccessibilityModifiersOnParameters.js b/tests/baselines/reference/constructSignatureWithAccessibilityModifiersOnParameters.js index f31d662d871..89de89c4fca 100644 --- a/tests/baselines/reference/constructSignatureWithAccessibilityModifiersOnParameters.js +++ b/tests/baselines/reference/constructSignatureWithAccessibilityModifiersOnParameters.js @@ -37,18 +37,18 @@ var C = (function () { this.y = y; } return C; -})(); +}()); var C2 = (function () { function C2(x) { this.x = x; } return C2; -})(); +}()); var C3 = (function () { function C3(x) { this.x = x; } return C3; -})(); +}()); var a; var b; diff --git a/tests/baselines/reference/constructSignatureWithAccessibilityModifiersOnParameters2.js b/tests/baselines/reference/constructSignatureWithAccessibilityModifiersOnParameters2.js index 26abb6448f9..c58b8ed003e 100644 --- a/tests/baselines/reference/constructSignatureWithAccessibilityModifiersOnParameters2.js +++ b/tests/baselines/reference/constructSignatureWithAccessibilityModifiersOnParameters2.js @@ -44,18 +44,18 @@ var C = (function () { this.y = y; } return C; -})(); +}()); var C2 = (function () { function C2(x) { this.x = x; } return C2; -})(); +}()); var C3 = (function () { function C3(y) { this.y = y; } return C3; -})(); +}()); var a; var b; diff --git a/tests/baselines/reference/constructSignaturesWithIdenticalOverloads.js b/tests/baselines/reference/constructSignaturesWithIdenticalOverloads.js index 92528d6635c..f2dc1d2357e 100644 --- a/tests/baselines/reference/constructSignaturesWithIdenticalOverloads.js +++ b/tests/baselines/reference/constructSignaturesWithIdenticalOverloads.js @@ -55,13 +55,13 @@ var C = (function () { function C(x) { } return C; -})(); +}()); var r1 = new C(1, ''); var C2 = (function () { function C2(x) { } return C2; -})(); +}()); var r2 = new C2(1, ''); var i; var r3 = new i(1, ''); diff --git a/tests/baselines/reference/constructSignaturesWithOverloads.js b/tests/baselines/reference/constructSignaturesWithOverloads.js index 1ee6290aeec..999ea156568 100644 --- a/tests/baselines/reference/constructSignaturesWithOverloads.js +++ b/tests/baselines/reference/constructSignaturesWithOverloads.js @@ -56,13 +56,13 @@ var C = (function () { function C(x) { } return C; -})(); +}()); var r1 = new C(1, ''); var C2 = (function () { function C2(x) { } return C2; -})(); +}()); var r2 = new C2(1, ''); var i; var r3 = new i(1, ''); diff --git a/tests/baselines/reference/constructSignaturesWithOverloads2.js b/tests/baselines/reference/constructSignaturesWithOverloads2.js index 642cac9f364..eae1b358dcc 100644 --- a/tests/baselines/reference/constructSignaturesWithOverloads2.js +++ b/tests/baselines/reference/constructSignaturesWithOverloads2.js @@ -46,7 +46,7 @@ var C = (function () { function C(x) { } return C; -})(); +}()); var C; (function (C) { C.x = 1; @@ -56,7 +56,7 @@ var C2 = (function () { function C2(x) { } return C2; -})(); +}()); var C2; (function (C2) { C2.x = 1; diff --git a/tests/baselines/reference/constructSignaturesWithOverloadsThatDifferOnlyByReturnType.js b/tests/baselines/reference/constructSignaturesWithOverloadsThatDifferOnlyByReturnType.js index 1ef6884816d..1593a378764 100644 --- a/tests/baselines/reference/constructSignaturesWithOverloadsThatDifferOnlyByReturnType.js +++ b/tests/baselines/reference/constructSignaturesWithOverloadsThatDifferOnlyByReturnType.js @@ -38,11 +38,11 @@ var C = (function () { function C(x) { } return C; -})(); +}()); var C2 = (function () { function C2(x, y) { } return C2; -})(); +}()); var a; var b; diff --git a/tests/baselines/reference/constructorArgWithGenericCallSignature.js b/tests/baselines/reference/constructorArgWithGenericCallSignature.js index ca859869850..c299bba6c91 100644 --- a/tests/baselines/reference/constructorArgWithGenericCallSignature.js +++ b/tests/baselines/reference/constructorArgWithGenericCallSignature.js @@ -21,7 +21,7 @@ var Test; function MyClass(func) { } return MyClass; - })(); + }()); Test.MyClass = MyClass; function F(func) { } Test.F = F; diff --git a/tests/baselines/reference/constructorArgs.js b/tests/baselines/reference/constructorArgs.js index 6fc3511b70e..1d533506e15 100644 --- a/tests/baselines/reference/constructorArgs.js +++ b/tests/baselines/reference/constructorArgs.js @@ -25,7 +25,7 @@ var Super = (function () { function Super(value) { } return Super; -})(); +}()); var Sub = (function (_super) { __extends(Sub, _super); function Sub(options) { @@ -33,4 +33,4 @@ var Sub = (function (_super) { this.options = options; } return Sub; -})(Super); +}(Super)); diff --git a/tests/baselines/reference/constructorArgsErrors1.js b/tests/baselines/reference/constructorArgsErrors1.js index 25701901e13..bb0725ab8b9 100644 --- a/tests/baselines/reference/constructorArgsErrors1.js +++ b/tests/baselines/reference/constructorArgsErrors1.js @@ -9,4 +9,4 @@ var foo = (function () { function foo(a) { } return foo; -})(); +}()); diff --git a/tests/baselines/reference/constructorArgsErrors2.js b/tests/baselines/reference/constructorArgsErrors2.js index a0cab9f39f8..5650c64c96d 100644 --- a/tests/baselines/reference/constructorArgsErrors2.js +++ b/tests/baselines/reference/constructorArgsErrors2.js @@ -11,4 +11,4 @@ var foo = (function () { this.a = a; } return foo; -})(); +}()); diff --git a/tests/baselines/reference/constructorArgsErrors3.js b/tests/baselines/reference/constructorArgsErrors3.js index 3f9b09254a1..4d7d36a02c5 100644 --- a/tests/baselines/reference/constructorArgsErrors3.js +++ b/tests/baselines/reference/constructorArgsErrors3.js @@ -11,4 +11,4 @@ var foo = (function () { this.a = a; } return foo; -})(); +}()); diff --git a/tests/baselines/reference/constructorArgsErrors4.js b/tests/baselines/reference/constructorArgsErrors4.js index c0646a54148..558cb6e68de 100644 --- a/tests/baselines/reference/constructorArgsErrors4.js +++ b/tests/baselines/reference/constructorArgsErrors4.js @@ -11,4 +11,4 @@ var foo = (function () { this.a = a; } return foo; -})(); +}()); diff --git a/tests/baselines/reference/constructorArgsErrors5.js b/tests/baselines/reference/constructorArgsErrors5.js index 3455490aa6f..c481d6f323c 100644 --- a/tests/baselines/reference/constructorArgsErrors5.js +++ b/tests/baselines/reference/constructorArgsErrors5.js @@ -10,4 +10,4 @@ var foo = (function () { function foo(a) { } return foo; -})(); +}()); diff --git a/tests/baselines/reference/constructorDefaultValuesReferencingThis.js b/tests/baselines/reference/constructorDefaultValuesReferencingThis.js index e022f46a528..5bc75012f7d 100644 --- a/tests/baselines/reference/constructorDefaultValuesReferencingThis.js +++ b/tests/baselines/reference/constructorDefaultValuesReferencingThis.js @@ -17,17 +17,17 @@ var C = (function () { if (x === void 0) { x = this; } } return C; -})(); +}()); var D = (function () { function D(x) { if (x === void 0) { x = this; } } return D; -})(); +}()); var E = (function () { function E(x) { if (x === void 0) { x = this; } this.x = x; } return E; -})(); +}()); diff --git a/tests/baselines/reference/constructorFunctionTypeIsAssignableToBaseType.js b/tests/baselines/reference/constructorFunctionTypeIsAssignableToBaseType.js index 305b3e54ead..d06faa80f20 100644 --- a/tests/baselines/reference/constructorFunctionTypeIsAssignableToBaseType.js +++ b/tests/baselines/reference/constructorFunctionTypeIsAssignableToBaseType.js @@ -29,18 +29,18 @@ var Base = (function () { function Base() { } return Base; -})(); +}()); var Derived = (function (_super) { __extends(Derived, _super); function Derived() { _super.apply(this, arguments); } return Derived; -})(Base); +}(Base)); var Derived2 = (function (_super) { __extends(Derived2, _super); function Derived2() { _super.apply(this, arguments); } return Derived2; -})(Base); +}(Base)); diff --git a/tests/baselines/reference/constructorFunctionTypeIsAssignableToBaseType2.js b/tests/baselines/reference/constructorFunctionTypeIsAssignableToBaseType2.js index b2bf377f0cc..1c3d6bf16d0 100644 --- a/tests/baselines/reference/constructorFunctionTypeIsAssignableToBaseType2.js +++ b/tests/baselines/reference/constructorFunctionTypeIsAssignableToBaseType2.js @@ -43,14 +43,14 @@ var Base = (function () { function Base(x) { } return Base; -})(); +}()); var Derived = (function (_super) { __extends(Derived, _super); function Derived(x) { _super.call(this, x); } return Derived; -})(Base); +}(Base)); var Derived2 = (function (_super) { __extends(Derived2, _super); // ok, not enforcing assignability relation on this @@ -59,4 +59,4 @@ var Derived2 = (function (_super) { return 1; } return Derived2; -})(Base); +}(Base)); diff --git a/tests/baselines/reference/constructorHasPrototypeProperty.js b/tests/baselines/reference/constructorHasPrototypeProperty.js index a1bdee8e7d4..960b76f52c4 100644 --- a/tests/baselines/reference/constructorHasPrototypeProperty.js +++ b/tests/baselines/reference/constructorHasPrototypeProperty.js @@ -43,14 +43,14 @@ var NonGeneric; function C() { } return C; - })(); + }()); var D = (function (_super) { __extends(D, _super); function D() { _super.apply(this, arguments); } return D; - })(C); + }(C)); var r = C.prototype; r.foo; var r2 = D.prototype; @@ -62,14 +62,14 @@ var Generic; function C() { } return C; - })(); + }()); var D = (function (_super) { __extends(D, _super); function D() { _super.apply(this, arguments); } return D; - })(C); + }(C)); var r = C.prototype; // C var ra = r.foo; // any var r2 = D.prototype; // D diff --git a/tests/baselines/reference/constructorImplementationWithDefaultValues.js b/tests/baselines/reference/constructorImplementationWithDefaultValues.js index 2279b13f21d..607ffb1e30b 100644 --- a/tests/baselines/reference/constructorImplementationWithDefaultValues.js +++ b/tests/baselines/reference/constructorImplementationWithDefaultValues.js @@ -27,18 +27,18 @@ var C = (function () { var y = x; } return C; -})(); +}()); var D = (function () { function D(x) { if (x === void 0) { x = null; } var y = x; } return D; -})(); +}()); var E = (function () { function E(x) { if (x === void 0) { x = null; } var y = x; } return E; -})(); +}()); diff --git a/tests/baselines/reference/constructorImplementationWithDefaultValues2.js b/tests/baselines/reference/constructorImplementationWithDefaultValues2.js index 217a8287f14..b0ca55b6504 100644 --- a/tests/baselines/reference/constructorImplementationWithDefaultValues2.js +++ b/tests/baselines/reference/constructorImplementationWithDefaultValues2.js @@ -28,7 +28,7 @@ var C = (function () { var y = x; } return C; -})(); +}()); var D = (function () { function D(x, y) { if (x === void 0) { x = 1; } @@ -37,11 +37,11 @@ var D = (function () { var z = x; } return D; -})(); +}()); var E = (function () { function E(x) { if (x === void 0) { x = new Date(); } var y = x; } return E; -})(); +}()); diff --git a/tests/baselines/reference/constructorInvocationWithTooFewTypeArgs.js b/tests/baselines/reference/constructorInvocationWithTooFewTypeArgs.js index e43276dfef1..6bc52392e1c 100644 --- a/tests/baselines/reference/constructorInvocationWithTooFewTypeArgs.js +++ b/tests/baselines/reference/constructorInvocationWithTooFewTypeArgs.js @@ -15,5 +15,5 @@ var D = (function () { function D() { } return D; -})(); +}()); var d = new D(); diff --git a/tests/baselines/reference/constructorOverloads1.js b/tests/baselines/reference/constructorOverloads1.js index 97f33dca862..47906974f6e 100644 --- a/tests/baselines/reference/constructorOverloads1.js +++ b/tests/baselines/reference/constructorOverloads1.js @@ -28,7 +28,7 @@ var Foo = (function () { Foo.prototype.bar1 = function () { }; Foo.prototype.bar2 = function () { }; return Foo; -})(); +}()); var f1 = new Foo("hey"); var f2 = new Foo(0); var f3 = new Foo(f1); diff --git a/tests/baselines/reference/constructorOverloads2.js b/tests/baselines/reference/constructorOverloads2.js index d95477d84f6..76481ec1bc6 100644 --- a/tests/baselines/reference/constructorOverloads2.js +++ b/tests/baselines/reference/constructorOverloads2.js @@ -36,7 +36,7 @@ var FooBase = (function () { } FooBase.prototype.bar1 = function () { }; return FooBase; -})(); +}()); var Foo = (function (_super) { __extends(Foo, _super); function Foo(x, y) { @@ -44,7 +44,7 @@ var Foo = (function (_super) { } Foo.prototype.bar1 = function () { }; return Foo; -})(FooBase); +}(FooBase)); var f1 = new Foo("hey"); var f2 = new Foo(0); var f3 = new Foo(f1); diff --git a/tests/baselines/reference/constructorOverloads3.js b/tests/baselines/reference/constructorOverloads3.js index c7e4e411319..61f0d50db03 100644 --- a/tests/baselines/reference/constructorOverloads3.js +++ b/tests/baselines/reference/constructorOverloads3.js @@ -34,7 +34,7 @@ var Foo = (function (_super) { } Foo.prototype.bar1 = function () { }; return Foo; -})(FooBase); +}(FooBase)); var f1 = new Foo("hey"); var f2 = new Foo(0); var f3 = new Foo(f1); diff --git a/tests/baselines/reference/constructorOverloads8.js b/tests/baselines/reference/constructorOverloads8.js index 6fc51494aba..f1185b6ab76 100644 --- a/tests/baselines/reference/constructorOverloads8.js +++ b/tests/baselines/reference/constructorOverloads8.js @@ -20,9 +20,9 @@ var C = (function () { function C(x) { } return C; -})(); +}()); var D = (function () { function D(x) { } return D; -})(); +}()); diff --git a/tests/baselines/reference/constructorOverloadsWithDefaultValues.js b/tests/baselines/reference/constructorOverloadsWithDefaultValues.js index 9e5ffe7388e..78a5d337690 100644 --- a/tests/baselines/reference/constructorOverloadsWithDefaultValues.js +++ b/tests/baselines/reference/constructorOverloadsWithDefaultValues.js @@ -18,9 +18,9 @@ var C = (function () { function C() { } return C; -})(); +}()); var D = (function () { function D() { } return D; -})(); +}()); diff --git a/tests/baselines/reference/constructorOverloadsWithOptionalParameters.js b/tests/baselines/reference/constructorOverloadsWithOptionalParameters.js index 183bc4eda01..b251a5f88ce 100644 --- a/tests/baselines/reference/constructorOverloadsWithOptionalParameters.js +++ b/tests/baselines/reference/constructorOverloadsWithOptionalParameters.js @@ -18,9 +18,9 @@ var C = (function () { function C() { } return C; -})(); +}()); var D = (function () { function D() { } return D; -})(); +}()); diff --git a/tests/baselines/reference/constructorParameterProperties.js b/tests/baselines/reference/constructorParameterProperties.js index 11446a316d3..17c6fdaddcd 100644 --- a/tests/baselines/reference/constructorParameterProperties.js +++ b/tests/baselines/reference/constructorParameterProperties.js @@ -28,7 +28,7 @@ var C = (function () { this.z = z; } return C; -})(); +}()); var c; var r = c.y; var r2 = c.x; // error @@ -39,7 +39,7 @@ var D = (function () { this.z = z; } return D; -})(); +}()); var d; var r = d.y; var r2 = d.x; // error diff --git a/tests/baselines/reference/constructorParameterProperties2.js b/tests/baselines/reference/constructorParameterProperties2.js index 02e4cf82c84..c740fc9fd30 100644 --- a/tests/baselines/reference/constructorParameterProperties2.js +++ b/tests/baselines/reference/constructorParameterProperties2.js @@ -37,7 +37,7 @@ var C = (function () { function C(y) { } // ok return C; -})(); +}()); var c; var r = c.y; var D = (function () { @@ -45,7 +45,7 @@ var D = (function () { this.y = y; } // error return D; -})(); +}()); var d; var r2 = d.y; var E = (function () { @@ -53,7 +53,7 @@ var E = (function () { this.y = y; } // error return E; -})(); +}()); var e; var r3 = e.y; // error var F = (function () { @@ -61,6 +61,6 @@ var F = (function () { this.y = y; } // error return F; -})(); +}()); var f; var r4 = f.y; // error diff --git a/tests/baselines/reference/constructorParameterShadowsOuterScopes.js b/tests/baselines/reference/constructorParameterShadowsOuterScopes.js index 18a1891c927..aa6612828fa 100644 --- a/tests/baselines/reference/constructorParameterShadowsOuterScopes.js +++ b/tests/baselines/reference/constructorParameterShadowsOuterScopes.js @@ -32,7 +32,7 @@ var C = (function () { x = 2; // error, x is string } return C; -})(); +}()); var y = 1; var D = (function () { function D(x) { @@ -40,4 +40,4 @@ var D = (function () { var y = ""; } return D; -})(); +}()); diff --git a/tests/baselines/reference/constructorParametersInVariableDeclarations.js b/tests/baselines/reference/constructorParametersInVariableDeclarations.js index 984c8c392b1..659b4ea98fc 100644 --- a/tests/baselines/reference/constructorParametersInVariableDeclarations.js +++ b/tests/baselines/reference/constructorParametersInVariableDeclarations.js @@ -24,7 +24,7 @@ var A = (function () { this.c = function () { return x; }; } return A; -})(); +}()); var B = (function () { function B() { this.a = x; @@ -33,4 +33,4 @@ var B = (function () { var x = 1; } return B; -})(); +}()); diff --git a/tests/baselines/reference/constructorParametersThatShadowExternalNamesInVariableDeclarations.js b/tests/baselines/reference/constructorParametersThatShadowExternalNamesInVariableDeclarations.js index 9e86b185fbd..1bcf24ee4c3 100644 --- a/tests/baselines/reference/constructorParametersThatShadowExternalNamesInVariableDeclarations.js +++ b/tests/baselines/reference/constructorParametersThatShadowExternalNamesInVariableDeclarations.js @@ -20,11 +20,11 @@ var A = (function () { this.a = x; } return A; -})(); +}()); var B = (function () { function B() { this.a = x; var x = ""; } return B; -})(); +}()); diff --git a/tests/baselines/reference/constructorReturningAPrimitive.js b/tests/baselines/reference/constructorReturningAPrimitive.js index 04308590a60..297c9954f55 100644 --- a/tests/baselines/reference/constructorReturningAPrimitive.js +++ b/tests/baselines/reference/constructorReturningAPrimitive.js @@ -27,7 +27,7 @@ var A = (function () { return 1; } return A; -})(); +}()); var a = new A(); var B = (function () { function B() { @@ -35,5 +35,5 @@ var B = (function () { return x; } return B; -})(); +}()); var b = new B(); diff --git a/tests/baselines/reference/constructorReturnsInvalidType.js b/tests/baselines/reference/constructorReturnsInvalidType.js index 7f6119cc8bd..82c5cc4a760 100644 --- a/tests/baselines/reference/constructorReturnsInvalidType.js +++ b/tests/baselines/reference/constructorReturnsInvalidType.js @@ -16,5 +16,5 @@ var X = (function () { } X.prototype.foo = function () { }; return X; -})(); +}()); var x = new X(); diff --git a/tests/baselines/reference/constructorStaticParamName.js b/tests/baselines/reference/constructorStaticParamName.js index cf74aed2ebc..9520a7c052c 100644 --- a/tests/baselines/reference/constructorStaticParamName.js +++ b/tests/baselines/reference/constructorStaticParamName.js @@ -12,4 +12,4 @@ var test = (function () { function test(static) { } return test; -})(); +}()); diff --git a/tests/baselines/reference/constructorStaticParamNameErrors.js b/tests/baselines/reference/constructorStaticParamNameErrors.js index 43e70a8c3cf..91d405efd28 100644 --- a/tests/baselines/reference/constructorStaticParamNameErrors.js +++ b/tests/baselines/reference/constructorStaticParamNameErrors.js @@ -12,4 +12,4 @@ var test = (function () { function test(static) { } return test; -})(); +}()); diff --git a/tests/baselines/reference/constructorWithAssignableReturnExpression.js b/tests/baselines/reference/constructorWithAssignableReturnExpression.js index 238f2e18aea..d691dd2b511 100644 --- a/tests/baselines/reference/constructorWithAssignableReturnExpression.js +++ b/tests/baselines/reference/constructorWithAssignableReturnExpression.js @@ -42,28 +42,28 @@ var C = (function () { return 1; } return C; -})(); +}()); var D = (function () { function D() { return 1; // error } return D; -})(); +}()); var E = (function () { function E() { return { x: 1 }; } return E; -})(); +}()); var F = (function () { function F() { return { x: 1 }; // error } return F; -})(); +}()); var G = (function () { function G() { return { x: null }; } return G; -})(); +}()); diff --git a/tests/baselines/reference/constructorWithExpressionLessReturn.js b/tests/baselines/reference/constructorWithExpressionLessReturn.js index c0074bdecfb..8bf0e2f8de0 100644 --- a/tests/baselines/reference/constructorWithExpressionLessReturn.js +++ b/tests/baselines/reference/constructorWithExpressionLessReturn.js @@ -30,24 +30,24 @@ var C = (function () { return; } return C; -})(); +}()); var D = (function () { function D() { return; } return D; -})(); +}()); var E = (function () { function E(x) { this.x = x; return; } return E; -})(); +}()); var F = (function () { function F(x) { this.x = x; return; } return F; -})(); +}()); diff --git a/tests/baselines/reference/constructorWithIncompleteTypeAnnotation.js b/tests/baselines/reference/constructorWithIncompleteTypeAnnotation.js index 4765d1de283..905c12e07e3 100644 --- a/tests/baselines/reference/constructorWithIncompleteTypeAnnotation.js +++ b/tests/baselines/reference/constructorWithIncompleteTypeAnnotation.js @@ -331,7 +331,7 @@ var TypeScriptAllInOne; console.log(e); }; return Program; - })(); + }()); TypeScriptAllInOne.Program = Program; try { } @@ -484,7 +484,7 @@ var BasicFeatures = (function () { return 1; }; return BasicFeatures; -})(); +}()); var CLASS = (function () { function CLASS() { this.d = function () { yield 0; }; @@ -507,13 +507,13 @@ var CLASS = (function () { return false; }; return CLASS; -})(); +}()); // todo: use these var A = (function () { function A() { } return A; -})(); +}()); method1(val, number); { return val; @@ -531,13 +531,13 @@ var B = (function (_super) { return this.method1(2); }; return B; -})(A); +}(A)); var Overloading = (function () { function Overloading() { this.otherValue = 42; } return Overloading; -})(); +}()); Overloads(value, string); Overloads(); while () diff --git a/tests/baselines/reference/constructorsWithSpecializedSignatures.js b/tests/baselines/reference/constructorsWithSpecializedSignatures.js index 4faa5e4030a..c3a0752ddf8 100644 --- a/tests/baselines/reference/constructorsWithSpecializedSignatures.js +++ b/tests/baselines/reference/constructorsWithSpecializedSignatures.js @@ -49,10 +49,10 @@ var D = (function () { function D(x) { } return D; -})(); +}()); // overloads are ok var D2 = (function () { function D2(x) { } // error return D2; -})(); +}()); diff --git a/tests/baselines/reference/contextualTypeAppliedToVarArgs.js b/tests/baselines/reference/contextualTypeAppliedToVarArgs.js index 77ce90ec737..f8b271ba47c 100644 --- a/tests/baselines/reference/contextualTypeAppliedToVarArgs.js +++ b/tests/baselines/reference/contextualTypeAppliedToVarArgs.js @@ -30,4 +30,4 @@ var Foo = (function () { }); }; return Foo; -})(); +}()); diff --git a/tests/baselines/reference/contextualTypeWithTuple.js b/tests/baselines/reference/contextualTypeWithTuple.js index cfcdd13f7d0..4fff51de563 100644 --- a/tests/baselines/reference/contextualTypeWithTuple.js +++ b/tests/baselines/reference/contextualTypeWithTuple.js @@ -36,12 +36,12 @@ var C = (function () { function C() { } return C; -})(); +}()); var D = (function () { function D() { } return D; -})(); +}()); var unionTuple = [new C(), "foo"]; var unionTuple1 = [new C(), "foo"]; var unionTuple2 = [new C(), "foo", new D()]; diff --git a/tests/baselines/reference/contextualTyping.js b/tests/baselines/reference/contextualTyping.js index a763b2b6544..227c6bb1f41 100644 --- a/tests/baselines/reference/contextualTyping.js +++ b/tests/baselines/reference/contextualTyping.js @@ -240,7 +240,7 @@ var C1T5 = (function () { }; } return C1T5; -})(); +}()); // CONTEXT: Module property declaration var C2T5; (function (C2T5) { @@ -279,7 +279,7 @@ var C4T5 = (function () { }; } return C4T5; -})(); +}()); // CONTEXT: Module property assignment var C5T5; (function (C5T5) { @@ -329,7 +329,7 @@ var C11t5 = (function () { function C11t5(f) { } return C11t5; -})(); +}()); ; var i = new C11t5(function (n) { return ({}); }); // CONTEXT: Type annotated expression diff --git a/tests/baselines/reference/contextualTyping.sourcemap.txt b/tests/baselines/reference/contextualTyping.sourcemap.txt index 3498ec016df..3557299d96a 100644 --- a/tests/baselines/reference/contextualTyping.sourcemap.txt +++ b/tests/baselines/reference/contextualTyping.sourcemap.txt @@ -107,7 +107,7 @@ sourceFile:contextualTyping.ts 1->Emitted(8, 5) Source(18, 1) + SourceIndex(0) 2 >Emitted(8, 16) Source(18, 2) + SourceIndex(0) --- ->>>})(); +>>>}()); 1 > 2 >^ 3 > @@ -1043,7 +1043,7 @@ sourceFile:contextualTyping.ts 1->Emitted(47, 5) Source(63, 1) + SourceIndex(0) 2 >Emitted(47, 16) Source(63, 2) + SourceIndex(0) --- ->>>})(); +>>>}()); 1 > 2 >^ 3 > @@ -2350,7 +2350,7 @@ sourceFile:contextualTyping.ts 1->Emitted(97, 5) Source(155, 55) + SourceIndex(0) 2 >Emitted(97, 17) Source(155, 56) + SourceIndex(0) --- ->>>})(); +>>>}()); 1 > 2 >^ 3 > diff --git a/tests/baselines/reference/contextualTyping10.js b/tests/baselines/reference/contextualTyping10.js index 08a2172b69a..cd324b384fd 100644 --- a/tests/baselines/reference/contextualTyping10.js +++ b/tests/baselines/reference/contextualTyping10.js @@ -7,4 +7,4 @@ var foo = (function () { this.bar = [{ id: 1 }, { id: 2 }]; } return foo; -})(); +}()); diff --git a/tests/baselines/reference/contextualTyping11.js b/tests/baselines/reference/contextualTyping11.js index a7ec3815fae..9abf332c29e 100644 --- a/tests/baselines/reference/contextualTyping11.js +++ b/tests/baselines/reference/contextualTyping11.js @@ -7,4 +7,4 @@ var foo = (function () { this.bar = [({})]; } return foo; -})(); +}()); diff --git a/tests/baselines/reference/contextualTyping12.js b/tests/baselines/reference/contextualTyping12.js index c41ccbed990..c9ce3e2f964 100644 --- a/tests/baselines/reference/contextualTyping12.js +++ b/tests/baselines/reference/contextualTyping12.js @@ -7,4 +7,4 @@ var foo = (function () { this.bar = [{ id: 1 }, { id: 2, name: "foo" }]; } return foo; -})(); +}()); diff --git a/tests/baselines/reference/contextualTyping14.js b/tests/baselines/reference/contextualTyping14.js index 5bae8c948a2..f29e077eaa2 100644 --- a/tests/baselines/reference/contextualTyping14.js +++ b/tests/baselines/reference/contextualTyping14.js @@ -7,4 +7,4 @@ var foo = (function () { this.bar = function (a) { return a; }; } return foo; -})(); +}()); diff --git a/tests/baselines/reference/contextualTyping15.js b/tests/baselines/reference/contextualTyping15.js index 250076ec4d5..30df3d3d428 100644 --- a/tests/baselines/reference/contextualTyping15.js +++ b/tests/baselines/reference/contextualTyping15.js @@ -7,4 +7,4 @@ var foo = (function () { this.bar = function () { return 1; }; } return foo; -})(); +}()); diff --git a/tests/baselines/reference/contextualTyping3.js b/tests/baselines/reference/contextualTyping3.js index 19d71f4ca71..2fc0f330b13 100644 --- a/tests/baselines/reference/contextualTyping3.js +++ b/tests/baselines/reference/contextualTyping3.js @@ -7,4 +7,4 @@ var foo = (function () { this.bar = { id: 5 }; } return foo; -})(); +}()); diff --git a/tests/baselines/reference/contextualTyping4.js b/tests/baselines/reference/contextualTyping4.js index af79e3732f2..36f7c61429f 100644 --- a/tests/baselines/reference/contextualTyping4.js +++ b/tests/baselines/reference/contextualTyping4.js @@ -7,4 +7,4 @@ var foo = (function () { this.bar = { id: 5, name: "foo" }; } return foo; -})(); +}()); diff --git a/tests/baselines/reference/contextualTyping5.js b/tests/baselines/reference/contextualTyping5.js index 3fcc1530f68..f5e68e93b22 100644 --- a/tests/baselines/reference/contextualTyping5.js +++ b/tests/baselines/reference/contextualTyping5.js @@ -7,4 +7,4 @@ var foo = (function () { this.bar = {}; } return foo; -})(); +}()); diff --git a/tests/baselines/reference/contextualTypingArrayOfLambdas.js b/tests/baselines/reference/contextualTypingArrayOfLambdas.js index 59da607079b..5775e0f064d 100644 --- a/tests/baselines/reference/contextualTypingArrayOfLambdas.js +++ b/tests/baselines/reference/contextualTypingArrayOfLambdas.js @@ -24,19 +24,19 @@ var A = (function () { function A() { } return A; -})(); +}()); var B = (function (_super) { __extends(B, _super); function B() { _super.apply(this, arguments); } return B; -})(A); +}(A)); var C = (function (_super) { __extends(C, _super); function C() { _super.apply(this, arguments); } return C; -})(A); +}(A)); var xs = [function (x) { }, function (x) { }, function (x) { }]; diff --git a/tests/baselines/reference/contextualTypingOfConditionalExpression.js b/tests/baselines/reference/contextualTypingOfConditionalExpression.js index a0f8ea0a4cf..29bb48e7970 100644 --- a/tests/baselines/reference/contextualTypingOfConditionalExpression.js +++ b/tests/baselines/reference/contextualTypingOfConditionalExpression.js @@ -25,19 +25,19 @@ var A = (function () { function A() { } return A; -})(); +}()); var B = (function (_super) { __extends(B, _super); function B() { _super.apply(this, arguments); } return B; -})(A); +}(A)); var C = (function (_super) { __extends(C, _super); function C() { _super.apply(this, arguments); } return C; -})(A); +}(A)); var x2 = true ? function (a) { return a.foo; } : function (b) { return b.foo; }; diff --git a/tests/baselines/reference/contextualTypingOfConditionalExpression2.js b/tests/baselines/reference/contextualTypingOfConditionalExpression2.js index 2833ed37d4b..1d84d74e590 100644 --- a/tests/baselines/reference/contextualTypingOfConditionalExpression2.js +++ b/tests/baselines/reference/contextualTypingOfConditionalExpression2.js @@ -22,19 +22,19 @@ var A = (function () { function A() { } return A; -})(); +}()); var B = (function (_super) { __extends(B, _super); function B() { _super.apply(this, arguments); } return B; -})(A); +}(A)); var C = (function (_super) { __extends(C, _super); function C() { _super.apply(this, arguments); } return C; -})(A); +}(A)); var x2 = true ? function (a) { return a.foo; } : function (b) { }; diff --git a/tests/baselines/reference/contextuallyTypedClassExpressionMethodDeclaration01.js b/tests/baselines/reference/contextuallyTypedClassExpressionMethodDeclaration01.js index edbe8c4d338..11081be4fb3 100644 --- a/tests/baselines/reference/contextuallyTypedClassExpressionMethodDeclaration01.js +++ b/tests/baselines/reference/contextuallyTypedClassExpressionMethodDeclaration01.js @@ -58,7 +58,7 @@ function getFoo1() { arg.strProp = "hello"; }; return class_1; - })(); + }()); } function getFoo2() { return (function () { @@ -71,7 +71,7 @@ function getFoo2() { arg.strProp = "hello"; }; return class_2; - })(); + }()); } function getFoo3() { return (function () { @@ -84,5 +84,5 @@ function getFoo3() { arg.strProp = "hello"; }; return class_3; - })(); + }()); } diff --git a/tests/baselines/reference/contextuallyTypedClassExpressionMethodDeclaration02.js b/tests/baselines/reference/contextuallyTypedClassExpressionMethodDeclaration02.js index 43e9134689f..ecd6e3c7dde 100644 --- a/tests/baselines/reference/contextuallyTypedClassExpressionMethodDeclaration02.js +++ b/tests/baselines/reference/contextuallyTypedClassExpressionMethodDeclaration02.js @@ -62,7 +62,7 @@ function getFoo1() { arg.strProp = "hello"; }; return class_1; - })(); + }()); } function getFoo2() { return (function () { @@ -75,7 +75,7 @@ function getFoo2() { }; } return class_2; - })(); + }()); } function getFoo3() { return (function () { @@ -88,5 +88,5 @@ function getFoo3() { }; } return class_3; - })(); + }()); } diff --git a/tests/baselines/reference/convertKeywordsYes.js b/tests/baselines/reference/convertKeywordsYes.js index a68f751f434..ba3c661d1d0 100644 --- a/tests/baselines/reference/convertKeywordsYes.js +++ b/tests/baselines/reference/convertKeywordsYes.js @@ -440,7 +440,7 @@ var bigClass = (function () { this.with = 0; } return bigClass; -})(); +}()); var bigEnum; (function (bigEnum) { bigEnum[bigEnum["constructor"] = 0] = "constructor"; @@ -504,70 +504,70 @@ var bigModule; function constructor() { } return constructor; - })(); + }()); var implements = (function () { function implements() { } return implements; - })(); + }()); var interface = (function () { function interface() { } return interface; - })(); + }()); var let = (function () { function let() { } return let; - })(); + }()); var module = (function () { function module() { } return module; - })(); + }()); var package = (function () { function package() { } return package; - })(); + }()); var private = (function () { function private() { } return private; - })(); + }()); var protected = (function () { function protected() { } return protected; - })(); + }()); var public = (function () { function public() { } return public; - })(); + }()); var set = (function () { function set() { } return set; - })(); + }()); var static = (function () { function static() { } return static; - })(); + }()); var get = (function () { function get() { } return get; - })(); + }()); var yield = (function () { function yield() { } return yield; - })(); + }()); var declare = (function () { function declare() { } return declare; - })(); + }()); })(bigModule || (bigModule = {})); diff --git a/tests/baselines/reference/covariance1.js b/tests/baselines/reference/covariance1.js index bed31338cbe..eadcd9485b6 100644 --- a/tests/baselines/reference/covariance1.js +++ b/tests/baselines/reference/covariance1.js @@ -25,7 +25,7 @@ var M; this.m1 = m1; } return XX; - })(); + }()); M.XX = XX; function f(y) { } M.f = f; diff --git a/tests/baselines/reference/crashInresolveReturnStatement.js b/tests/baselines/reference/crashInresolveReturnStatement.js index 72ece3c8cfc..be2e38ddf49 100644 --- a/tests/baselines/reference/crashInresolveReturnStatement.js +++ b/tests/baselines/reference/crashInresolveReturnStatement.js @@ -26,7 +26,7 @@ var WorkItemToolbar = (function () { WITDialogs.createCopyOfWorkItem(); }; return WorkItemToolbar; -})(); +}()); var CreateCopyOfWorkItemDialog = (function () { function CreateCopyOfWorkItemDialog() { } @@ -34,7 +34,7 @@ var CreateCopyOfWorkItemDialog = (function () { return null; }; return CreateCopyOfWorkItemDialog; -})(); +}()); function createWorkItemDialog(dialogType) { } var WITDialogs = (function () { @@ -44,4 +44,4 @@ var WITDialogs = (function () { createWorkItemDialog(CreateCopyOfWorkItemDialog); }; return WITDialogs; -})(); +}()); diff --git a/tests/baselines/reference/crashInsourcePropertyIsRelatableToTargetProperty.js b/tests/baselines/reference/crashInsourcePropertyIsRelatableToTargetProperty.js index 332f4897fc7..c385eff83d5 100644 --- a/tests/baselines/reference/crashInsourcePropertyIsRelatableToTargetProperty.js +++ b/tests/baselines/reference/crashInsourcePropertyIsRelatableToTargetProperty.js @@ -21,14 +21,14 @@ var C = (function () { this.x = 1; } return C; -})(); +}()); var D = (function (_super) { __extends(D, _super); function D() { _super.apply(this, arguments); } return D; -})(C); +}(C)); function foo(x, items) { return null; } diff --git a/tests/baselines/reference/crashIntypeCheckObjectCreationExpression.js b/tests/baselines/reference/crashIntypeCheckObjectCreationExpression.js index 8ae7ccc1354..00f4dbdc377 100644 --- a/tests/baselines/reference/crashIntypeCheckObjectCreationExpression.js +++ b/tests/baselines/reference/crashIntypeCheckObjectCreationExpression.js @@ -20,6 +20,6 @@ define(["require", "exports"], function (require, exports) { BuildWorkspaceService.prototype.injectBuildService = function (service) { }; return BuildWorkspaceService; - })(); + }()); exports.BuildWorkspaceService = BuildWorkspaceService; }); diff --git a/tests/baselines/reference/crashOnMethodSignatures.js b/tests/baselines/reference/crashOnMethodSignatures.js index 8475020f307..8444eb0280b 100644 --- a/tests/baselines/reference/crashOnMethodSignatures.js +++ b/tests/baselines/reference/crashOnMethodSignatures.js @@ -9,4 +9,4 @@ var A = (function () { function A() { } return A; -})(); +}()); diff --git a/tests/baselines/reference/crashRegressionTest.js b/tests/baselines/reference/crashRegressionTest.js index 6b8067df83c..22efbf3fba4 100644 --- a/tests/baselines/reference/crashRegressionTest.js +++ b/tests/baselines/reference/crashRegressionTest.js @@ -41,14 +41,14 @@ var MsPortal; this._templateStorage.templateSources[this._name] = value; }; return StringTemplate; - })(); + }()); var TemplateStorage = (function () { function TemplateStorage() { this.templateSources = {}; this.templateData = {}; } return TemplateStorage; - })(); + }()); TemplateEngine.TemplateStorage = TemplateStorage; })(TemplateEngine = Util.TemplateEngine || (Util.TemplateEngine = {})); })(Util = MsPortal.Util || (MsPortal.Util = {})); diff --git a/tests/baselines/reference/createArray.js b/tests/baselines/reference/createArray.js index 82572e05cad..8314570c089 100644 --- a/tests/baselines/reference/createArray.js +++ b/tests/baselines/reference/createArray.js @@ -21,7 +21,7 @@ var C = (function () { function C() { } return C; -})(); +}()); new C[]; var ba = new boolean[]; var sa = new string[]; diff --git a/tests/baselines/reference/declFileAccessors.js b/tests/baselines/reference/declFileAccessors.js index 6c92f5b18d5..e3616c79e38 100644 --- a/tests/baselines/reference/declFileAccessors.js +++ b/tests/baselines/reference/declFileAccessors.js @@ -183,7 +183,7 @@ var c1 = (function () { configurable: true }); return c1; -})(); +}()); exports.c1 = c1; //// [declFileAccessors_1.js] /** This is comment for c2 - the global class*/ @@ -266,7 +266,7 @@ var c2 = (function () { configurable: true }); return c2; -})(); +}()); //// [declFileAccessors_0.d.ts] diff --git a/tests/baselines/reference/declFileAliasUseBeforeDeclaration.js b/tests/baselines/reference/declFileAliasUseBeforeDeclaration.js index 9c0ffc6123b..e5219508329 100644 --- a/tests/baselines/reference/declFileAliasUseBeforeDeclaration.js +++ b/tests/baselines/reference/declFileAliasUseBeforeDeclaration.js @@ -14,7 +14,7 @@ var Foo = (function () { function Foo() { } return Foo; -})(); +}()); exports.Foo = Foo; //// [declFileAliasUseBeforeDeclaration_test.js] "use strict"; diff --git a/tests/baselines/reference/declFileClassExtendsNull.js b/tests/baselines/reference/declFileClassExtendsNull.js index 0d50b320592..e9081acab55 100644 --- a/tests/baselines/reference/declFileClassExtendsNull.js +++ b/tests/baselines/reference/declFileClassExtendsNull.js @@ -15,7 +15,7 @@ var ExtendsNull = (function (_super) { _super.apply(this, arguments); } return ExtendsNull; -})(null); +}(null)); //// [declFileClassExtendsNull.d.ts] diff --git a/tests/baselines/reference/declFileClassWithIndexSignature.js b/tests/baselines/reference/declFileClassWithIndexSignature.js index 956bbfe5c46..31369db6660 100644 --- a/tests/baselines/reference/declFileClassWithIndexSignature.js +++ b/tests/baselines/reference/declFileClassWithIndexSignature.js @@ -9,7 +9,7 @@ var BlockIntrinsics = (function () { function BlockIntrinsics() { } return BlockIntrinsics; -})(); +}()); //// [declFileClassWithIndexSignature.d.ts] diff --git a/tests/baselines/reference/declFileClassWithStaticMethodReturningConstructor.js b/tests/baselines/reference/declFileClassWithStaticMethodReturningConstructor.js index 1a54642fbd4..844559232e4 100644 --- a/tests/baselines/reference/declFileClassWithStaticMethodReturningConstructor.js +++ b/tests/baselines/reference/declFileClassWithStaticMethodReturningConstructor.js @@ -15,7 +15,7 @@ var Enhancement = (function () { return this; }; return Enhancement; -})(); +}()); exports.Enhancement = Enhancement; diff --git a/tests/baselines/reference/declFileConstructors.js b/tests/baselines/reference/declFileConstructors.js index e1786dfdd5e..44e816712fb 100644 --- a/tests/baselines/reference/declFileConstructors.js +++ b/tests/baselines/reference/declFileConstructors.js @@ -104,7 +104,7 @@ var SimpleConstructor = (function () { function SimpleConstructor() { } return SimpleConstructor; -})(); +}()); exports.SimpleConstructor = SimpleConstructor; var ConstructorWithParameters = (function () { /** This is comment for function signature*/ @@ -114,7 +114,7 @@ var ConstructorWithParameters = (function () { var d = a; } return ConstructorWithParameters; -})(); +}()); exports.ConstructorWithParameters = ConstructorWithParameters; var ConstructorWithRestParamters = (function () { function ConstructorWithRestParamters(a) { @@ -125,34 +125,34 @@ var ConstructorWithRestParamters = (function () { return a + rests.join(""); } return ConstructorWithRestParamters; -})(); +}()); exports.ConstructorWithRestParamters = ConstructorWithRestParamters; var ConstructorWithOverloads = (function () { function ConstructorWithOverloads(a) { } return ConstructorWithOverloads; -})(); +}()); exports.ConstructorWithOverloads = ConstructorWithOverloads; var ConstructorWithPublicParameterProperty = (function () { function ConstructorWithPublicParameterProperty(x) { this.x = x; } return ConstructorWithPublicParameterProperty; -})(); +}()); exports.ConstructorWithPublicParameterProperty = ConstructorWithPublicParameterProperty; var ConstructorWithPrivateParameterProperty = (function () { function ConstructorWithPrivateParameterProperty(x) { this.x = x; } return ConstructorWithPrivateParameterProperty; -})(); +}()); exports.ConstructorWithPrivateParameterProperty = ConstructorWithPrivateParameterProperty; var ConstructorWithOptionalParameterProperty = (function () { function ConstructorWithOptionalParameterProperty(x) { this.x = x; } return ConstructorWithOptionalParameterProperty; -})(); +}()); exports.ConstructorWithOptionalParameterProperty = ConstructorWithOptionalParameterProperty; var ConstructorWithParameterInitializer = (function () { function ConstructorWithParameterInitializer(x) { @@ -160,7 +160,7 @@ var ConstructorWithParameterInitializer = (function () { this.x = x; } return ConstructorWithParameterInitializer; -})(); +}()); exports.ConstructorWithParameterInitializer = ConstructorWithParameterInitializer; //// [declFileConstructors_1.js] var GlobalSimpleConstructor = (function () { @@ -168,7 +168,7 @@ var GlobalSimpleConstructor = (function () { function GlobalSimpleConstructor() { } return GlobalSimpleConstructor; -})(); +}()); var GlobalConstructorWithParameters = (function () { /** This is comment for function signature*/ function GlobalConstructorWithParameters(/** this is comment about a*/ a, @@ -177,7 +177,7 @@ var GlobalConstructorWithParameters = (function () { var d = a; } return GlobalConstructorWithParameters; -})(); +}()); var GlobalConstructorWithRestParamters = (function () { function GlobalConstructorWithRestParamters(a) { var rests = []; @@ -187,37 +187,37 @@ var GlobalConstructorWithRestParamters = (function () { return a + rests.join(""); } return GlobalConstructorWithRestParamters; -})(); +}()); var GlobalConstructorWithOverloads = (function () { function GlobalConstructorWithOverloads(a) { } return GlobalConstructorWithOverloads; -})(); +}()); var GlobalConstructorWithPublicParameterProperty = (function () { function GlobalConstructorWithPublicParameterProperty(x) { this.x = x; } return GlobalConstructorWithPublicParameterProperty; -})(); +}()); var GlobalConstructorWithPrivateParameterProperty = (function () { function GlobalConstructorWithPrivateParameterProperty(x) { this.x = x; } return GlobalConstructorWithPrivateParameterProperty; -})(); +}()); var GlobalConstructorWithOptionalParameterProperty = (function () { function GlobalConstructorWithOptionalParameterProperty(x) { this.x = x; } return GlobalConstructorWithOptionalParameterProperty; -})(); +}()); var GlobalConstructorWithParameterInitializer = (function () { function GlobalConstructorWithParameterInitializer(x) { if (x === void 0) { x = "hello"; } this.x = x; } return GlobalConstructorWithParameterInitializer; -})(); +}()); //// [declFileConstructors_0.d.ts] diff --git a/tests/baselines/reference/declFileExportImportChain.js b/tests/baselines/reference/declFileExportImportChain.js index 88aa985ef7b..99affd5eb4d 100644 --- a/tests/baselines/reference/declFileExportImportChain.js +++ b/tests/baselines/reference/declFileExportImportChain.js @@ -35,7 +35,7 @@ define(["require", "exports"], function (require, exports) { function c1() { } return c1; - })(); + }()); m2.c1 = c1; })(m2 = m1.m2 || (m1.m2 = {})); })(m1 || (m1 = {})); diff --git a/tests/baselines/reference/declFileExportImportChain2.js b/tests/baselines/reference/declFileExportImportChain2.js index 6b633b0fb97..27c61e9e43d 100644 --- a/tests/baselines/reference/declFileExportImportChain2.js +++ b/tests/baselines/reference/declFileExportImportChain2.js @@ -32,7 +32,7 @@ define(["require", "exports"], function (require, exports) { function c1() { } return c1; - })(); + }()); m2.c1 = c1; })(m2 = m1.m2 || (m1.m2 = {})); })(m1 || (m1 = {})); diff --git a/tests/baselines/reference/declFileForClassWithMultipleBaseClasses.js b/tests/baselines/reference/declFileForClassWithMultipleBaseClasses.js index 5d7273098f1..dda944bef3d 100644 --- a/tests/baselines/reference/declFileForClassWithMultipleBaseClasses.js +++ b/tests/baselines/reference/declFileForClassWithMultipleBaseClasses.js @@ -33,13 +33,13 @@ var A = (function () { } A.prototype.foo = function () { }; return A; -})(); +}()); var B = (function () { function B() { } B.prototype.bar = function () { }; return B; -})(); +}()); var D = (function () { function D() { } @@ -48,7 +48,7 @@ var D = (function () { D.prototype.foo = function () { }; D.prototype.bar = function () { }; return D; -})(); +}()); //// [declFileForClassWithMultipleBaseClasses.d.ts] diff --git a/tests/baselines/reference/declFileForClassWithPrivateOverloadedFunction.js b/tests/baselines/reference/declFileForClassWithPrivateOverloadedFunction.js index ee2dc8e83bd..2c0e89fe6db 100644 --- a/tests/baselines/reference/declFileForClassWithPrivateOverloadedFunction.js +++ b/tests/baselines/reference/declFileForClassWithPrivateOverloadedFunction.js @@ -12,7 +12,7 @@ var C = (function () { } C.prototype.foo = function (x) { }; return C; -})(); +}()); //// [declFileForClassWithPrivateOverloadedFunction.d.ts] diff --git a/tests/baselines/reference/declFileForFunctionTypeAsTypeParameter.js b/tests/baselines/reference/declFileForFunctionTypeAsTypeParameter.js index 0f13824fc45..4b9535cd2c3 100644 --- a/tests/baselines/reference/declFileForFunctionTypeAsTypeParameter.js +++ b/tests/baselines/reference/declFileForFunctionTypeAsTypeParameter.js @@ -19,14 +19,14 @@ var X = (function () { function X() { } return X; -})(); +}()); var C = (function (_super) { __extends(C, _super); function C() { _super.apply(this, arguments); } return C; -})(X); +}(X)); //// [declFileForFunctionTypeAsTypeParameter.d.ts] diff --git a/tests/baselines/reference/declFileForTypeParameters.js b/tests/baselines/reference/declFileForTypeParameters.js index ebf4f4826ae..3fbac683ef9 100644 --- a/tests/baselines/reference/declFileForTypeParameters.js +++ b/tests/baselines/reference/declFileForTypeParameters.js @@ -15,7 +15,7 @@ var C = (function () { return this.x; }; return C; -})(); +}()); //// [declFileForTypeParameters.d.ts] diff --git a/tests/baselines/reference/declFileGenericClassWithGenericExtendedClass.js b/tests/baselines/reference/declFileGenericClassWithGenericExtendedClass.js index caaba28859a..117bb6a7bd5 100644 --- a/tests/baselines/reference/declFileGenericClassWithGenericExtendedClass.js +++ b/tests/baselines/reference/declFileGenericClassWithGenericExtendedClass.js @@ -22,19 +22,19 @@ var Base = (function () { function Base() { } return Base; -})(); +}()); var Derived = (function (_super) { __extends(Derived, _super); function Derived() { _super.apply(this, arguments); } return Derived; -})(Base); +}(Base)); var Baz = (function () { function Baz() { } return Baz; -})(); +}()); //// [declFileGenericClassWithGenericExtendedClass.d.ts] diff --git a/tests/baselines/reference/declFileGenericType.js b/tests/baselines/reference/declFileGenericType.js index ccc022f26d5..0974f9d7b36 100644 --- a/tests/baselines/reference/declFileGenericType.js +++ b/tests/baselines/reference/declFileGenericType.js @@ -52,13 +52,13 @@ var C; function A() { } return A; - })(); + }()); C.A = A; var B = (function () { function B() { } return B; - })(); + }()); C.B = B; function F(x) { return null; } C.F = F; @@ -77,7 +77,7 @@ var C; this.val = val; } return D; - })(); + }()); C.D = D; })(C = exports.C || (exports.C = {})); exports.b = C.F; @@ -94,7 +94,7 @@ var h = (function (_super) { _super.apply(this, arguments); } return h; -})(C.A); +}(C.A)); exports.h = h; exports.j = C.F6; diff --git a/tests/baselines/reference/declFileGenericType2.js b/tests/baselines/reference/declFileGenericType2.js index 416e0f6737c..a4636d82993 100644 --- a/tests/baselines/reference/declFileGenericType2.js +++ b/tests/baselines/reference/declFileGenericType2.js @@ -61,7 +61,7 @@ var templa; _super.call(this); } return AbstractElementController; - })(templa.mvc.AbstractController); + }(templa.mvc.AbstractController)); mvc.AbstractElementController = AbstractElementController; })(mvc = dom.mvc || (dom.mvc = {})); })(dom = templa.dom || (templa.dom = {})); @@ -82,7 +82,7 @@ var templa; this._controllers = []; } return AbstractCompositeElementController; - })(templa.dom.mvc.AbstractElementController); + }(templa.dom.mvc.AbstractElementController)); composite.AbstractCompositeElementController = AbstractCompositeElementController; })(composite = mvc.composite || (mvc.composite = {})); })(mvc = dom.mvc || (dom.mvc = {})); diff --git a/tests/baselines/reference/declFileImportChainInExportAssignment.js b/tests/baselines/reference/declFileImportChainInExportAssignment.js index 41157907e8b..a45ae847ebe 100644 --- a/tests/baselines/reference/declFileImportChainInExportAssignment.js +++ b/tests/baselines/reference/declFileImportChainInExportAssignment.js @@ -19,7 +19,7 @@ var m; function c() { } return c; - })(); + }()); c_1.c = c; })(c = m.c || (m.c = {})); })(m || (m = {})); diff --git a/tests/baselines/reference/declFileImportedTypeUseInTypeArgPosition.js b/tests/baselines/reference/declFileImportedTypeUseInTypeArgPosition.js index e12a921ffc2..951291115fe 100644 --- a/tests/baselines/reference/declFileImportedTypeUseInTypeArgPosition.js +++ b/tests/baselines/reference/declFileImportedTypeUseInTypeArgPosition.js @@ -18,7 +18,7 @@ var List = (function () { function List() { } return List; -})(); +}()); //// [declFileImportedTypeUseInTypeArgPosition.d.ts] diff --git a/tests/baselines/reference/declFileInternalAliases.js b/tests/baselines/reference/declFileInternalAliases.js index 2ebe48ce782..a21cb18ad1d 100644 --- a/tests/baselines/reference/declFileInternalAliases.js +++ b/tests/baselines/reference/declFileInternalAliases.js @@ -19,7 +19,7 @@ var m; function c() { } return c; - })(); + }()); m.c = c; })(m || (m = {})); var m1; diff --git a/tests/baselines/reference/declFileMethods.js b/tests/baselines/reference/declFileMethods.js index c31fd6950ce..4a317a4e720 100644 --- a/tests/baselines/reference/declFileMethods.js +++ b/tests/baselines/reference/declFileMethods.js @@ -272,7 +272,7 @@ var c1 = (function () { return a; }; return c1; -})(); +}()); exports.c1 = c1; //// [declFileMethods_1.js] var c2 = (function () { @@ -355,7 +355,7 @@ var c2 = (function () { return a; }; return c2; -})(); +}()); //// [declFileMethods_0.d.ts] diff --git a/tests/baselines/reference/declFileModuleAssignmentInObjectLiteralProperty.js b/tests/baselines/reference/declFileModuleAssignmentInObjectLiteralProperty.js index 443933069da..b2f27673c4d 100644 --- a/tests/baselines/reference/declFileModuleAssignmentInObjectLiteralProperty.js +++ b/tests/baselines/reference/declFileModuleAssignmentInObjectLiteralProperty.js @@ -16,7 +16,7 @@ var m1; function c() { } return c; - })(); + }()); m1.c = c; })(m1 || (m1 = {})); var d = { diff --git a/tests/baselines/reference/declFileModuleContinuation.js b/tests/baselines/reference/declFileModuleContinuation.js index 70cb0e43668..98235e830b5 100644 --- a/tests/baselines/reference/declFileModuleContinuation.js +++ b/tests/baselines/reference/declFileModuleContinuation.js @@ -20,7 +20,7 @@ var A; function W() { } return W; - })(); + }()); C.W = W; })(C = B.C || (B.C = {})); })(B = A.B || (A.B = {})); diff --git a/tests/baselines/reference/declFileModuleWithPropertyOfTypeModule.js b/tests/baselines/reference/declFileModuleWithPropertyOfTypeModule.js index 652abed5e6f..6b6fe3eebe4 100644 --- a/tests/baselines/reference/declFileModuleWithPropertyOfTypeModule.js +++ b/tests/baselines/reference/declFileModuleWithPropertyOfTypeModule.js @@ -14,7 +14,7 @@ var m; function c() { } return c; - })(); + }()); m.c = c; m.a = m; })(m || (m = {})); diff --git a/tests/baselines/reference/declFilePrivateMethodOverloads.js b/tests/baselines/reference/declFilePrivateMethodOverloads.js index d6b2320b904..531b60367a2 100644 --- a/tests/baselines/reference/declFilePrivateMethodOverloads.js +++ b/tests/baselines/reference/declFilePrivateMethodOverloads.js @@ -34,7 +34,7 @@ var c1 = (function () { // Function here }; return c1; -})(); +}()); //// [declFilePrivateMethodOverloads.d.ts] diff --git a/tests/baselines/reference/declFilePrivateStatic.js b/tests/baselines/reference/declFilePrivateStatic.js index 326ce62171d..dd81d94b3c5 100644 --- a/tests/baselines/reference/declFilePrivateStatic.js +++ b/tests/baselines/reference/declFilePrivateStatic.js @@ -43,7 +43,7 @@ var C = (function () { C.x = 1; C.y = 1; return C; -})(); +}()); //// [declFilePrivateStatic.d.ts] diff --git a/tests/baselines/reference/declFileTypeAnnotationArrayType.js b/tests/baselines/reference/declFileTypeAnnotationArrayType.js index 0a9d04d6bc7..54dd7bbbc23 100644 --- a/tests/baselines/reference/declFileTypeAnnotationArrayType.js +++ b/tests/baselines/reference/declFileTypeAnnotationArrayType.js @@ -56,27 +56,27 @@ var c = (function () { function c() { } return c; -})(); +}()); var m; (function (m) { var c = (function () { function c() { } return c; - })(); + }()); m.c = c; var g = (function () { function g() { } return g; - })(); + }()); m.g = g; })(m || (m = {})); var g = (function () { function g() { } return g; -})(); +}()); // Just the name function foo() { return [new c()]; diff --git a/tests/baselines/reference/declFileTypeAnnotationParenType.js b/tests/baselines/reference/declFileTypeAnnotationParenType.js index 126ec3a873e..4afe07cc9d8 100644 --- a/tests/baselines/reference/declFileTypeAnnotationParenType.js +++ b/tests/baselines/reference/declFileTypeAnnotationParenType.js @@ -15,7 +15,7 @@ var c = (function () { function c() { } return c; -})(); +}()); var x = [function () { return new c(); }]; var y = [function () { return new c(); }]; var k = (function () { return new c(); }) || ""; diff --git a/tests/baselines/reference/declFileTypeAnnotationTupleType.js b/tests/baselines/reference/declFileTypeAnnotationTupleType.js index 91d44c2b07f..323fdce03f9 100644 --- a/tests/baselines/reference/declFileTypeAnnotationTupleType.js +++ b/tests/baselines/reference/declFileTypeAnnotationTupleType.js @@ -23,27 +23,27 @@ var c = (function () { function c() { } return c; -})(); +}()); var m; (function (m) { var c = (function () { function c() { } return c; - })(); + }()); m.c = c; var g = (function () { function g() { } return g; - })(); + }()); m.g = g; })(m || (m = {})); var g = (function () { function g() { } return g; -})(); +}()); // Just the name var k = [new c(), new m.c()]; var l = k; diff --git a/tests/baselines/reference/declFileTypeAnnotationTypeAlias.js b/tests/baselines/reference/declFileTypeAnnotationTypeAlias.js index 178511f2b78..f7672149308 100644 --- a/tests/baselines/reference/declFileTypeAnnotationTypeAlias.js +++ b/tests/baselines/reference/declFileTypeAnnotationTypeAlias.js @@ -38,7 +38,7 @@ var M; function c() { } return c; - })(); + }()); M.c = c; var m; (function (m) { @@ -46,7 +46,7 @@ var M; function c() { } return c; - })(); + }()); m.c = c; })(m = M.m || (M.m = {})); })(M || (M = {})); @@ -58,7 +58,7 @@ var M; function Window() { } return Window; - })(); + }()); N.Window = Window; })(N = M.N || (M.N = {})); })(M || (M = {})); diff --git a/tests/baselines/reference/declFileTypeAnnotationTypeLiteral.js b/tests/baselines/reference/declFileTypeAnnotationTypeLiteral.js index 5e4a8ea714b..befd96a9fa7 100644 --- a/tests/baselines/reference/declFileTypeAnnotationTypeLiteral.js +++ b/tests/baselines/reference/declFileTypeAnnotationTypeLiteral.js @@ -44,19 +44,19 @@ var c = (function () { function c() { } return c; -})(); +}()); var g = (function () { function g() { } return g; -})(); +}()); var m; (function (m) { var c = (function () { function c() { } return c; - })(); + }()); m.c = c; })(m || (m = {})); // Object literal with everything diff --git a/tests/baselines/reference/declFileTypeAnnotationTypeQuery.js b/tests/baselines/reference/declFileTypeAnnotationTypeQuery.js index 28443bc04ad..e64e81e4939 100644 --- a/tests/baselines/reference/declFileTypeAnnotationTypeQuery.js +++ b/tests/baselines/reference/declFileTypeAnnotationTypeQuery.js @@ -48,27 +48,27 @@ var c = (function () { function c() { } return c; -})(); +}()); var m; (function (m) { var c = (function () { function c() { } return c; - })(); + }()); m.c = c; var g = (function () { function g() { } return g; - })(); + }()); m.g = g; })(m || (m = {})); var g = (function () { function g() { } return g; -})(); +}()); // Just the name function foo() { return c; diff --git a/tests/baselines/reference/declFileTypeAnnotationTypeReference.js b/tests/baselines/reference/declFileTypeAnnotationTypeReference.js index 3818f38d2c1..7d2e7102fb6 100644 --- a/tests/baselines/reference/declFileTypeAnnotationTypeReference.js +++ b/tests/baselines/reference/declFileTypeAnnotationTypeReference.js @@ -48,27 +48,27 @@ var c = (function () { function c() { } return c; -})(); +}()); var m; (function (m) { var c = (function () { function c() { } return c; - })(); + }()); m.c = c; var g = (function () { function g() { } return g; - })(); + }()); m.g = g; })(m || (m = {})); var g = (function () { function g() { } return g; -})(); +}()); // Just the name function foo() { return new c(); diff --git a/tests/baselines/reference/declFileTypeAnnotationUnionType.js b/tests/baselines/reference/declFileTypeAnnotationUnionType.js index 0a8e256ef28..c90501bab5c 100644 --- a/tests/baselines/reference/declFileTypeAnnotationUnionType.js +++ b/tests/baselines/reference/declFileTypeAnnotationUnionType.js @@ -27,27 +27,27 @@ var c = (function () { function c() { } return c; -})(); +}()); var m; (function (m) { var c = (function () { function c() { } return c; - })(); + }()); m.c = c; var g = (function () { function g() { } return g; - })(); + }()); m.g = g; })(m || (m = {})); var g = (function () { function g() { } return g; -})(); +}()); // Just the name var k = new c() || new m.c(); var l = new c() || new m.c(); diff --git a/tests/baselines/reference/declFileTypeAnnotationVisibilityErrorAccessors.js b/tests/baselines/reference/declFileTypeAnnotationVisibilityErrorAccessors.js index f7dc7a18260..957dbb98263 100644 --- a/tests/baselines/reference/declFileTypeAnnotationVisibilityErrorAccessors.js +++ b/tests/baselines/reference/declFileTypeAnnotationVisibilityErrorAccessors.js @@ -107,12 +107,12 @@ var m; function private1() { } return private1; - })(); + }()); var public1 = (function () { function public1() { } return public1; - })(); + }()); m.public1 = public1; var m2; (function (m2) { @@ -120,7 +120,7 @@ var m; function public2() { } return public2; - })(); + }()); m2.public2 = public2; })(m2 || (m2 = {})); var c = (function () { @@ -256,6 +256,6 @@ var m; configurable: true }); return c; - })(); + }()); m.c = c; })(m || (m = {})); diff --git a/tests/baselines/reference/declFileTypeAnnotationVisibilityErrorParameterOfFunction.js b/tests/baselines/reference/declFileTypeAnnotationVisibilityErrorParameterOfFunction.js index 4f66f0c8c7f..7774ee27206 100644 --- a/tests/baselines/reference/declFileTypeAnnotationVisibilityErrorParameterOfFunction.js +++ b/tests/baselines/reference/declFileTypeAnnotationVisibilityErrorParameterOfFunction.js @@ -52,12 +52,12 @@ var m; function private1() { } return private1; - })(); + }()); var public1 = (function () { function public1() { } return public1; - })(); + }()); m.public1 = public1; // Directly using names from this module function foo1(param) { @@ -90,7 +90,7 @@ var m; function public2() { } return public2; - })(); + }()); m2.public2 = public2; })(m2 || (m2 = {})); function foo111(param) { diff --git a/tests/baselines/reference/declFileTypeAnnotationVisibilityErrorReturnTypeOfFunction.js b/tests/baselines/reference/declFileTypeAnnotationVisibilityErrorReturnTypeOfFunction.js index e12d9ebca63..7e26816beb8 100644 --- a/tests/baselines/reference/declFileTypeAnnotationVisibilityErrorReturnTypeOfFunction.js +++ b/tests/baselines/reference/declFileTypeAnnotationVisibilityErrorReturnTypeOfFunction.js @@ -64,12 +64,12 @@ var m; function private1() { } return private1; - })(); + }()); var public1 = (function () { function public1() { } return public1; - })(); + }()); m.public1 = public1; // Directly using names from this module function foo1() { @@ -106,7 +106,7 @@ var m; function public2() { } return public2; - })(); + }()); m2.public2 = public2; })(m2 || (m2 = {})); function foo111() { diff --git a/tests/baselines/reference/declFileTypeAnnotationVisibilityErrorTypeAlias.js b/tests/baselines/reference/declFileTypeAnnotationVisibilityErrorTypeAlias.js index ebad7156617..2b7052903fb 100644 --- a/tests/baselines/reference/declFileTypeAnnotationVisibilityErrorTypeAlias.js +++ b/tests/baselines/reference/declFileTypeAnnotationVisibilityErrorTypeAlias.js @@ -50,7 +50,7 @@ var M; function Window() { } return Window; - })(); + }()); N.Window = Window; })(N = M.N || (M.N = {})); })(M || (M = {})); @@ -62,7 +62,7 @@ var M1; function Window() { } return Window; - })(); + }()); N.Window = Window; })(N = M1.N || (M1.N = {})); })(M1 || (M1 = {})); @@ -72,19 +72,19 @@ var M2; function private1() { } return private1; - })(); + }()); var public1 = (function () { function public1() { } return public1; - })(); + }()); var m3; (function (m3) { var public1 = (function () { function public1() { } return public1; - })(); + }()); m3.public1 = public1; })(m3 || (m3 = {})); })(M2 || (M2 = {})); diff --git a/tests/baselines/reference/declFileTypeAnnotationVisibilityErrorTypeLiteral.js b/tests/baselines/reference/declFileTypeAnnotationVisibilityErrorTypeLiteral.js index 19bdce50cd7..46dfaf3c77e 100644 --- a/tests/baselines/reference/declFileTypeAnnotationVisibilityErrorTypeLiteral.js +++ b/tests/baselines/reference/declFileTypeAnnotationVisibilityErrorTypeLiteral.js @@ -41,14 +41,14 @@ var m; function private1() { } return private1; - })(); + }()); var m2; (function (m2) { var public1 = (function () { function public1() { } return public1; - })(); + }()); m2.public1 = public1; })(m2 || (m2 = {})); m.x2 = { diff --git a/tests/baselines/reference/declFileTypeAnnotationVisibilityErrorVariableDeclaration.js b/tests/baselines/reference/declFileTypeAnnotationVisibilityErrorVariableDeclaration.js index 3d4a4337ae9..a75903c7369 100644 --- a/tests/baselines/reference/declFileTypeAnnotationVisibilityErrorVariableDeclaration.js +++ b/tests/baselines/reference/declFileTypeAnnotationVisibilityErrorVariableDeclaration.js @@ -40,12 +40,12 @@ var m; function private1() { } return private1; - })(); + }()); var public1 = (function () { function public1() { } return public1; - })(); + }()); m.public1 = public1; // Directly using names from this module var x; @@ -60,7 +60,7 @@ var m; function public2() { } return public2; - })(); + }()); m2.public2 = public2; })(m2 || (m2 = {})); var x3; diff --git a/tests/baselines/reference/declFileTypeofClass.js b/tests/baselines/reference/declFileTypeofClass.js index a7faca03f9d..7058ace0c94 100644 --- a/tests/baselines/reference/declFileTypeofClass.js +++ b/tests/baselines/reference/declFileTypeofClass.js @@ -21,7 +21,7 @@ var c = (function () { function c() { } return c; -})(); +}()); var x; var y = c; var z; @@ -29,7 +29,7 @@ var genericC = (function () { function genericC() { } return genericC; -})(); +}()); var genericX = genericC; diff --git a/tests/baselines/reference/declFileTypeofInAnonymousType.js b/tests/baselines/reference/declFileTypeofInAnonymousType.js index 01025ed1806..68db3d120cd 100644 --- a/tests/baselines/reference/declFileTypeofInAnonymousType.js +++ b/tests/baselines/reference/declFileTypeofInAnonymousType.js @@ -29,7 +29,7 @@ var m1; function c() { } return c; - })(); + }()); m1.c = c; (function (e) { e[e["weekday"] = 0] = "weekday"; diff --git a/tests/baselines/reference/declFileWithClassNameConflictingWithClassReferredByExtendsClause.js b/tests/baselines/reference/declFileWithClassNameConflictingWithClassReferredByExtendsClause.js index e21c28138a2..4ac08f97a52 100644 --- a/tests/baselines/reference/declFileWithClassNameConflictingWithClassReferredByExtendsClause.js +++ b/tests/baselines/reference/declFileWithClassNameConflictingWithClassReferredByExtendsClause.js @@ -38,7 +38,7 @@ var X; _super.apply(this, arguments); } return W; - })(A.B.Base.W); + }(A.B.Base.W)); base.W = W; })(base = Y.base || (Y.base = {})); })(Y = X.Y || (X.Y = {})); @@ -57,7 +57,7 @@ var X; _super.apply(this, arguments); } return W; - })(X.Y.base.W); + }(X.Y.base.W)); Z.W = W; })(Z = base.Z || (base.Z = {})); })(base = Y.base || (Y.base = {})); diff --git a/tests/baselines/reference/declFileWithExtendsClauseThatHasItsContainerNameConflict.js b/tests/baselines/reference/declFileWithExtendsClauseThatHasItsContainerNameConflict.js index 587b8ff1e27..6dfce6e8e63 100644 --- a/tests/baselines/reference/declFileWithExtendsClauseThatHasItsContainerNameConflict.js +++ b/tests/baselines/reference/declFileWithExtendsClauseThatHasItsContainerNameConflict.js @@ -32,7 +32,7 @@ var A; function EventManager() { } return EventManager; - })(); + }()); B.EventManager = EventManager; })(B = A.B || (A.B = {})); })(A || (A = {})); @@ -48,7 +48,7 @@ var A; _super.apply(this, arguments); } return ContextMenu; - })(B.EventManager); + }(B.EventManager)); C.ContextMenu = ContextMenu; })(C = B.C || (B.C = {})); })(B = A.B || (A.B = {})); diff --git a/tests/baselines/reference/declFileWithInternalModuleNameConflictsInExtendsClause1.js b/tests/baselines/reference/declFileWithInternalModuleNameConflictsInExtendsClause1.js index 1e599870302..9b69ca88dc2 100644 --- a/tests/baselines/reference/declFileWithInternalModuleNameConflictsInExtendsClause1.js +++ b/tests/baselines/reference/declFileWithInternalModuleNameConflictsInExtendsClause1.js @@ -24,7 +24,7 @@ var X; function W() { } return W; - })(); + }()); C.W = W; })(C = B.C || (B.C = {})); })(B = A.B || (A.B = {})); diff --git a/tests/baselines/reference/declFileWithInternalModuleNameConflictsInExtendsClause2.js b/tests/baselines/reference/declFileWithInternalModuleNameConflictsInExtendsClause2.js index e225e9bb9f6..aa44c19444a 100644 --- a/tests/baselines/reference/declFileWithInternalModuleNameConflictsInExtendsClause2.js +++ b/tests/baselines/reference/declFileWithInternalModuleNameConflictsInExtendsClause2.js @@ -27,7 +27,7 @@ var X; function W() { } return W; - })(); + }()); C.W = W; })(C = B.C || (B.C = {})); })(B = A.B || (A.B = {})); diff --git a/tests/baselines/reference/declFileWithInternalModuleNameConflictsInExtendsClause3.js b/tests/baselines/reference/declFileWithInternalModuleNameConflictsInExtendsClause3.js index 34be43c93b3..164626db45a 100644 --- a/tests/baselines/reference/declFileWithInternalModuleNameConflictsInExtendsClause3.js +++ b/tests/baselines/reference/declFileWithInternalModuleNameConflictsInExtendsClause3.js @@ -27,7 +27,7 @@ var X; function W() { } return W; - })(); + }()); C.W = W; })(C = B.C || (B.C = {})); })(B = A.B || (A.B = {})); diff --git a/tests/baselines/reference/declInput-2.js b/tests/baselines/reference/declInput-2.js index dcd37454ef0..eece6082356 100644 --- a/tests/baselines/reference/declInput-2.js +++ b/tests/baselines/reference/declInput-2.js @@ -28,12 +28,12 @@ var M; function C() { } return C; - })(); + }()); var E = (function () { function E() { } return E; - })(); + }()); M.E = E; var D = (function () { function D() { @@ -45,6 +45,6 @@ var M; D.prototype.m262 = function (i) { }; D.prototype.m3 = function () { return new C(); }; return D; - })(); + }()); M.D = D; })(M || (M = {})); diff --git a/tests/baselines/reference/declInput.js b/tests/baselines/reference/declInput.js index cd558c93403..1f29093d0a8 100644 --- a/tests/baselines/reference/declInput.js +++ b/tests/baselines/reference/declInput.js @@ -23,7 +23,7 @@ var bar = (function () { x++; }; return bar; -})(); +}()); //// [declInput.d.ts] diff --git a/tests/baselines/reference/declInput3.js b/tests/baselines/reference/declInput3.js index 3be31de3de0..292023270ae 100644 --- a/tests/baselines/reference/declInput3.js +++ b/tests/baselines/reference/declInput3.js @@ -23,7 +23,7 @@ var bar = (function () { x++; }; return bar; -})(); +}()); //// [declInput3.d.ts] diff --git a/tests/baselines/reference/declInput4.js b/tests/baselines/reference/declInput4.js index 07b6f091a14..ec57bfaf3e8 100644 --- a/tests/baselines/reference/declInput4.js +++ b/tests/baselines/reference/declInput4.js @@ -22,12 +22,12 @@ var M; function C() { } return C; - })(); + }()); var E = (function () { function E() { } return E; - })(); + }()); M.E = E; var D = (function () { function D() { @@ -36,7 +36,7 @@ var M; D.prototype.m242 = function () { return null; }; D.prototype.m26 = function (i) { }; return D; - })(); + }()); M.D = D; })(M || (M = {})); diff --git a/tests/baselines/reference/declarationEmitDestructuringParameterProperties.js b/tests/baselines/reference/declarationEmitDestructuringParameterProperties.js index a98620c8529..16756fe0afe 100644 --- a/tests/baselines/reference/declarationEmitDestructuringParameterProperties.js +++ b/tests/baselines/reference/declarationEmitDestructuringParameterProperties.js @@ -23,21 +23,21 @@ var C1 = (function () { this.[x, y, z] = [x, y, z]; } return C1; -})(); +}()); var C2 = (function () { function C2(_a) { var x = _a[0], y = _a[1], z = _a[2]; this.[x, y, z] = [x, y, z]; } return C2; -})(); +}()); var C3 = (function () { function C3(_a) { var x = _a.x, y = _a.y, z = _a.z; this.{ x, y, z } = { x, y, z }; } return C3; -})(); +}()); //// [declarationEmitDestructuringParameterProperties.d.ts] diff --git a/tests/baselines/reference/declarationEmitDestructuringPrivacyError.js b/tests/baselines/reference/declarationEmitDestructuringPrivacyError.js index fa3cae9478b..7f62541ae99 100644 --- a/tests/baselines/reference/declarationEmitDestructuringPrivacyError.js +++ b/tests/baselines/reference/declarationEmitDestructuringPrivacyError.js @@ -12,7 +12,7 @@ var m; function c() { } return c; - })(); + }()); _a = [10, new c(), 30], m.x = _a[0], m.y = _a[1], m.z = _a[2]; var _a; })(m || (m = {})); diff --git a/tests/baselines/reference/declarationEmitDetachedComment1.js b/tests/baselines/reference/declarationEmitDetachedComment1.js index 38c7e60406d..6d3666d389d 100644 --- a/tests/baselines/reference/declarationEmitDetachedComment1.js +++ b/tests/baselines/reference/declarationEmitDetachedComment1.js @@ -41,7 +41,7 @@ var Hello = (function () { function Hello() { } return Hello; -})(); +}()); //// [test2.js] /* A comment at the top of the file. */ /** @@ -51,7 +51,7 @@ var Hi = (function () { function Hi() { } return Hi; -})(); +}()); //// [test3.js] // A one-line comment at the top of the file. /** @@ -61,7 +61,7 @@ var Hola = (function () { function Hola() { } return Hola; -})(); +}()); //// [test1.d.ts] diff --git a/tests/baselines/reference/declarationEmitDetachedComment2.js b/tests/baselines/reference/declarationEmitDetachedComment2.js index d4d176da12c..e06872b5eab 100644 --- a/tests/baselines/reference/declarationEmitDetachedComment2.js +++ b/tests/baselines/reference/declarationEmitDetachedComment2.js @@ -38,19 +38,19 @@ var Hello = (function () { function Hello() { } return Hello; -})(); +}()); //// [test2.js] var Hi = (function () { function Hi() { } return Hi; -})(); +}()); //// [test3.js] var Hola = (function () { function Hola() { } return Hola; -})(); +}()); //// [test1.d.ts] diff --git a/tests/baselines/reference/declarationEmitImportInExportAssignmentModule.js b/tests/baselines/reference/declarationEmitImportInExportAssignmentModule.js index f39b35fe1f1..a60b35c73ab 100644 --- a/tests/baselines/reference/declarationEmitImportInExportAssignmentModule.js +++ b/tests/baselines/reference/declarationEmitImportInExportAssignmentModule.js @@ -20,7 +20,7 @@ var m; function c() { } return c; - })(); + }()); c_1.c = c; })(c = m.c || (m.c = {})); })(m || (m = {})); diff --git a/tests/baselines/reference/declarationEmit_nameConflicts.js b/tests/baselines/reference/declarationEmit_nameConflicts.js index f0db81e0ac8..5004ded4837 100644 --- a/tests/baselines/reference/declarationEmit_nameConflicts.js +++ b/tests/baselines/reference/declarationEmit_nameConflicts.js @@ -57,7 +57,7 @@ var f; function c() { } return c; - })(); + }()); f.c = c; })(f || (f = {})); module.exports = f; @@ -72,7 +72,7 @@ var M; function C() { } return C; - })(); + }()); M.C = C; var N; (function (N) { @@ -95,7 +95,7 @@ var M; function C() { } return C; - })(); + }()); P.C = C; var N; (function (N) { @@ -121,7 +121,7 @@ var M; function C() { } return C; - })(); + }()); Q.C = C; var N; (function (N) { diff --git a/tests/baselines/reference/declarationEmit_nameConflicts2.js b/tests/baselines/reference/declarationEmit_nameConflicts2.js index e7b145877f8..b93745c3a12 100644 --- a/tests/baselines/reference/declarationEmit_nameConflicts2.js +++ b/tests/baselines/reference/declarationEmit_nameConflicts2.js @@ -28,7 +28,7 @@ var X; function C() { } return C; - })(); + }()); base.C = C; var M; (function (M) { diff --git a/tests/baselines/reference/declarationEmit_nameConflicts3.js b/tests/baselines/reference/declarationEmit_nameConflicts3.js index 07299132bd4..f1ea96973b8 100644 --- a/tests/baselines/reference/declarationEmit_nameConflicts3.js +++ b/tests/baselines/reference/declarationEmit_nameConflicts3.js @@ -59,7 +59,7 @@ var M; } C.f = function () { }; return C; - })(); + }()); P.C = C; var E = (function (_super) { __extends(E, _super); @@ -67,7 +67,7 @@ var M; _super.apply(this, arguments); } return E; - })(C); + }(C)); P.E = E; (function (D) { D[D["f"] = 0] = "f"; diff --git a/tests/baselines/reference/declarationEmit_protectedMembers.js b/tests/baselines/reference/declarationEmit_protectedMembers.js index 536f4f4aff7..5aad004939d 100644 --- a/tests/baselines/reference/declarationEmit_protectedMembers.js +++ b/tests/baselines/reference/declarationEmit_protectedMembers.js @@ -83,7 +83,7 @@ var C1 = (function () { configurable: true }); return C1; -})(); +}()); // Derived class overriding protected members var C2 = (function (_super) { __extends(C2, _super); @@ -97,7 +97,7 @@ var C2 = (function (_super) { return _super.sf.call(this) + this.sx; }; return C2; -})(C1); +}(C1)); // Derived class making protected members public var C3 = (function (_super) { __extends(C3, _super); @@ -116,7 +116,7 @@ var C3 = (function (_super) { configurable: true }); return C3; -})(C2); +}(C2)); // Protected properties in constructors var C4 = (function () { function C4(a, b) { @@ -124,7 +124,7 @@ var C4 = (function () { this.b = b; } return C4; -})(); +}()); //// [declarationEmit_protectedMembers.d.ts] diff --git a/tests/baselines/reference/declarationFileOverwriteError.js b/tests/baselines/reference/declarationFileOverwriteError.js index a9ae79f8ed6..7bc57cce7d1 100644 --- a/tests/baselines/reference/declarationFileOverwriteError.js +++ b/tests/baselines/reference/declarationFileOverwriteError.js @@ -14,4 +14,4 @@ var d = (function () { function d() { } return d; -})(); +}()); diff --git a/tests/baselines/reference/declarationFileOverwriteErrorWithOut.js b/tests/baselines/reference/declarationFileOverwriteErrorWithOut.js index 34d9c95a005..372d07f5ba7 100644 --- a/tests/baselines/reference/declarationFileOverwriteErrorWithOut.js +++ b/tests/baselines/reference/declarationFileOverwriteErrorWithOut.js @@ -14,4 +14,4 @@ var d = (function () { function d() { } return d; -})(); +}()); diff --git a/tests/baselines/reference/declarationFiles.js b/tests/baselines/reference/declarationFiles.js index 7ef41a630cb..56f44b2c7e4 100644 --- a/tests/baselines/reference/declarationFiles.js +++ b/tests/baselines/reference/declarationFiles.js @@ -54,17 +54,17 @@ var C1 = (function () { } C1.prototype.f = function (x) { return undefined; }; return C1; -})(); +}()); var C2 = (function () { function C2() { } return C2; -})(); +}()); var C3 = (function () { function C3() { } return C3; -})(); +}()); var C4 = (function () { function C4() { var _this = this; @@ -87,4 +87,4 @@ var C4 = (function () { return function () { return _this; }; }; return C4; -})(); +}()); diff --git a/tests/baselines/reference/declareDottedExtend.js b/tests/baselines/reference/declareDottedExtend.js index 030e5048ef7..f1e9ea0b4de 100644 --- a/tests/baselines/reference/declareDottedExtend.js +++ b/tests/baselines/reference/declareDottedExtend.js @@ -24,11 +24,11 @@ var D = (function (_super) { _super.apply(this, arguments); } return D; -})(ab.C); +}(ab.C)); var E = (function (_super) { __extends(E, _super); function E() { _super.apply(this, arguments); } return E; -})(A.B.C); +}(A.B.C)); diff --git a/tests/baselines/reference/declareIdentifierAsBeginningOfStatementExpression01.js b/tests/baselines/reference/declareIdentifierAsBeginningOfStatementExpression01.js index 047b9b76719..32bbdcff6a9 100644 --- a/tests/baselines/reference/declareIdentifierAsBeginningOfStatementExpression01.js +++ b/tests/baselines/reference/declareIdentifierAsBeginningOfStatementExpression01.js @@ -11,6 +11,6 @@ var C = (function () { function C() { } return C; -})(); +}()); var declare; declare instanceof C; diff --git a/tests/baselines/reference/decoratorCallGeneric.js b/tests/baselines/reference/decoratorCallGeneric.js index 8c141d5a131..acc9c48297d 100644 --- a/tests/baselines/reference/decoratorCallGeneric.js +++ b/tests/baselines/reference/decoratorCallGeneric.js @@ -28,4 +28,4 @@ var C = (function () { dec ], C); return C; -})(); +}()); diff --git a/tests/baselines/reference/decoratorChecksFunctionBodies.js b/tests/baselines/reference/decoratorChecksFunctionBodies.js index a5aa63b0b31..d70c4a33460 100644 --- a/tests/baselines/reference/decoratorChecksFunctionBodies.js +++ b/tests/baselines/reference/decoratorChecksFunctionBodies.js @@ -38,4 +38,4 @@ var A = (function () { }) ], A.prototype, "m", null); return A; -})(); +}()); diff --git a/tests/baselines/reference/decoratorInstantiateModulesInFunctionBodies.js b/tests/baselines/reference/decoratorInstantiateModulesInFunctionBodies.js index 51f32d67b4e..92dcc1f836c 100644 --- a/tests/baselines/reference/decoratorInstantiateModulesInFunctionBodies.js +++ b/tests/baselines/reference/decoratorInstantiateModulesInFunctionBodies.js @@ -49,4 +49,4 @@ var Wat = (function () { filter(function () { return a_1.test == 'abc'; }) ], Wat, "whatever", null); return Wat; -})(); +}()); diff --git a/tests/baselines/reference/decoratorMetadata.js b/tests/baselines/reference/decoratorMetadata.js index 32ecf919593..2f360df0618 100644 --- a/tests/baselines/reference/decoratorMetadata.js +++ b/tests/baselines/reference/decoratorMetadata.js @@ -24,7 +24,7 @@ var Service = (function () { function Service() { } return Service; -})(); +}()); Object.defineProperty(exports, "__esModule", { value: true }); exports.default = Service; //// [component.js] @@ -56,4 +56,4 @@ var MyComponent = (function () { __metadata('design:paramtypes', [service_1.default]) ], MyComponent); return MyComponent; -})(); +}()); diff --git a/tests/baselines/reference/decoratorMetadataForMethodWithNoReturnTypeAnnotation01.js b/tests/baselines/reference/decoratorMetadataForMethodWithNoReturnTypeAnnotation01.js index 911a93f948d..f5048ead631 100644 --- a/tests/baselines/reference/decoratorMetadataForMethodWithNoReturnTypeAnnotation01.js +++ b/tests/baselines/reference/decoratorMetadataForMethodWithNoReturnTypeAnnotation01.js @@ -27,4 +27,4 @@ var MyClass = (function () { __metadata('design:returntype', void 0) ], MyClass.prototype, "doSomething", null); return MyClass; -})(); +}()); diff --git a/tests/baselines/reference/decoratorMetadataOnInferredType.js b/tests/baselines/reference/decoratorMetadataOnInferredType.js index 46d853a7dcd..5a39a6ce42c 100644 --- a/tests/baselines/reference/decoratorMetadataOnInferredType.js +++ b/tests/baselines/reference/decoratorMetadataOnInferredType.js @@ -24,7 +24,7 @@ var A = (function () { console.log('new A'); } return A; -})(); +}()); function decorator(target, propertyKey) { } var B = (function () { @@ -36,5 +36,5 @@ var B = (function () { __metadata('design:type', Object) ], B.prototype, "x", void 0); return B; -})(); +}()); exports.B = B; diff --git a/tests/baselines/reference/decoratorMetadataWithConstructorType.js b/tests/baselines/reference/decoratorMetadataWithConstructorType.js index 28df2186097..39e8d1811aa 100644 --- a/tests/baselines/reference/decoratorMetadataWithConstructorType.js +++ b/tests/baselines/reference/decoratorMetadataWithConstructorType.js @@ -24,7 +24,7 @@ var A = (function () { console.log('new A'); } return A; -})(); +}()); function decorator(target, propertyKey) { } var B = (function () { @@ -36,5 +36,5 @@ var B = (function () { __metadata('design:type', A) ], B.prototype, "x", void 0); return B; -})(); +}()); exports.B = B; diff --git a/tests/baselines/reference/decoratorMetadataWithImportDeclarationNameCollision.js b/tests/baselines/reference/decoratorMetadataWithImportDeclarationNameCollision.js index 4b37415c4b7..b549d28c7f1 100644 --- a/tests/baselines/reference/decoratorMetadataWithImportDeclarationNameCollision.js +++ b/tests/baselines/reference/decoratorMetadataWithImportDeclarationNameCollision.js @@ -31,7 +31,7 @@ var db = (function () { db.prototype.doSomething = function () { }; return db; -})(); +}()); exports.db = db; //// [service.js] "use strict"; @@ -49,5 +49,5 @@ var MyClass = (function () { __metadata('design:paramtypes', [db_1.db]) ], MyClass); return MyClass; -})(); +}()); exports.MyClass = MyClass; diff --git a/tests/baselines/reference/decoratorMetadataWithImportDeclarationNameCollision2.js b/tests/baselines/reference/decoratorMetadataWithImportDeclarationNameCollision2.js index 015ed6eb122..acd86e78d76 100644 --- a/tests/baselines/reference/decoratorMetadataWithImportDeclarationNameCollision2.js +++ b/tests/baselines/reference/decoratorMetadataWithImportDeclarationNameCollision2.js @@ -31,7 +31,7 @@ var db = (function () { db.prototype.doSomething = function () { }; return db; -})(); +}()); exports.db = db; //// [service.js] "use strict"; @@ -49,5 +49,5 @@ var MyClass = (function () { __metadata('design:paramtypes', [db_1.db]) ], MyClass); return MyClass; -})(); +}()); exports.MyClass = MyClass; diff --git a/tests/baselines/reference/decoratorMetadataWithImportDeclarationNameCollision3.js b/tests/baselines/reference/decoratorMetadataWithImportDeclarationNameCollision3.js index 0aff28542c0..2acd829c107 100644 --- a/tests/baselines/reference/decoratorMetadataWithImportDeclarationNameCollision3.js +++ b/tests/baselines/reference/decoratorMetadataWithImportDeclarationNameCollision3.js @@ -31,7 +31,7 @@ var db = (function () { db.prototype.doSomething = function () { }; return db; -})(); +}()); exports.db = db; //// [service.js] "use strict"; @@ -49,5 +49,5 @@ var MyClass = (function () { __metadata('design:paramtypes', [db.db]) ], MyClass); return MyClass; -})(); +}()); exports.MyClass = MyClass; diff --git a/tests/baselines/reference/decoratorMetadataWithImportDeclarationNameCollision4.js b/tests/baselines/reference/decoratorMetadataWithImportDeclarationNameCollision4.js index c9f51ae3eed..4af0beeddcb 100644 --- a/tests/baselines/reference/decoratorMetadataWithImportDeclarationNameCollision4.js +++ b/tests/baselines/reference/decoratorMetadataWithImportDeclarationNameCollision4.js @@ -31,7 +31,7 @@ var db = (function () { db.prototype.doSomething = function () { }; return db; -})(); +}()); exports.db = db; //// [service.js] "use strict"; @@ -49,5 +49,5 @@ var MyClass = (function () { __metadata('design:paramtypes', [Object]) ], MyClass); return MyClass; -})(); +}()); exports.MyClass = MyClass; diff --git a/tests/baselines/reference/decoratorMetadataWithImportDeclarationNameCollision5.js b/tests/baselines/reference/decoratorMetadataWithImportDeclarationNameCollision5.js index b5b1dd02ecd..f1537e3b447 100644 --- a/tests/baselines/reference/decoratorMetadataWithImportDeclarationNameCollision5.js +++ b/tests/baselines/reference/decoratorMetadataWithImportDeclarationNameCollision5.js @@ -31,7 +31,7 @@ var db = (function () { db.prototype.doSomething = function () { }; return db; -})(); +}()); Object.defineProperty(exports, "__esModule", { value: true }); exports.default = db; //// [service.js] @@ -50,5 +50,5 @@ var MyClass = (function () { __metadata('design:paramtypes', [db_1.default]) ], MyClass); return MyClass; -})(); +}()); exports.MyClass = MyClass; diff --git a/tests/baselines/reference/decoratorMetadataWithImportDeclarationNameCollision6.js b/tests/baselines/reference/decoratorMetadataWithImportDeclarationNameCollision6.js index 5cb989e750a..7ef2c288810 100644 --- a/tests/baselines/reference/decoratorMetadataWithImportDeclarationNameCollision6.js +++ b/tests/baselines/reference/decoratorMetadataWithImportDeclarationNameCollision6.js @@ -31,7 +31,7 @@ var db = (function () { db.prototype.doSomething = function () { }; return db; -})(); +}()); Object.defineProperty(exports, "__esModule", { value: true }); exports.default = db; //// [service.js] @@ -50,5 +50,5 @@ var MyClass = (function () { __metadata('design:paramtypes', [db_1.default]) ], MyClass); return MyClass; -})(); +}()); exports.MyClass = MyClass; diff --git a/tests/baselines/reference/decoratorMetadataWithImportDeclarationNameCollision7.js b/tests/baselines/reference/decoratorMetadataWithImportDeclarationNameCollision7.js index 7962eae638f..f8469cdd6a4 100644 --- a/tests/baselines/reference/decoratorMetadataWithImportDeclarationNameCollision7.js +++ b/tests/baselines/reference/decoratorMetadataWithImportDeclarationNameCollision7.js @@ -31,7 +31,7 @@ var db = (function () { db.prototype.doSomething = function () { }; return db; -})(); +}()); Object.defineProperty(exports, "__esModule", { value: true }); exports.default = db; //// [service.js] @@ -50,5 +50,5 @@ var MyClass = (function () { __metadata('design:paramtypes', [Object]) ], MyClass); return MyClass; -})(); +}()); exports.MyClass = MyClass; diff --git a/tests/baselines/reference/decoratorMetadataWithImportDeclarationNameCollision8.js b/tests/baselines/reference/decoratorMetadataWithImportDeclarationNameCollision8.js index d4b24d075e9..f1885ccfaec 100644 --- a/tests/baselines/reference/decoratorMetadataWithImportDeclarationNameCollision8.js +++ b/tests/baselines/reference/decoratorMetadataWithImportDeclarationNameCollision8.js @@ -31,7 +31,7 @@ var db = (function () { db.prototype.doSomething = function () { }; return db; -})(); +}()); exports.db = db; //// [service.js] "use strict"; @@ -49,5 +49,5 @@ var MyClass = (function () { __metadata('design:paramtypes', [database.db]) ], MyClass); return MyClass; -})(); +}()); exports.MyClass = MyClass; diff --git a/tests/baselines/reference/decoratorOnClass1.js b/tests/baselines/reference/decoratorOnClass1.js index 81fb8a4afbf..7ea46b4698f 100644 --- a/tests/baselines/reference/decoratorOnClass1.js +++ b/tests/baselines/reference/decoratorOnClass1.js @@ -19,4 +19,4 @@ var C = (function () { dec ], C); return C; -})(); +}()); diff --git a/tests/baselines/reference/decoratorOnClass2.js b/tests/baselines/reference/decoratorOnClass2.js index d2258f2e0f3..3f24c7ae55b 100644 --- a/tests/baselines/reference/decoratorOnClass2.js +++ b/tests/baselines/reference/decoratorOnClass2.js @@ -20,5 +20,5 @@ var C = (function () { dec ], C); return C; -})(); +}()); exports.C = C; diff --git a/tests/baselines/reference/decoratorOnClass3.js b/tests/baselines/reference/decoratorOnClass3.js index 53888b7f107..5a3601fc1f3 100644 --- a/tests/baselines/reference/decoratorOnClass3.js +++ b/tests/baselines/reference/decoratorOnClass3.js @@ -20,4 +20,4 @@ var C = (function () { dec ], C); return C; -})(); +}()); diff --git a/tests/baselines/reference/decoratorOnClass4.js b/tests/baselines/reference/decoratorOnClass4.js index bfcfe490498..adbe30db662 100644 --- a/tests/baselines/reference/decoratorOnClass4.js +++ b/tests/baselines/reference/decoratorOnClass4.js @@ -19,4 +19,4 @@ var C = (function () { dec() ], C); return C; -})(); +}()); diff --git a/tests/baselines/reference/decoratorOnClass5.js b/tests/baselines/reference/decoratorOnClass5.js index b3ceb807408..6741b26373b 100644 --- a/tests/baselines/reference/decoratorOnClass5.js +++ b/tests/baselines/reference/decoratorOnClass5.js @@ -19,4 +19,4 @@ var C = (function () { dec() ], C); return C; -})(); +}()); diff --git a/tests/baselines/reference/decoratorOnClass8.js b/tests/baselines/reference/decoratorOnClass8.js index 81edefc39fa..e5cd8812ea7 100644 --- a/tests/baselines/reference/decoratorOnClass8.js +++ b/tests/baselines/reference/decoratorOnClass8.js @@ -19,4 +19,4 @@ var C = (function () { dec() ], C); return C; -})(); +}()); diff --git a/tests/baselines/reference/decoratorOnClassAccessor1.js b/tests/baselines/reference/decoratorOnClassAccessor1.js index 5a5d7ec98ee..cf989705b79 100644 --- a/tests/baselines/reference/decoratorOnClassAccessor1.js +++ b/tests/baselines/reference/decoratorOnClassAccessor1.js @@ -24,4 +24,4 @@ var C = (function () { dec ], C.prototype, "accessor", null); return C; -})(); +}()); diff --git a/tests/baselines/reference/decoratorOnClassAccessor2.js b/tests/baselines/reference/decoratorOnClassAccessor2.js index 62b4d46669b..9e9455b4380 100644 --- a/tests/baselines/reference/decoratorOnClassAccessor2.js +++ b/tests/baselines/reference/decoratorOnClassAccessor2.js @@ -24,4 +24,4 @@ var C = (function () { dec ], C.prototype, "accessor", null); return C; -})(); +}()); diff --git a/tests/baselines/reference/decoratorOnClassAccessor3.js b/tests/baselines/reference/decoratorOnClassAccessor3.js index ce630dde3b2..8a27914e0c8 100644 --- a/tests/baselines/reference/decoratorOnClassAccessor3.js +++ b/tests/baselines/reference/decoratorOnClassAccessor3.js @@ -24,4 +24,4 @@ var C = (function () { dec ], C.prototype, "accessor", null); return C; -})(); +}()); diff --git a/tests/baselines/reference/decoratorOnClassAccessor4.js b/tests/baselines/reference/decoratorOnClassAccessor4.js index 5d47233c797..85b35e95cef 100644 --- a/tests/baselines/reference/decoratorOnClassAccessor4.js +++ b/tests/baselines/reference/decoratorOnClassAccessor4.js @@ -24,4 +24,4 @@ var C = (function () { dec ], C.prototype, "accessor", null); return C; -})(); +}()); diff --git a/tests/baselines/reference/decoratorOnClassAccessor5.js b/tests/baselines/reference/decoratorOnClassAccessor5.js index b0383637272..12ec7a08adc 100644 --- a/tests/baselines/reference/decoratorOnClassAccessor5.js +++ b/tests/baselines/reference/decoratorOnClassAccessor5.js @@ -24,4 +24,4 @@ var C = (function () { dec ], C.prototype, "accessor", null); return C; -})(); +}()); diff --git a/tests/baselines/reference/decoratorOnClassAccessor6.js b/tests/baselines/reference/decoratorOnClassAccessor6.js index e76151ef562..d5477deb5af 100644 --- a/tests/baselines/reference/decoratorOnClassAccessor6.js +++ b/tests/baselines/reference/decoratorOnClassAccessor6.js @@ -24,4 +24,4 @@ var C = (function () { dec ], C.prototype, "accessor", null); return C; -})(); +}()); diff --git a/tests/baselines/reference/decoratorOnClassConstructor1.js b/tests/baselines/reference/decoratorOnClassConstructor1.js index c61d1d218a5..3d58c627602 100644 --- a/tests/baselines/reference/decoratorOnClassConstructor1.js +++ b/tests/baselines/reference/decoratorOnClassConstructor1.js @@ -10,4 +10,4 @@ var C = (function () { function C() { } return C; -})(); +}()); diff --git a/tests/baselines/reference/decoratorOnClassConstructorParameter1.js b/tests/baselines/reference/decoratorOnClassConstructorParameter1.js index b100a5a60f8..fe04f569e30 100644 --- a/tests/baselines/reference/decoratorOnClassConstructorParameter1.js +++ b/tests/baselines/reference/decoratorOnClassConstructorParameter1.js @@ -22,4 +22,4 @@ var C = (function () { __param(0, dec) ], C); return C; -})(); +}()); diff --git a/tests/baselines/reference/decoratorOnClassConstructorParameter4.js b/tests/baselines/reference/decoratorOnClassConstructorParameter4.js index 73d7bfba5a9..8d02bd467d6 100644 --- a/tests/baselines/reference/decoratorOnClassConstructorParameter4.js +++ b/tests/baselines/reference/decoratorOnClassConstructorParameter4.js @@ -22,4 +22,4 @@ var C = (function () { __param(1, dec) ], C); return C; -})(); +}()); diff --git a/tests/baselines/reference/decoratorOnClassMethod1.js b/tests/baselines/reference/decoratorOnClassMethod1.js index 3b8d308570c..ef029b84543 100644 --- a/tests/baselines/reference/decoratorOnClassMethod1.js +++ b/tests/baselines/reference/decoratorOnClassMethod1.js @@ -20,4 +20,4 @@ var C = (function () { dec ], C.prototype, "method", null); return C; -})(); +}()); diff --git a/tests/baselines/reference/decoratorOnClassMethod10.js b/tests/baselines/reference/decoratorOnClassMethod10.js index 22a6be7f613..f90251d6196 100644 --- a/tests/baselines/reference/decoratorOnClassMethod10.js +++ b/tests/baselines/reference/decoratorOnClassMethod10.js @@ -20,4 +20,4 @@ var C = (function () { dec ], C.prototype, "method", null); return C; -})(); +}()); diff --git a/tests/baselines/reference/decoratorOnClassMethod11.js b/tests/baselines/reference/decoratorOnClassMethod11.js index 59f0594f483..f1589a39286 100644 --- a/tests/baselines/reference/decoratorOnClassMethod11.js +++ b/tests/baselines/reference/decoratorOnClassMethod11.js @@ -26,5 +26,5 @@ var M; this.decorator ], C.prototype, "method", null); return C; - })(); + }()); })(M || (M = {})); diff --git a/tests/baselines/reference/decoratorOnClassMethod12.js b/tests/baselines/reference/decoratorOnClassMethod12.js index 5c43251e4c1..0650f1d00ee 100644 --- a/tests/baselines/reference/decoratorOnClassMethod12.js +++ b/tests/baselines/reference/decoratorOnClassMethod12.js @@ -28,7 +28,7 @@ var M; } S.prototype.decorator = function (target, key) { }; return S; - })(); + }()); var C = (function (_super) { __extends(C, _super); function C() { @@ -39,5 +39,5 @@ var M; _super.decorator ], C.prototype, "method", null); return C; - })(S); + }(S)); })(M || (M = {})); diff --git a/tests/baselines/reference/decoratorOnClassMethod2.js b/tests/baselines/reference/decoratorOnClassMethod2.js index 1841baeb724..5db2922ed71 100644 --- a/tests/baselines/reference/decoratorOnClassMethod2.js +++ b/tests/baselines/reference/decoratorOnClassMethod2.js @@ -20,4 +20,4 @@ var C = (function () { dec ], C.prototype, "method", null); return C; -})(); +}()); diff --git a/tests/baselines/reference/decoratorOnClassMethod3.js b/tests/baselines/reference/decoratorOnClassMethod3.js index 8ede72027d8..30f527368f2 100644 --- a/tests/baselines/reference/decoratorOnClassMethod3.js +++ b/tests/baselines/reference/decoratorOnClassMethod3.js @@ -20,4 +20,4 @@ var C = (function () { dec ], C.prototype, "method", null); return C; -})(); +}()); diff --git a/tests/baselines/reference/decoratorOnClassMethod8.js b/tests/baselines/reference/decoratorOnClassMethod8.js index 2cb404cf078..bf8c06d9b90 100644 --- a/tests/baselines/reference/decoratorOnClassMethod8.js +++ b/tests/baselines/reference/decoratorOnClassMethod8.js @@ -20,4 +20,4 @@ var C = (function () { dec ], C.prototype, "method", null); return C; -})(); +}()); diff --git a/tests/baselines/reference/decoratorOnClassMethodParameter1.js b/tests/baselines/reference/decoratorOnClassMethodParameter1.js index 099f746727c..efb1e4abff2 100644 --- a/tests/baselines/reference/decoratorOnClassMethodParameter1.js +++ b/tests/baselines/reference/decoratorOnClassMethodParameter1.js @@ -23,4 +23,4 @@ var C = (function () { __param(0, dec) ], C.prototype, "method", null); return C; -})(); +}()); diff --git a/tests/baselines/reference/decoratorOnClassProperty1.js b/tests/baselines/reference/decoratorOnClassProperty1.js index 9283570bf3a..65a399332f1 100644 --- a/tests/baselines/reference/decoratorOnClassProperty1.js +++ b/tests/baselines/reference/decoratorOnClassProperty1.js @@ -19,4 +19,4 @@ var C = (function () { dec ], C.prototype, "prop", void 0); return C; -})(); +}()); diff --git a/tests/baselines/reference/decoratorOnClassProperty10.js b/tests/baselines/reference/decoratorOnClassProperty10.js index 5246dff9643..9df40eaf83a 100644 --- a/tests/baselines/reference/decoratorOnClassProperty10.js +++ b/tests/baselines/reference/decoratorOnClassProperty10.js @@ -19,4 +19,4 @@ var C = (function () { dec() ], C.prototype, "prop", void 0); return C; -})(); +}()); diff --git a/tests/baselines/reference/decoratorOnClassProperty11.js b/tests/baselines/reference/decoratorOnClassProperty11.js index 51bce1f1385..8b771caf8b5 100644 --- a/tests/baselines/reference/decoratorOnClassProperty11.js +++ b/tests/baselines/reference/decoratorOnClassProperty11.js @@ -19,4 +19,4 @@ var C = (function () { dec ], C.prototype, "prop", void 0); return C; -})(); +}()); diff --git a/tests/baselines/reference/decoratorOnClassProperty2.js b/tests/baselines/reference/decoratorOnClassProperty2.js index 153c72ce0b9..3ab2b515e3c 100644 --- a/tests/baselines/reference/decoratorOnClassProperty2.js +++ b/tests/baselines/reference/decoratorOnClassProperty2.js @@ -19,4 +19,4 @@ var C = (function () { dec ], C.prototype, "prop", void 0); return C; -})(); +}()); diff --git a/tests/baselines/reference/decoratorOnClassProperty3.js b/tests/baselines/reference/decoratorOnClassProperty3.js index 4f3b1ca5929..9c0d3f90e42 100644 --- a/tests/baselines/reference/decoratorOnClassProperty3.js +++ b/tests/baselines/reference/decoratorOnClassProperty3.js @@ -19,4 +19,4 @@ var C = (function () { dec ], C.prototype, "prop", void 0); return C; -})(); +}()); diff --git a/tests/baselines/reference/decoratorOnClassProperty6.js b/tests/baselines/reference/decoratorOnClassProperty6.js index e92e018c587..823a652af24 100644 --- a/tests/baselines/reference/decoratorOnClassProperty6.js +++ b/tests/baselines/reference/decoratorOnClassProperty6.js @@ -19,4 +19,4 @@ var C = (function () { dec ], C.prototype, "prop", void 0); return C; -})(); +}()); diff --git a/tests/baselines/reference/decoratorOnClassProperty7.js b/tests/baselines/reference/decoratorOnClassProperty7.js index 9521fe0ce5e..134f35022e0 100644 --- a/tests/baselines/reference/decoratorOnClassProperty7.js +++ b/tests/baselines/reference/decoratorOnClassProperty7.js @@ -19,4 +19,4 @@ var C = (function () { dec ], C.prototype, "prop", void 0); return C; -})(); +}()); diff --git a/tests/baselines/reference/decrementOperatorWithAnyOtherType.js b/tests/baselines/reference/decrementOperatorWithAnyOtherType.js index 155c7cede22..51015cf44ed 100644 --- a/tests/baselines/reference/decrementOperatorWithAnyOtherType.js +++ b/tests/baselines/reference/decrementOperatorWithAnyOtherType.js @@ -58,7 +58,7 @@ var A = (function () { function A() { } return A; -})(); +}()); var M; (function (M) { })(M || (M = {})); diff --git a/tests/baselines/reference/decrementOperatorWithAnyOtherTypeInvalidOperations.js b/tests/baselines/reference/decrementOperatorWithAnyOtherTypeInvalidOperations.js index f8021a713c4..94f5c942bfc 100644 --- a/tests/baselines/reference/decrementOperatorWithAnyOtherTypeInvalidOperations.js +++ b/tests/baselines/reference/decrementOperatorWithAnyOtherTypeInvalidOperations.js @@ -90,7 +90,7 @@ var A = (function () { return a; }; return A; -})(); +}()); var M; (function (M) { })(M || (M = {})); diff --git a/tests/baselines/reference/decrementOperatorWithNumberType.js b/tests/baselines/reference/decrementOperatorWithNumberType.js index 98f9b9d8fde..b737c91597a 100644 --- a/tests/baselines/reference/decrementOperatorWithNumberType.js +++ b/tests/baselines/reference/decrementOperatorWithNumberType.js @@ -47,7 +47,7 @@ var A = (function () { function A() { } return A; -})(); +}()); var M; (function (M) { })(M || (M = {})); diff --git a/tests/baselines/reference/decrementOperatorWithNumberTypeInvalidOperations.js b/tests/baselines/reference/decrementOperatorWithNumberTypeInvalidOperations.js index 00a613a16f6..b49f94081b9 100644 --- a/tests/baselines/reference/decrementOperatorWithNumberTypeInvalidOperations.js +++ b/tests/baselines/reference/decrementOperatorWithNumberTypeInvalidOperations.js @@ -56,7 +56,7 @@ var A = (function () { } A.foo = function () { return 1; }; return A; -})(); +}()); var M; (function (M) { })(M || (M = {})); diff --git a/tests/baselines/reference/decrementOperatorWithUnsupportedBooleanType.js b/tests/baselines/reference/decrementOperatorWithUnsupportedBooleanType.js index 9ce6d2320be..71e52cfd197 100644 --- a/tests/baselines/reference/decrementOperatorWithUnsupportedBooleanType.js +++ b/tests/baselines/reference/decrementOperatorWithUnsupportedBooleanType.js @@ -63,7 +63,7 @@ var A = (function () { } A.foo = function () { return true; }; return A; -})(); +}()); var M; (function (M) { })(M || (M = {})); diff --git a/tests/baselines/reference/decrementOperatorWithUnsupportedStringType.js b/tests/baselines/reference/decrementOperatorWithUnsupportedStringType.js index dfc828dcb28..1502e93e756 100644 --- a/tests/baselines/reference/decrementOperatorWithUnsupportedStringType.js +++ b/tests/baselines/reference/decrementOperatorWithUnsupportedStringType.js @@ -75,7 +75,7 @@ var A = (function () { } A.foo = function () { return ""; }; return A; -})(); +}()); var M; (function (M) { })(M || (M = {})); diff --git a/tests/baselines/reference/defaultArgsInOverloads.js b/tests/baselines/reference/defaultArgsInOverloads.js index defc4f3e223..1b4c65db653 100644 --- a/tests/baselines/reference/defaultArgsInOverloads.js +++ b/tests/baselines/reference/defaultArgsInOverloads.js @@ -33,5 +33,5 @@ var C = (function () { if (a === void 0) { a = null; } }; return C; -})(); +}()); var f; diff --git a/tests/baselines/reference/defaultExportsCannotMerge02.js b/tests/baselines/reference/defaultExportsCannotMerge02.js index 57b175266c1..f327c62e571 100644 --- a/tests/baselines/reference/defaultExportsCannotMerge02.js +++ b/tests/baselines/reference/defaultExportsCannotMerge02.js @@ -31,7 +31,7 @@ var Decl = (function () { function Decl() { } return Decl; -})(); +}()); Object.defineProperty(exports, "__esModule", { value: true }); exports.default = Decl; //// [m2.js] diff --git a/tests/baselines/reference/defaultExportsCannotMerge03.js b/tests/baselines/reference/defaultExportsCannotMerge03.js index 0b4f77bfb10..4369392c6e9 100644 --- a/tests/baselines/reference/defaultExportsCannotMerge03.js +++ b/tests/baselines/reference/defaultExportsCannotMerge03.js @@ -31,7 +31,7 @@ var Decl = (function () { function Decl() { } return Decl; -})(); +}()); Object.defineProperty(exports, "__esModule", { value: true }); exports.default = Decl; //// [m2.js] diff --git a/tests/baselines/reference/defaultIndexProps1.js b/tests/baselines/reference/defaultIndexProps1.js index fc8fe52b9fc..58591e237ca 100644 --- a/tests/baselines/reference/defaultIndexProps1.js +++ b/tests/baselines/reference/defaultIndexProps1.js @@ -18,7 +18,7 @@ var Foo = (function () { this.v = "Yo"; } return Foo; -})(); +}()); var f = new Foo(); var q = f["v"]; var o = { v: "Yo2" }; diff --git a/tests/baselines/reference/defaultIndexProps2.js b/tests/baselines/reference/defaultIndexProps2.js index 7652e591cc9..60478ea8a37 100644 --- a/tests/baselines/reference/defaultIndexProps2.js +++ b/tests/baselines/reference/defaultIndexProps2.js @@ -21,7 +21,7 @@ var Foo = (function () { this.v = "Yo"; } return Foo; -})(); +}()); var f = new Foo(); // WScript.Echo(f[0]); var o = { v: "Yo2" }; diff --git a/tests/baselines/reference/defaultValueInConstructorOverload1.js b/tests/baselines/reference/defaultValueInConstructorOverload1.js index 968876bf7ec..a8ac6e04491 100644 --- a/tests/baselines/reference/defaultValueInConstructorOverload1.js +++ b/tests/baselines/reference/defaultValueInConstructorOverload1.js @@ -11,4 +11,4 @@ var C = (function () { if (x === void 0) { x = ''; } } return C; -})(); +}()); diff --git a/tests/baselines/reference/deleteOperatorInvalidOperations.js b/tests/baselines/reference/deleteOperatorInvalidOperations.js index fd15797698e..484b60b4cb4 100644 --- a/tests/baselines/reference/deleteOperatorInvalidOperations.js +++ b/tests/baselines/reference/deleteOperatorInvalidOperations.js @@ -30,4 +30,4 @@ var testADelx = (function () { delete s; //expect error } return testADelx; -})(); +}()); diff --git a/tests/baselines/reference/deleteOperatorWithAnyOtherType.js b/tests/baselines/reference/deleteOperatorWithAnyOtherType.js index 03558d41e87..a9c437b0e7b 100644 --- a/tests/baselines/reference/deleteOperatorWithAnyOtherType.js +++ b/tests/baselines/reference/deleteOperatorWithAnyOtherType.js @@ -80,7 +80,7 @@ var A = (function () { return a; }; return A; -})(); +}()); var M; (function (M) { })(M || (M = {})); diff --git a/tests/baselines/reference/deleteOperatorWithBooleanType.js b/tests/baselines/reference/deleteOperatorWithBooleanType.js index 2b390f2dc0f..0b45c7907b0 100644 --- a/tests/baselines/reference/deleteOperatorWithBooleanType.js +++ b/tests/baselines/reference/deleteOperatorWithBooleanType.js @@ -47,7 +47,7 @@ var A = (function () { } A.foo = function () { return false; }; return A; -})(); +}()); var M; (function (M) { })(M || (M = {})); diff --git a/tests/baselines/reference/deleteOperatorWithNumberType.js b/tests/baselines/reference/deleteOperatorWithNumberType.js index 024fc850cc4..769dc81c63f 100644 --- a/tests/baselines/reference/deleteOperatorWithNumberType.js +++ b/tests/baselines/reference/deleteOperatorWithNumberType.js @@ -55,7 +55,7 @@ var A = (function () { } A.foo = function () { return 1; }; return A; -})(); +}()); var M; (function (M) { })(M || (M = {})); diff --git a/tests/baselines/reference/deleteOperatorWithStringType.js b/tests/baselines/reference/deleteOperatorWithStringType.js index 9dcf113b4b2..0d084d096ba 100644 --- a/tests/baselines/reference/deleteOperatorWithStringType.js +++ b/tests/baselines/reference/deleteOperatorWithStringType.js @@ -54,7 +54,7 @@ var A = (function () { } A.foo = function () { return ""; }; return A; -})(); +}()); var M; (function (M) { })(M || (M = {})); diff --git a/tests/baselines/reference/dependencyViaImportAlias.js b/tests/baselines/reference/dependencyViaImportAlias.js index 4ce37904a22..fad51e2ee1f 100644 --- a/tests/baselines/reference/dependencyViaImportAlias.js +++ b/tests/baselines/reference/dependencyViaImportAlias.js @@ -17,7 +17,7 @@ define(["require", "exports"], function (require, exports) { function A() { } return A; - })(); + }()); exports.A = A; }); //// [B.js] diff --git a/tests/baselines/reference/derivedClassConstructorWithoutSuperCall.js b/tests/baselines/reference/derivedClassConstructorWithoutSuperCall.js index b9090176add..2e6ac2c7934 100644 --- a/tests/baselines/reference/derivedClassConstructorWithoutSuperCall.js +++ b/tests/baselines/reference/derivedClassConstructorWithoutSuperCall.js @@ -43,36 +43,36 @@ var Base = (function () { function Base() { } return Base; -})(); +}()); var Derived = (function (_super) { __extends(Derived, _super); function Derived() { } return Derived; -})(Base); +}(Base)); var Base2 = (function () { function Base2() { } return Base2; -})(); +}()); var Derived2 = (function (_super) { __extends(Derived2, _super); function Derived2() { var r2 = function () { return _super.call(this); }; // error for misplaced super call (nested function) } return Derived2; -})(Base2); +}(Base2)); var Derived3 = (function (_super) { __extends(Derived3, _super); function Derived3() { var r = function () { _super.call(this); }; // error } return Derived3; -})(Base2); +}(Base2)); var Derived4 = (function (_super) { __extends(Derived4, _super); function Derived4() { var r = _super.call(this); // ok } return Derived4; -})(Base2); +}(Base2)); diff --git a/tests/baselines/reference/derivedClassFunctionOverridesBaseClassAccessor.js b/tests/baselines/reference/derivedClassFunctionOverridesBaseClassAccessor.js index 64da47e68e0..7dbb901362f 100644 --- a/tests/baselines/reference/derivedClassFunctionOverridesBaseClassAccessor.js +++ b/tests/baselines/reference/derivedClassFunctionOverridesBaseClassAccessor.js @@ -33,7 +33,7 @@ var Base = (function () { configurable: true }); return Base; -})(); +}()); // error var Derived = (function (_super) { __extends(Derived, _super); @@ -44,4 +44,4 @@ var Derived = (function (_super) { return 1; }; return Derived; -})(Base); +}(Base)); diff --git a/tests/baselines/reference/derivedClassIncludesInheritedMembers.js b/tests/baselines/reference/derivedClassIncludesInheritedMembers.js index 0538ba9b54a..0c7a21232e6 100644 --- a/tests/baselines/reference/derivedClassIncludesInheritedMembers.js +++ b/tests/baselines/reference/derivedClassIncludesInheritedMembers.js @@ -64,14 +64,14 @@ var Base = (function () { configurable: true }); return Base; -})(); +}()); var Derived = (function (_super) { __extends(Derived, _super); function Derived() { _super.apply(this, arguments); } return Derived; -})(Base); +}(Base)); var d = new Derived(1); var r1 = d.a; var r2 = d.b(); @@ -85,14 +85,14 @@ var Base2 = (function () { function Base2() { } return Base2; -})(); +}()); var Derived2 = (function (_super) { __extends(Derived2, _super); function Derived2() { _super.apply(this, arguments); } return Derived2; -})(Base2); +}(Base2)); var d2; var r7 = d2['']; var r8 = d2[1]; diff --git a/tests/baselines/reference/derivedClassOverridesIndexersWithAssignmentCompatibility.js b/tests/baselines/reference/derivedClassOverridesIndexersWithAssignmentCompatibility.js index a575c9bb183..a44d4340b8f 100644 --- a/tests/baselines/reference/derivedClassOverridesIndexersWithAssignmentCompatibility.js +++ b/tests/baselines/reference/derivedClassOverridesIndexersWithAssignmentCompatibility.js @@ -27,7 +27,7 @@ var Base = (function () { function Base() { } return Base; -})(); +}()); // ok, use assignment compatibility var Derived = (function (_super) { __extends(Derived, _super); @@ -35,12 +35,12 @@ var Derived = (function (_super) { _super.apply(this, arguments); } return Derived; -})(Base); +}(Base)); var Base2 = (function () { function Base2() { } return Base2; -})(); +}()); // ok, use assignment compatibility var Derived2 = (function (_super) { __extends(Derived2, _super); @@ -48,4 +48,4 @@ var Derived2 = (function (_super) { _super.apply(this, arguments); } return Derived2; -})(Base2); +}(Base2)); diff --git a/tests/baselines/reference/derivedClassOverridesPrivateFunction1.js b/tests/baselines/reference/derivedClassOverridesPrivateFunction1.js index 7e11209b8fe..c81c6f048f5 100644 --- a/tests/baselines/reference/derivedClassOverridesPrivateFunction1.js +++ b/tests/baselines/reference/derivedClassOverridesPrivateFunction1.js @@ -28,7 +28,7 @@ var BaseClass = (function () { BaseClass.prototype._init = function () { }; return BaseClass; -})(); +}()); var DerivedClass = (function (_super) { __extends(DerivedClass, _super); function DerivedClass() { @@ -37,5 +37,5 @@ var DerivedClass = (function (_super) { DerivedClass.prototype._init = function () { }; return DerivedClass; -})(BaseClass); +}(BaseClass)); new DerivedClass(); diff --git a/tests/baselines/reference/derivedClassOverridesPrivates.js b/tests/baselines/reference/derivedClassOverridesPrivates.js index 6662b5013d8..cd486152c1c 100644 --- a/tests/baselines/reference/derivedClassOverridesPrivates.js +++ b/tests/baselines/reference/derivedClassOverridesPrivates.js @@ -25,23 +25,23 @@ var Base = (function () { function Base() { } return Base; -})(); +}()); var Derived = (function (_super) { __extends(Derived, _super); function Derived() { _super.apply(this, arguments); } return Derived; -})(Base); +}(Base)); var Base2 = (function () { function Base2() { } return Base2; -})(); +}()); var Derived2 = (function (_super) { __extends(Derived2, _super); function Derived2() { _super.apply(this, arguments); } return Derived2; -})(Base2); +}(Base2)); diff --git a/tests/baselines/reference/derivedClassOverridesProtectedMembers.js b/tests/baselines/reference/derivedClassOverridesProtectedMembers.js index 21f2ce87880..5b8af9e85bf 100644 --- a/tests/baselines/reference/derivedClassOverridesProtectedMembers.js +++ b/tests/baselines/reference/derivedClassOverridesProtectedMembers.js @@ -62,7 +62,7 @@ var Base = (function () { configurable: true }); return Base; -})(); +}()); var Derived = (function (_super) { __extends(Derived, _super); function Derived(a) { @@ -83,4 +83,4 @@ var Derived = (function (_super) { configurable: true }); return Derived; -})(Base); +}(Base)); diff --git a/tests/baselines/reference/derivedClassOverridesProtectedMembers2.js b/tests/baselines/reference/derivedClassOverridesProtectedMembers2.js index b5fe3e93af5..5c7d73d5dfd 100644 --- a/tests/baselines/reference/derivedClassOverridesProtectedMembers2.js +++ b/tests/baselines/reference/derivedClassOverridesProtectedMembers2.js @@ -89,7 +89,7 @@ var Base = (function () { configurable: true }); return Base; -})(); +}()); // Increase visibility of all protected members to public var Derived = (function (_super) { __extends(Derived, _super); @@ -111,7 +111,7 @@ var Derived = (function (_super) { configurable: true }); return Derived; -})(Base); +}(Base)); var d = new Derived(y); var r1 = d.a; var r2 = d.b(y); @@ -127,14 +127,14 @@ var Base2 = (function () { function Base2() { } return Base2; -})(); +}()); var Derived2 = (function (_super) { __extends(Derived2, _super); function Derived2() { _super.apply(this, arguments); } return Derived2; -})(Base2); +}(Base2)); var d2; var r7 = d2['']; var r8 = d2[1]; diff --git a/tests/baselines/reference/derivedClassOverridesProtectedMembers3.js b/tests/baselines/reference/derivedClassOverridesProtectedMembers3.js index c4dc1d0e9d5..ebb675a26db 100644 --- a/tests/baselines/reference/derivedClassOverridesProtectedMembers3.js +++ b/tests/baselines/reference/derivedClassOverridesProtectedMembers3.js @@ -97,7 +97,7 @@ var Base = (function () { configurable: true }); return Base; -})(); +}()); // Errors // decrease visibility of all public members to protected var Derived1 = (function (_super) { @@ -106,7 +106,7 @@ var Derived1 = (function (_super) { _super.call(this, a); } return Derived1; -})(Base); +}(Base)); var Derived2 = (function (_super) { __extends(Derived2, _super); function Derived2(a) { @@ -114,7 +114,7 @@ var Derived2 = (function (_super) { } Derived2.prototype.b = function (a) { }; return Derived2; -})(Base); +}(Base)); var Derived3 = (function (_super) { __extends(Derived3, _super); function Derived3(a) { @@ -126,7 +126,7 @@ var Derived3 = (function (_super) { configurable: true }); return Derived3; -})(Base); +}(Base)); var Derived4 = (function (_super) { __extends(Derived4, _super); function Derived4(a) { @@ -138,21 +138,21 @@ var Derived4 = (function (_super) { configurable: true }); return Derived4; -})(Base); +}(Base)); var Derived5 = (function (_super) { __extends(Derived5, _super); function Derived5(a) { _super.call(this, a); } return Derived5; -})(Base); +}(Base)); var Derived6 = (function (_super) { __extends(Derived6, _super); function Derived6(a) { _super.call(this, a); } return Derived6; -})(Base); +}(Base)); var Derived7 = (function (_super) { __extends(Derived7, _super); function Derived7(a) { @@ -160,7 +160,7 @@ var Derived7 = (function (_super) { } Derived7.s = function (a) { }; return Derived7; -})(Base); +}(Base)); var Derived8 = (function (_super) { __extends(Derived8, _super); function Derived8(a) { @@ -172,7 +172,7 @@ var Derived8 = (function (_super) { configurable: true }); return Derived8; -})(Base); +}(Base)); var Derived9 = (function (_super) { __extends(Derived9, _super); function Derived9(a) { @@ -184,11 +184,11 @@ var Derived9 = (function (_super) { configurable: true }); return Derived9; -})(Base); +}(Base)); var Derived10 = (function (_super) { __extends(Derived10, _super); function Derived10(a) { _super.call(this, a); } return Derived10; -})(Base); +}(Base)); diff --git a/tests/baselines/reference/derivedClassOverridesProtectedMembers4.js b/tests/baselines/reference/derivedClassOverridesProtectedMembers4.js index f25c3b792de..b8a15ee8b6c 100644 --- a/tests/baselines/reference/derivedClassOverridesProtectedMembers4.js +++ b/tests/baselines/reference/derivedClassOverridesProtectedMembers4.js @@ -26,18 +26,18 @@ var Base = (function () { function Base() { } return Base; -})(); +}()); var Derived1 = (function (_super) { __extends(Derived1, _super); function Derived1() { _super.apply(this, arguments); } return Derived1; -})(Base); +}(Base)); var Derived2 = (function (_super) { __extends(Derived2, _super); function Derived2() { _super.apply(this, arguments); } return Derived2; -})(Derived1); +}(Derived1)); diff --git a/tests/baselines/reference/derivedClassOverridesPublicMembers.js b/tests/baselines/reference/derivedClassOverridesPublicMembers.js index 5125be4eeeb..b62f0d8f7d3 100644 --- a/tests/baselines/reference/derivedClassOverridesPublicMembers.js +++ b/tests/baselines/reference/derivedClassOverridesPublicMembers.js @@ -88,7 +88,7 @@ var Base = (function () { configurable: true }); return Base; -})(); +}()); var Derived = (function (_super) { __extends(Derived, _super); function Derived(a) { @@ -109,7 +109,7 @@ var Derived = (function (_super) { configurable: true }); return Derived; -})(Base); +}(Base)); var d = new Derived(y); var r1 = d.a; var r2 = d.b(y); @@ -125,14 +125,14 @@ var Base2 = (function () { function Base2() { } return Base2; -})(); +}()); var Derived2 = (function (_super) { __extends(Derived2, _super); function Derived2() { _super.apply(this, arguments); } return Derived2; -})(Base2); +}(Base2)); var d2; var r7 = d2['']; var r8 = d2[1]; diff --git a/tests/baselines/reference/derivedClassOverridesWithoutSubtype.js b/tests/baselines/reference/derivedClassOverridesWithoutSubtype.js index 9762c88035a..147e6edbbb4 100644 --- a/tests/baselines/reference/derivedClassOverridesWithoutSubtype.js +++ b/tests/baselines/reference/derivedClassOverridesWithoutSubtype.js @@ -33,23 +33,23 @@ var Base = (function () { function Base() { } return Base; -})(); +}()); var Derived = (function (_super) { __extends(Derived, _super); function Derived() { _super.apply(this, arguments); } return Derived; -})(Base); +}(Base)); var Base2 = (function () { function Base2() { } return Base2; -})(); +}()); var Derived2 = (function (_super) { __extends(Derived2, _super); function Derived2() { _super.apply(this, arguments); } return Derived2; -})(Base2); +}(Base2)); diff --git a/tests/baselines/reference/derivedClassParameterProperties.js b/tests/baselines/reference/derivedClassParameterProperties.js index 55c0a312b71..c0a1736a2a3 100644 --- a/tests/baselines/reference/derivedClassParameterProperties.js +++ b/tests/baselines/reference/derivedClassParameterProperties.js @@ -105,7 +105,7 @@ var Base = (function () { function Base() { } return Base; -})(); +}()); var Derived = (function (_super) { __extends(Derived, _super); function Derived(y) { @@ -113,7 +113,7 @@ var Derived = (function (_super) { _super.call(this); // ok } return Derived; -})(Base); +}(Base)); var Derived2 = (function (_super) { __extends(Derived2, _super); function Derived2(y) { @@ -122,7 +122,7 @@ var Derived2 = (function (_super) { _super.call(this); // error } return Derived2; -})(Base); +}(Base)); var Derived3 = (function (_super) { __extends(Derived3, _super); function Derived3(y) { @@ -131,7 +131,7 @@ var Derived3 = (function (_super) { var a = 1; } return Derived3; -})(Base); +}(Base)); var Derived4 = (function (_super) { __extends(Derived4, _super); function Derived4(y) { @@ -140,7 +140,7 @@ var Derived4 = (function (_super) { _super.call(this); // error } return Derived4; -})(Base); +}(Base)); var Derived5 = (function (_super) { __extends(Derived5, _super); function Derived5(y) { @@ -149,7 +149,7 @@ var Derived5 = (function (_super) { var b = 2; } return Derived5; -})(Base); +}(Base)); var Derived6 = (function (_super) { __extends(Derived6, _super); function Derived6(y) { @@ -158,7 +158,7 @@ var Derived6 = (function (_super) { _super.call(this); // ok } return Derived6; -})(Base); +}(Base)); var Derived7 = (function (_super) { __extends(Derived7, _super); function Derived7(y) { @@ -168,7 +168,7 @@ var Derived7 = (function (_super) { _super.call(this); // error } return Derived7; -})(Base); +}(Base)); var Derived8 = (function (_super) { __extends(Derived8, _super); function Derived8(y) { @@ -178,13 +178,13 @@ var Derived8 = (function (_super) { this.b = 3; } return Derived8; -})(Base); +}(Base)); // generic cases of Derived7 and Derived8 var Base2 = (function () { function Base2() { } return Base2; -})(); +}()); var Derived9 = (function (_super) { __extends(Derived9, _super); function Derived9(y) { @@ -194,7 +194,7 @@ var Derived9 = (function (_super) { _super.call(this); // error } return Derived9; -})(Base2); +}(Base2)); var Derived10 = (function (_super) { __extends(Derived10, _super); function Derived10(y) { @@ -204,4 +204,4 @@ var Derived10 = (function (_super) { this.b = 3; } return Derived10; -})(Base2); +}(Base2)); diff --git a/tests/baselines/reference/derivedClassSuperCallsInNonConstructorMembers.js b/tests/baselines/reference/derivedClassSuperCallsInNonConstructorMembers.js index 0c214d42fec..e043ee8a5c5 100644 --- a/tests/baselines/reference/derivedClassSuperCallsInNonConstructorMembers.js +++ b/tests/baselines/reference/derivedClassSuperCallsInNonConstructorMembers.js @@ -42,7 +42,7 @@ var Base = (function () { function Base() { } return Base; -})(); +}()); var Derived = (function (_super) { __extends(Derived, _super); function Derived() { @@ -79,4 +79,4 @@ var Derived = (function (_super) { }); Derived.a = _super.call(this); return Derived; -})(Base); +}(Base)); diff --git a/tests/baselines/reference/derivedClassSuperCallsWithThisArg.js b/tests/baselines/reference/derivedClassSuperCallsWithThisArg.js index a81a092fa54..1c88306bf3a 100644 --- a/tests/baselines/reference/derivedClassSuperCallsWithThisArg.js +++ b/tests/baselines/reference/derivedClassSuperCallsWithThisArg.js @@ -38,14 +38,14 @@ var Base = (function () { function Base(a) { } return Base; -})(); +}()); var Derived = (function (_super) { __extends(Derived, _super); function Derived() { _super.call(this, this); // ok } return Derived; -})(Base); +}(Base)); var Derived2 = (function (_super) { __extends(Derived2, _super); function Derived2(a) { @@ -53,7 +53,7 @@ var Derived2 = (function (_super) { this.a = a; } return Derived2; -})(Base); +}(Base)); var Derived3 = (function (_super) { __extends(Derived3, _super); function Derived3(a) { @@ -62,7 +62,7 @@ var Derived3 = (function (_super) { this.a = a; } return Derived3; -})(Base); +}(Base)); var Derived4 = (function (_super) { __extends(Derived4, _super); function Derived4(a) { @@ -70,4 +70,4 @@ var Derived4 = (function (_super) { this.a = a; } return Derived4; -})(Base); +}(Base)); diff --git a/tests/baselines/reference/derivedClassTransitivity.js b/tests/baselines/reference/derivedClassTransitivity.js index de7669a71b5..38c465492e6 100644 --- a/tests/baselines/reference/derivedClassTransitivity.js +++ b/tests/baselines/reference/derivedClassTransitivity.js @@ -32,7 +32,7 @@ var C = (function () { } C.prototype.foo = function (x) { }; return C; -})(); +}()); var D = (function (_super) { __extends(D, _super); function D() { @@ -40,7 +40,7 @@ var D = (function (_super) { } D.prototype.foo = function () { }; // ok to drop parameters return D; -})(C); +}(C)); var E = (function (_super) { __extends(E, _super); function E() { @@ -48,7 +48,7 @@ var E = (function (_super) { } E.prototype.foo = function (x) { }; // ok to add optional parameters return E; -})(D); +}(D)); var c; var d; var e; diff --git a/tests/baselines/reference/derivedClassTransitivity2.js b/tests/baselines/reference/derivedClassTransitivity2.js index 22e930ab7f9..5d08905a605 100644 --- a/tests/baselines/reference/derivedClassTransitivity2.js +++ b/tests/baselines/reference/derivedClassTransitivity2.js @@ -32,7 +32,7 @@ var C = (function () { } C.prototype.foo = function (x, y) { }; return C; -})(); +}()); var D = (function (_super) { __extends(D, _super); function D() { @@ -40,7 +40,7 @@ var D = (function (_super) { } D.prototype.foo = function (x) { }; // ok to drop parameters return D; -})(C); +}(C)); var E = (function (_super) { __extends(E, _super); function E() { @@ -48,7 +48,7 @@ var E = (function (_super) { } E.prototype.foo = function (x, y) { }; // ok to add optional parameters return E; -})(D); +}(D)); var c; var d; var e; diff --git a/tests/baselines/reference/derivedClassTransitivity3.js b/tests/baselines/reference/derivedClassTransitivity3.js index a1aa3a978eb..be7e97a8fc5 100644 --- a/tests/baselines/reference/derivedClassTransitivity3.js +++ b/tests/baselines/reference/derivedClassTransitivity3.js @@ -32,7 +32,7 @@ var C = (function () { } C.prototype.foo = function (x, y) { }; return C; -})(); +}()); var D = (function (_super) { __extends(D, _super); function D() { @@ -40,7 +40,7 @@ var D = (function (_super) { } D.prototype.foo = function (x) { }; // ok to drop parameters return D; -})(C); +}(C)); var E = (function (_super) { __extends(E, _super); function E() { @@ -48,7 +48,7 @@ var E = (function (_super) { } E.prototype.foo = function (x, y) { }; // ok to add optional parameters return E; -})(D); +}(D)); var c; var d; var e; diff --git a/tests/baselines/reference/derivedClassTransitivity4.js b/tests/baselines/reference/derivedClassTransitivity4.js index a4d319707c7..0c70f03218e 100644 --- a/tests/baselines/reference/derivedClassTransitivity4.js +++ b/tests/baselines/reference/derivedClassTransitivity4.js @@ -32,7 +32,7 @@ var C = (function () { } C.prototype.foo = function (x) { }; return C; -})(); +}()); var D = (function (_super) { __extends(D, _super); function D() { @@ -40,7 +40,7 @@ var D = (function (_super) { } D.prototype.foo = function () { }; // ok to drop parameters return D; -})(C); +}(C)); var E = (function (_super) { __extends(E, _super); function E() { @@ -48,7 +48,7 @@ var E = (function (_super) { } E.prototype.foo = function (x) { }; // ok to add optional parameters return E; -})(D); +}(D)); var c; var d; var e; diff --git a/tests/baselines/reference/derivedClassWithAny.js b/tests/baselines/reference/derivedClassWithAny.js index 123853f3afd..34af167011d 100644 --- a/tests/baselines/reference/derivedClassWithAny.js +++ b/tests/baselines/reference/derivedClassWithAny.js @@ -87,7 +87,7 @@ var C = (function () { return 1; }; return C; -})(); +}()); var D = (function (_super) { __extends(D, _super); function D() { @@ -114,7 +114,7 @@ var D = (function (_super) { return null; }; return D; -})(C); +}(C)); // if D is a valid class definition than E is now not safe tranisitively through C var E = (function (_super) { __extends(E, _super); @@ -140,7 +140,7 @@ var E = (function (_super) { return ''; }; return E; -})(D); +}(D)); var c; var d; var e; diff --git a/tests/baselines/reference/derivedClassWithPrivateInstanceShadowingProtectedInstance.js b/tests/baselines/reference/derivedClassWithPrivateInstanceShadowingProtectedInstance.js index 3454c60f881..2c0775efc19 100644 --- a/tests/baselines/reference/derivedClassWithPrivateInstanceShadowingProtectedInstance.js +++ b/tests/baselines/reference/derivedClassWithPrivateInstanceShadowingProtectedInstance.js @@ -41,7 +41,7 @@ var Base = (function () { configurable: true }); return Base; -})(); +}()); // error, not a subtype var Derived = (function (_super) { __extends(Derived, _super); @@ -58,4 +58,4 @@ var Derived = (function (_super) { configurable: true }); return Derived; -})(Base); +}(Base)); diff --git a/tests/baselines/reference/derivedClassWithPrivateInstanceShadowingPublicInstance.js b/tests/baselines/reference/derivedClassWithPrivateInstanceShadowingPublicInstance.js index 7de92c9cb2f..540be97d165 100644 --- a/tests/baselines/reference/derivedClassWithPrivateInstanceShadowingPublicInstance.js +++ b/tests/baselines/reference/derivedClassWithPrivateInstanceShadowingPublicInstance.js @@ -51,7 +51,7 @@ var Base = (function () { configurable: true }); return Base; -})(); +}()); // error, not a subtype var Derived = (function (_super) { __extends(Derived, _super); @@ -68,7 +68,7 @@ var Derived = (function (_super) { configurable: true }); return Derived; -})(Base); +}(Base)); var r = Base.x; // ok var r2 = Derived.x; // error var r3 = Base.fn(); // ok diff --git a/tests/baselines/reference/derivedClassWithPrivateStaticShadowingProtectedStatic.js b/tests/baselines/reference/derivedClassWithPrivateStaticShadowingProtectedStatic.js index 36d2b7d2dc3..93d5b49fcd0 100644 --- a/tests/baselines/reference/derivedClassWithPrivateStaticShadowingProtectedStatic.js +++ b/tests/baselines/reference/derivedClassWithPrivateStaticShadowingProtectedStatic.js @@ -40,7 +40,7 @@ var Base = (function () { configurable: true }); return Base; -})(); +}()); // should be error var Derived = (function (_super) { __extends(Derived, _super); @@ -57,4 +57,4 @@ var Derived = (function (_super) { configurable: true }); return Derived; -})(Base); +}(Base)); diff --git a/tests/baselines/reference/derivedClassWithPrivateStaticShadowingPublicStatic.js b/tests/baselines/reference/derivedClassWithPrivateStaticShadowingPublicStatic.js index 36080385b3b..b58acc01082 100644 --- a/tests/baselines/reference/derivedClassWithPrivateStaticShadowingPublicStatic.js +++ b/tests/baselines/reference/derivedClassWithPrivateStaticShadowingPublicStatic.js @@ -52,7 +52,7 @@ var Base = (function () { configurable: true }); return Base; -})(); +}()); // BUG 847404 // should be error var Derived = (function (_super) { @@ -70,7 +70,7 @@ var Derived = (function (_super) { configurable: true }); return Derived; -})(Base); +}(Base)); var r = Base.x; // ok var r2 = Derived.x; // error var r3 = Base.fn(); // ok diff --git a/tests/baselines/reference/derivedClassWithoutExplicitConstructor.js b/tests/baselines/reference/derivedClassWithoutExplicitConstructor.js index 27a634ab2d9..479beebbbfe 100644 --- a/tests/baselines/reference/derivedClassWithoutExplicitConstructor.js +++ b/tests/baselines/reference/derivedClassWithoutExplicitConstructor.js @@ -37,7 +37,7 @@ var Base = (function () { this.a = x; } return Base; -})(); +}()); var Derived = (function (_super) { __extends(Derived, _super); function Derived() { @@ -46,7 +46,7 @@ var Derived = (function (_super) { this.y = 'hello'; } return Derived; -})(Base); +}(Base)); var r = new Derived(); // error var r2 = new Derived(1); var Base2 = (function () { @@ -54,7 +54,7 @@ var Base2 = (function () { this.a = x; } return Base2; -})(); +}()); var D = (function (_super) { __extends(D, _super); function D() { @@ -63,6 +63,6 @@ var D = (function (_super) { this.y = null; } return D; -})(Base2); +}(Base2)); var d = new D(); // error var d2 = new D(new Date()); // ok diff --git a/tests/baselines/reference/derivedClassWithoutExplicitConstructor2.js b/tests/baselines/reference/derivedClassWithoutExplicitConstructor2.js index 82c5eec1d7d..4dc35c5e006 100644 --- a/tests/baselines/reference/derivedClassWithoutExplicitConstructor2.js +++ b/tests/baselines/reference/derivedClassWithoutExplicitConstructor2.js @@ -45,7 +45,7 @@ var Base = (function () { this.a = x; } return Base; -})(); +}()); var Derived = (function (_super) { __extends(Derived, _super); function Derived() { @@ -54,7 +54,7 @@ var Derived = (function (_super) { this.y = 'hello'; } return Derived; -})(Base); +}(Base)); var r = new Derived(); // error var r2 = new Derived(1); var r3 = new Derived(1, 2); @@ -64,7 +64,7 @@ var Base2 = (function () { this.a = x; } return Base2; -})(); +}()); var D = (function (_super) { __extends(D, _super); function D() { @@ -73,7 +73,7 @@ var D = (function (_super) { this.y = null; } return D; -})(Base2); +}(Base2)); var d = new D(); // error var d2 = new D(new Date()); // ok var d3 = new D(new Date(), new Date()); diff --git a/tests/baselines/reference/derivedClassWithoutExplicitConstructor3.js b/tests/baselines/reference/derivedClassWithoutExplicitConstructor3.js index 4bfa7c81577..3b0a673d378 100644 --- a/tests/baselines/reference/derivedClassWithoutExplicitConstructor3.js +++ b/tests/baselines/reference/derivedClassWithoutExplicitConstructor3.js @@ -59,7 +59,7 @@ var Base = (function () { this.a = x; } return Base; -})(); +}()); var Derived = (function (_super) { __extends(Derived, _super); function Derived(y, z) { @@ -68,7 +68,7 @@ var Derived = (function (_super) { this.b = y; } return Derived; -})(Base); +}(Base)); var Derived2 = (function (_super) { __extends(Derived2, _super); function Derived2() { @@ -77,7 +77,7 @@ var Derived2 = (function (_super) { this.y = 'hello'; } return Derived2; -})(Derived); +}(Derived)); var r = new Derived(); // error var r2 = new Derived2(1); // error var r3 = new Derived('', ''); @@ -86,7 +86,7 @@ var Base2 = (function () { this.a = x; } return Base2; -})(); +}()); var D = (function (_super) { __extends(D, _super); function D(y, z) { @@ -95,7 +95,7 @@ var D = (function (_super) { this.b = y; } return D; -})(Base); +}(Base)); var D2 = (function (_super) { __extends(D2, _super); function D2() { @@ -104,7 +104,7 @@ var D2 = (function (_super) { this.y = null; } return D2; -})(D); +}(D)); var d = new D2(); // error var d2 = new D2(new Date()); // error var d3 = new D2(new Date(), new Date()); // ok diff --git a/tests/baselines/reference/derivedClasses.js b/tests/baselines/reference/derivedClasses.js index 214c65bde6c..b6103940b33 100644 --- a/tests/baselines/reference/derivedClasses.js +++ b/tests/baselines/reference/derivedClasses.js @@ -47,14 +47,14 @@ var Red = (function (_super) { return getHue() + " red"; }; return Red; -})(Color); +}(Color)); var Color = (function () { function Color() { } Color.prototype.shade = function () { return "some shade"; }; Color.prototype.hue = function () { return "some hue"; }; return Color; -})(); +}()); var Blue = (function (_super) { __extends(Blue, _super); function Blue() { @@ -66,7 +66,7 @@ var Blue = (function (_super) { return getHue() + " blue"; }; return Blue; -})(Color); +}(Color)); var r = new Red(); var b = new Blue(); r.shade(); diff --git a/tests/baselines/reference/derivedGenericClassWithAny.js b/tests/baselines/reference/derivedGenericClassWithAny.js index 15835e78bd5..56daf4b7310 100644 --- a/tests/baselines/reference/derivedGenericClassWithAny.js +++ b/tests/baselines/reference/derivedGenericClassWithAny.js @@ -60,7 +60,7 @@ var C = (function () { return null; }; return C; -})(); +}()); var D = (function (_super) { __extends(D, _super); function D() { @@ -87,7 +87,7 @@ var D = (function (_super) { return null; }; return D; -})(C); +}(C)); // if D is a valid class definition than E is now not safe tranisitively through C var E = (function (_super) { __extends(E, _super); @@ -104,7 +104,7 @@ var E = (function (_super) { return ''; // error }; return E; -})(D); +}(D)); var c; var d; var e; diff --git a/tests/baselines/reference/derivedTypeAccessesHiddenBaseCallViaSuperPropertyAccess.js b/tests/baselines/reference/derivedTypeAccessesHiddenBaseCallViaSuperPropertyAccess.js index 0839b93971b..2e0a561e846 100644 --- a/tests/baselines/reference/derivedTypeAccessesHiddenBaseCallViaSuperPropertyAccess.js +++ b/tests/baselines/reference/derivedTypeAccessesHiddenBaseCallViaSuperPropertyAccess.js @@ -30,7 +30,7 @@ var Base = (function () { return null; }; return Base; -})(); +}()); var Derived = (function (_super) { __extends(Derived, _super); function Derived() { @@ -45,4 +45,4 @@ var Derived = (function (_super) { var r3 = this.foo({ a: 1, b: 2 }); // { a: number; b: number; } }; return Derived; -})(Base); +}(Base)); diff --git a/tests/baselines/reference/derivedTypeCallingBaseImplWithOptionalParams.js b/tests/baselines/reference/derivedTypeCallingBaseImplWithOptionalParams.js index 7bf7444a0e5..f9982a7bfe9 100644 --- a/tests/baselines/reference/derivedTypeCallingBaseImplWithOptionalParams.js +++ b/tests/baselines/reference/derivedTypeCallingBaseImplWithOptionalParams.js @@ -20,7 +20,7 @@ var MyClass = (function () { MyClass.prototype.myMethod = function (myList) { }; return MyClass; -})(); +}()); var x = new MyClass(); x.myMethod(); // should be valid, but MyClass has no implementation to handle it. var y = new MyClass(); diff --git a/tests/baselines/reference/derivedTypeDoesNotRequireExtendsClause.js b/tests/baselines/reference/derivedTypeDoesNotRequireExtendsClause.js index f00c32114cf..cfbe44166c9 100644 --- a/tests/baselines/reference/derivedTypeDoesNotRequireExtendsClause.js +++ b/tests/baselines/reference/derivedTypeDoesNotRequireExtendsClause.js @@ -30,19 +30,19 @@ var Base = (function () { function Base() { } return Base; -})(); +}()); var Derived = (function () { function Derived() { } return Derived; -})(); +}()); var Derived2 = (function (_super) { __extends(Derived2, _super); function Derived2() { _super.apply(this, arguments); } return Derived2; -})(Base); +}(Base)); var b; var d1; var d2; diff --git a/tests/baselines/reference/destructuringParameterDeclaration1ES5.js b/tests/baselines/reference/destructuringParameterDeclaration1ES5.js index 9a5b4eb8156..28e6429fb7f 100644 --- a/tests/baselines/reference/destructuringParameterDeclaration1ES5.js +++ b/tests/baselines/reference/destructuringParameterDeclaration1ES5.js @@ -187,7 +187,7 @@ var C2 = (function () { var a = _a[0], b = _a[1], c = _a[2]; }; return C2; -})(); +}()); var C3 = (function () { function C3() { } @@ -201,7 +201,7 @@ var C3 = (function () { var a = _a[0], b = _a[1], c = _a[2]; }; return C3; -})(); +}()); function d5(_a) { var _b = _a === void 0 ? { x: 1, y: 2 } : _a, x = _b.x, y = _b.y; } diff --git a/tests/baselines/reference/destructuringParameterDeclaration2.js b/tests/baselines/reference/destructuringParameterDeclaration2.js index dcb2c87f25b..7cc2cb52318 100644 --- a/tests/baselines/reference/destructuringParameterDeclaration2.js +++ b/tests/baselines/reference/destructuringParameterDeclaration2.js @@ -140,7 +140,7 @@ var C4 = (function () { var a = _a[0], b = _a[1], q = _a[2]; }; return C4; -})(); +}()); // Destructuring parameter declarations do not permit type annotations on the individual binding patterns, // as such annotations would conflict with the already established meaning of colons in object literals. // Type annotations must instead be written on the top- level parameter declaration diff --git a/tests/baselines/reference/destructuringParameterDeclaration4.js b/tests/baselines/reference/destructuringParameterDeclaration4.js index adc5264e1ff..2f0f24ac123 100644 --- a/tests/baselines/reference/destructuringParameterDeclaration4.js +++ b/tests/baselines/reference/destructuringParameterDeclaration4.js @@ -90,7 +90,7 @@ var C = (function () { } } // Error, rest parameter can't have accessibilityModifier return C; -})(); +}()); // Rest parameter with generic function foo1() { var a = []; diff --git a/tests/baselines/reference/destructuringParameterDeclaration5.js b/tests/baselines/reference/destructuringParameterDeclaration5.js index 38366ca67ba..2df6ce46b2c 100644 --- a/tests/baselines/reference/destructuringParameterDeclaration5.js +++ b/tests/baselines/reference/destructuringParameterDeclaration5.js @@ -61,26 +61,26 @@ var Class = (function () { function Class() { } return Class; -})(); +}()); var SubClass = (function (_super) { __extends(SubClass, _super); function SubClass() { _super.call(this); } return SubClass; -})(Class); +}(Class)); var D = (function () { function D() { } return D; -})(); +}()); var SubD = (function (_super) { __extends(SubD, _super); function SubD() { _super.call(this); } return SubD; -})(D); +}(D)); function d0(_a) { var x = (_a === void 0 ? { x: new Class() } : _a).x; } diff --git a/tests/baselines/reference/destructuringParameterProperties1.js b/tests/baselines/reference/destructuringParameterProperties1.js index cc16cc78de5..55d62d6720e 100644 --- a/tests/baselines/reference/destructuringParameterProperties1.js +++ b/tests/baselines/reference/destructuringParameterProperties1.js @@ -36,21 +36,21 @@ var C1 = (function () { this.[x, y, z] = [x, y, z]; } return C1; -})(); +}()); var C2 = (function () { function C2(_a) { var x = _a[0], y = _a[1], z = _a[2]; this.[x, y, z] = [x, y, z]; } return C2; -})(); +}()); var C3 = (function () { function C3(_a) { var x = _a.x, y = _a.y, z = _a.z; this.{ x, y, z } = { x, y, z }; } return C3; -})(); +}()); var c1 = new C1([]); c1 = new C1(["larry", "{curly}", "moe"]); var useC1Properties = c1.x === c1.y && c1.y === c1.z; diff --git a/tests/baselines/reference/destructuringParameterProperties2.js b/tests/baselines/reference/destructuringParameterProperties2.js index 27e190af62f..086585fac8e 100644 --- a/tests/baselines/reference/destructuringParameterProperties2.js +++ b/tests/baselines/reference/destructuringParameterProperties2.js @@ -49,7 +49,7 @@ var C1 = (function () { return this.c; }; return C1; -})(); +}()); var x = new C1(undefined, [0, undefined, ""]); var _a = [x.getA(), x.getB(), x.getC()], x_a = _a[0], x_b = _a[1], x_c = _a[2]; var y = new C1(10, [0, "", true]); diff --git a/tests/baselines/reference/destructuringParameterProperties3.js b/tests/baselines/reference/destructuringParameterProperties3.js index fe9e69d7e5b..71992019015 100644 --- a/tests/baselines/reference/destructuringParameterProperties3.js +++ b/tests/baselines/reference/destructuringParameterProperties3.js @@ -52,7 +52,7 @@ var C1 = (function () { return this.c; }; return C1; -})(); +}()); var x = new C1(undefined, [0, true, ""]); var _a = [x.getA(), x.getB(), x.getC()], x_a = _a[0], x_b = _a[1], x_c = _a[2]; var y = new C1(10, [0, true, true]); diff --git a/tests/baselines/reference/destructuringParameterProperties5.js b/tests/baselines/reference/destructuringParameterProperties5.js index d9b1710ae89..d857ea040a8 100644 --- a/tests/baselines/reference/destructuringParameterProperties5.js +++ b/tests/baselines/reference/destructuringParameterProperties5.js @@ -21,6 +21,6 @@ var C1 = (function () { var bar = this.x1 || this.x2 || this.x3 || this.y || this.z; } return C1; -})(); +}()); var a = new C1([{ x1: 10, x2: "", x3: true }, "", false]); var _a = [a.x1, a.x2, a.x3, a.y, a.z], a_x1 = _a[0], a_x2 = _a[1], a_x3 = _a[2], a_y = _a[3], a_z = _a[4]; diff --git a/tests/baselines/reference/destructuringWithGenericParameter.js b/tests/baselines/reference/destructuringWithGenericParameter.js index 61d523f81fa..40c78df673f 100644 --- a/tests/baselines/reference/destructuringWithGenericParameter.js +++ b/tests/baselines/reference/destructuringWithGenericParameter.js @@ -19,7 +19,7 @@ var GenericClass = (function () { function GenericClass() { } return GenericClass; -})(); +}()); var genericObject = new GenericClass(); function genericFunction(object, callback) { callback(object.payload); diff --git a/tests/baselines/reference/destructuringWithNewExpression.js b/tests/baselines/reference/destructuringWithNewExpression.js index 310129674b1..3f30d285b70 100644 --- a/tests/baselines/reference/destructuringWithNewExpression.js +++ b/tests/baselines/reference/destructuringWithNewExpression.js @@ -11,5 +11,5 @@ var C = (function () { this.x = 0; } return C; -})(); +}()); var x = (new C).x; diff --git a/tests/baselines/reference/detachedCommentAtStartOfConstructor1.js b/tests/baselines/reference/detachedCommentAtStartOfConstructor1.js index 13312aea362..a0ae2ef15e9 100644 --- a/tests/baselines/reference/detachedCommentAtStartOfConstructor1.js +++ b/tests/baselines/reference/detachedCommentAtStartOfConstructor1.js @@ -20,4 +20,4 @@ var TestFile = (function () { this.message = getMessage(); } return TestFile; -})(); +}()); diff --git a/tests/baselines/reference/detachedCommentAtStartOfConstructor2.js b/tests/baselines/reference/detachedCommentAtStartOfConstructor2.js index 754b432c7c5..284c9372dab 100644 --- a/tests/baselines/reference/detachedCommentAtStartOfConstructor2.js +++ b/tests/baselines/reference/detachedCommentAtStartOfConstructor2.js @@ -21,4 +21,4 @@ var TestFile = (function () { this.message = getMessage(); } return TestFile; -})(); +}()); diff --git a/tests/baselines/reference/detachedCommentAtStartOfFunctionBody1.js b/tests/baselines/reference/detachedCommentAtStartOfFunctionBody1.js index 3bbea65541f..1b459bbe062 100644 --- a/tests/baselines/reference/detachedCommentAtStartOfFunctionBody1.js +++ b/tests/baselines/reference/detachedCommentAtStartOfFunctionBody1.js @@ -20,4 +20,4 @@ var TestFile = (function () { return function () { return message + _this.name; }; }; return TestFile; -})(); +}()); diff --git a/tests/baselines/reference/detachedCommentAtStartOfFunctionBody2.js b/tests/baselines/reference/detachedCommentAtStartOfFunctionBody2.js index 2a0ac0a4f0a..8b33b737beb 100644 --- a/tests/baselines/reference/detachedCommentAtStartOfFunctionBody2.js +++ b/tests/baselines/reference/detachedCommentAtStartOfFunctionBody2.js @@ -21,4 +21,4 @@ var TestFile = (function () { return function () { return message + _this.name; }; }; return TestFile; -})(); +}()); diff --git a/tests/baselines/reference/detachedCommentAtStartOfLambdaFunction1.js b/tests/baselines/reference/detachedCommentAtStartOfLambdaFunction1.js index 2505e3f6082..51ae4090ae1 100644 --- a/tests/baselines/reference/detachedCommentAtStartOfLambdaFunction1.js +++ b/tests/baselines/reference/detachedCommentAtStartOfLambdaFunction1.js @@ -28,4 +28,4 @@ var TestFile = (function () { }; }; return TestFile; -})(); +}()); diff --git a/tests/baselines/reference/detachedCommentAtStartOfLambdaFunction2.js b/tests/baselines/reference/detachedCommentAtStartOfLambdaFunction2.js index 53f6d08eaf5..22dfe4bbc44 100644 --- a/tests/baselines/reference/detachedCommentAtStartOfLambdaFunction2.js +++ b/tests/baselines/reference/detachedCommentAtStartOfLambdaFunction2.js @@ -29,4 +29,4 @@ var TestFile = (function () { }; }; return TestFile; -})(); +}()); diff --git a/tests/baselines/reference/differentTypesWithSameName.js b/tests/baselines/reference/differentTypesWithSameName.js index 54a7a0f43bd..a7278cebdbc 100644 --- a/tests/baselines/reference/differentTypesWithSameName.js +++ b/tests/baselines/reference/differentTypesWithSameName.js @@ -23,7 +23,7 @@ var m; function variable() { } return variable; - })(); + }()); m.variable = variable; function doSomething(v) { } @@ -33,6 +33,6 @@ var variable = (function () { function variable() { } return variable; -})(); +}()); var v = new variable(); m.doSomething(v); diff --git a/tests/baselines/reference/directDependenceBetweenTypeAliases.js b/tests/baselines/reference/directDependenceBetweenTypeAliases.js index 370e33483fc..eaee45703f7 100644 --- a/tests/baselines/reference/directDependenceBetweenTypeAliases.js +++ b/tests/baselines/reference/directDependenceBetweenTypeAliases.js @@ -48,13 +48,13 @@ var C = (function () { function C() { } return C; -})(); +}()); // A type query directly depends on the type of the referenced entity. var x = []; var C1 = (function () { function C1() { } return C1; -})(); +}()); var yy; var zz; diff --git a/tests/baselines/reference/disallowLineTerminatorBeforeArrow.js b/tests/baselines/reference/disallowLineTerminatorBeforeArrow.js index 7e292614d43..b6a4eb9783e 100644 --- a/tests/baselines/reference/disallowLineTerminatorBeforeArrow.js +++ b/tests/baselines/reference/disallowLineTerminatorBeforeArrow.js @@ -157,7 +157,7 @@ var m; }; } return City; - })(); + }()); (function (Enum) { Enum[Enum["claw"] = (function () { return 10; diff --git a/tests/baselines/reference/doNotEmitDetachedCommentsAtStartOfConstructor.js b/tests/baselines/reference/doNotEmitDetachedCommentsAtStartOfConstructor.js index ba6dbf8b743..4672d9e0c4c 100644 --- a/tests/baselines/reference/doNotEmitDetachedCommentsAtStartOfConstructor.js +++ b/tests/baselines/reference/doNotEmitDetachedCommentsAtStartOfConstructor.js @@ -43,22 +43,22 @@ var A = (function () { var x = 10; } return A; -})(); +}()); var B = (function () { function B() { var y = 10; } return B; -})(); +}()); var C = (function () { function C() { var x = 10; } return C; -})(); +}()); var D = (function () { function D() { var y = 10; } return D; -})(); +}()); diff --git a/tests/baselines/reference/doNotEmitPinnedCommentOnNotEmittedNode.js b/tests/baselines/reference/doNotEmitPinnedCommentOnNotEmittedNode.js index de55d21cb1d..cddfb7aecdc 100644 --- a/tests/baselines/reference/doNotEmitPinnedCommentOnNotEmittedNode.js +++ b/tests/baselines/reference/doNotEmitPinnedCommentOnNotEmittedNode.js @@ -17,5 +17,5 @@ var C = (function () { } C.prototype.foo = function (x, y) { }; return C; -})(); +}()); var x = 10; diff --git a/tests/baselines/reference/doNotEmitPinnedCommentOnNotEmittedNodets.js b/tests/baselines/reference/doNotEmitPinnedCommentOnNotEmittedNodets.js index 66896350e6d..3198699405d 100644 --- a/tests/baselines/reference/doNotEmitPinnedCommentOnNotEmittedNodets.js +++ b/tests/baselines/reference/doNotEmitPinnedCommentOnNotEmittedNodets.js @@ -15,4 +15,4 @@ var C = (function () { } C.prototype.foo = function (x, y) { }; return C; -})(); +}()); diff --git a/tests/baselines/reference/dottedSymbolResolution1.js b/tests/baselines/reference/dottedSymbolResolution1.js index a0ac7a38b88..956968761ae 100644 --- a/tests/baselines/reference/dottedSymbolResolution1.js +++ b/tests/baselines/reference/dottedSymbolResolution1.js @@ -31,7 +31,7 @@ var Base = (function () { } Base.prototype.foo = function () { }; return Base; -})(); +}()); function each(collection, callback) { return null; } diff --git a/tests/baselines/reference/downlevelLetConst16.js b/tests/baselines/reference/downlevelLetConst16.js index d6f05f7584a..4b9d4c438fc 100644 --- a/tests/baselines/reference/downlevelLetConst16.js +++ b/tests/baselines/reference/downlevelLetConst16.js @@ -278,7 +278,7 @@ var A = (function () { use(x); }; return A; -})(); +}()); var B = (function () { function B() { } @@ -302,7 +302,7 @@ var B = (function () { use(x); }; return B; -})(); +}()); function bar1() { var x = 1; use(x); diff --git a/tests/baselines/reference/duplicateAnonymousInners1.js b/tests/baselines/reference/duplicateAnonymousInners1.js index c8cb35afb2e..5bb73bf68ed 100644 --- a/tests/baselines/reference/duplicateAnonymousInners1.js +++ b/tests/baselines/reference/duplicateAnonymousInners1.js @@ -32,12 +32,12 @@ var Foo; function Helper() { } return Helper; - })(); + }()); var Inner = (function () { function Inner() { } return Inner; - })(); + }()); // Inner should show up in intellisense Foo.Outer = 0; })(Foo || (Foo = {})); @@ -48,5 +48,5 @@ var Foo; function Helper() { } return Helper; - })(); + }()); })(Foo || (Foo = {})); diff --git a/tests/baselines/reference/duplicateAnonymousModuleClasses.js b/tests/baselines/reference/duplicateAnonymousModuleClasses.js index f55a3ca8664..74f80a65d40 100644 --- a/tests/baselines/reference/duplicateAnonymousModuleClasses.js +++ b/tests/baselines/reference/duplicateAnonymousModuleClasses.js @@ -63,7 +63,7 @@ var F; function Helper() { } return Helper; - })(); + }()); })(F || (F = {})); var F; (function (F) { @@ -72,7 +72,7 @@ var F; function Helper() { } return Helper; - })(); + }()); })(F || (F = {})); var Foo; (function (Foo) { @@ -80,7 +80,7 @@ var Foo; function Helper() { } return Helper; - })(); + }()); })(Foo || (Foo = {})); var Foo; (function (Foo) { @@ -89,7 +89,7 @@ var Foo; function Helper() { } return Helper; - })(); + }()); })(Foo || (Foo = {})); var Gar; (function (Gar) { @@ -99,7 +99,7 @@ var Gar; function Helper() { } return Helper; - })(); + }()); })(Foo || (Foo = {})); var Foo; (function (Foo) { @@ -108,6 +108,6 @@ var Gar; function Helper() { } return Helper; - })(); + }()); })(Foo || (Foo = {})); })(Gar || (Gar = {})); diff --git a/tests/baselines/reference/duplicateClassElements.js b/tests/baselines/reference/duplicateClassElements.js index da320eb9ac4..ed47c532a76 100644 --- a/tests/baselines/reference/duplicateClassElements.js +++ b/tests/baselines/reference/duplicateClassElements.js @@ -102,4 +102,4 @@ var a = (function () { a.prototype.z2 = function () { }; return a; -})(); +}()); diff --git a/tests/baselines/reference/duplicateConstructorOverloadSignature.js b/tests/baselines/reference/duplicateConstructorOverloadSignature.js index 08bad59f531..8d7980ea0f7 100644 --- a/tests/baselines/reference/duplicateConstructorOverloadSignature.js +++ b/tests/baselines/reference/duplicateConstructorOverloadSignature.js @@ -10,4 +10,4 @@ var C = (function () { function C(x) { } return C; -})(); +}()); diff --git a/tests/baselines/reference/duplicateConstructorOverloadSignature2.js b/tests/baselines/reference/duplicateConstructorOverloadSignature2.js index d739150a588..a9d2a49fb25 100644 --- a/tests/baselines/reference/duplicateConstructorOverloadSignature2.js +++ b/tests/baselines/reference/duplicateConstructorOverloadSignature2.js @@ -10,4 +10,4 @@ var C = (function () { function C(x) { } return C; -})(); +}()); diff --git a/tests/baselines/reference/duplicateExportAssignments.js b/tests/baselines/reference/duplicateExportAssignments.js index 934ba3ae567..9d75121f232 100644 --- a/tests/baselines/reference/duplicateExportAssignments.js +++ b/tests/baselines/reference/duplicateExportAssignments.js @@ -53,7 +53,7 @@ var y = (function () { function y() { } return y; -})(); +}()); ; module.exports = x; //// [foo3.js] @@ -66,7 +66,7 @@ var y = (function () { function y() { } return y; -})(); +}()); module.exports = x; //// [foo4.js] "use strict"; diff --git a/tests/baselines/reference/duplicateIdentifiersAcrossContainerBoundaries.js b/tests/baselines/reference/duplicateIdentifiersAcrossContainerBoundaries.js index ad96e55a507..21733e2cebf 100644 --- a/tests/baselines/reference/duplicateIdentifiersAcrossContainerBoundaries.js +++ b/tests/baselines/reference/duplicateIdentifiersAcrossContainerBoundaries.js @@ -59,7 +59,7 @@ var M; function I() { } return I; - })(); + }()); M.I = I; })(M || (M = {})); var M; @@ -73,7 +73,7 @@ var M; function f() { } return f; - })(); + }()); M.f = f; // error })(M || (M = {})); var M; @@ -86,7 +86,7 @@ var M; function g() { } return g; - })(); + }()); M.g = g; // no error })(M || (M = {})); var M; @@ -95,7 +95,7 @@ var M; function C() { } return C; - })(); + }()); M.C = C; })(M || (M = {})); var M; @@ -114,7 +114,7 @@ var Foo = (function () { function Foo() { } return Foo; -})(); +}()); var Foo; (function (Foo) { })(Foo || (Foo = {})); diff --git a/tests/baselines/reference/duplicateIdentifiersAcrossFileBoundaries.js b/tests/baselines/reference/duplicateIdentifiersAcrossFileBoundaries.js index a2509ea97f4..70635dcbd7e 100644 --- a/tests/baselines/reference/duplicateIdentifiersAcrossFileBoundaries.js +++ b/tests/baselines/reference/duplicateIdentifiersAcrossFileBoundaries.js @@ -39,19 +39,19 @@ var C1 = (function () { function C1() { } return C1; -})(); +}()); var C2 = (function () { function C2() { } return C2; -})(); +}()); function f() { } var v = 3; var Foo = (function () { function Foo() { } return Foo; -})(); +}()); var N; (function (N) { var F; @@ -64,13 +64,13 @@ var I = (function () { function I() { } return I; -})(); // error -- cannot merge interface with non-ambient class +}()); // error -- cannot merge interface with non-ambient class function C2() { } // error -- cannot merge function with non-ambient class var f = (function () { function f() { } return f; -})(); // error -- cannot merge function with non-ambient class +}()); // error -- cannot merge function with non-ambient class var v = 3; var Foo; (function (Foo) { diff --git a/tests/baselines/reference/duplicateLocalVariable1.js b/tests/baselines/reference/duplicateLocalVariable1.js index e155a2e50c9..734b01eaed7 100644 --- a/tests/baselines/reference/duplicateLocalVariable1.js +++ b/tests/baselines/reference/duplicateLocalVariable1.js @@ -357,7 +357,7 @@ var TestCase = (function () { this.errorMessageRegEx = errorMessageRegEx; } return TestCase; -})(); +}()); exports.TestCase = TestCase; var TestRunner = (function () { function TestRunner() { @@ -406,7 +406,7 @@ var TestRunner = (function () { } }; return TestRunner; -})(); +}()); exports.TestRunner = TestRunner; exports.tests = (function () { var testRunner = new TestRunner(); diff --git a/tests/baselines/reference/duplicateLocalVariable2.js b/tests/baselines/reference/duplicateLocalVariable2.js index b507e337250..d6f5c26d628 100644 --- a/tests/baselines/reference/duplicateLocalVariable2.js +++ b/tests/baselines/reference/duplicateLocalVariable2.js @@ -45,7 +45,7 @@ define(["require", "exports"], function (require, exports) { this.errorMessageRegEx = errorMessageRegEx; } return TestCase; - })(); + }()); exports.TestCase = TestCase; var TestRunner = (function () { function TestRunner() { @@ -56,7 +56,7 @@ define(["require", "exports"], function (require, exports) { TestRunner.prototype.addTest = function (test) { }; return TestRunner; - })(); + }()); exports.TestRunner = TestRunner; exports.tests = (function () { var testRunner = new TestRunner(); diff --git a/tests/baselines/reference/duplicateNumericIndexers.js b/tests/baselines/reference/duplicateNumericIndexers.js index 4329e9019fb..87299585bb6 100644 --- a/tests/baselines/reference/duplicateNumericIndexers.js +++ b/tests/baselines/reference/duplicateNumericIndexers.js @@ -39,5 +39,5 @@ var C = (function () { function C() { } return C; -})(); +}()); var a; diff --git a/tests/baselines/reference/duplicatePropertyNames.js b/tests/baselines/reference/duplicatePropertyNames.js index c3cde82e2cc..d4dfe612fc5 100644 --- a/tests/baselines/reference/duplicatePropertyNames.js +++ b/tests/baselines/reference/duplicatePropertyNames.js @@ -58,7 +58,7 @@ var C = (function () { C.prototype.bar = function (x) { }; C.prototype.bar = function (x) { }; return C; -})(); +}()); var a; var b = { foo: '', diff --git a/tests/baselines/reference/duplicateStringIndexers.js b/tests/baselines/reference/duplicateStringIndexers.js index e4f8b7c9f3c..3708d6a4989 100644 --- a/tests/baselines/reference/duplicateStringIndexers.js +++ b/tests/baselines/reference/duplicateStringIndexers.js @@ -42,6 +42,6 @@ var test; function C() { } return C; - })(); + }()); var a; })(test || (test = {})); diff --git a/tests/baselines/reference/duplicateSymbolsExportMatching.js b/tests/baselines/reference/duplicateSymbolsExportMatching.js index 8a8374a8dd4..d37d1efb3bb 100644 --- a/tests/baselines/reference/duplicateSymbolsExportMatching.js +++ b/tests/baselines/reference/duplicateSymbolsExportMatching.js @@ -101,7 +101,7 @@ define(["require", "exports"], function (require, exports) { function C() { } return C; - })(); + }()); var C; (function (C) { var t; diff --git a/tests/baselines/reference/duplicateTypeParameters2.js b/tests/baselines/reference/duplicateTypeParameters2.js index 65dce28ad3f..63910fa1758 100644 --- a/tests/baselines/reference/duplicateTypeParameters2.js +++ b/tests/baselines/reference/duplicateTypeParameters2.js @@ -10,10 +10,10 @@ var A = (function () { } A.prototype.foo = function () { }; return A; -})(); +}()); var B = (function () { function B() { } B.prototype.bar = function () { }; return B; -})(); +}()); diff --git a/tests/baselines/reference/duplicateVariablesByScope.js b/tests/baselines/reference/duplicateVariablesByScope.js index 43b6e89d412..2f9a0348811 100644 --- a/tests/baselines/reference/duplicateVariablesByScope.js +++ b/tests/baselines/reference/duplicateVariablesByScope.js @@ -63,4 +63,4 @@ var C = (function () { } }; return C; -})(); +}()); diff --git a/tests/baselines/reference/elaboratedErrors.js b/tests/baselines/reference/elaboratedErrors.js index ae5877b2dd6..cb8d1bd1ea4 100644 --- a/tests/baselines/reference/elaboratedErrors.js +++ b/tests/baselines/reference/elaboratedErrors.js @@ -33,7 +33,7 @@ var WorkerFS = (function () { function WorkerFS() { } return WorkerFS; -})(); +}()); var x; var y; // Only one of these errors should be large diff --git a/tests/baselines/reference/emitArrowFunctionWhenUsingArguments12.js b/tests/baselines/reference/emitArrowFunctionWhenUsingArguments12.js index df4fddd3b32..a2c0b7df488 100644 --- a/tests/baselines/reference/emitArrowFunctionWhenUsingArguments12.js +++ b/tests/baselines/reference/emitArrowFunctionWhenUsingArguments12.js @@ -14,4 +14,4 @@ var C = (function () { var a = function () { return arguments; }; }; return C; -})(); +}()); diff --git a/tests/baselines/reference/emitDefaultParametersMethod.js b/tests/baselines/reference/emitDefaultParametersMethod.js index 126c19305b3..1048926a187 100644 --- a/tests/baselines/reference/emitDefaultParametersMethod.js +++ b/tests/baselines/reference/emitDefaultParametersMethod.js @@ -43,13 +43,13 @@ var C = (function () { } }; return C; -})(); +}()); var D = (function () { function D(y) { if (y === void 0) { y = "hello"; } } return D; -})(); +}()); var E = (function () { function E(y) { if (y === void 0) { y = "hello"; } @@ -59,4 +59,4 @@ var E = (function () { } } return E; -})(); +}()); diff --git a/tests/baselines/reference/emitMemberAccessExpression.js b/tests/baselines/reference/emitMemberAccessExpression.js index 92fef4b36ff..f242f0903c4 100644 --- a/tests/baselines/reference/emitMemberAccessExpression.js +++ b/tests/baselines/reference/emitMemberAccessExpression.js @@ -40,7 +40,7 @@ var Microsoft; var res = Model.KnockoutExtentions; }; return _Person; - })(); + }()); Model._Person = _Person; })(Model = PeopleAtWork.Model || (PeopleAtWork.Model = {})); })(PeopleAtWork = Microsoft.PeopleAtWork || (Microsoft.PeopleAtWork = {})); @@ -61,7 +61,7 @@ var Microsoft; function KnockoutExtentions() { } return KnockoutExtentions; - })(); + }()); Model.KnockoutExtentions = KnockoutExtentions; })(Model = PeopleAtWork.Model || (PeopleAtWork.Model = {})); })(PeopleAtWork = Microsoft.PeopleAtWork || (Microsoft.PeopleAtWork = {})); diff --git a/tests/baselines/reference/emitRestParametersMethod.js b/tests/baselines/reference/emitRestParametersMethod.js index 5ceb6d768f8..1dec771cde8 100644 --- a/tests/baselines/reference/emitRestParametersMethod.js +++ b/tests/baselines/reference/emitRestParametersMethod.js @@ -34,7 +34,7 @@ var C = (function () { } }; return C; -})(); +}()); var D = (function () { function D() { var rest = []; @@ -55,4 +55,4 @@ var D = (function () { } }; return D; -})(); +}()); diff --git a/tests/baselines/reference/emitThisInSuperMethodCall.js b/tests/baselines/reference/emitThisInSuperMethodCall.js index f5cff5a8fa5..ba648b12d86 100644 --- a/tests/baselines/reference/emitThisInSuperMethodCall.js +++ b/tests/baselines/reference/emitThisInSuperMethodCall.js @@ -39,7 +39,7 @@ var User = (function () { User.prototype.sayHello = function () { }; return User; -})(); +}()); var RegisteredUser = (function (_super) { __extends(RegisteredUser, _super); function RegisteredUser() { @@ -65,4 +65,4 @@ var RegisteredUser = (function (_super) { } }; return RegisteredUser; -})(User); +}(User)); diff --git a/tests/baselines/reference/emptyGenericParamList.js b/tests/baselines/reference/emptyGenericParamList.js index c5d01778f2d..173a9401d87 100644 --- a/tests/baselines/reference/emptyGenericParamList.js +++ b/tests/baselines/reference/emptyGenericParamList.js @@ -7,5 +7,5 @@ var I = (function () { function I() { } return I; -})(); +}()); var x; diff --git a/tests/baselines/reference/emptyModuleName.js b/tests/baselines/reference/emptyModuleName.js index 892ce5f59b1..5c85d39e1ec 100644 --- a/tests/baselines/reference/emptyModuleName.js +++ b/tests/baselines/reference/emptyModuleName.js @@ -17,4 +17,4 @@ var B = (function (_super) { _super.apply(this, arguments); } return B; -})(A); +}(A)); diff --git a/tests/baselines/reference/emptyTypeArgumentListWithNew.js b/tests/baselines/reference/emptyTypeArgumentListWithNew.js index d51c4f630a6..6fe2aeb5090 100644 --- a/tests/baselines/reference/emptyTypeArgumentListWithNew.js +++ b/tests/baselines/reference/emptyTypeArgumentListWithNew.js @@ -7,5 +7,5 @@ var foo = (function () { function foo() { } return foo; -})(); +}()); new foo(); diff --git a/tests/baselines/reference/enumAssignability.js b/tests/baselines/reference/enumAssignability.js index 5bf639d9cf1..79e4b461563 100644 --- a/tests/baselines/reference/enumAssignability.js +++ b/tests/baselines/reference/enumAssignability.js @@ -79,7 +79,7 @@ var Others; function C() { } return C; - })(); + }()); var ac; var ai; var b = e; // ok diff --git a/tests/baselines/reference/enumAssignabilityInInheritance.js b/tests/baselines/reference/enumAssignabilityInInheritance.js index 01439854259..dc5237108f5 100644 --- a/tests/baselines/reference/enumAssignabilityInInheritance.js +++ b/tests/baselines/reference/enumAssignabilityInInheritance.js @@ -129,13 +129,13 @@ var A = (function () { function A() { } return A; -})(); +}()); var r4 = foo9(E.A); var A2 = (function () { function A2() { } return A2; -})(); +}()); var r4 = foo10(E.A); var r4 = foo11(E.A); var r4 = foo12(E.A); @@ -154,7 +154,7 @@ var CC = (function () { function CC() { } return CC; -})(); +}()); var CC; (function (CC) { CC.bar = 1; diff --git a/tests/baselines/reference/enumAssignmentCompat.js b/tests/baselines/reference/enumAssignmentCompat.js index f56b1f300ed..b4762d182d4 100644 --- a/tests/baselines/reference/enumAssignmentCompat.js +++ b/tests/baselines/reference/enumAssignmentCompat.js @@ -45,7 +45,7 @@ var W; function D() { } return D; - })(); + }()); W.D = D; })(W || (W = {})); var W; diff --git a/tests/baselines/reference/enumAssignmentCompat2.js b/tests/baselines/reference/enumAssignmentCompat2.js index 1fb7eb65e36..0cc3b6befbf 100644 --- a/tests/baselines/reference/enumAssignmentCompat2.js +++ b/tests/baselines/reference/enumAssignmentCompat2.js @@ -50,7 +50,7 @@ var W; function D() { } return D; - })(); + }()); W.D = D; })(W || (W = {})); var x = W; diff --git a/tests/baselines/reference/enumGenericTypeClash.js b/tests/baselines/reference/enumGenericTypeClash.js index 849fd2c59d6..931df9f9d98 100644 --- a/tests/baselines/reference/enumGenericTypeClash.js +++ b/tests/baselines/reference/enumGenericTypeClash.js @@ -8,7 +8,7 @@ var X = (function () { function X() { } return X; -})(); +}()); var X; (function (X) { X[X["MyVal"] = 0] = "MyVal"; diff --git a/tests/baselines/reference/enumIsNotASubtypeOfAnythingButNumber.js b/tests/baselines/reference/enumIsNotASubtypeOfAnythingButNumber.js index d932985ad7d..56f40eef6e0 100644 --- a/tests/baselines/reference/enumIsNotASubtypeOfAnythingButNumber.js +++ b/tests/baselines/reference/enumIsNotASubtypeOfAnythingButNumber.js @@ -140,12 +140,12 @@ var A = (function () { function A() { } return A; -})(); +}()); var A2 = (function () { function A2() { } return A2; -})(); +}()); var E2; (function (E2) { E2[E2["A"] = 0] = "A"; @@ -159,7 +159,7 @@ var c = (function () { function c() { } return c; -})(); +}()); var c; (function (c) { c.bar = 1; diff --git a/tests/baselines/reference/errorForwardReferenceForwadingConstructor.js b/tests/baselines/reference/errorForwardReferenceForwadingConstructor.js index 0b30745fa15..96f6c65b85c 100644 --- a/tests/baselines/reference/errorForwardReferenceForwadingConstructor.js +++ b/tests/baselines/reference/errorForwardReferenceForwadingConstructor.js @@ -26,11 +26,11 @@ var base = (function () { this.n = n; } return base; -})(); +}()); var derived = (function (_super) { __extends(derived, _super); function derived() { _super.apply(this, arguments); } return derived; -})(base); +}(base)); diff --git a/tests/baselines/reference/errorRecoveryInClassDeclaration.js b/tests/baselines/reference/errorRecoveryInClassDeclaration.js index 7f95bed19f9..cfe274c34bf 100644 --- a/tests/baselines/reference/errorRecoveryInClassDeclaration.js +++ b/tests/baselines/reference/errorRecoveryInClassDeclaration.js @@ -15,4 +15,4 @@ var C = (function () { var v = foo(public, blaz(), {}); }; return C; -})(); +}()); diff --git a/tests/baselines/reference/errorSuperCalls.js b/tests/baselines/reference/errorSuperCalls.js index d2d4911c76a..4cc6a4d968f 100644 --- a/tests/baselines/reference/errorSuperCalls.js +++ b/tests/baselines/reference/errorSuperCalls.js @@ -122,12 +122,12 @@ var NoBase = (function () { //super call in static class member initializer with no base type NoBase.k = _super.call(this); return NoBase; -})(); +}()); var Base = (function () { function Base() { } return Base; -})(); +}()); var Derived = (function (_super) { __extends(Derived, _super); //super call with type arguments @@ -136,12 +136,12 @@ var Derived = (function (_super) { _super.call(this); } return Derived; -})(Base); +}(Base)); var OtherBase = (function () { function OtherBase() { } return OtherBase; -})(); +}()); var OtherDerived = (function (_super) { __extends(OtherDerived, _super); function OtherDerived() { @@ -166,4 +166,4 @@ var OtherDerived = (function (_super) { configurable: true }); return OtherDerived; -})(OtherBase); +}(OtherBase)); diff --git a/tests/baselines/reference/errorSuperPropertyAccess.js b/tests/baselines/reference/errorSuperPropertyAccess.js index 6e35248cd35..cf6ed2598ea 100644 --- a/tests/baselines/reference/errorSuperPropertyAccess.js +++ b/tests/baselines/reference/errorSuperPropertyAccess.js @@ -165,7 +165,7 @@ var NoBase = (function () { configurable: true }); return NoBase; -})(); +}()); var SomeBase = (function () { function SomeBase() { this.privateMember = 0; @@ -178,7 +178,7 @@ var SomeBase = (function () { SomeBase.privateStaticMember = 0; SomeBase.publicStaticMember = 0; return SomeBase; -})(); +}()); //super.publicInstanceMemberNotFunction in constructor of derived class //super.publicInstanceMemberNotFunction in instance member function of derived class //super.publicInstanceMemberNotFunction in instance member accessor(get and set) of derived class @@ -212,7 +212,7 @@ var SomeDerived1 = (function (_super) { }; }; return SomeDerived1; -})(SomeBase); +}(SomeBase)); //super.privateProperty in constructor of derived class //super.privateProperty in instance member function of derived class //super.privateProperty in instance member accessor(get and set) of derived class @@ -237,7 +237,7 @@ var SomeDerived2 = (function (_super) { configurable: true }); return SomeDerived2; -})(SomeBase); +}(SomeBase)); //super.publicStaticMemberNotFunction in static member function of derived class //super.publicStaticMemberNotFunction in static member accessor(get and set) of derived class //super.privateStaticProperty in static member function of derived class @@ -268,6 +268,6 @@ var SomeDerived3 = (function (_super) { configurable: true }); return SomeDerived3; -})(SomeBase); +}(SomeBase)); // In object literal var obj = { n: _super.wat, p: _super.foo.call(this) }; diff --git a/tests/baselines/reference/errorSupression1.js b/tests/baselines/reference/errorSupression1.js index 53e40e585f0..77545131ce3 100644 --- a/tests/baselines/reference/errorSupression1.js +++ b/tests/baselines/reference/errorSupression1.js @@ -14,7 +14,7 @@ var Foo = (function () { } Foo.bar = function () { return "x"; }; return Foo; -})(); +}()); var baz = Foo.b; // Foo.b won't bind. baz.concat("y"); diff --git a/tests/baselines/reference/errorsInGenericTypeReference.js b/tests/baselines/reference/errorsInGenericTypeReference.js index 42c7456be60..a7898810e10 100644 --- a/tests/baselines/reference/errorsInGenericTypeReference.js +++ b/tests/baselines/reference/errorsInGenericTypeReference.js @@ -82,14 +82,14 @@ var Foo = (function () { function Foo() { } return Foo; -})(); +}()); // in call type arguments var testClass1 = (function () { function testClass1() { } testClass1.prototype.method = function () { }; return testClass1; -})(); +}()); var tc1 = new testClass1(); tc1.method(); // error: could not find symbol V // in constructor type arguments @@ -97,7 +97,7 @@ var testClass2 = (function () { function testClass2() { } return testClass2; -})(); +}()); var tc2 = new testClass2(); // error: could not find symbol V // in method return type annotation var testClass3 = (function () { @@ -112,7 +112,7 @@ var testClass3 = (function () { configurable: true }); return testClass3; -})(); +}()); // in function return type annotation function testFunction1() { return null; } // error: could not find symbol V // in paramter types @@ -124,13 +124,13 @@ var testClass4 = (function () { function testClass4() { } return testClass4; -})(); // error: could not find symbol V +}()); // error: could not find symbol V var testClass6 = (function () { function testClass6() { } testClass6.prototype.method = function () { }; // error: could not find symbol V return testClass6; -})(); +}()); // in extends clause var testClass7 = (function (_super) { __extends(testClass7, _super); @@ -138,10 +138,10 @@ var testClass7 = (function (_super) { _super.apply(this, arguments); } return testClass7; -})(Foo); // error: could not find symbol V +}(Foo)); // error: could not find symbol V // in implements clause var testClass8 = (function () { function testClass8() { } return testClass8; -})(); // error: could not find symbol V +}()); // error: could not find symbol V diff --git a/tests/baselines/reference/es3-amd.js b/tests/baselines/reference/es3-amd.js index 03d4a53e9c5..ecdbfe80b46 100644 --- a/tests/baselines/reference/es3-amd.js +++ b/tests/baselines/reference/es3-amd.js @@ -21,4 +21,4 @@ var A = (function () { return 42; }; return A; -})(); +}()); diff --git a/tests/baselines/reference/es3-declaration-amd.js b/tests/baselines/reference/es3-declaration-amd.js index 12dd009cc0e..133cf33629a 100644 --- a/tests/baselines/reference/es3-declaration-amd.js +++ b/tests/baselines/reference/es3-declaration-amd.js @@ -21,7 +21,7 @@ var A = (function () { return 42; }; return A; -})(); +}()); //// [es3-declaration-amd.d.ts] diff --git a/tests/baselines/reference/es3-sourcemap-amd.js b/tests/baselines/reference/es3-sourcemap-amd.js index df673a2fe56..4b16caec721 100644 --- a/tests/baselines/reference/es3-sourcemap-amd.js +++ b/tests/baselines/reference/es3-sourcemap-amd.js @@ -21,5 +21,5 @@ var A = (function () { return 42; }; return A; -})(); +}()); //# sourceMappingURL=es3-sourcemap-amd.js.map \ No newline at end of file diff --git a/tests/baselines/reference/es3-sourcemap-amd.sourcemap.txt b/tests/baselines/reference/es3-sourcemap-amd.sourcemap.txt index 2a5a48fbe47..9cb84dff0ba 100644 --- a/tests/baselines/reference/es3-sourcemap-amd.sourcemap.txt +++ b/tests/baselines/reference/es3-sourcemap-amd.sourcemap.txt @@ -86,7 +86,7 @@ sourceFile:es3-sourcemap-amd.ts 1->Emitted(7, 5) Source(13, 1) + SourceIndex(0) 2 >Emitted(7, 13) Source(13, 2) + SourceIndex(0) --- ->>>})(); +>>>}()); 1 > 2 >^ 3 > diff --git a/tests/baselines/reference/es3defaultAliasIsQuoted.js b/tests/baselines/reference/es3defaultAliasIsQuoted.js index 393302df518..ac6a0bd24da 100644 --- a/tests/baselines/reference/es3defaultAliasIsQuoted.js +++ b/tests/baselines/reference/es3defaultAliasIsQuoted.js @@ -21,7 +21,7 @@ var Foo = (function () { } Foo.CONSTANT = "Foo"; return Foo; -})(); +}()); exports.Foo = Foo; function assert(value) { if (!value) diff --git a/tests/baselines/reference/es5-amd.js b/tests/baselines/reference/es5-amd.js index e33fecaed64..ebfc5ee12d1 100644 --- a/tests/baselines/reference/es5-amd.js +++ b/tests/baselines/reference/es5-amd.js @@ -21,4 +21,4 @@ var A = (function () { return 42; }; return A; -})(); +}()); diff --git a/tests/baselines/reference/es5-commonjs.js b/tests/baselines/reference/es5-commonjs.js index da5bff3aea7..6a301f9a2ac 100644 --- a/tests/baselines/reference/es5-commonjs.js +++ b/tests/baselines/reference/es5-commonjs.js @@ -23,6 +23,6 @@ var A = (function () { return 42; }; return A; -})(); +}()); Object.defineProperty(exports, "__esModule", { value: true }); exports.default = A; diff --git a/tests/baselines/reference/es5-commonjs4.js b/tests/baselines/reference/es5-commonjs4.js index 56bb5ba5f79..b67c771df3c 100644 --- a/tests/baselines/reference/es5-commonjs4.js +++ b/tests/baselines/reference/es5-commonjs4.js @@ -24,6 +24,6 @@ var A = (function () { return 42; }; return A; -})(); +}()); exports.default = A; exports.__esModule = 1; diff --git a/tests/baselines/reference/es5-declaration-amd.js b/tests/baselines/reference/es5-declaration-amd.js index e180e88d514..32c9690dc4e 100644 --- a/tests/baselines/reference/es5-declaration-amd.js +++ b/tests/baselines/reference/es5-declaration-amd.js @@ -21,7 +21,7 @@ var A = (function () { return 42; }; return A; -})(); +}()); //// [es5-declaration-amd.d.ts] diff --git a/tests/baselines/reference/es5-souremap-amd.js b/tests/baselines/reference/es5-souremap-amd.js index 8bfb47fc3b8..b957f605e7c 100644 --- a/tests/baselines/reference/es5-souremap-amd.js +++ b/tests/baselines/reference/es5-souremap-amd.js @@ -21,5 +21,5 @@ var A = (function () { return 42; }; return A; -})(); +}()); //# sourceMappingURL=es5-souremap-amd.js.map \ No newline at end of file diff --git a/tests/baselines/reference/es5-souremap-amd.sourcemap.txt b/tests/baselines/reference/es5-souremap-amd.sourcemap.txt index 3b5226d31f1..fc573856f9c 100644 --- a/tests/baselines/reference/es5-souremap-amd.sourcemap.txt +++ b/tests/baselines/reference/es5-souremap-amd.sourcemap.txt @@ -86,7 +86,7 @@ sourceFile:es5-souremap-amd.ts 1->Emitted(7, 5) Source(13, 1) + SourceIndex(0) 2 >Emitted(7, 13) Source(13, 2) + SourceIndex(0) --- ->>>})(); +>>>}()); 1 > 2 >^ 3 > diff --git a/tests/baselines/reference/es5-system.js b/tests/baselines/reference/es5-system.js index 1fde76a762c..a9633352b8b 100644 --- a/tests/baselines/reference/es5-system.js +++ b/tests/baselines/reference/es5-system.js @@ -28,7 +28,7 @@ System.register([], function(exports_1) { return 42; }; return A; - })(); + }()); exports_1("default", A); } } diff --git a/tests/baselines/reference/es5-umd.js b/tests/baselines/reference/es5-umd.js index 8c68092cbc6..f98d5cde719 100644 --- a/tests/baselines/reference/es5-umd.js +++ b/tests/baselines/reference/es5-umd.js @@ -22,4 +22,4 @@ var A = (function () { return 42; }; return A; -})(); +}()); diff --git a/tests/baselines/reference/es5-umd2.js b/tests/baselines/reference/es5-umd2.js index 7a6dd8f1063..abc98aa77d6 100644 --- a/tests/baselines/reference/es5-umd2.js +++ b/tests/baselines/reference/es5-umd2.js @@ -31,6 +31,6 @@ export class A return 42; }; return A; - })(); + }()); exports.A = A; }); diff --git a/tests/baselines/reference/es5-umd3.js b/tests/baselines/reference/es5-umd3.js index 0665c52696e..27e2e72aab4 100644 --- a/tests/baselines/reference/es5-umd3.js +++ b/tests/baselines/reference/es5-umd3.js @@ -31,7 +31,7 @@ export default class A return 42; }; return A; - })(); + }()); Object.defineProperty(exports, "__esModule", { value: true }); exports.default = A; }); diff --git a/tests/baselines/reference/es5-umd4.js b/tests/baselines/reference/es5-umd4.js index 546b882cac8..8ac60343759 100644 --- a/tests/baselines/reference/es5-umd4.js +++ b/tests/baselines/reference/es5-umd4.js @@ -33,6 +33,6 @@ export = A; return 42; }; return A; - })(); + }()); return A; }); diff --git a/tests/baselines/reference/es5ExportDefaultClassDeclaration.js b/tests/baselines/reference/es5ExportDefaultClassDeclaration.js index ee513ea6e5f..fc8acfb95ea 100644 --- a/tests/baselines/reference/es5ExportDefaultClassDeclaration.js +++ b/tests/baselines/reference/es5ExportDefaultClassDeclaration.js @@ -12,7 +12,7 @@ var C = (function () { } C.prototype.method = function () { }; return C; -})(); +}()); Object.defineProperty(exports, "__esModule", { value: true }); exports.default = C; diff --git a/tests/baselines/reference/es5ExportDefaultClassDeclaration2.js b/tests/baselines/reference/es5ExportDefaultClassDeclaration2.js index bd348d97893..0f60a104a7e 100644 --- a/tests/baselines/reference/es5ExportDefaultClassDeclaration2.js +++ b/tests/baselines/reference/es5ExportDefaultClassDeclaration2.js @@ -12,7 +12,7 @@ var default_1 = (function () { } default_1.prototype.method = function () { }; return default_1; -})(); +}()); Object.defineProperty(exports, "__esModule", { value: true }); exports.default = default_1; diff --git a/tests/baselines/reference/es5ExportDefaultClassDeclaration3.js b/tests/baselines/reference/es5ExportDefaultClassDeclaration3.js index bd038613308..00af2676a0d 100644 --- a/tests/baselines/reference/es5ExportDefaultClassDeclaration3.js +++ b/tests/baselines/reference/es5ExportDefaultClassDeclaration3.js @@ -24,7 +24,7 @@ var C = (function () { return new C(); }; return C; -})(); +}()); Object.defineProperty(exports, "__esModule", { value: true }); exports.default = C; var after = new C(); diff --git a/tests/baselines/reference/es5ExportEqualsDts.js b/tests/baselines/reference/es5ExportEqualsDts.js index 3d2e493a5ac..bc083ca0756 100644 --- a/tests/baselines/reference/es5ExportEqualsDts.js +++ b/tests/baselines/reference/es5ExportEqualsDts.js @@ -23,7 +23,7 @@ var A = (function () { return aVal; }; return A; -})(); +}()); module.exports = A; diff --git a/tests/baselines/reference/es5ModuleInternalNamedImports.js b/tests/baselines/reference/es5ModuleInternalNamedImports.js index 506f6bbed33..e8963b7db40 100644 --- a/tests/baselines/reference/es5ModuleInternalNamedImports.js +++ b/tests/baselines/reference/es5ModuleInternalNamedImports.js @@ -44,7 +44,7 @@ define(["require", "exports"], function (require, exports) { function M_C() { } return M_C; - })(); + }()); M.M_C = M_C; // instantiated module var M_M; diff --git a/tests/baselines/reference/es5ModuleWithModuleGenAmd.js b/tests/baselines/reference/es5ModuleWithModuleGenAmd.js index 22c34aa6fff..7060153f0d0 100644 --- a/tests/baselines/reference/es5ModuleWithModuleGenAmd.js +++ b/tests/baselines/reference/es5ModuleWithModuleGenAmd.js @@ -21,6 +21,6 @@ define(["require", "exports"], function (require, exports) { return 42; }; return A; - })(); + }()); exports.A = A; }); diff --git a/tests/baselines/reference/es5ModuleWithModuleGenCommonjs.js b/tests/baselines/reference/es5ModuleWithModuleGenCommonjs.js index ec0c7fafc85..e5f995fb5e0 100644 --- a/tests/baselines/reference/es5ModuleWithModuleGenCommonjs.js +++ b/tests/baselines/reference/es5ModuleWithModuleGenCommonjs.js @@ -20,5 +20,5 @@ var A = (function () { return 42; }; return A; -})(); +}()); exports.A = A; diff --git a/tests/baselines/reference/es5ModuleWithoutModuleGenTarget.js b/tests/baselines/reference/es5ModuleWithoutModuleGenTarget.js index ae6bd73c1cc..34ad74818b2 100644 --- a/tests/baselines/reference/es5ModuleWithoutModuleGenTarget.js +++ b/tests/baselines/reference/es5ModuleWithoutModuleGenTarget.js @@ -20,5 +20,5 @@ var A = (function () { return 42; }; return A; -})(); +}()); exports.A = A; diff --git a/tests/baselines/reference/es5andes6module.js b/tests/baselines/reference/es5andes6module.js index 0d489357852..a6ca59befbf 100644 --- a/tests/baselines/reference/es5andes6module.js +++ b/tests/baselines/reference/es5andes6module.js @@ -22,5 +22,5 @@ var A = (function () { return 42; }; return A; -})(); +}()); exports.default = A; diff --git a/tests/baselines/reference/es6ClassSuperCodegenBug.js b/tests/baselines/reference/es6ClassSuperCodegenBug.js index 9f15af96be8..c32865478e3 100644 --- a/tests/baselines/reference/es6ClassSuperCodegenBug.js +++ b/tests/baselines/reference/es6ClassSuperCodegenBug.js @@ -24,7 +24,7 @@ var A = (function () { function A(str1, str2) { } return A; -})(); +}()); var B = (function (_super) { __extends(B, _super); function B() { @@ -36,4 +36,4 @@ var B = (function (_super) { } } return B; -})(A); +}(A)); diff --git a/tests/baselines/reference/es6ClassTest.js b/tests/baselines/reference/es6ClassTest.js index 9247dfde1c3..365e91321a4 100644 --- a/tests/baselines/reference/es6ClassTest.js +++ b/tests/baselines/reference/es6ClassTest.js @@ -97,7 +97,7 @@ var Bar = (function () { return x; }; return Bar; -})(); +}()); // new-style class var Foo = (function (_super) { __extends(Foo, _super); @@ -115,7 +115,7 @@ var Foo = (function (_super) { Foo.prototype.boo = function (x) { return x; }; Foo.statVal = 0; return Foo; -})(Bar); +}(Bar)); var f = new Foo(); //class GetSetMonster { // // attack(target) { diff --git a/tests/baselines/reference/es6ClassTest2.js b/tests/baselines/reference/es6ClassTest2.js index 20200a692ff..86ff00121cf 100644 --- a/tests/baselines/reference/es6ClassTest2.js +++ b/tests/baselines/reference/es6ClassTest2.js @@ -174,7 +174,7 @@ var BasicMonster = (function () { // WScript.Echo("Attacks " + target); }; return BasicMonster; -})(); +}()); var m1 = new BasicMonster("1", 100); var m2 = new BasicMonster("2", 100); m1.attack(m2); @@ -210,7 +210,7 @@ var GetSetMonster = (function () { configurable: true }); return GetSetMonster; -})(); +}()); var m3 = new BasicMonster("1", 100); var m4 = new BasicMonster("2", 100); m3.attack(m4); @@ -226,7 +226,7 @@ var OverloadedMonster = (function () { //WScript.Echo("Attacks " + target); }; return OverloadedMonster; -})(); +}()); var m5 = new OverloadedMonster("1"); var m6 = new OverloadedMonster("2"); m5.attack(m6); @@ -246,7 +246,7 @@ var SplatMonster = (function () { } }; return SplatMonster; -})(); +}()); function foo() { return true; } var PrototypeMonster = (function () { function PrototypeMonster() { @@ -254,7 +254,7 @@ var PrototypeMonster = (function () { this.b = foo(); } return PrototypeMonster; -})(); +}()); var SuperParent = (function () { function SuperParent(a) { } @@ -263,7 +263,7 @@ var SuperParent = (function () { SuperParent.prototype.c = function () { }; return SuperParent; -})(); +}()); var SuperChild = (function (_super) { __extends(SuperChild, _super); function SuperChild() { @@ -276,7 +276,7 @@ var SuperChild = (function (_super) { _super.prototype.c.call(this); }; return SuperChild; -})(SuperParent); +}(SuperParent)); var Statics = (function () { function Statics() { } @@ -285,7 +285,7 @@ var Statics = (function () { }; Statics.foo = 1; return Statics; -})(); +}()); var stat = new Statics(); var ImplementsInterface = (function () { function ImplementsInterface() { @@ -293,7 +293,7 @@ var ImplementsInterface = (function () { this.z = "foo"; } return ImplementsInterface; -})(); +}()); var Visibility = (function () { function Visibility() { this.x = 1; @@ -302,14 +302,14 @@ var Visibility = (function () { Visibility.prototype.foo = function () { }; Visibility.prototype.bar = function () { }; return Visibility; -})(); +}()); var BaseClassWithConstructor = (function () { function BaseClassWithConstructor(x, s) { this.x = x; this.s = s; } return BaseClassWithConstructor; -})(); +}()); // used to test codegen var ChildClassWithoutConstructor = (function (_super) { __extends(ChildClassWithoutConstructor, _super); @@ -317,5 +317,5 @@ var ChildClassWithoutConstructor = (function (_super) { _super.apply(this, arguments); } return ChildClassWithoutConstructor; -})(BaseClassWithConstructor); +}(BaseClassWithConstructor)); var ccwc = new ChildClassWithoutConstructor(1, "s"); diff --git a/tests/baselines/reference/es6ClassTest3.js b/tests/baselines/reference/es6ClassTest3.js index 572bd079636..daf6f63a2c1 100644 --- a/tests/baselines/reference/es6ClassTest3.js +++ b/tests/baselines/reference/es6ClassTest3.js @@ -27,5 +27,5 @@ var M; Visibility.prototype.bar = function () { }; ; return Visibility; - })(); + }()); })(M || (M = {})); diff --git a/tests/baselines/reference/es6ClassTest5.js b/tests/baselines/reference/es6ClassTest5.js index b6d3e55b8e1..b909fac58b5 100644 --- a/tests/baselines/reference/es6ClassTest5.js +++ b/tests/baselines/reference/es6ClassTest5.js @@ -20,10 +20,10 @@ var C1T5 = (function () { }; } return C1T5; -})(); +}()); var bigClass = (function () { function bigClass() { this.break = 1; } return bigClass; -})(); +}()); diff --git a/tests/baselines/reference/es6ClassTest7.js b/tests/baselines/reference/es6ClassTest7.js index 970e9c4fd9e..14662410a14 100644 --- a/tests/baselines/reference/es6ClassTest7.js +++ b/tests/baselines/reference/es6ClassTest7.js @@ -20,4 +20,4 @@ var Bar = (function (_super) { _super.apply(this, arguments); } return Bar; -})(M.Foo); +}(M.Foo)); diff --git a/tests/baselines/reference/es6ClassTest8.js b/tests/baselines/reference/es6ClassTest8.js index f96bbd16b0b..afac7054ee3 100644 --- a/tests/baselines/reference/es6ClassTest8.js +++ b/tests/baselines/reference/es6ClassTest8.js @@ -50,7 +50,7 @@ var C = (function () { var b = f1(f1(bar)); } return C; -})(); +}()); var Vector = (function () { function Vector(x, y, z) { this.x = x; @@ -63,7 +63,7 @@ var Vector = (function () { Vector.cross = function (v1, v2) { return null; }; Vector.dot = function (v1, v2) { return null; }; return Vector; -})(); +}()); var Camera = (function () { function Camera(pos, lookAt) { this.pos = pos; @@ -73,4 +73,4 @@ var Camera = (function () { this.up = Vector.times(down, Vector.norm(Vector.cross(this.forward, this.right))); } return Camera; -})(); +}()); diff --git a/tests/baselines/reference/es6DeclOrdering.js b/tests/baselines/reference/es6DeclOrdering.js index 53726e3b0bf..b5dc55ebc9c 100644 --- a/tests/baselines/reference/es6DeclOrdering.js +++ b/tests/baselines/reference/es6DeclOrdering.js @@ -26,4 +26,4 @@ var Bar = (function () { return this._store.length; }; return Bar; -})(); +}()); diff --git a/tests/baselines/reference/es6ExportAllInEs5.js b/tests/baselines/reference/es6ExportAllInEs5.js index fcd858bf457..73de2e7cce3 100644 --- a/tests/baselines/reference/es6ExportAllInEs5.js +++ b/tests/baselines/reference/es6ExportAllInEs5.js @@ -22,7 +22,7 @@ var c = (function () { function c() { } return c; -})(); +}()); exports.c = c; var m; (function (m) { diff --git a/tests/baselines/reference/es6ExportClauseInEs5.js b/tests/baselines/reference/es6ExportClauseInEs5.js index 9d30e585fde..f602f1ff609 100644 --- a/tests/baselines/reference/es6ExportClauseInEs5.js +++ b/tests/baselines/reference/es6ExportClauseInEs5.js @@ -22,7 +22,7 @@ var c = (function () { function c() { } return c; -})(); +}()); exports.c = c; exports.c2 = c; var m; diff --git a/tests/baselines/reference/es6ExportClauseWithoutModuleSpecifierInEs5.js b/tests/baselines/reference/es6ExportClauseWithoutModuleSpecifierInEs5.js index 83fb99134de..ab9bd3d98c8 100644 --- a/tests/baselines/reference/es6ExportClauseWithoutModuleSpecifierInEs5.js +++ b/tests/baselines/reference/es6ExportClauseWithoutModuleSpecifierInEs5.js @@ -26,7 +26,7 @@ var c = (function () { function c() { } return c; -})(); +}()); exports.c = c; var m; (function (m) { diff --git a/tests/baselines/reference/es6ImportDefaultBindingDts.js b/tests/baselines/reference/es6ImportDefaultBindingDts.js index 7adac1fab32..dbc90cb80a3 100644 --- a/tests/baselines/reference/es6ImportDefaultBindingDts.js +++ b/tests/baselines/reference/es6ImportDefaultBindingDts.js @@ -17,7 +17,7 @@ var c = (function () { function c() { } return c; -})(); +}()); Object.defineProperty(exports, "__esModule", { value: true }); exports.default = c; //// [client.js] diff --git a/tests/baselines/reference/es6ImportDefaultBindingFollowedWithNamedImportDts.js b/tests/baselines/reference/es6ImportDefaultBindingFollowedWithNamedImportDts.js index 6618fcb9db7..a0916932d4c 100644 --- a/tests/baselines/reference/es6ImportDefaultBindingFollowedWithNamedImportDts.js +++ b/tests/baselines/reference/es6ImportDefaultBindingFollowedWithNamedImportDts.js @@ -30,37 +30,37 @@ var a = (function () { function a() { } return a; -})(); +}()); exports.a = a; var x = (function () { function x() { } return x; -})(); +}()); exports.x = x; var m = (function () { function m() { } return m; -})(); +}()); exports.m = m; var a11 = (function () { function a11() { } return a11; -})(); +}()); exports.a11 = a11; var a12 = (function () { function a12() { } return a12; -})(); +}()); exports.a12 = a12; var x11 = (function () { function x11() { } return x11; -})(); +}()); exports.x11 = x11; //// [client.js] "use strict"; diff --git a/tests/baselines/reference/es6ImportDefaultBindingFollowedWithNamedImportDts1.js b/tests/baselines/reference/es6ImportDefaultBindingFollowedWithNamedImportDts1.js index f2a50fb494b..b588c9516e9 100644 --- a/tests/baselines/reference/es6ImportDefaultBindingFollowedWithNamedImportDts1.js +++ b/tests/baselines/reference/es6ImportDefaultBindingFollowedWithNamedImportDts1.js @@ -25,7 +25,7 @@ var a = (function () { function a() { } return a; -})(); +}()); Object.defineProperty(exports, "__esModule", { value: true }); exports.default = a; //// [client.js] diff --git a/tests/baselines/reference/es6ImportDefaultBindingFollowedWithNamespaceBindingDts.js b/tests/baselines/reference/es6ImportDefaultBindingFollowedWithNamespaceBindingDts.js index c4d43e40daf..20abd2e6132 100644 --- a/tests/baselines/reference/es6ImportDefaultBindingFollowedWithNamespaceBindingDts.js +++ b/tests/baselines/reference/es6ImportDefaultBindingFollowedWithNamespaceBindingDts.js @@ -14,7 +14,7 @@ var a = (function () { function a() { } return a; -})(); +}()); exports.a = a; //// [client.js] "use strict"; diff --git a/tests/baselines/reference/es6ImportDefaultBindingFollowedWithNamespaceBindingDts1.js b/tests/baselines/reference/es6ImportDefaultBindingFollowedWithNamespaceBindingDts1.js index 94b3296f363..5a2f1f35290 100644 --- a/tests/baselines/reference/es6ImportDefaultBindingFollowedWithNamespaceBindingDts1.js +++ b/tests/baselines/reference/es6ImportDefaultBindingFollowedWithNamespaceBindingDts1.js @@ -16,7 +16,7 @@ define(["require", "exports"], function (require, exports) { function a() { } return a; - })(); + }()); Object.defineProperty(exports, "__esModule", { value: true }); exports.default = a; }); diff --git a/tests/baselines/reference/es6ImportNameSpaceImportDts.js b/tests/baselines/reference/es6ImportNameSpaceImportDts.js index 0e6252a76a5..cf66c08331e 100644 --- a/tests/baselines/reference/es6ImportNameSpaceImportDts.js +++ b/tests/baselines/reference/es6ImportNameSpaceImportDts.js @@ -15,7 +15,7 @@ var c = (function () { function c() { } return c; -})(); +}()); exports.c = c; ; //// [client.js] diff --git a/tests/baselines/reference/es6ImportNamedImportDts.js b/tests/baselines/reference/es6ImportNamedImportDts.js index ceb8219b2fd..7fdf620164b 100644 --- a/tests/baselines/reference/es6ImportNamedImportDts.js +++ b/tests/baselines/reference/es6ImportNamedImportDts.js @@ -52,85 +52,85 @@ var a = (function () { function a() { } return a; -})(); +}()); exports.a = a; var a11 = (function () { function a11() { } return a11; -})(); +}()); exports.a11 = a11; var a12 = (function () { function a12() { } return a12; -})(); +}()); exports.a12 = a12; var x = (function () { function x() { } return x; -})(); +}()); exports.x = x; var x11 = (function () { function x11() { } return x11; -})(); +}()); exports.x11 = x11; var m = (function () { function m() { } return m; -})(); +}()); exports.m = m; var a1 = (function () { function a1() { } return a1; -})(); +}()); exports.a1 = a1; var x1 = (function () { function x1() { } return x1; -})(); +}()); exports.x1 = x1; var a111 = (function () { function a111() { } return a111; -})(); +}()); exports.a111 = a111; var x111 = (function () { function x111() { } return x111; -})(); +}()); exports.x111 = x111; var z1 = (function () { function z1() { } return z1; -})(); +}()); exports.z1 = z1; var z2 = (function () { function z2() { } return z2; -})(); +}()); exports.z2 = z2; var aaaa = (function () { function aaaa() { } return aaaa; -})(); +}()); exports.aaaa = aaaa; var aaaa1 = (function () { function aaaa1() { } return aaaa1; -})(); +}()); exports.aaaa1 = aaaa1; //// [client.js] "use strict"; diff --git a/tests/baselines/reference/es6ImportNamedImportInIndirectExportAssignment.js b/tests/baselines/reference/es6ImportNamedImportInIndirectExportAssignment.js index 03c74489bfd..3e85778de58 100644 --- a/tests/baselines/reference/es6ImportNamedImportInIndirectExportAssignment.js +++ b/tests/baselines/reference/es6ImportNamedImportInIndirectExportAssignment.js @@ -20,7 +20,7 @@ var a; function c() { } return c; - })(); + }()); a.c = c; })(a = exports.a || (exports.a = {})); //// [es6ImportNamedImportInIndirectExportAssignment_1.js] diff --git a/tests/baselines/reference/es6ImportNamedImportWithTypesAndValues.js b/tests/baselines/reference/es6ImportNamedImportWithTypesAndValues.js index da401100405..583a008f0ac 100644 --- a/tests/baselines/reference/es6ImportNamedImportWithTypesAndValues.js +++ b/tests/baselines/reference/es6ImportNamedImportWithTypesAndValues.js @@ -27,14 +27,14 @@ var C = (function () { this.prop = "hello"; } return C; -})(); +}()); exports.C = C; var C2 = (function () { function C2() { this.prop2 = "world"; } return C2; -})(); +}()); exports.C2 = C2; //// [client.js] "use strict"; diff --git a/tests/baselines/reference/es6MemberScoping.js b/tests/baselines/reference/es6MemberScoping.js index 7e70045ceb3..d38a64c611a 100644 --- a/tests/baselines/reference/es6MemberScoping.js +++ b/tests/baselines/reference/es6MemberScoping.js @@ -26,10 +26,10 @@ var Foo = (function () { return this._store.length; }; return Foo; -})(); +}()); var Foo2 = (function () { function Foo2() { } Foo2.Foo2 = function () { return 0; }; // should not be an error return Foo2; -})(); +}()); diff --git a/tests/baselines/reference/escapedIdentifiers.js b/tests/baselines/reference/escapedIdentifiers.js index 64eaaa5784f..c1b5fe8ae09 100644 --- a/tests/baselines/reference/escapedIdentifiers.js +++ b/tests/baselines/reference/escapedIdentifiers.js @@ -154,12 +154,12 @@ var classType1 = (function () { function classType1() { } return classType1; -})(); +}()); var classType\u0032 = (function () { function classType\u0032() { } return classType\u0032; -})(); +}()); var classType1Object1 = new classType1(); classType1Object1.foo1 = 2; var classType1Object2 = new classType\u0031(); @@ -187,7 +187,7 @@ var testClass = (function () { arg4 = 2; }; return testClass; -})(); +}()); // constructors var constructorTestClass = (function () { function constructorTestClass(arg1, arg\u0032, arg\u0033, arg4) { @@ -197,7 +197,7 @@ var constructorTestClass = (function () { this.arg4 = arg4; } return constructorTestClass; -})(); +}()); var constructorTestObject = new constructorTestClass(1, 'string', true, 2); constructorTestObject.arg\u0031 = 1; constructorTestObject.arg2 = 'string'; diff --git a/tests/baselines/reference/everyTypeAssignableToAny.js b/tests/baselines/reference/everyTypeAssignableToAny.js index 8730167c3ff..0b72b915618 100644 --- a/tests/baselines/reference/everyTypeAssignableToAny.js +++ b/tests/baselines/reference/everyTypeAssignableToAny.js @@ -66,7 +66,7 @@ var C = (function () { function C() { } return C; -})(); +}()); var ac; var ai; var E; diff --git a/tests/baselines/reference/everyTypeWithAnnotationAndInitializer.js b/tests/baselines/reference/everyTypeWithAnnotationAndInitializer.js index 707801dc4ee..50068024b83 100644 --- a/tests/baselines/reference/everyTypeWithAnnotationAndInitializer.js +++ b/tests/baselines/reference/everyTypeWithAnnotationAndInitializer.js @@ -53,12 +53,12 @@ var C = (function () { function C() { } return C; -})(); +}()); var D = (function () { function D() { } return D; -})(); +}()); function F(x) { return 42; } var M; (function (M) { @@ -66,7 +66,7 @@ var M; function A() { } return A; - })(); + }()); M.A = A; function F2(x) { return x.toString(); } M.F2 = F2; diff --git a/tests/baselines/reference/everyTypeWithAnnotationAndInvalidInitializer.js b/tests/baselines/reference/everyTypeWithAnnotationAndInvalidInitializer.js index 40e45bf7ec0..8ae23514920 100644 --- a/tests/baselines/reference/everyTypeWithAnnotationAndInvalidInitializer.js +++ b/tests/baselines/reference/everyTypeWithAnnotationAndInvalidInitializer.js @@ -59,12 +59,12 @@ var C = (function () { function C() { } return C; -})(); +}()); var D = (function () { function D() { } return D; -})(); +}()); function F(x) { return 42; } function F2(x) { return x < 42; } var M; @@ -73,7 +73,7 @@ var M; function A() { } return A; - })(); + }()); M.A = A; function F2(x) { return x.toString(); } M.F2 = F2; @@ -84,7 +84,7 @@ var N; function A() { } return A; - })(); + }()); N.A = A; function F2(x) { return x.toString(); } N.F2 = F2; diff --git a/tests/baselines/reference/everyTypeWithInitializer.js b/tests/baselines/reference/everyTypeWithInitializer.js index aae0a9fe291..b6af5725c92 100644 --- a/tests/baselines/reference/everyTypeWithInitializer.js +++ b/tests/baselines/reference/everyTypeWithInitializer.js @@ -54,12 +54,12 @@ var C = (function () { function C() { } return C; -})(); +}()); var D = (function () { function D() { } return D; -})(); +}()); function F(x) { return 42; } var M; (function (M) { @@ -67,7 +67,7 @@ var M; function A() { } return A; - })(); + }()); M.A = A; function F2(x) { return x.toString(); } M.F2 = F2; diff --git a/tests/baselines/reference/exportAlreadySeen.js b/tests/baselines/reference/exportAlreadySeen.js index 68d30a697fd..749b08b18cd 100644 --- a/tests/baselines/reference/exportAlreadySeen.js +++ b/tests/baselines/reference/exportAlreadySeen.js @@ -31,7 +31,7 @@ var M; function C() { } return C; - })(); + }()); N.C = C; })(N = M.N || (M.N = {})); })(M || (M = {})); diff --git a/tests/baselines/reference/exportAssignClassAndModule.js b/tests/baselines/reference/exportAssignClassAndModule.js index 0fbfcc93948..bdfceef6b80 100644 --- a/tests/baselines/reference/exportAssignClassAndModule.js +++ b/tests/baselines/reference/exportAssignClassAndModule.js @@ -24,7 +24,7 @@ var Foo = (function () { function Foo() { } return Foo; -})(); +}()); module.exports = Foo; //// [exportAssignClassAndModule_1.js] "use strict"; diff --git a/tests/baselines/reference/exportAssignNonIdentifier.js b/tests/baselines/reference/exportAssignNonIdentifier.js index 8a266a35396..6209ade63cd 100644 --- a/tests/baselines/reference/exportAssignNonIdentifier.js +++ b/tests/baselines/reference/exportAssignNonIdentifier.js @@ -40,7 +40,7 @@ module.exports = (function () { function Foo3() { } return Foo3; -})(); +}()); //// [foo4.js] "use strict"; module.exports = true; diff --git a/tests/baselines/reference/exportAssignmentAndDeclaration.js b/tests/baselines/reference/exportAssignmentAndDeclaration.js index b2202df50e6..9e87d733c6b 100644 --- a/tests/baselines/reference/exportAssignmentAndDeclaration.js +++ b/tests/baselines/reference/exportAssignmentAndDeclaration.js @@ -23,6 +23,6 @@ define(["require", "exports"], function (require, exports) { function C1() { } return C1; - })(); + }()); return C1; }); diff --git a/tests/baselines/reference/exportAssignmentClass.js b/tests/baselines/reference/exportAssignmentClass.js index 000684f1a9f..02c74fe1f39 100644 --- a/tests/baselines/reference/exportAssignmentClass.js +++ b/tests/baselines/reference/exportAssignmentClass.js @@ -19,7 +19,7 @@ define(["require", "exports"], function (require, exports) { this.p = 0; } return C; - })(); + }()); return C; }); //// [exportAssignmentClass_B.js] diff --git a/tests/baselines/reference/exportAssignmentConstrainedGenericType.js b/tests/baselines/reference/exportAssignmentConstrainedGenericType.js index 08c1adb3a04..c0b8f2b50c1 100644 --- a/tests/baselines/reference/exportAssignmentConstrainedGenericType.js +++ b/tests/baselines/reference/exportAssignmentConstrainedGenericType.js @@ -20,7 +20,7 @@ var Foo = (function () { function Foo(x) { } return Foo; -})(); +}()); module.exports = Foo; //// [foo_1.js] "use strict"; diff --git a/tests/baselines/reference/exportAssignmentGenericType.js b/tests/baselines/reference/exportAssignmentGenericType.js index e9c6e821522..390a929ce35 100644 --- a/tests/baselines/reference/exportAssignmentGenericType.js +++ b/tests/baselines/reference/exportAssignmentGenericType.js @@ -18,7 +18,7 @@ var Foo = (function () { function Foo() { } return Foo; -})(); +}()); module.exports = Foo; //// [foo_1.js] "use strict"; diff --git a/tests/baselines/reference/exportAssignmentOfGenericType1.js b/tests/baselines/reference/exportAssignmentOfGenericType1.js index 54d936a4101..0504bad39c7 100644 --- a/tests/baselines/reference/exportAssignmentOfGenericType1.js +++ b/tests/baselines/reference/exportAssignmentOfGenericType1.js @@ -20,7 +20,7 @@ define(["require", "exports"], function (require, exports) { function T() { } return T; - })(); + }()); return T; }); //// [exportAssignmentOfGenericType1_1.js] @@ -37,7 +37,7 @@ define(["require", "exports", "exportAssignmentOfGenericType1_0"], function (req _super.apply(this, arguments); } return M; - })(q); + }(q)); var m; var r = m.foo; }); diff --git a/tests/baselines/reference/exportAssignmentTopLevelClodule.js b/tests/baselines/reference/exportAssignmentTopLevelClodule.js index 28075a7e55b..08220cc8de3 100644 --- a/tests/baselines/reference/exportAssignmentTopLevelClodule.js +++ b/tests/baselines/reference/exportAssignmentTopLevelClodule.js @@ -24,7 +24,7 @@ define(["require", "exports"], function (require, exports) { this.test = "test"; } return Foo; - })(); + }()); var Foo; (function (Foo) { Foo.answer = 42; diff --git a/tests/baselines/reference/exportAssignmentWithExports.js b/tests/baselines/reference/exportAssignmentWithExports.js index 9f43a515ad0..626e7881548 100644 --- a/tests/baselines/reference/exportAssignmentWithExports.js +++ b/tests/baselines/reference/exportAssignmentWithExports.js @@ -9,11 +9,11 @@ var C = (function () { function C() { } return C; -})(); +}()); exports.C = C; var D = (function () { function D() { } return D; -})(); +}()); module.exports = D; diff --git a/tests/baselines/reference/exportCodeGen.js b/tests/baselines/reference/exportCodeGen.js index 30ed0b07ae9..41564c35d1a 100644 --- a/tests/baselines/reference/exportCodeGen.js +++ b/tests/baselines/reference/exportCodeGen.js @@ -100,7 +100,7 @@ var E; function C() { } return C; - })(); + }()); E.C = C; var M; (function (M) { @@ -120,7 +120,7 @@ var F; function C() { } return C; - })(); + }()); var M; (function (M) { var x = 42; diff --git a/tests/baselines/reference/exportDeclarationInInternalModule.js b/tests/baselines/reference/exportDeclarationInInternalModule.js index 39c8123a1e7..ecd9d5adf4d 100644 --- a/tests/baselines/reference/exportDeclarationInInternalModule.js +++ b/tests/baselines/reference/exportDeclarationInInternalModule.js @@ -28,21 +28,21 @@ var Bbb = (function () { function Bbb() { } return Bbb; -})(); +}()); var Aaa = (function (_super) { __extends(Aaa, _super); function Aaa() { _super.apply(this, arguments); } return Aaa; -})(Bbb); +}(Bbb)); var Aaa; (function (Aaa) { var SomeType = (function () { function SomeType() { } return SomeType; - })(); + }()); Aaa.SomeType = SomeType; })(Aaa || (Aaa = {})); var Bbb; @@ -51,7 +51,7 @@ var Bbb; function SomeType() { } return SomeType; - })(); + }()); Bbb.SomeType = SomeType; // this line causes the nullref })(Bbb || (Bbb = {})); diff --git a/tests/baselines/reference/exportImport.js b/tests/baselines/reference/exportImport.js index 0177bbbecaa..eb0623efced 100644 --- a/tests/baselines/reference/exportImport.js +++ b/tests/baselines/reference/exportImport.js @@ -23,7 +23,7 @@ define(["require", "exports"], function (require, exports) { this.name = 'one'; } return Widget1; - })(); + }()); return Widget1; }); //// [exporter.js] diff --git a/tests/baselines/reference/exportImportAlias.js b/tests/baselines/reference/exportImportAlias.js index dea9705fc9f..be77f755368 100644 --- a/tests/baselines/reference/exportImportAlias.js +++ b/tests/baselines/reference/exportImportAlias.js @@ -79,7 +79,7 @@ var A; this.y = y; } return Point; - })(); + }()); A.Point = Point; })(A || (A = {})); var C; @@ -104,7 +104,7 @@ var X; this.y = y; } return Point; - })(); + }()); Y.Point = Point; })(Y = X.Y || (X.Y = {})); })(X || (X = {})); @@ -122,7 +122,7 @@ var K; this.name = name; } return L; - })(); + }()); K.L = L; var L; (function (L) { diff --git a/tests/baselines/reference/exportImportAndClodule.js b/tests/baselines/reference/exportImportAndClodule.js index 0873051b40d..e519d555792 100644 --- a/tests/baselines/reference/exportImportAndClodule.js +++ b/tests/baselines/reference/exportImportAndClodule.js @@ -27,7 +27,7 @@ var K; this.name = name; } return L; - })(); + }()); K.L = L; var L; (function (L) { diff --git a/tests/baselines/reference/exportNonInitializedVariablesAMD.js b/tests/baselines/reference/exportNonInitializedVariablesAMD.js index 9759f41831b..d8dd17a562c 100644 --- a/tests/baselines/reference/exportNonInitializedVariablesAMD.js +++ b/tests/baselines/reference/exportNonInitializedVariablesAMD.js @@ -44,7 +44,7 @@ define(["require", "exports"], function (require, exports) { function A() { } return A; - })(); + }()); var B; (function (B) { B.a = 1, B.c = 2; @@ -62,7 +62,7 @@ define(["require", "exports"], function (require, exports) { function D() { } return D; - })(); + }()); exports.e1 = new D; exports.f1 = new D; exports.g1 = new D; diff --git a/tests/baselines/reference/exportNonInitializedVariablesCommonJS.js b/tests/baselines/reference/exportNonInitializedVariablesCommonJS.js index 047b22c2ce1..f986ef7f36b 100644 --- a/tests/baselines/reference/exportNonInitializedVariablesCommonJS.js +++ b/tests/baselines/reference/exportNonInitializedVariablesCommonJS.js @@ -43,7 +43,7 @@ var A = (function () { function A() { } return A; -})(); +}()); var B; (function (B) { B.a = 1, B.c = 2; @@ -61,7 +61,7 @@ var D = (function () { function D() { } return D; -})(); +}()); exports.e1 = new D; exports.f1 = new D; exports.g1 = new D; diff --git a/tests/baselines/reference/exportNonInitializedVariablesSystem.js b/tests/baselines/reference/exportNonInitializedVariablesSystem.js index c2b78f35cc2..b5674bf5ce3 100644 --- a/tests/baselines/reference/exportNonInitializedVariablesSystem.js +++ b/tests/baselines/reference/exportNonInitializedVariablesSystem.js @@ -46,7 +46,7 @@ System.register([], function(exports_1) { function A() { } return A; - })(); + }()); (function (B) { B.a = 1, B.c = 2; })(B || (B = {})); @@ -62,7 +62,7 @@ System.register([], function(exports_1) { function D() { } return D; - })(); + }()); exports_1("e1", e1 = new D); exports_1("f1", f1 = new D); exports_1("g1", g1 = new D); diff --git a/tests/baselines/reference/exportNonInitializedVariablesUMD.js b/tests/baselines/reference/exportNonInitializedVariablesUMD.js index 2567fb57ecf..772f63205b6 100644 --- a/tests/baselines/reference/exportNonInitializedVariablesUMD.js +++ b/tests/baselines/reference/exportNonInitializedVariablesUMD.js @@ -51,7 +51,7 @@ export let h1: D = new D; function A() { } return A; - })(); + }()); var B; (function (B) { B.a = 1, B.c = 2; @@ -69,7 +69,7 @@ export let h1: D = new D; function D() { } return D; - })(); + }()); exports.e1 = new D; exports.f1 = new D; exports.g1 = new D; diff --git a/tests/baselines/reference/exportNonVisibleType.js b/tests/baselines/reference/exportNonVisibleType.js index ad2b2a9d910..6208c164be8 100644 --- a/tests/baselines/reference/exportNonVisibleType.js +++ b/tests/baselines/reference/exportNonVisibleType.js @@ -45,7 +45,7 @@ var C1 = (function () { function C1() { } return C1; -})(); +}()); module.exports = C1; //// [foo3.js] "use strict"; @@ -53,5 +53,5 @@ var C1 = (function () { function C1() { } return C1; -})(); +}()); module.exports = C1; diff --git a/tests/baselines/reference/exportPrivateType.js b/tests/baselines/reference/exportPrivateType.js index 14267730dfb..efdd7cb8e6e 100644 --- a/tests/baselines/reference/exportPrivateType.js +++ b/tests/baselines/reference/exportPrivateType.js @@ -37,12 +37,12 @@ var foo; function C1() { } return C1; - })(); + }()); var C2 = (function () { function C2() { } C2.prototype.test = function () { return true; }; return C2; - })(); + }()); })(foo || (foo = {})); var y = foo.g; // Exported variable 'y' has or is using private type 'foo.C2'. diff --git a/tests/baselines/reference/exportStarFromEmptyModule.js b/tests/baselines/reference/exportStarFromEmptyModule.js index e131d5ae8d9..afb4d2f10c1 100644 --- a/tests/baselines/reference/exportStarFromEmptyModule.js +++ b/tests/baselines/reference/exportStarFromEmptyModule.js @@ -29,7 +29,7 @@ var A = (function () { function A() { } return A; -})(); +}()); exports.A = A; //// [exportStarFromEmptyModule_module2.js] // empty @@ -44,7 +44,7 @@ var A = (function () { function A() { } return A; -})(); +}()); exports.A = A; //// [exportStarFromEmptyModule_module4.js] "use strict"; diff --git a/tests/baselines/reference/exportVisibility.js b/tests/baselines/reference/exportVisibility.js index f4c7e97b297..a49cd744441 100644 --- a/tests/baselines/reference/exportVisibility.js +++ b/tests/baselines/reference/exportVisibility.js @@ -15,7 +15,7 @@ var Foo = (function () { function Foo() { } return Foo; -})(); +}()); exports.Foo = Foo; exports.foo = new Foo(); function test(foo) { diff --git a/tests/baselines/reference/exportingContainingVisibleType.js b/tests/baselines/reference/exportingContainingVisibleType.js index 0742731636a..f2d78fe9a88 100644 --- a/tests/baselines/reference/exportingContainingVisibleType.js +++ b/tests/baselines/reference/exportingContainingVisibleType.js @@ -25,6 +25,6 @@ define(["require", "exports"], function (require, exports) { configurable: true }); return Foo; - })(); + }()); exports.x = 5; }); diff --git a/tests/baselines/reference/exportsAndImports1-amd.js b/tests/baselines/reference/exportsAndImports1-amd.js index 555a56ce31f..9e04b3485d2 100644 --- a/tests/baselines/reference/exportsAndImports1-amd.js +++ b/tests/baselines/reference/exportsAndImports1-amd.js @@ -45,7 +45,7 @@ define(["require", "exports"], function (require, exports) { function C() { } return C; - })(); + }()); exports.C = C; var E; (function (E) { diff --git a/tests/baselines/reference/exportsAndImports1.js b/tests/baselines/reference/exportsAndImports1.js index 312b379dde1..46eda0656ad 100644 --- a/tests/baselines/reference/exportsAndImports1.js +++ b/tests/baselines/reference/exportsAndImports1.js @@ -44,7 +44,7 @@ var C = (function () { function C() { } return C; -})(); +}()); exports.C = C; var E; (function (E) { diff --git a/tests/baselines/reference/exportsAndImports3-amd.js b/tests/baselines/reference/exportsAndImports3-amd.js index be86b9ba7b8..0e315f1f18b 100644 --- a/tests/baselines/reference/exportsAndImports3-amd.js +++ b/tests/baselines/reference/exportsAndImports3-amd.js @@ -46,7 +46,7 @@ define(["require", "exports"], function (require, exports) { function C() { } return C; - })(); + }()); exports.C = C; exports.C1 = C; (function (E) { diff --git a/tests/baselines/reference/exportsAndImports3.js b/tests/baselines/reference/exportsAndImports3.js index e29f403a5e0..16115a192da 100644 --- a/tests/baselines/reference/exportsAndImports3.js +++ b/tests/baselines/reference/exportsAndImports3.js @@ -45,7 +45,7 @@ var C = (function () { function C() { } return C; -})(); +}()); exports.C = C; exports.C1 = C; (function (E) { diff --git a/tests/baselines/reference/extBaseClass1.js b/tests/baselines/reference/extBaseClass1.js index 07923eccc88..446c6df9c94 100644 --- a/tests/baselines/reference/extBaseClass1.js +++ b/tests/baselines/reference/extBaseClass1.js @@ -32,7 +32,7 @@ var M; this.x = 10; } return B; - })(); + }()); M.B = B; var C = (function (_super) { __extends(C, _super); @@ -40,7 +40,7 @@ var M; _super.apply(this, arguments); } return C; - })(B); + }(B)); M.C = C; })(M || (M = {})); var M; @@ -51,7 +51,7 @@ var M; _super.apply(this, arguments); } return C2; - })(M.B); + }(M.B)); M.C2 = C2; })(M || (M = {})); var N; @@ -62,6 +62,6 @@ var N; _super.apply(this, arguments); } return C3; - })(M.B); + }(M.B)); N.C3 = C3; })(N || (N = {})); diff --git a/tests/baselines/reference/extBaseClass2.js b/tests/baselines/reference/extBaseClass2.js index 6e9972c3f29..f7bd85d685c 100644 --- a/tests/baselines/reference/extBaseClass2.js +++ b/tests/baselines/reference/extBaseClass2.js @@ -24,7 +24,7 @@ var N; _super.apply(this, arguments); } return C4; - })(M.B); + }(M.B)); N.C4 = C4; })(N || (N = {})); var M; @@ -35,6 +35,6 @@ var M; _super.apply(this, arguments); } return C5; - })(B); + }(B)); M.C5 = C5; })(M || (M = {})); diff --git a/tests/baselines/reference/extendAndImplementTheSameBaseType.js b/tests/baselines/reference/extendAndImplementTheSameBaseType.js index 6a631ceebf8..e52e5b497ac 100644 --- a/tests/baselines/reference/extendAndImplementTheSameBaseType.js +++ b/tests/baselines/reference/extendAndImplementTheSameBaseType.js @@ -24,7 +24,7 @@ var C = (function () { } C.prototype.bar = function () { }; return C; -})(); +}()); var D = (function (_super) { __extends(D, _super); function D() { @@ -32,7 +32,7 @@ var D = (function (_super) { } D.prototype.baz = function () { }; return D; -})(C); +}(C)); var c; var d = new D(); d.bar(); diff --git a/tests/baselines/reference/extendAndImplementTheSameBaseType2.js b/tests/baselines/reference/extendAndImplementTheSameBaseType2.js index 42cf785c0b0..1f4f62a42ee 100644 --- a/tests/baselines/reference/extendAndImplementTheSameBaseType2.js +++ b/tests/baselines/reference/extendAndImplementTheSameBaseType2.js @@ -29,7 +29,7 @@ var C = (function () { return null; }; return C; -})(); +}()); var D = (function (_super) { __extends(D, _super); function D() { @@ -37,7 +37,7 @@ var D = (function (_super) { } D.prototype.baz = function () { }; return D; -})(C); +}(C)); var d = new D(); var r = d.foo; var r2 = d.foo; diff --git a/tests/baselines/reference/extendBaseClassBeforeItsDeclared.js b/tests/baselines/reference/extendBaseClassBeforeItsDeclared.js index d8c54b58d7e..d598389d0fa 100644 --- a/tests/baselines/reference/extendBaseClassBeforeItsDeclared.js +++ b/tests/baselines/reference/extendBaseClassBeforeItsDeclared.js @@ -15,10 +15,10 @@ var derived = (function (_super) { _super.apply(this, arguments); } return derived; -})(base); +}(base)); var base = (function () { function base(n) { this.n = n; } return base; -})(); +}()); diff --git a/tests/baselines/reference/extendClassExpressionFromModule.js b/tests/baselines/reference/extendClassExpressionFromModule.js index 0c137f54486..56b54d2821f 100644 --- a/tests/baselines/reference/extendClassExpressionFromModule.js +++ b/tests/baselines/reference/extendClassExpressionFromModule.js @@ -17,7 +17,7 @@ var x = (function () { function x() { } return x; -})(); +}()); module.exports = x; //// [foo2.js] "use strict"; @@ -34,4 +34,4 @@ var y = (function (_super) { _super.apply(this, arguments); } return y; -})(x); +}(x)); diff --git a/tests/baselines/reference/extendConstructSignatureInInterface.js b/tests/baselines/reference/extendConstructSignatureInInterface.js index c440872a566..20f43a948b8 100644 --- a/tests/baselines/reference/extendConstructSignatureInInterface.js +++ b/tests/baselines/reference/extendConstructSignatureInInterface.js @@ -23,5 +23,5 @@ var E = (function (_super) { _super.apply(this, arguments); } return E; -})(CStatic); +}(CStatic)); var e = new E(1); diff --git a/tests/baselines/reference/extendNonClassSymbol1.js b/tests/baselines/reference/extendNonClassSymbol1.js index 29408686068..558e6d6ba57 100644 --- a/tests/baselines/reference/extendNonClassSymbol1.js +++ b/tests/baselines/reference/extendNonClassSymbol1.js @@ -14,7 +14,7 @@ var A = (function () { } A.prototype.foo = function () { }; return A; -})(); +}()); var x = A; var C = (function (_super) { __extends(C, _super); @@ -22,4 +22,4 @@ var C = (function (_super) { _super.apply(this, arguments); } return C; -})(x); // error, could not find symbol xs +}(x)); // error, could not find symbol xs diff --git a/tests/baselines/reference/extendNonClassSymbol2.js b/tests/baselines/reference/extendNonClassSymbol2.js index a65eeca612a..3785c7c5846 100644 --- a/tests/baselines/reference/extendNonClassSymbol2.js +++ b/tests/baselines/reference/extendNonClassSymbol2.js @@ -21,4 +21,4 @@ var C = (function (_super) { _super.apply(this, arguments); } return C; -})(Foo); // error, could not find symbol Foo +}(Foo)); // error, could not find symbol Foo diff --git a/tests/baselines/reference/extendingClassFromAliasAndUsageInIndexer.js b/tests/baselines/reference/extendingClassFromAliasAndUsageInIndexer.js index 004c89be3fb..6542492e200 100644 --- a/tests/baselines/reference/extendingClassFromAliasAndUsageInIndexer.js +++ b/tests/baselines/reference/extendingClassFromAliasAndUsageInIndexer.js @@ -38,7 +38,7 @@ var Model = (function () { function Model() { } return Model; -})(); +}()); exports.Model = Model; //// [extendingClassFromAliasAndUsageInIndexer_moduleA.js] "use strict"; @@ -54,7 +54,7 @@ var VisualizationModel = (function (_super) { _super.apply(this, arguments); } return VisualizationModel; -})(Backbone.Model); +}(Backbone.Model)); exports.VisualizationModel = VisualizationModel; //// [extendingClassFromAliasAndUsageInIndexer_moduleB.js] "use strict"; @@ -70,7 +70,7 @@ var VisualizationModel = (function (_super) { _super.apply(this, arguments); } return VisualizationModel; -})(Backbone.Model); +}(Backbone.Model)); exports.VisualizationModel = VisualizationModel; //// [extendingClassFromAliasAndUsageInIndexer_main.js] "use strict"; diff --git a/tests/baselines/reference/extendsClauseAlreadySeen.js b/tests/baselines/reference/extendsClauseAlreadySeen.js index ed6602c116a..fb9a3f12378 100644 --- a/tests/baselines/reference/extendsClauseAlreadySeen.js +++ b/tests/baselines/reference/extendsClauseAlreadySeen.js @@ -16,7 +16,7 @@ var C = (function () { function C() { } return C; -})(); +}()); var D = (function (_super) { __extends(D, _super); function D() { @@ -24,4 +24,4 @@ var D = (function (_super) { } D.prototype.baz = function () { }; return D; -})(C); +}(C)); diff --git a/tests/baselines/reference/extendsClauseAlreadySeen2.js b/tests/baselines/reference/extendsClauseAlreadySeen2.js index 2c77f4e673f..9423789dd35 100644 --- a/tests/baselines/reference/extendsClauseAlreadySeen2.js +++ b/tests/baselines/reference/extendsClauseAlreadySeen2.js @@ -16,7 +16,7 @@ var C = (function () { function C() { } return C; -})(); +}()); var D = (function (_super) { __extends(D, _super); function D() { @@ -24,4 +24,4 @@ var D = (function (_super) { } D.prototype.baz = function () { }; return D; -})(C); +}(C)); diff --git a/tests/baselines/reference/externModule.js b/tests/baselines/reference/externModule.js index bf175f0eeff..d5684ea1f46 100644 --- a/tests/baselines/reference/externModule.js +++ b/tests/baselines/reference/externModule.js @@ -47,7 +47,7 @@ module; function XDate() { } return XDate; - })(); + }()); exports.XDate = XDate; } var d = new XDate(); diff --git a/tests/baselines/reference/externalModuleAssignToVar.js b/tests/baselines/reference/externalModuleAssignToVar.js index dc74c9446e2..e621b7c930b 100644 --- a/tests/baselines/reference/externalModuleAssignToVar.js +++ b/tests/baselines/reference/externalModuleAssignToVar.js @@ -33,7 +33,7 @@ define(["require", "exports"], function (require, exports) { function C() { } return C; - })(); + }()); exports.C = C; }); //// [externalModuleAssignToVar_core_require2.js] @@ -43,7 +43,7 @@ define(["require", "exports"], function (require, exports) { function C() { } return C; - })(); + }()); return C; }); //// [externalModuleAssignToVar_ext.js] @@ -53,7 +53,7 @@ define(["require", "exports"], function (require, exports) { function D() { } return D; - })(); + }()); return D; }); //// [externalModuleAssignToVar_core.js] diff --git a/tests/baselines/reference/externalModuleExportingGenericClass.js b/tests/baselines/reference/externalModuleExportingGenericClass.js index 78608c08c56..c4b8556bb80 100644 --- a/tests/baselines/reference/externalModuleExportingGenericClass.js +++ b/tests/baselines/reference/externalModuleExportingGenericClass.js @@ -21,7 +21,7 @@ var C = (function () { function C() { } return C; -})(); +}()); module.exports = C; //// [externalModuleExportingGenericClass_file1.js] "use strict"; diff --git a/tests/baselines/reference/externalModuleQualification.js b/tests/baselines/reference/externalModuleQualification.js index 3f9978c7b0a..26255ac3fcd 100644 --- a/tests/baselines/reference/externalModuleQualification.js +++ b/tests/baselines/reference/externalModuleQualification.js @@ -19,7 +19,7 @@ var DiffEditor = (function () { if (id === void 0) { id = exports.ID; } } return DiffEditor; -})(); +}()); exports.DiffEditor = DiffEditor; var NavigateAction = (function () { function NavigateAction() { @@ -27,4 +27,4 @@ var NavigateAction = (function () { NavigateAction.prototype.f = function (editor) { }; return NavigateAction; -})(); +}()); diff --git a/tests/baselines/reference/fatArrowSelf.js b/tests/baselines/reference/fatArrowSelf.js index 7648cb28a4b..db9aaa347dc 100644 --- a/tests/baselines/reference/fatArrowSelf.js +++ b/tests/baselines/reference/fatArrowSelf.js @@ -33,7 +33,7 @@ var Events; EventEmitter.prototype.addListener = function (type, listener) { }; return EventEmitter; - })(); + }()); Events.EventEmitter = EventEmitter; })(Events || (Events = {})); var Consumer; @@ -51,5 +51,5 @@ var Consumer; EventEmitterConsummer.prototype.changed = function () { }; return EventEmitterConsummer; - })(); + }()); })(Consumer || (Consumer = {})); diff --git a/tests/baselines/reference/fieldAndGetterWithSameName.js b/tests/baselines/reference/fieldAndGetterWithSameName.js index a43e9cf0a1b..eb5171acd75 100644 --- a/tests/baselines/reference/fieldAndGetterWithSameName.js +++ b/tests/baselines/reference/fieldAndGetterWithSameName.js @@ -16,6 +16,6 @@ define(["require", "exports"], function (require, exports) { configurable: true }); return C; - })(); + }()); exports.C = C; }); diff --git a/tests/baselines/reference/filesEmittingIntoSameOutputWithOutOption.js b/tests/baselines/reference/filesEmittingIntoSameOutputWithOutOption.js index d8513e6731c..0c6f1c8034d 100644 --- a/tests/baselines/reference/filesEmittingIntoSameOutputWithOutOption.js +++ b/tests/baselines/reference/filesEmittingIntoSameOutputWithOutOption.js @@ -16,7 +16,7 @@ define("a", ["require", "exports"], function (require, exports) { function c() { } return c; - })(); + }()); exports.c = c; }); function foo() { diff --git a/tests/baselines/reference/fillInMissingTypeArgsOnConstructCalls.js b/tests/baselines/reference/fillInMissingTypeArgsOnConstructCalls.js index ce91d4616f4..af0a1e7a63b 100644 --- a/tests/baselines/reference/fillInMissingTypeArgsOnConstructCalls.js +++ b/tests/baselines/reference/fillInMissingTypeArgsOnConstructCalls.js @@ -10,5 +10,5 @@ var A = (function () { function A() { } return A; -})(); +}()); var a = new A(); diff --git a/tests/baselines/reference/fluentClasses.js b/tests/baselines/reference/fluentClasses.js index 12f3cfff48d..3d5efcc1b1a 100644 --- a/tests/baselines/reference/fluentClasses.js +++ b/tests/baselines/reference/fluentClasses.js @@ -31,7 +31,7 @@ var A = (function () { return this; }; return A; -})(); +}()); var B = (function (_super) { __extends(B, _super); function B() { @@ -41,7 +41,7 @@ var B = (function (_super) { return this; }; return B; -})(A); +}(A)); var C = (function (_super) { __extends(C, _super); function C() { @@ -51,6 +51,6 @@ var C = (function (_super) { return this; }; return C; -})(B); +}(B)); var c; var z = c.foo().bar().baz(); // Fluent pattern diff --git a/tests/baselines/reference/for-inStatements.js b/tests/baselines/reference/for-inStatements.js index d735a37ba97..5c097a68ccc 100644 --- a/tests/baselines/reference/for-inStatements.js +++ b/tests/baselines/reference/for-inStatements.js @@ -122,7 +122,7 @@ var A = (function () { return null; }; return A; -})(); +}()); var B = (function (_super) { __extends(B, _super); function B() { @@ -137,7 +137,7 @@ var B = (function (_super) { return null; }; return B; -})(A); +}(A)); var i; for (var x in i[42]) { } var M; @@ -146,7 +146,7 @@ var M; function X() { } return X; - })(); + }()); M.X = X; })(M || (M = {})); for (var x in M) { } diff --git a/tests/baselines/reference/for-inStatementsInvalid.js b/tests/baselines/reference/for-inStatementsInvalid.js index 93b9fb9b97f..caec9bd1987 100644 --- a/tests/baselines/reference/for-inStatementsInvalid.js +++ b/tests/baselines/reference/for-inStatementsInvalid.js @@ -103,7 +103,7 @@ var A = (function () { return null; }; return A; -})(); +}()); var B = (function (_super) { __extends(B, _super); function B() { @@ -118,6 +118,6 @@ var B = (function (_super) { return null; }; return B; -})(A); +}(A)); var i; for (var x in i[42]) { } diff --git a/tests/baselines/reference/forStatements.js b/tests/baselines/reference/forStatements.js index 253fafc81e8..c380185ecf5 100644 --- a/tests/baselines/reference/forStatements.js +++ b/tests/baselines/reference/forStatements.js @@ -52,12 +52,12 @@ var C = (function () { function C() { } return C; -})(); +}()); var D = (function () { function D() { } return D; -})(); +}()); function F(x) { return 42; } var M; (function (M) { @@ -65,7 +65,7 @@ var M; function A() { } return A; - })(); + }()); M.A = A; function F2(x) { return x.toString(); } M.F2 = F2; diff --git a/tests/baselines/reference/forStatementsMultipleInvalidDecl.js b/tests/baselines/reference/forStatementsMultipleInvalidDecl.js index 20639c687cb..aff01bc8565 100644 --- a/tests/baselines/reference/forStatementsMultipleInvalidDecl.js +++ b/tests/baselines/reference/forStatementsMultipleInvalidDecl.js @@ -64,19 +64,19 @@ var C = (function () { function C() { } return C; -})(); +}()); var C2 = (function (_super) { __extends(C2, _super); function C2() { _super.apply(this, arguments); } return C2; -})(C); +}(C)); var D = (function () { function D() { } return D; -})(); +}()); function F(x) { return 42; } var M; (function (M) { @@ -84,7 +84,7 @@ var M; function A() { } return A; - })(); + }()); M.A = A; function F2(x) { return x.toString(); } M.F2 = F2; diff --git a/tests/baselines/reference/forgottenNew.js b/tests/baselines/reference/forgottenNew.js index 72b0537882e..927f21a04df 100644 --- a/tests/baselines/reference/forgottenNew.js +++ b/tests/baselines/reference/forgottenNew.js @@ -12,7 +12,7 @@ var Tools; function NullLogger() { } return NullLogger; - })(); + }()); Tools.NullLogger = NullLogger; })(Tools || (Tools = {})); var logger = Tools.NullLogger(); diff --git a/tests/baselines/reference/funClodule.js b/tests/baselines/reference/funClodule.js index cc7dba7e476..8ea98ad7487 100644 --- a/tests/baselines/reference/funClodule.js +++ b/tests/baselines/reference/funClodule.js @@ -30,4 +30,4 @@ var foo3 = (function () { function foo3() { } return foo3; -})(); // Should error +}()); // Should error diff --git a/tests/baselines/reference/functionAndPropertyNameConflict.js b/tests/baselines/reference/functionAndPropertyNameConflict.js index 28a2cd54c9e..bd3b5b7243d 100644 --- a/tests/baselines/reference/functionAndPropertyNameConflict.js +++ b/tests/baselines/reference/functionAndPropertyNameConflict.js @@ -19,4 +19,4 @@ var C65 = (function () { configurable: true }); return C65; -})(); +}()); diff --git a/tests/baselines/reference/functionArgShadowing.js b/tests/baselines/reference/functionArgShadowing.js index 451e46536e0..bae1365a789 100644 --- a/tests/baselines/reference/functionArgShadowing.js +++ b/tests/baselines/reference/functionArgShadowing.js @@ -20,13 +20,13 @@ var A = (function () { } A.prototype.foo = function () { }; return A; -})(); +}()); var B = (function () { function B() { } B.prototype.bar = function () { }; return B; -})(); +}()); function foo(x) { var x = new B(); x.bar(); // the property bar does not exist on a value of type A @@ -38,4 +38,4 @@ var C = (function () { var n = p; } return C; -})(); +}()); diff --git a/tests/baselines/reference/functionCall5.js b/tests/baselines/reference/functionCall5.js index dc7db4a9959..4eccd50ed3c 100644 --- a/tests/baselines/reference/functionCall5.js +++ b/tests/baselines/reference/functionCall5.js @@ -10,7 +10,7 @@ var m1; function c1() { } return c1; - })(); + }()); m1.c1 = c1; })(m1 || (m1 = {})); function foo() { return new m1.c1(); } diff --git a/tests/baselines/reference/functionCall7.js b/tests/baselines/reference/functionCall7.js index cb30e5d8b24..68e9e4af77a 100644 --- a/tests/baselines/reference/functionCall7.js +++ b/tests/baselines/reference/functionCall7.js @@ -15,7 +15,7 @@ var m1; function c1() { } return c1; - })(); + }()); m1.c1 = c1; })(m1 || (m1 = {})); function foo(a) { a.a = 1; } diff --git a/tests/baselines/reference/functionConstraintSatisfaction.js b/tests/baselines/reference/functionConstraintSatisfaction.js index b8741456178..eb654b1a2a2 100644 --- a/tests/baselines/reference/functionConstraintSatisfaction.js +++ b/tests/baselines/reference/functionConstraintSatisfaction.js @@ -69,7 +69,7 @@ var C = (function () { function C() { } return C; -})(); +}()); var a; var b; var c; @@ -87,7 +87,7 @@ var C2 = (function () { function C2() { } return C2; -})(); +}()); var a2; var b2; var c2; diff --git a/tests/baselines/reference/functionConstraintSatisfaction2.js b/tests/baselines/reference/functionConstraintSatisfaction2.js index 9e70a508ccd..ccbfbc70aba 100644 --- a/tests/baselines/reference/functionConstraintSatisfaction2.js +++ b/tests/baselines/reference/functionConstraintSatisfaction2.js @@ -51,13 +51,13 @@ var C = (function () { function C() { } return C; -})(); +}()); var b; var C2 = (function () { function C2() { } return C2; -})(); +}()); var b2; var r = foo2(new Function()); var r2 = foo2(function (x) { return x; }); diff --git a/tests/baselines/reference/functionConstraintSatisfaction3.js b/tests/baselines/reference/functionConstraintSatisfaction3.js index 2c1bfa4d399..fee12434eee 100644 --- a/tests/baselines/reference/functionConstraintSatisfaction3.js +++ b/tests/baselines/reference/functionConstraintSatisfaction3.js @@ -49,7 +49,7 @@ var C = (function () { function C() { } return C; -})(); +}()); var a; var b; var c; @@ -64,7 +64,7 @@ var C2 = (function () { function C2() { } return C2; -})(); +}()); var a2; var b2; var c2; diff --git a/tests/baselines/reference/functionExpressionAndLambdaMatchesFunction.js b/tests/baselines/reference/functionExpressionAndLambdaMatchesFunction.js index fe10f96f7bb..be2aa29460a 100644 --- a/tests/baselines/reference/functionExpressionAndLambdaMatchesFunction.js +++ b/tests/baselines/reference/functionExpressionAndLambdaMatchesFunction.js @@ -18,4 +18,4 @@ var CDoc = (function () { doSomething(function () { }); } return CDoc; -})(); +}()); diff --git a/tests/baselines/reference/functionExpressionContextualTyping1.js b/tests/baselines/reference/functionExpressionContextualTyping1.js index 8d60572b30f..9592af7138c 100644 --- a/tests/baselines/reference/functionExpressionContextualTyping1.js +++ b/tests/baselines/reference/functionExpressionContextualTyping1.js @@ -75,7 +75,7 @@ var Class = (function () { } Class.prototype.foo = function () { }; return Class; -})(); +}()); var a1 = function (a1) { a1.foo(); return 1; @@ -117,4 +117,4 @@ var C = (function () { }; // Per spec, no contextual signature can be extracted in this case. } return C; -})(); +}()); diff --git a/tests/baselines/reference/functionImplementationErrors.js b/tests/baselines/reference/functionImplementationErrors.js index 4436f1bc94f..2dc6c8a1bc4 100644 --- a/tests/baselines/reference/functionImplementationErrors.js +++ b/tests/baselines/reference/functionImplementationErrors.js @@ -125,26 +125,26 @@ var Base = (function () { function Base() { } return Base; -})(); +}()); var AnotherClass = (function () { function AnotherClass() { } return AnotherClass; -})(); +}()); var Derived1 = (function (_super) { __extends(Derived1, _super); function Derived1() { _super.apply(this, arguments); } return Derived1; -})(Base); +}(Base)); var Derived2 = (function (_super) { __extends(Derived2, _super); function Derived2() { _super.apply(this, arguments); } return Derived2; -})(Base); +}(Base)); function f8() { return new Derived1(); return new Derived2(); diff --git a/tests/baselines/reference/functionImplementations.js b/tests/baselines/reference/functionImplementations.js index 512da960b78..6e37f929efe 100644 --- a/tests/baselines/reference/functionImplementations.js +++ b/tests/baselines/reference/functionImplementations.js @@ -232,14 +232,14 @@ var Base = (function () { function Base() { } return Base; -})(); +}()); var Derived = (function (_super) { __extends(Derived, _super); function Derived() { _super.apply(this, arguments); } return Derived; -})(Base); +}(Base)); var b; var b = function () { return new Base(); @@ -290,12 +290,12 @@ var Derived2 = (function (_super) { _super.apply(this, arguments); } return Derived2; -})(Base); +}(Base)); var AnotherClass = (function () { function AnotherClass() { } return AnotherClass; -})(); +}()); // if f is a contextually typed function expression, the inferred return type is the union type // of the types of the return statement expressions in the function body, // ignoring return statements with no expressions. diff --git a/tests/baselines/reference/functionLiteralForOverloads2.js b/tests/baselines/reference/functionLiteralForOverloads2.js index f374dfb4599..ed6bdcf7841 100644 --- a/tests/baselines/reference/functionLiteralForOverloads2.js +++ b/tests/baselines/reference/functionLiteralForOverloads2.js @@ -34,12 +34,12 @@ var C = (function () { function C(x) { } return C; -})(); +}()); var D = (function () { function D(x) { } return D; -})(); +}()); var f = C; var f2 = C; var f3 = D; diff --git a/tests/baselines/reference/functionOverloadErrors.js b/tests/baselines/reference/functionOverloadErrors.js index b0c0f449456..a07f04ae9a8 100644 --- a/tests/baselines/reference/functionOverloadErrors.js +++ b/tests/baselines/reference/functionOverloadErrors.js @@ -141,7 +141,7 @@ var cls = (function () { cls.prototype.f = function () { }; cls.prototype.g = function () { }; return cls; -})(); +}()); //Function overloads with differing export var M; (function (M) { diff --git a/tests/baselines/reference/functionOverloads5.js b/tests/baselines/reference/functionOverloads5.js index b59154d2417..f23c66f3beb 100644 --- a/tests/baselines/reference/functionOverloads5.js +++ b/tests/baselines/reference/functionOverloads5.js @@ -11,4 +11,4 @@ var baz = (function () { } baz.prototype.foo = function (bar) { }; return baz; -})(); +}()); diff --git a/tests/baselines/reference/functionOverloads6.js b/tests/baselines/reference/functionOverloads6.js index 2c19b376dc8..442708ca718 100644 --- a/tests/baselines/reference/functionOverloads6.js +++ b/tests/baselines/reference/functionOverloads6.js @@ -12,4 +12,4 @@ var foo = (function () { } foo.fnOverload = function (foo) { }; return foo; -})(); +}()); diff --git a/tests/baselines/reference/functionOverloads7.js b/tests/baselines/reference/functionOverloads7.js index 540abf9eb8c..4d807d57548 100644 --- a/tests/baselines/reference/functionOverloads7.js +++ b/tests/baselines/reference/functionOverloads7.js @@ -20,4 +20,4 @@ var foo = (function () { foo = this.bar("test"); }; return foo; -})(); +}()); diff --git a/tests/baselines/reference/functionOverloadsOutOfOrder.js b/tests/baselines/reference/functionOverloadsOutOfOrder.js index 32d69fb72ff..f675646fed7 100644 --- a/tests/baselines/reference/functionOverloadsOutOfOrder.js +++ b/tests/baselines/reference/functionOverloadsOutOfOrder.js @@ -23,7 +23,7 @@ var d = (function () { return ns.toString(); }; return d; -})(); +}()); var e = (function () { function e() { } @@ -31,4 +31,4 @@ var e = (function () { return ns.toString(); }; return e; -})(); +}()); diff --git a/tests/baselines/reference/functionOverloadsRecursiveGenericReturnType.js b/tests/baselines/reference/functionOverloadsRecursiveGenericReturnType.js index ab0baf20592..1d38d65ad38 100644 --- a/tests/baselines/reference/functionOverloadsRecursiveGenericReturnType.js +++ b/tests/baselines/reference/functionOverloadsRecursiveGenericReturnType.js @@ -19,12 +19,12 @@ var B = (function () { function B() { } return B; -})(); +}()); var A = (function () { function A() { } return A; -})(); +}()); function Choice() { var v_args = []; for (var _i = 0; _i < arguments.length; _i++) { diff --git a/tests/baselines/reference/functionSubtypingOfVarArgs.js b/tests/baselines/reference/functionSubtypingOfVarArgs.js index ddcb0570908..7485abe1927 100644 --- a/tests/baselines/reference/functionSubtypingOfVarArgs.js +++ b/tests/baselines/reference/functionSubtypingOfVarArgs.js @@ -28,7 +28,7 @@ var EventBase = (function () { this._listeners.push(listener); }; return EventBase; -})(); +}()); var StringEvent = (function (_super) { __extends(StringEvent, _super); function StringEvent() { @@ -38,4 +38,4 @@ var StringEvent = (function (_super) { _super.prototype.add.call(this, listener); }; return StringEvent; -})(EventBase); +}(EventBase)); diff --git a/tests/baselines/reference/functionSubtypingOfVarArgs2.js b/tests/baselines/reference/functionSubtypingOfVarArgs2.js index d04a5b97dae..33d0e8c7e03 100644 --- a/tests/baselines/reference/functionSubtypingOfVarArgs2.js +++ b/tests/baselines/reference/functionSubtypingOfVarArgs2.js @@ -28,7 +28,7 @@ var EventBase = (function () { this._listeners.push(listener); }; return EventBase; -})(); +}()); var StringEvent = (function (_super) { __extends(StringEvent, _super); function StringEvent() { @@ -38,4 +38,4 @@ var StringEvent = (function (_super) { _super.prototype.add.call(this, listener); }; return StringEvent; -})(EventBase); +}(EventBase)); diff --git a/tests/baselines/reference/functionWithSameNameAsField.js b/tests/baselines/reference/functionWithSameNameAsField.js index cc9b6b12d44..f4b328e4c5b 100644 --- a/tests/baselines/reference/functionWithSameNameAsField.js +++ b/tests/baselines/reference/functionWithSameNameAsField.js @@ -17,4 +17,4 @@ var TestProgressBar = (function () { return this; }; return TestProgressBar; -})(); +}()); diff --git a/tests/baselines/reference/functionsInClassExpressions.js b/tests/baselines/reference/functionsInClassExpressions.js index debd8138831..616e6a3251c 100644 --- a/tests/baselines/reference/functionsInClassExpressions.js +++ b/tests/baselines/reference/functionsInClassExpressions.js @@ -22,4 +22,4 @@ var Foo = (function () { } class_1.prototype.m = function () { return this.bar; }; return class_1; -})(); +}()); diff --git a/tests/baselines/reference/functionsMissingReturnStatementsAndExpressions.js b/tests/baselines/reference/functionsMissingReturnStatementsAndExpressions.js index f76e5342aee..4dfe851683a 100644 --- a/tests/baselines/reference/functionsMissingReturnStatementsAndExpressions.js +++ b/tests/baselines/reference/functionsMissingReturnStatementsAndExpressions.js @@ -236,4 +236,4 @@ var C = (function () { configurable: true }); return C; -})(); +}()); diff --git a/tests/baselines/reference/fuzzy.js b/tests/baselines/reference/fuzzy.js index b98a9ced107..af2bda74339 100644 --- a/tests/baselines/reference/fuzzy.js +++ b/tests/baselines/reference/fuzzy.js @@ -47,6 +47,6 @@ var M; return ({ oneI: this }); }; return C; - })(); + }()); M.C = C; })(M || (M = {})); diff --git a/tests/baselines/reference/generatedContextualTyping.js b/tests/baselines/reference/generatedContextualTyping.js index a867d4b7629..8093c8bec41 100644 --- a/tests/baselines/reference/generatedContextualTyping.js +++ b/tests/baselines/reference/generatedContextualTyping.js @@ -365,21 +365,21 @@ var Base = (function () { function Base() { } return Base; -})(); +}()); var Derived1 = (function (_super) { __extends(Derived1, _super); function Derived1() { _super.apply(this, arguments); } return Derived1; -})(Base); +}(Base)); var Derived2 = (function (_super) { __extends(Derived2, _super); function Derived2() { _super.apply(this, arguments); } return Derived2; -})(Base); +}(Base)); var b = new Base(), d1 = new Derived1(), d2 = new Derived2(); var x1 = function () { return [d1, d2]; }; var x2 = function () { return [d1, d2]; }; @@ -398,673 +398,673 @@ var x13 = (function () { this.member = function () { return [d1, d2]; }; } return x13; -})(); +}()); var x14 = (function () { function x14() { this.member = function () { return [d1, d2]; }; } return x14; -})(); +}()); var x15 = (function () { function x15() { this.member = function named() { return [d1, d2]; }; } return x15; -})(); +}()); var x16 = (function () { function x16() { this.member = function () { return [d1, d2]; }; } return x16; -})(); +}()); var x17 = (function () { function x17() { this.member = function () { return [d1, d2]; }; } return x17; -})(); +}()); var x18 = (function () { function x18() { this.member = function named() { return [d1, d2]; }; } return x18; -})(); +}()); var x19 = (function () { function x19() { this.member = [d1, d2]; } return x19; -})(); +}()); var x20 = (function () { function x20() { this.member = [d1, d2]; } return x20; -})(); +}()); var x21 = (function () { function x21() { this.member = [d1, d2]; } return x21; -})(); +}()); var x22 = (function () { function x22() { this.member = { n: [d1, d2] }; } return x22; -})(); +}()); var x23 = (function () { function x23() { this.member = function (n) { var n; return null; }; } return x23; -})(); +}()); var x24 = (function () { function x24() { this.member = { func: function (n) { return [d1, d2]; } }; } return x24; -})(); +}()); var x25 = (function () { function x25() { this.member = function () { return [d1, d2]; }; } return x25; -})(); +}()); var x26 = (function () { function x26() { this.member = function () { return [d1, d2]; }; } return x26; -})(); +}()); var x27 = (function () { function x27() { this.member = function named() { return [d1, d2]; }; } return x27; -})(); +}()); var x28 = (function () { function x28() { this.member = function () { return [d1, d2]; }; } return x28; -})(); +}()); var x29 = (function () { function x29() { this.member = function () { return [d1, d2]; }; } return x29; -})(); +}()); var x30 = (function () { function x30() { this.member = function named() { return [d1, d2]; }; } return x30; -})(); +}()); var x31 = (function () { function x31() { this.member = [d1, d2]; } return x31; -})(); +}()); var x32 = (function () { function x32() { this.member = [d1, d2]; } return x32; -})(); +}()); var x33 = (function () { function x33() { this.member = [d1, d2]; } return x33; -})(); +}()); var x34 = (function () { function x34() { this.member = { n: [d1, d2] }; } return x34; -})(); +}()); var x35 = (function () { function x35() { this.member = function (n) { var n; return null; }; } return x35; -})(); +}()); var x36 = (function () { function x36() { this.member = { func: function (n) { return [d1, d2]; } }; } return x36; -})(); +}()); var x37 = (function () { function x37() { this.member = function () { return [d1, d2]; }; } return x37; -})(); +}()); var x38 = (function () { function x38() { this.member = function () { return [d1, d2]; }; } return x38; -})(); +}()); var x39 = (function () { function x39() { this.member = function named() { return [d1, d2]; }; } return x39; -})(); +}()); var x40 = (function () { function x40() { this.member = function () { return [d1, d2]; }; } return x40; -})(); +}()); var x41 = (function () { function x41() { this.member = function () { return [d1, d2]; }; } return x41; -})(); +}()); var x42 = (function () { function x42() { this.member = function named() { return [d1, d2]; }; } return x42; -})(); +}()); var x43 = (function () { function x43() { this.member = [d1, d2]; } return x43; -})(); +}()); var x44 = (function () { function x44() { this.member = [d1, d2]; } return x44; -})(); +}()); var x45 = (function () { function x45() { this.member = [d1, d2]; } return x45; -})(); +}()); var x46 = (function () { function x46() { this.member = { n: [d1, d2] }; } return x46; -})(); +}()); var x47 = (function () { function x47() { this.member = function (n) { var n; return null; }; } return x47; -})(); +}()); var x48 = (function () { function x48() { this.member = { func: function (n) { return [d1, d2]; } }; } return x48; -})(); +}()); var x49 = (function () { function x49() { } x49.member = function () { return [d1, d2]; }; return x49; -})(); +}()); var x50 = (function () { function x50() { } x50.member = function () { return [d1, d2]; }; return x50; -})(); +}()); var x51 = (function () { function x51() { } x51.member = function named() { return [d1, d2]; }; return x51; -})(); +}()); var x52 = (function () { function x52() { } x52.member = function () { return [d1, d2]; }; return x52; -})(); +}()); var x53 = (function () { function x53() { } x53.member = function () { return [d1, d2]; }; return x53; -})(); +}()); var x54 = (function () { function x54() { } x54.member = function named() { return [d1, d2]; }; return x54; -})(); +}()); var x55 = (function () { function x55() { } x55.member = [d1, d2]; return x55; -})(); +}()); var x56 = (function () { function x56() { } x56.member = [d1, d2]; return x56; -})(); +}()); var x57 = (function () { function x57() { } x57.member = [d1, d2]; return x57; -})(); +}()); var x58 = (function () { function x58() { } x58.member = { n: [d1, d2] }; return x58; -})(); +}()); var x59 = (function () { function x59() { } x59.member = function (n) { var n; return null; }; return x59; -})(); +}()); var x60 = (function () { function x60() { } x60.member = { func: function (n) { return [d1, d2]; } }; return x60; -})(); +}()); var x61 = (function () { function x61() { } x61.member = function () { return [d1, d2]; }; return x61; -})(); +}()); var x62 = (function () { function x62() { } x62.member = function () { return [d1, d2]; }; return x62; -})(); +}()); var x63 = (function () { function x63() { } x63.member = function named() { return [d1, d2]; }; return x63; -})(); +}()); var x64 = (function () { function x64() { } x64.member = function () { return [d1, d2]; }; return x64; -})(); +}()); var x65 = (function () { function x65() { } x65.member = function () { return [d1, d2]; }; return x65; -})(); +}()); var x66 = (function () { function x66() { } x66.member = function named() { return [d1, d2]; }; return x66; -})(); +}()); var x67 = (function () { function x67() { } x67.member = [d1, d2]; return x67; -})(); +}()); var x68 = (function () { function x68() { } x68.member = [d1, d2]; return x68; -})(); +}()); var x69 = (function () { function x69() { } x69.member = [d1, d2]; return x69; -})(); +}()); var x70 = (function () { function x70() { } x70.member = { n: [d1, d2] }; return x70; -})(); +}()); var x71 = (function () { function x71() { } x71.member = function (n) { var n; return null; }; return x71; -})(); +}()); var x72 = (function () { function x72() { } x72.member = { func: function (n) { return [d1, d2]; } }; return x72; -})(); +}()); var x73 = (function () { function x73() { } x73.member = function () { return [d1, d2]; }; return x73; -})(); +}()); var x74 = (function () { function x74() { } x74.member = function () { return [d1, d2]; }; return x74; -})(); +}()); var x75 = (function () { function x75() { } x75.member = function named() { return [d1, d2]; }; return x75; -})(); +}()); var x76 = (function () { function x76() { } x76.member = function () { return [d1, d2]; }; return x76; -})(); +}()); var x77 = (function () { function x77() { } x77.member = function () { return [d1, d2]; }; return x77; -})(); +}()); var x78 = (function () { function x78() { } x78.member = function named() { return [d1, d2]; }; return x78; -})(); +}()); var x79 = (function () { function x79() { } x79.member = [d1, d2]; return x79; -})(); +}()); var x80 = (function () { function x80() { } x80.member = [d1, d2]; return x80; -})(); +}()); var x81 = (function () { function x81() { } x81.member = [d1, d2]; return x81; -})(); +}()); var x82 = (function () { function x82() { } x82.member = { n: [d1, d2] }; return x82; -})(); +}()); var x83 = (function () { function x83() { } x83.member = function (n) { var n; return null; }; return x83; -})(); +}()); var x84 = (function () { function x84() { } x84.member = { func: function (n) { return [d1, d2]; } }; return x84; -})(); +}()); var x85 = (function () { function x85(parm) { if (parm === void 0) { parm = function () { return [d1, d2]; }; } } return x85; -})(); +}()); var x86 = (function () { function x86(parm) { if (parm === void 0) { parm = function () { return [d1, d2]; }; } } return x86; -})(); +}()); var x87 = (function () { function x87(parm) { if (parm === void 0) { parm = function named() { return [d1, d2]; }; } } return x87; -})(); +}()); var x88 = (function () { function x88(parm) { if (parm === void 0) { parm = function () { return [d1, d2]; }; } } return x88; -})(); +}()); var x89 = (function () { function x89(parm) { if (parm === void 0) { parm = function () { return [d1, d2]; }; } } return x89; -})(); +}()); var x90 = (function () { function x90(parm) { if (parm === void 0) { parm = function named() { return [d1, d2]; }; } } return x90; -})(); +}()); var x91 = (function () { function x91(parm) { if (parm === void 0) { parm = [d1, d2]; } } return x91; -})(); +}()); var x92 = (function () { function x92(parm) { if (parm === void 0) { parm = [d1, d2]; } } return x92; -})(); +}()); var x93 = (function () { function x93(parm) { if (parm === void 0) { parm = [d1, d2]; } } return x93; -})(); +}()); var x94 = (function () { function x94(parm) { if (parm === void 0) { parm = { n: [d1, d2] }; } } return x94; -})(); +}()); var x95 = (function () { function x95(parm) { if (parm === void 0) { parm = function (n) { var n; return null; }; } } return x95; -})(); +}()); var x96 = (function () { function x96(parm) { if (parm === void 0) { parm = { func: function (n) { return [d1, d2]; } }; } } return x96; -})(); +}()); var x97 = (function () { function x97(parm) { if (parm === void 0) { parm = function () { return [d1, d2]; }; } this.parm = parm; } return x97; -})(); +}()); var x98 = (function () { function x98(parm) { if (parm === void 0) { parm = function () { return [d1, d2]; }; } this.parm = parm; } return x98; -})(); +}()); var x99 = (function () { function x99(parm) { if (parm === void 0) { parm = function named() { return [d1, d2]; }; } this.parm = parm; } return x99; -})(); +}()); var x100 = (function () { function x100(parm) { if (parm === void 0) { parm = function () { return [d1, d2]; }; } this.parm = parm; } return x100; -})(); +}()); var x101 = (function () { function x101(parm) { if (parm === void 0) { parm = function () { return [d1, d2]; }; } this.parm = parm; } return x101; -})(); +}()); var x102 = (function () { function x102(parm) { if (parm === void 0) { parm = function named() { return [d1, d2]; }; } this.parm = parm; } return x102; -})(); +}()); var x103 = (function () { function x103(parm) { if (parm === void 0) { parm = [d1, d2]; } this.parm = parm; } return x103; -})(); +}()); var x104 = (function () { function x104(parm) { if (parm === void 0) { parm = [d1, d2]; } this.parm = parm; } return x104; -})(); +}()); var x105 = (function () { function x105(parm) { if (parm === void 0) { parm = [d1, d2]; } this.parm = parm; } return x105; -})(); +}()); var x106 = (function () { function x106(parm) { if (parm === void 0) { parm = { n: [d1, d2] }; } this.parm = parm; } return x106; -})(); +}()); var x107 = (function () { function x107(parm) { if (parm === void 0) { parm = function (n) { var n; return null; }; } this.parm = parm; } return x107; -})(); +}()); var x108 = (function () { function x108(parm) { if (parm === void 0) { parm = { func: function (n) { return [d1, d2]; } }; } this.parm = parm; } return x108; -})(); +}()); var x109 = (function () { function x109(parm) { if (parm === void 0) { parm = function () { return [d1, d2]; }; } this.parm = parm; } return x109; -})(); +}()); var x110 = (function () { function x110(parm) { if (parm === void 0) { parm = function () { return [d1, d2]; }; } this.parm = parm; } return x110; -})(); +}()); var x111 = (function () { function x111(parm) { if (parm === void 0) { parm = function named() { return [d1, d2]; }; } this.parm = parm; } return x111; -})(); +}()); var x112 = (function () { function x112(parm) { if (parm === void 0) { parm = function () { return [d1, d2]; }; } this.parm = parm; } return x112; -})(); +}()); var x113 = (function () { function x113(parm) { if (parm === void 0) { parm = function () { return [d1, d2]; }; } this.parm = parm; } return x113; -})(); +}()); var x114 = (function () { function x114(parm) { if (parm === void 0) { parm = function named() { return [d1, d2]; }; } this.parm = parm; } return x114; -})(); +}()); var x115 = (function () { function x115(parm) { if (parm === void 0) { parm = [d1, d2]; } this.parm = parm; } return x115; -})(); +}()); var x116 = (function () { function x116(parm) { if (parm === void 0) { parm = [d1, d2]; } this.parm = parm; } return x116; -})(); +}()); var x117 = (function () { function x117(parm) { if (parm === void 0) { parm = [d1, d2]; } this.parm = parm; } return x117; -})(); +}()); var x118 = (function () { function x118(parm) { if (parm === void 0) { parm = { n: [d1, d2] }; } this.parm = parm; } return x118; -})(); +}()); var x119 = (function () { function x119(parm) { if (parm === void 0) { parm = function (n) { var n; return null; }; } this.parm = parm; } return x119; -})(); +}()); var x120 = (function () { function x120(parm) { if (parm === void 0) { parm = { func: function (n) { return [d1, d2]; } }; } this.parm = parm; } return x120; -})(); +}()); function x121(parm) { if (parm === void 0) { parm = function () { return [d1, d2]; }; } } diff --git a/tests/baselines/reference/generativeRecursionWithTypeOf.js b/tests/baselines/reference/generativeRecursionWithTypeOf.js index 2b7eebfd11c..5a2ee9a0f1a 100644 --- a/tests/baselines/reference/generativeRecursionWithTypeOf.js +++ b/tests/baselines/reference/generativeRecursionWithTypeOf.js @@ -16,7 +16,7 @@ var C = (function () { } C.foo = function (x) { }; return C; -})(); +}()); var M; (function (M) { function f(x) { diff --git a/tests/baselines/reference/genericArrayWithoutTypeAnnotation.js b/tests/baselines/reference/genericArrayWithoutTypeAnnotation.js index 88f9713c3fe..2a5177ca255 100644 --- a/tests/baselines/reference/genericArrayWithoutTypeAnnotation.js +++ b/tests/baselines/reference/genericArrayWithoutTypeAnnotation.js @@ -14,4 +14,4 @@ var Bar = (function () { Bar.prototype.getBar = function (foo) { }; return Bar; -})(); +}()); diff --git a/tests/baselines/reference/genericAssignmentCompatWithInterfaces1.js b/tests/baselines/reference/genericAssignmentCompatWithInterfaces1.js index 70f70ae07ba..81d65dbbbb4 100644 --- a/tests/baselines/reference/genericAssignmentCompatWithInterfaces1.js +++ b/tests/baselines/reference/genericAssignmentCompatWithInterfaces1.js @@ -25,7 +25,7 @@ var A = (function () { } A.prototype.compareTo = function (other) { return 1; }; return A; -})(); +}()); var z = { x: new A() }; var a1 = { x: new A() }; var a2 = function () { diff --git a/tests/baselines/reference/genericBaseClassLiteralProperty.js b/tests/baselines/reference/genericBaseClassLiteralProperty.js index f8a5f78e753..5aa43d78826 100644 --- a/tests/baselines/reference/genericBaseClassLiteralProperty.js +++ b/tests/baselines/reference/genericBaseClassLiteralProperty.js @@ -22,7 +22,7 @@ var BaseClass = (function () { function BaseClass() { } return BaseClass; -})(); +}()); var SubClass = (function (_super) { __extends(SubClass, _super); function SubClass() { @@ -33,4 +33,4 @@ var SubClass = (function (_super) { var y = this._getValue2(); }; return SubClass; -})(BaseClass); +}(BaseClass)); diff --git a/tests/baselines/reference/genericBaseClassLiteralProperty2.js b/tests/baselines/reference/genericBaseClassLiteralProperty2.js index d5c480955d8..3226f1cd659 100644 --- a/tests/baselines/reference/genericBaseClassLiteralProperty2.js +++ b/tests/baselines/reference/genericBaseClassLiteralProperty2.js @@ -25,13 +25,13 @@ var CollectionItem2 = (function () { function CollectionItem2() { } return CollectionItem2; -})(); +}()); var BaseCollection2 = (function () { function BaseCollection2() { this._itemsByKey = {}; } return BaseCollection2; -})(); +}()); var DataView2 = (function (_super) { __extends(DataView2, _super); function DataView2() { @@ -41,4 +41,4 @@ var DataView2 = (function (_super) { this._itemsByKey['dummy'] = item; }; return DataView2; -})(BaseCollection2); +}(BaseCollection2)); diff --git a/tests/baselines/reference/genericCallTypeArgumentInference.js b/tests/baselines/reference/genericCallTypeArgumentInference.js index cfa366e5e2b..994b4a52e60 100644 --- a/tests/baselines/reference/genericCallTypeArgumentInference.js +++ b/tests/baselines/reference/genericCallTypeArgumentInference.js @@ -139,7 +139,7 @@ var C = (function () { return x; }; return C; -})(); +}()); var c = new C('', 1); var r4 = c.foo('', 1); // string var r5 = c.foo2('', 1); // number diff --git a/tests/baselines/reference/genericCallWithConstraintsTypeArgumentInference.js b/tests/baselines/reference/genericCallWithConstraintsTypeArgumentInference.js index 9df55756ee2..04d5bd2d997 100644 --- a/tests/baselines/reference/genericCallWithConstraintsTypeArgumentInference.js +++ b/tests/baselines/reference/genericCallWithConstraintsTypeArgumentInference.js @@ -118,21 +118,21 @@ var Base = (function () { function Base() { } return Base; -})(); +}()); var Derived = (function (_super) { __extends(Derived, _super); function Derived() { _super.apply(this, arguments); } return Derived; -})(Base); +}(Base)); var Derived2 = (function (_super) { __extends(Derived2, _super); function Derived2() { _super.apply(this, arguments); } return Derived2; -})(Derived); +}(Derived)); var b; var d1; var d2; @@ -187,7 +187,7 @@ var C = (function () { return x; }; return C; -})(); +}()); var c = new C(b, d1); var r4 = c.foo(d1, d2); // Base var r5 = c.foo2(b, d2); // Derived diff --git a/tests/baselines/reference/genericCallWithFixedArguments.js b/tests/baselines/reference/genericCallWithFixedArguments.js index e588c0d113d..a207d5c6d17 100644 --- a/tests/baselines/reference/genericCallWithFixedArguments.js +++ b/tests/baselines/reference/genericCallWithFixedArguments.js @@ -13,12 +13,12 @@ var A = (function () { } A.prototype.foo = function () { }; return A; -})(); +}()); var B = (function () { function B() { } B.prototype.bar = function () { }; return B; -})(); +}()); function g(x) { } g(7); // the parameter list is fixed, so this should not error diff --git a/tests/baselines/reference/genericCallWithFunctionTypedArguments4.js b/tests/baselines/reference/genericCallWithFunctionTypedArguments4.js index 06c49c64f5b..c4290b73828 100644 --- a/tests/baselines/reference/genericCallWithFunctionTypedArguments4.js +++ b/tests/baselines/reference/genericCallWithFunctionTypedArguments4.js @@ -28,12 +28,12 @@ var C = (function () { function C() { } return C; -})(); +}()); var D = (function () { function D() { } return D; -})(); +}()); var a; function foo4(cb) { var u; diff --git a/tests/baselines/reference/genericCallWithObjectTypeArgs.js b/tests/baselines/reference/genericCallWithObjectTypeArgs.js index b5429e9df43..3496c28ecc3 100644 --- a/tests/baselines/reference/genericCallWithObjectTypeArgs.js +++ b/tests/baselines/reference/genericCallWithObjectTypeArgs.js @@ -26,17 +26,17 @@ var C = (function () { function C() { } return C; -})(); +}()); var D = (function () { function D() { } return D; -})(); +}()); var X = (function () { function X() { } return X; -})(); +}()); function foo(t, t2) { var x; return x; diff --git a/tests/baselines/reference/genericCallWithObjectTypeArgs2.js b/tests/baselines/reference/genericCallWithObjectTypeArgs2.js index bded01ead69..509dd9a1136 100644 --- a/tests/baselines/reference/genericCallWithObjectTypeArgs2.js +++ b/tests/baselines/reference/genericCallWithObjectTypeArgs2.js @@ -42,21 +42,21 @@ var Base = (function () { function Base() { } return Base; -})(); +}()); var Derived = (function (_super) { __extends(Derived, _super); function Derived() { _super.apply(this, arguments); } return Derived; -})(Base); +}(Base)); var Derived2 = (function (_super) { __extends(Derived2, _super); function Derived2() { _super.apply(this, arguments); } return Derived2; -})(Base); +}(Base)); // returns {}[] function f(a) { return [a.x, a.y]; diff --git a/tests/baselines/reference/genericCallWithObjectTypeArgsAndConstraints.js b/tests/baselines/reference/genericCallWithObjectTypeArgsAndConstraints.js index ca8c11bd7b3..308051b720e 100644 --- a/tests/baselines/reference/genericCallWithObjectTypeArgsAndConstraints.js +++ b/tests/baselines/reference/genericCallWithObjectTypeArgsAndConstraints.js @@ -40,17 +40,17 @@ var C = (function () { function C() { } return C; -})(); +}()); var D = (function () { function D() { } return D; -})(); +}()); var X = (function () { function X() { } return X; -})(); +}()); function foo(t, t2) { var x; return x; diff --git a/tests/baselines/reference/genericCallWithObjectTypeArgsAndConstraints2.js b/tests/baselines/reference/genericCallWithObjectTypeArgsAndConstraints2.js index 96c2f9300db..d3f18e0bfcb 100644 --- a/tests/baselines/reference/genericCallWithObjectTypeArgsAndConstraints2.js +++ b/tests/baselines/reference/genericCallWithObjectTypeArgsAndConstraints2.js @@ -50,14 +50,14 @@ var Base = (function () { function Base() { } return Base; -})(); +}()); var Derived = (function (_super) { __extends(Derived, _super); function Derived() { _super.apply(this, arguments); } return Derived; -})(Base); +}(Base)); function f(x) { var r; return r; diff --git a/tests/baselines/reference/genericCallWithObjectTypeArgsAndConstraints3.js b/tests/baselines/reference/genericCallWithObjectTypeArgsAndConstraints3.js index daaa2f5c0eb..acab51690d3 100644 --- a/tests/baselines/reference/genericCallWithObjectTypeArgsAndConstraints3.js +++ b/tests/baselines/reference/genericCallWithObjectTypeArgsAndConstraints3.js @@ -48,21 +48,21 @@ var Base = (function () { function Base() { } return Base; -})(); +}()); var Derived = (function (_super) { __extends(Derived, _super); function Derived() { _super.apply(this, arguments); } return Derived; -})(Base); +}(Base)); var Derived2 = (function (_super) { __extends(Derived2, _super); function Derived2() { _super.apply(this, arguments); } return Derived2; -})(Base); +}(Base)); function f(a) { var r; return r; diff --git a/tests/baselines/reference/genericCallWithObjectTypeArgsAndConstraints4.js b/tests/baselines/reference/genericCallWithObjectTypeArgsAndConstraints4.js index 10d32ddeae7..2025c3eb6c0 100644 --- a/tests/baselines/reference/genericCallWithObjectTypeArgsAndConstraints4.js +++ b/tests/baselines/reference/genericCallWithObjectTypeArgsAndConstraints4.js @@ -39,12 +39,12 @@ var C = (function () { function C() { } return C; -})(); +}()); var D = (function () { function D() { } return D; -})(); +}()); function foo(t, t2) { return function (x) { return t2; }; } diff --git a/tests/baselines/reference/genericCallWithObjectTypeArgsAndConstraints5.js b/tests/baselines/reference/genericCallWithObjectTypeArgsAndConstraints5.js index 95b98767a09..355f639748b 100644 --- a/tests/baselines/reference/genericCallWithObjectTypeArgsAndConstraints5.js +++ b/tests/baselines/reference/genericCallWithObjectTypeArgsAndConstraints5.js @@ -30,12 +30,12 @@ var C = (function () { function C() { } return C; -})(); +}()); var D = (function () { function D() { } return D; -})(); +}()); function foo(t, t2) { return function (x) { return t2; }; } diff --git a/tests/baselines/reference/genericCallbacksAndClassHierarchy.js b/tests/baselines/reference/genericCallbacksAndClassHierarchy.js index 093757d513d..31b4cd181b9 100644 --- a/tests/baselines/reference/genericCallbacksAndClassHierarchy.js +++ b/tests/baselines/reference/genericCallbacksAndClassHierarchy.js @@ -35,13 +35,13 @@ var M; function C1() { } return C1; - })(); + }()); M.C1 = C1; var A = (function () { function A() { } return A; - })(); + }()); M.A = A; var B = (function (_super) { __extends(B, _super); @@ -49,7 +49,7 @@ var M; _super.apply(this, arguments); } return B; - })(C1); + }(C1)); M.B = B; var D = (function () { function D() { @@ -62,6 +62,6 @@ var M; v.subscribe(function (newValue) { }); }; return D; - })(); + }()); M.D = D; })(M || (M = {})); diff --git a/tests/baselines/reference/genericCallsWithoutParens.js b/tests/baselines/reference/genericCallsWithoutParens.js index a479fbab375..b920016b58d 100644 --- a/tests/baselines/reference/genericCallsWithoutParens.js +++ b/tests/baselines/reference/genericCallsWithoutParens.js @@ -16,5 +16,5 @@ var C = (function () { function C() { } return C; -})(); +}()); var c = new C(); // parse error diff --git a/tests/baselines/reference/genericClassExpressionInFunction.js b/tests/baselines/reference/genericClassExpressionInFunction.js index bb45587eea1..f334da52625 100644 --- a/tests/baselines/reference/genericClassExpressionInFunction.js +++ b/tests/baselines/reference/genericClassExpressionInFunction.js @@ -41,7 +41,7 @@ var A = (function () { function A() { } return A; -})(); +}()); function B1() { // class expression can use T return (function (_super) { @@ -50,7 +50,7 @@ function B1() { _super.apply(this, arguments); } return class_1; - })(A); + }(A)); } var B2 = (function () { function B2() { @@ -60,10 +60,10 @@ var B2 = (function () { _super.apply(this, arguments); } return class_2; - })(A); + }(A)); } return B2; -})(); +}()); function B3() { return (function (_super) { __extends(Inner, _super); @@ -71,7 +71,7 @@ function B3() { _super.apply(this, arguments); } return Inner; - })(A); + }(A)); } // extends can call B var K = (function (_super) { @@ -80,14 +80,14 @@ var K = (function (_super) { _super.apply(this, arguments); } return K; -})(B1()); +}(B1())); var C = (function (_super) { __extends(C, _super); function C() { _super.apply(this, arguments); } return C; -})((new B2().anon)); +}((new B2().anon))); var b3Number = B3(); var S = (function (_super) { __extends(S, _super); @@ -95,7 +95,7 @@ var S = (function (_super) { _super.apply(this, arguments); } return S; -})(b3Number); +}(b3Number)); var c = new C(); var k = new K(); var s = new S(); diff --git a/tests/baselines/reference/genericClassImplementingGenericInterfaceFromAnotherModule.js b/tests/baselines/reference/genericClassImplementingGenericInterfaceFromAnotherModule.js index 7d26be5fb2e..588cf93fe4b 100644 --- a/tests/baselines/reference/genericClassImplementingGenericInterfaceFromAnotherModule.js +++ b/tests/baselines/reference/genericClassImplementingGenericInterfaceFromAnotherModule.js @@ -14,7 +14,7 @@ var bar; function Foo() { } return Foo; - })(); + }()); bar.Foo = Foo; })(bar || (bar = {})); diff --git a/tests/baselines/reference/genericClassInheritsConstructorFromNonGenericClass.js b/tests/baselines/reference/genericClassInheritsConstructorFromNonGenericClass.js index f77f60a2fb9..9f71ace88a9 100644 --- a/tests/baselines/reference/genericClassInheritsConstructorFromNonGenericClass.js +++ b/tests/baselines/reference/genericClassInheritsConstructorFromNonGenericClass.js @@ -17,16 +17,16 @@ var A = (function (_super) { _super.apply(this, arguments); } return A; -})(B); +}(B)); var B = (function (_super) { __extends(B, _super); function B() { _super.apply(this, arguments); } return B; -})(C); +}(C)); var C = (function () { function C(p) { } return C; -})(); +}()); diff --git a/tests/baselines/reference/genericClassPropertyInheritanceSpecialization.js b/tests/baselines/reference/genericClassPropertyInheritanceSpecialization.js index 69261747244..8f90c2fb6e4 100644 --- a/tests/baselines/reference/genericClassPropertyInheritanceSpecialization.js +++ b/tests/baselines/reference/genericClassPropertyInheritanceSpecialization.js @@ -93,7 +93,7 @@ var Portal; Validator.prototype.destroy = function () { }; Validator.prototype._validate = function (value) { return 0; }; return Validator; - })(); + }()); Validators.Validator = Validator; })(Validators = Controls.Validators || (Controls.Validators = {})); })(Controls = Portal.Controls || (Portal.Controls = {})); @@ -112,7 +112,7 @@ var PortalFx; _super.call(this, message); } return Validator; - })(Portal.Controls.Validators.Validator); + }(Portal.Controls.Validators.Validator)); Validators.Validator = Validator; })(Validators = Controls.Validators || (Controls.Validators = {})); })(Controls = ViewModels.Controls || (ViewModels.Controls = {})); @@ -123,4 +123,4 @@ var ViewModel = (function () { this.validators = ko.observableArray(); } return ViewModel; -})(); +}()); diff --git a/tests/baselines/reference/genericClassStaticMethod.js b/tests/baselines/reference/genericClassStaticMethod.js index aed721aa7d5..394e6650e0a 100644 --- a/tests/baselines/reference/genericClassStaticMethod.js +++ b/tests/baselines/reference/genericClassStaticMethod.js @@ -22,7 +22,7 @@ var Foo = (function () { Foo.getFoo = function () { }; return Foo; -})(); +}()); var Bar = (function (_super) { __extends(Bar, _super); function Bar() { @@ -31,4 +31,4 @@ var Bar = (function (_super) { Bar.getFoo = function () { }; return Bar; -})(Foo); +}(Foo)); diff --git a/tests/baselines/reference/genericClassWithFunctionTypedMemberArguments.js b/tests/baselines/reference/genericClassWithFunctionTypedMemberArguments.js index 5156c4d6b12..50510d88c24 100644 --- a/tests/baselines/reference/genericClassWithFunctionTypedMemberArguments.js +++ b/tests/baselines/reference/genericClassWithFunctionTypedMemberArguments.js @@ -76,7 +76,7 @@ var ImmediatelyFix; return x(null); }; return C; - })(); + }()); var c = new C(); var r = c.foo(function (x) { return ''; }); // {} var r2 = c.foo(function (x) { return ''; }); // string @@ -88,7 +88,7 @@ var ImmediatelyFix; return x(null); }; return C2; - })(); + }()); var c2 = new C2(); var ra = c2.foo(function (x) { return 1; }); // number var r3a = c2.foo(function (x) { return 1; }); // number @@ -102,7 +102,7 @@ var WithCandidates; return cb(x); }; return C; - })(); + }()); var c; var r4 = c.foo2(1, function (a) { return ''; }); // string, contextual signature instantiation is applied to generic functions var r5 = c.foo2(1, function (a) { return ''; }); // string @@ -114,7 +114,7 @@ var WithCandidates; return cb(x); }; return C2; - })(); + }()); var c2; var r7 = c2.foo3(1, function (a) { return ''; }, ''); // string var r8 = c2.foo3(1, function (a) { return ''; }, ''); // string @@ -125,7 +125,7 @@ var WithCandidates; return cb(x); }; return C3; - })(); + }()); var c3; function other(t, u) { var r10 = c.foo2(1, function (x) { return ''; }); // error diff --git a/tests/baselines/reference/genericClassWithObjectTypeArgsAndConstraints.js b/tests/baselines/reference/genericClassWithObjectTypeArgsAndConstraints.js index 5b0a4c11164..467675c3497 100644 --- a/tests/baselines/reference/genericClassWithObjectTypeArgsAndConstraints.js +++ b/tests/baselines/reference/genericClassWithObjectTypeArgsAndConstraints.js @@ -67,17 +67,17 @@ var C = (function () { function C() { } return C; -})(); +}()); var D = (function () { function D() { } return D; -})(); +}()); var X = (function () { function X() { } return X; -})(); +}()); var Class; (function (Class) { var G = (function () { @@ -88,7 +88,7 @@ var Class; return x; }; return G; - })(); + }()); var c1 = new X(); var d1 = new X(); var g; @@ -102,7 +102,7 @@ var Class; return x; }; return G2; - })(); + }()); var g2; var r = g2.foo2(c1, d1); var r2 = g2.foo2(c1, c1); diff --git a/tests/baselines/reference/genericClassWithStaticFactory.js b/tests/baselines/reference/genericClassWithStaticFactory.js index 6fbef32dc1b..ee65f23c2f1 100644 --- a/tests/baselines/reference/genericClassWithStaticFactory.js +++ b/tests/baselines/reference/genericClassWithStaticFactory.js @@ -230,7 +230,7 @@ var Editor; return this.insertEntryBefore(entry); }; return List; - })(); + }()); Editor.List = List; var ListFactory = (function () { function ListFactory() { @@ -262,6 +262,6 @@ var Editor; } }; return ListFactory; - })(); + }()); Editor.ListFactory = ListFactory; })(Editor || (Editor = {})); diff --git a/tests/baselines/reference/genericClassWithStaticsUsingTypeArguments.js b/tests/baselines/reference/genericClassWithStaticsUsingTypeArguments.js index 4caeacd19e2..2039e459572 100644 --- a/tests/baselines/reference/genericClassWithStaticsUsingTypeArguments.js +++ b/tests/baselines/reference/genericClassWithStaticsUsingTypeArguments.js @@ -30,4 +30,4 @@ var Foo = (function () { Foo.d = false || (function (x) { return x || undefined; })(null); Foo.e = function (x) { return null; }; return Foo; -})(); +}()); diff --git a/tests/baselines/reference/genericClasses0.js b/tests/baselines/reference/genericClasses0.js index 158793a9cbf..df6e691b9da 100644 --- a/tests/baselines/reference/genericClasses0.js +++ b/tests/baselines/reference/genericClasses0.js @@ -12,7 +12,7 @@ var C = (function () { function C() { } return C; -})(); +}()); var v1; var y = v1.x; // should be 'string' diff --git a/tests/baselines/reference/genericClasses1.js b/tests/baselines/reference/genericClasses1.js index 804d6624a32..de4ad6f917b 100644 --- a/tests/baselines/reference/genericClasses1.js +++ b/tests/baselines/reference/genericClasses1.js @@ -12,7 +12,7 @@ var C = (function () { function C() { } return C; -})(); +}()); var v1 = new C(); var y = v1.x; // should be 'string' diff --git a/tests/baselines/reference/genericClasses2.js b/tests/baselines/reference/genericClasses2.js index b581621dc97..dcfed142d02 100644 --- a/tests/baselines/reference/genericClasses2.js +++ b/tests/baselines/reference/genericClasses2.js @@ -20,7 +20,7 @@ var C = (function () { function C() { } return C; -})(); +}()); var v1; var y = v1.x; // should be 'string' var w = v1.y.a; // should be 'string' diff --git a/tests/baselines/reference/genericClasses3.js b/tests/baselines/reference/genericClasses3.js index 14ffab2f6f6..2bd33efb3dc 100644 --- a/tests/baselines/reference/genericClasses3.js +++ b/tests/baselines/reference/genericClasses3.js @@ -27,14 +27,14 @@ var B = (function () { function B() { } return B; -})(); +}()); var C = (function (_super) { __extends(C, _super); function C() { _super.apply(this, arguments); } return C; -})(B); +}(B)); var v2; var y = v2.x; // should be 'string' var u = v2.a; // should be 'string' diff --git a/tests/baselines/reference/genericClasses4.js b/tests/baselines/reference/genericClasses4.js index 24927413d3e..ab3620d2d79 100644 --- a/tests/baselines/reference/genericClasses4.js +++ b/tests/baselines/reference/genericClasses4.js @@ -37,4 +37,4 @@ var Vec2_T = (function () { return retval; }; return Vec2_T; -})(); +}()); diff --git a/tests/baselines/reference/genericClassesInModule.js b/tests/baselines/reference/genericClassesInModule.js index 3f19b1f71f7..e531e25ec7a 100644 --- a/tests/baselines/reference/genericClassesInModule.js +++ b/tests/baselines/reference/genericClassesInModule.js @@ -16,13 +16,13 @@ var Foo; function B() { } return B; - })(); + }()); Foo.B = B; var A = (function () { function A() { } return A; - })(); + }()); Foo.A = A; })(Foo || (Foo = {})); var a = new Foo.B(); diff --git a/tests/baselines/reference/genericClassesInModule2.js b/tests/baselines/reference/genericClassesInModule2.js index 1ec61d09864..a17d9272c5b 100644 --- a/tests/baselines/reference/genericClassesInModule2.js +++ b/tests/baselines/reference/genericClassesInModule2.js @@ -32,13 +32,13 @@ define(["require", "exports"], function (require, exports) { var child = new B(this); }; return A; - })(); + }()); exports.A = A; var B = (function () { function B(parent) { this.parent = parent; } return B; - })(); + }()); exports.B = B; }); diff --git a/tests/baselines/reference/genericCloduleInModule.js b/tests/baselines/reference/genericCloduleInModule.js index 92c519aa012..e3f926e1f91 100644 --- a/tests/baselines/reference/genericCloduleInModule.js +++ b/tests/baselines/reference/genericCloduleInModule.js @@ -21,7 +21,7 @@ var A; B.prototype.foo = function () { }; B.bar = function () { }; return B; - })(); + }()); A.B = B; var B; (function (B) { diff --git a/tests/baselines/reference/genericCloduleInModule2.js b/tests/baselines/reference/genericCloduleInModule2.js index bb8021ffe8c..433a165db92 100644 --- a/tests/baselines/reference/genericCloduleInModule2.js +++ b/tests/baselines/reference/genericCloduleInModule2.js @@ -24,7 +24,7 @@ var A; B.prototype.foo = function () { }; B.bar = function () { }; return B; - })(); + }()); A.B = B; })(A || (A = {})); var A; diff --git a/tests/baselines/reference/genericCloneReturnTypes.js b/tests/baselines/reference/genericCloneReturnTypes.js index d7a279fb0bc..6d301c008e6 100644 --- a/tests/baselines/reference/genericCloneReturnTypes.js +++ b/tests/baselines/reference/genericCloneReturnTypes.js @@ -34,7 +34,7 @@ var Bar = (function () { return new Bar(this.size); }; return Bar; -})(); +}()); var b; var b2 = b.clone(); var b3; diff --git a/tests/baselines/reference/genericCloneReturnTypes2.js b/tests/baselines/reference/genericCloneReturnTypes2.js index 9a1201af7f8..1e908c4c865 100644 --- a/tests/baselines/reference/genericCloneReturnTypes2.js +++ b/tests/baselines/reference/genericCloneReturnTypes2.js @@ -25,7 +25,7 @@ var MyList = (function () { return new MyList(this.size); }; return MyList; -})(); +}()); var a; var b = a.clone(); // ok var c = a.clone(); // bug was there was an error on this line diff --git a/tests/baselines/reference/genericConstraint1.js b/tests/baselines/reference/genericConstraint1.js index 38de98b121a..52ce0143357 100644 --- a/tests/baselines/reference/genericConstraint1.js +++ b/tests/baselines/reference/genericConstraint1.js @@ -16,6 +16,6 @@ var C = (function () { return null; }; return C; -})(); +}()); var x = new C(); x.bar2(2, ""); diff --git a/tests/baselines/reference/genericConstraint2.js b/tests/baselines/reference/genericConstraint2.js index 9548ae485b4..9056ec847d7 100644 --- a/tests/baselines/reference/genericConstraint2.js +++ b/tests/baselines/reference/genericConstraint2.js @@ -37,7 +37,7 @@ var ComparableString = (function () { return 0; }; return ComparableString; -})(); +}()); var a = new ComparableString("a"); var b = new ComparableString("b"); var c = compare(a, b); diff --git a/tests/baselines/reference/genericConstraintDeclaration.js b/tests/baselines/reference/genericConstraintDeclaration.js index 6e3f8d5ff8b..eafda32f122 100644 --- a/tests/baselines/reference/genericConstraintDeclaration.js +++ b/tests/baselines/reference/genericConstraintDeclaration.js @@ -14,7 +14,7 @@ var List = (function () { } List.empty = function () { return null; }; return List; -})(); +}()); //// [genericConstraintDeclaration.d.ts] diff --git a/tests/baselines/reference/genericConstraintOnExtendedBuiltinTypes.js b/tests/baselines/reference/genericConstraintOnExtendedBuiltinTypes.js index b4e56933775..d2bf12667fc 100644 --- a/tests/baselines/reference/genericConstraintOnExtendedBuiltinTypes.js +++ b/tests/baselines/reference/genericConstraintOnExtendedBuiltinTypes.js @@ -41,7 +41,7 @@ var EndGate; this._from = from.Clone(); } return Tween; - })(); + }()); Tweening.Tween = Tween; })(Tweening = EndGate.Tweening || (EndGate.Tweening = {})); })(EndGate || (EndGate = {})); @@ -55,7 +55,7 @@ var EndGate; _super.call(this, from); } return NumberTween; - })(Tweening.Tween); + }(Tweening.Tween)); Tweening.NumberTween = NumberTween; })(Tweening = EndGate.Tweening || (EndGate.Tweening = {})); })(EndGate || (EndGate = {})); diff --git a/tests/baselines/reference/genericConstraintOnExtendedBuiltinTypes2.js b/tests/baselines/reference/genericConstraintOnExtendedBuiltinTypes2.js index 54a807a8e87..f61f57cb615 100644 --- a/tests/baselines/reference/genericConstraintOnExtendedBuiltinTypes2.js +++ b/tests/baselines/reference/genericConstraintOnExtendedBuiltinTypes2.js @@ -40,7 +40,7 @@ var EndGate; this._from = from.Clone(); } return Tween; - })(); + }()); Tweening.Tween = Tween; })(Tweening = EndGate.Tweening || (EndGate.Tweening = {})); })(EndGate || (EndGate = {})); @@ -54,7 +54,7 @@ var EndGate; _super.call(this, from); } return NumberTween; - })(Tweening.Tween); + }(Tweening.Tween)); Tweening.NumberTween = NumberTween; })(Tweening = EndGate.Tweening || (EndGate.Tweening = {})); })(EndGate || (EndGate = {})); diff --git a/tests/baselines/reference/genericConstructExpressionWithoutArgs.js b/tests/baselines/reference/genericConstructExpressionWithoutArgs.js index c3066de2721..5eb21728eb1 100644 --- a/tests/baselines/reference/genericConstructExpressionWithoutArgs.js +++ b/tests/baselines/reference/genericConstructExpressionWithoutArgs.js @@ -15,12 +15,12 @@ var B = (function () { function B() { } return B; -})(); +}()); var b = new B; // no error var C = (function () { function C() { } return C; -})(); +}()); var c = new C; // C var c2 = new C(); // error, type params are actually part of the arg list so you need both diff --git a/tests/baselines/reference/genericDerivedTypeWithSpecializedBase.js b/tests/baselines/reference/genericDerivedTypeWithSpecializedBase.js index eb27365ebc5..906145850f1 100644 --- a/tests/baselines/reference/genericDerivedTypeWithSpecializedBase.js +++ b/tests/baselines/reference/genericDerivedTypeWithSpecializedBase.js @@ -22,14 +22,14 @@ var A = (function () { function A() { } return A; -})(); +}()); var B = (function (_super) { __extends(B, _super); function B() { _super.apply(this, arguments); } return B; -})(A); +}(A)); var x; var y; x = y; // error diff --git a/tests/baselines/reference/genericDerivedTypeWithSpecializedBase2.js b/tests/baselines/reference/genericDerivedTypeWithSpecializedBase2.js index be94a778858..1c73075acc4 100644 --- a/tests/baselines/reference/genericDerivedTypeWithSpecializedBase2.js +++ b/tests/baselines/reference/genericDerivedTypeWithSpecializedBase2.js @@ -22,14 +22,14 @@ var A = (function () { function A() { } return A; -})(); +}()); var B = (function (_super) { __extends(B, _super); function B() { _super.apply(this, arguments); } return B; -})(A); +}(A)); var x; var y; x = y; // error diff --git a/tests/baselines/reference/genericFunctionsWithOptionalParameters3.js b/tests/baselines/reference/genericFunctionsWithOptionalParameters3.js index 9ad885a899a..7caa65b971b 100644 --- a/tests/baselines/reference/genericFunctionsWithOptionalParameters3.js +++ b/tests/baselines/reference/genericFunctionsWithOptionalParameters3.js @@ -21,7 +21,7 @@ var Collection = (function () { } Collection.prototype.add = function (x) { }; return Collection; -})(); +}()); var utils; var c = new Collection(); var r3 = utils.mapReduce(c, function (x) { return 1; }, function (y) { return new Date(); }); diff --git a/tests/baselines/reference/genericGetter.js b/tests/baselines/reference/genericGetter.js index 59425d8c13b..81e2531f1b9 100644 --- a/tests/baselines/reference/genericGetter.js +++ b/tests/baselines/reference/genericGetter.js @@ -21,6 +21,6 @@ var C = (function () { configurable: true }); return C; -})(); +}()); var c = new C(); var r = c.x; diff --git a/tests/baselines/reference/genericGetter2.js b/tests/baselines/reference/genericGetter2.js index 9d39ce02d5f..022233b78e0 100644 --- a/tests/baselines/reference/genericGetter2.js +++ b/tests/baselines/reference/genericGetter2.js @@ -13,7 +13,7 @@ var A = (function () { function A() { } return A; -})(); +}()); var C = (function () { function C() { } @@ -25,4 +25,4 @@ var C = (function () { configurable: true }); return C; -})(); +}()); diff --git a/tests/baselines/reference/genericGetter3.js b/tests/baselines/reference/genericGetter3.js index 1cb01c6f112..93465009378 100644 --- a/tests/baselines/reference/genericGetter3.js +++ b/tests/baselines/reference/genericGetter3.js @@ -16,7 +16,7 @@ var A = (function () { function A() { } return A; -})(); +}()); var C = (function () { function C() { } @@ -28,6 +28,6 @@ var C = (function () { configurable: true }); return C; -})(); +}()); var c = new C(); var r = c.x; diff --git a/tests/baselines/reference/genericImplements.js b/tests/baselines/reference/genericImplements.js index b8d295153a4..1a67fb29ad8 100644 --- a/tests/baselines/reference/genericImplements.js +++ b/tests/baselines/reference/genericImplements.js @@ -25,13 +25,13 @@ var A = (function () { function A() { } return A; -})(); +}()); ; var B = (function () { function B() { } return B; -})(); +}()); ; // OK var X = (function () { @@ -39,18 +39,18 @@ var X = (function () { } X.prototype.f = function () { return undefined; }; return X; -})(); // { f: () => { b; } } +}()); // { f: () => { b; } } // OK var Y = (function () { function Y() { } Y.prototype.f = function () { return undefined; }; return Y; -})(); // { f: () => { a; } } +}()); // { f: () => { a; } } // OK var Z = (function () { function Z() { } Z.prototype.f = function () { return undefined; }; return Z; -})(); // { f: () => T } +}()); // { f: () => T } diff --git a/tests/baselines/reference/genericInstanceOf.js b/tests/baselines/reference/genericInstanceOf.js index 9017cfe050a..6d060a75fe1 100644 --- a/tests/baselines/reference/genericInstanceOf.js +++ b/tests/baselines/reference/genericInstanceOf.js @@ -22,4 +22,4 @@ var C = (function () { } }; return C; -})(); +}()); diff --git a/tests/baselines/reference/genericInterfaceImplementation.js b/tests/baselines/reference/genericInterfaceImplementation.js index 8dc442b4959..c68c3e0d222 100644 --- a/tests/baselines/reference/genericInterfaceImplementation.js +++ b/tests/baselines/reference/genericInterfaceImplementation.js @@ -27,4 +27,4 @@ var None = (function () { return new None(); }; return None; -})(); +}()); diff --git a/tests/baselines/reference/genericInterfacesWithoutTypeArguments.js b/tests/baselines/reference/genericInterfacesWithoutTypeArguments.js index 4db7f2d0b1d..e6a2fd65a66 100644 --- a/tests/baselines/reference/genericInterfacesWithoutTypeArguments.js +++ b/tests/baselines/reference/genericInterfacesWithoutTypeArguments.js @@ -10,6 +10,6 @@ var C = (function () { function C() { } return C; -})(); +}()); var i; var c; diff --git a/tests/baselines/reference/genericMemberFunction.js b/tests/baselines/reference/genericMemberFunction.js index b442b2f8757..c15868e20c4 100644 --- a/tests/baselines/reference/genericMemberFunction.js +++ b/tests/baselines/reference/genericMemberFunction.js @@ -32,7 +32,7 @@ define(["require", "exports"], function (require, exports) { return undefined; }; return BuildError; - })(); + }()); exports.BuildError = BuildError; var FileWithErrors = (function () { function FileWithErrors() { @@ -44,7 +44,7 @@ define(["require", "exports"], function (require, exports) { return undefined; }; return FileWithErrors; - })(); + }()); exports.FileWithErrors = FileWithErrors; var BuildResult = (function () { function BuildResult() { @@ -57,6 +57,6 @@ define(["require", "exports"], function (require, exports) { }); }; return BuildResult; - })(); + }()); exports.BuildResult = BuildResult; }); diff --git a/tests/baselines/reference/genericMergedDeclarationUsingTypeParameter2.js b/tests/baselines/reference/genericMergedDeclarationUsingTypeParameter2.js index 27961a68c73..ac51424deea 100644 --- a/tests/baselines/reference/genericMergedDeclarationUsingTypeParameter2.js +++ b/tests/baselines/reference/genericMergedDeclarationUsingTypeParameter2.js @@ -11,7 +11,7 @@ var foo = (function () { function foo(x) { } return foo; -})(); +}()); var foo; (function (foo) { var y = 1; diff --git a/tests/baselines/reference/genericObjectCreationWithoutTypeArgs.js b/tests/baselines/reference/genericObjectCreationWithoutTypeArgs.js index 75e85283aa9..bbd621ca09f 100644 --- a/tests/baselines/reference/genericObjectCreationWithoutTypeArgs.js +++ b/tests/baselines/reference/genericObjectCreationWithoutTypeArgs.js @@ -14,7 +14,7 @@ var SS = (function () { function SS() { } return SS; -})(); +}()); var x1 = new SS(); // OK var x2 = new SS(); // Correctly give error var x3 = new SS(); // OK diff --git a/tests/baselines/reference/genericObjectLitReturnType.js b/tests/baselines/reference/genericObjectLitReturnType.js index 826f5233b55..e9b1ba2f60d 100644 --- a/tests/baselines/reference/genericObjectLitReturnType.js +++ b/tests/baselines/reference/genericObjectLitReturnType.js @@ -17,7 +17,7 @@ var X = (function () { } X.prototype.f = function (t) { return { a: t }; }; return X; -})(); +}()); var x; var t1 = x.f(5); t1.a = 5; // Should not error: t1 should have type {a: number}, instead has type {a: T} diff --git a/tests/baselines/reference/genericOfACloduleType1.js b/tests/baselines/reference/genericOfACloduleType1.js index 1f115aa486a..3e4b9d3a9d4 100644 --- a/tests/baselines/reference/genericOfACloduleType1.js +++ b/tests/baselines/reference/genericOfACloduleType1.js @@ -18,7 +18,7 @@ var G = (function () { } G.prototype.bar = function (x) { return x; }; return G; -})(); +}()); var M; (function (M) { var C = (function () { @@ -26,7 +26,7 @@ var M; } C.prototype.foo = function () { }; return C; - })(); + }()); M.C = C; var C; (function (C) { @@ -34,7 +34,7 @@ var M; function X() { } return X; - })(); + }()); C.X = X; })(C = M.C || (M.C = {})); var g1 = new G(); diff --git a/tests/baselines/reference/genericOfACloduleType2.js b/tests/baselines/reference/genericOfACloduleType2.js index 1d671289cb2..f1e3f2a8a00 100644 --- a/tests/baselines/reference/genericOfACloduleType2.js +++ b/tests/baselines/reference/genericOfACloduleType2.js @@ -21,7 +21,7 @@ var G = (function () { } G.prototype.bar = function (x) { return x; }; return G; -})(); +}()); var M; (function (M) { var C = (function () { @@ -29,7 +29,7 @@ var M; } C.prototype.foo = function () { }; return C; - })(); + }()); M.C = C; var C; (function (C) { @@ -37,7 +37,7 @@ var M; function X() { } return X; - })(); + }()); C.X = X; })(C = M.C || (M.C = {})); var g1 = new G(); diff --git a/tests/baselines/reference/genericOverloadSignatures.js b/tests/baselines/reference/genericOverloadSignatures.js index 45a21d5a334..829ee557e4e 100644 --- a/tests/baselines/reference/genericOverloadSignatures.js +++ b/tests/baselines/reference/genericOverloadSignatures.js @@ -36,5 +36,5 @@ var C2 = (function () { function C2() { } return C2; -})(); +}()); var b; diff --git a/tests/baselines/reference/genericPrototypeProperty.js b/tests/baselines/reference/genericPrototypeProperty.js index fb6f9b78848..77102b280a1 100644 --- a/tests/baselines/reference/genericPrototypeProperty.js +++ b/tests/baselines/reference/genericPrototypeProperty.js @@ -15,7 +15,7 @@ var C = (function () { } C.prototype.foo = function (x) { return null; }; return C; -})(); +}()); var r = C.prototype; // should be any var r2 = r.x; diff --git a/tests/baselines/reference/genericPrototypeProperty2.js b/tests/baselines/reference/genericPrototypeProperty2.js index cbe33431ca4..3f1b6e21adc 100644 --- a/tests/baselines/reference/genericPrototypeProperty2.js +++ b/tests/baselines/reference/genericPrototypeProperty2.js @@ -25,23 +25,23 @@ var BaseEvent = (function () { function BaseEvent() { } return BaseEvent; -})(); +}()); var MyEvent = (function (_super) { __extends(MyEvent, _super); function MyEvent() { _super.apply(this, arguments); } return MyEvent; -})(BaseEvent); +}(BaseEvent)); var BaseEventWrapper = (function () { function BaseEventWrapper() { } return BaseEventWrapper; -})(); +}()); var MyEventWrapper = (function (_super) { __extends(MyEventWrapper, _super); function MyEventWrapper() { _super.apply(this, arguments); } return MyEventWrapper; -})(BaseEventWrapper); +}(BaseEventWrapper)); diff --git a/tests/baselines/reference/genericPrototypeProperty3.js b/tests/baselines/reference/genericPrototypeProperty3.js index 6447a4e0ac2..b7cca85561c 100644 --- a/tests/baselines/reference/genericPrototypeProperty3.js +++ b/tests/baselines/reference/genericPrototypeProperty3.js @@ -24,23 +24,23 @@ var BaseEvent = (function () { function BaseEvent() { } return BaseEvent; -})(); +}()); var MyEvent = (function (_super) { __extends(MyEvent, _super); function MyEvent() { _super.apply(this, arguments); } return MyEvent; -})(BaseEvent); +}(BaseEvent)); var BaseEventWrapper = (function () { function BaseEventWrapper() { } return BaseEventWrapper; -})(); +}()); var MyEventWrapper = (function (_super) { __extends(MyEventWrapper, _super); function MyEventWrapper() { _super.apply(this, arguments); } return MyEventWrapper; -})(BaseEventWrapper); +}(BaseEventWrapper)); diff --git a/tests/baselines/reference/genericRecursiveImplicitConstructorErrors2.js b/tests/baselines/reference/genericRecursiveImplicitConstructorErrors2.js index a1f7566f1c0..73012f714e8 100644 --- a/tests/baselines/reference/genericRecursiveImplicitConstructorErrors2.js +++ b/tests/baselines/reference/genericRecursiveImplicitConstructorErrors2.js @@ -52,7 +52,7 @@ var TypeScript2; return undefined; }; return PullSymbol; - })(); + }()); TypeScript2.PullSymbol = PullSymbol; var PullTypeSymbol = (function (_super) { __extends(PullTypeSymbol, _super); @@ -60,6 +60,6 @@ var TypeScript2; _super.apply(this, arguments); } return PullTypeSymbol; - })(PullSymbol); + }(PullSymbol)); TypeScript2.PullTypeSymbol = PullTypeSymbol; })(TypeScript2 || (TypeScript2 = {})); diff --git a/tests/baselines/reference/genericRecursiveImplicitConstructorErrors3.js b/tests/baselines/reference/genericRecursiveImplicitConstructorErrors3.js index a0229e19925..61cb758c48e 100644 --- a/tests/baselines/reference/genericRecursiveImplicitConstructorErrors3.js +++ b/tests/baselines/reference/genericRecursiveImplicitConstructorErrors3.js @@ -44,7 +44,7 @@ var TypeScript; MemberName.create = function (arg1, arg2, arg3) { }; return MemberName; - })(); + }()); TypeScript.MemberName = MemberName; })(TypeScript || (TypeScript = {})); var TypeScript; @@ -54,7 +54,7 @@ var TypeScript; this.type = null; } return PullSymbol; - })(); + }()); TypeScript.PullSymbol = PullSymbol; var PullTypeSymbol = (function (_super) { __extends(PullTypeSymbol, _super); @@ -76,6 +76,6 @@ var TypeScript; } }; return PullTypeSymbol; - })(PullSymbol); + }(PullSymbol)); TypeScript.PullTypeSymbol = PullTypeSymbol; })(TypeScript || (TypeScript = {})); diff --git a/tests/baselines/reference/genericReturnTypeFromGetter1.js b/tests/baselines/reference/genericReturnTypeFromGetter1.js index 76b60435f55..56367ca9c5e 100644 --- a/tests/baselines/reference/genericReturnTypeFromGetter1.js +++ b/tests/baselines/reference/genericReturnTypeFromGetter1.js @@ -21,6 +21,6 @@ define(["require", "exports"], function (require, exports) { configurable: true }); return DbSet; - })(); + }()); exports.DbSet = DbSet; }); diff --git a/tests/baselines/reference/genericReversingTypeParameters.js b/tests/baselines/reference/genericReversingTypeParameters.js index 2a52c2e9ba6..33f598a1642 100644 --- a/tests/baselines/reference/genericReversingTypeParameters.js +++ b/tests/baselines/reference/genericReversingTypeParameters.js @@ -17,7 +17,7 @@ var BiMap = (function () { BiMap.prototype.get = function (key) { return null; }; BiMap.prototype.inverse = function () { return null; }; return BiMap; -})(); +}()); var b = new BiMap(); var r1 = b.get(''); var i = b.inverse(); // used to get the type wrong here. diff --git a/tests/baselines/reference/genericReversingTypeParameters2.js b/tests/baselines/reference/genericReversingTypeParameters2.js index 4f4bc564f89..40102d790d9 100644 --- a/tests/baselines/reference/genericReversingTypeParameters2.js +++ b/tests/baselines/reference/genericReversingTypeParameters2.js @@ -16,7 +16,7 @@ var BiMap = (function () { BiMap.prototype.get = function (key) { return null; }; BiMap.prototype.inverse = function () { return null; }; return BiMap; -})(); +}()); var b = new BiMap(); var i = b.inverse(); // used to get the type wrong here. var r2b = i.get(1); diff --git a/tests/baselines/reference/genericSpecializations1.js b/tests/baselines/reference/genericSpecializations1.js index 3e59fceff97..2aabf708a6f 100644 --- a/tests/baselines/reference/genericSpecializations1.js +++ b/tests/baselines/reference/genericSpecializations1.js @@ -21,16 +21,16 @@ var IntFooBad = (function () { } IntFooBad.prototype.foo = function (x) { return null; }; return IntFooBad; -})(); +}()); var StringFoo2 = (function () { function StringFoo2() { } StringFoo2.prototype.foo = function (x) { return null; }; return StringFoo2; -})(); +}()); var StringFoo3 = (function () { function StringFoo3() { } StringFoo3.prototype.foo = function (x) { return null; }; return StringFoo3; -})(); +}()); diff --git a/tests/baselines/reference/genericSpecializations2.js b/tests/baselines/reference/genericSpecializations2.js index 8497d2db8b4..6975575ec5e 100644 --- a/tests/baselines/reference/genericSpecializations2.js +++ b/tests/baselines/reference/genericSpecializations2.js @@ -27,22 +27,22 @@ var IFoo = (function () { return null; }; return IFoo; -})(); +}()); var IntFooBad = (function () { function IntFooBad() { } IntFooBad.prototype.foo = function (x) { return null; }; return IntFooBad; -})(); +}()); var StringFoo2 = (function () { function StringFoo2() { } StringFoo2.prototype.foo = function (x) { return null; }; return StringFoo2; -})(); +}()); var StringFoo3 = (function () { function StringFoo3() { } StringFoo3.prototype.foo = function (x) { return null; }; return StringFoo3; -})(); +}()); diff --git a/tests/baselines/reference/genericSpecializations3.js b/tests/baselines/reference/genericSpecializations3.js index 3c582ae31fd..03d07b6dff9 100644 --- a/tests/baselines/reference/genericSpecializations3.js +++ b/tests/baselines/reference/genericSpecializations3.js @@ -43,21 +43,21 @@ var IntFooBad = (function () { } IntFooBad.prototype.foo = function (x) { return null; }; return IntFooBad; -})(); +}()); var intFooBad; var IntFoo = (function () { function IntFoo() { } IntFoo.prototype.foo = function (x) { return null; }; return IntFoo; -})(); +}()); var intFoo; var StringFoo2 = (function () { function StringFoo2() { } StringFoo2.prototype.foo = function (x) { return null; }; return StringFoo2; -})(); +}()); var stringFoo2; stringFoo2.foo("hm"); intFoo = stringFoo2; // error @@ -67,5 +67,5 @@ var StringFoo3 = (function () { } StringFoo3.prototype.foo = function (x) { return null; }; return StringFoo3; -})(); +}()); var stringFoo3; diff --git a/tests/baselines/reference/genericStaticAnyTypeFunction.js b/tests/baselines/reference/genericStaticAnyTypeFunction.js index 6816afec910..7ed9494d3cf 100644 --- a/tests/baselines/reference/genericStaticAnyTypeFunction.js +++ b/tests/baselines/reference/genericStaticAnyTypeFunction.js @@ -30,4 +30,4 @@ var A = (function () { return this.one(source, 42); // should not error }; return A; -})(); +}()); diff --git a/tests/baselines/reference/genericTypeAssertions1.js b/tests/baselines/reference/genericTypeAssertions1.js index 54637007d99..904e696af48 100644 --- a/tests/baselines/reference/genericTypeAssertions1.js +++ b/tests/baselines/reference/genericTypeAssertions1.js @@ -10,7 +10,7 @@ var A = (function () { } A.prototype.foo = function (x) { }; return A; -})(); +}()); var foo = new A(); var r = new A(); // error var r2 = foo; // error diff --git a/tests/baselines/reference/genericTypeAssertions2.js b/tests/baselines/reference/genericTypeAssertions2.js index 22ff708592e..02a51aed35d 100644 --- a/tests/baselines/reference/genericTypeAssertions2.js +++ b/tests/baselines/reference/genericTypeAssertions2.js @@ -24,7 +24,7 @@ var A = (function () { } A.prototype.foo = function (x) { }; return A; -})(); +}()); var B = (function (_super) { __extends(B, _super); function B() { @@ -34,7 +34,7 @@ var B = (function (_super) { return null; }; return B; -})(A); +}(A)); var foo = new A(); var r = new B(); var r2 = new B(); // error diff --git a/tests/baselines/reference/genericTypeAssertions4.js b/tests/baselines/reference/genericTypeAssertions4.js index d6d8672283c..2c5bbf51d7f 100644 --- a/tests/baselines/reference/genericTypeAssertions4.js +++ b/tests/baselines/reference/genericTypeAssertions4.js @@ -36,7 +36,7 @@ var A = (function () { } A.prototype.foo = function () { return ""; }; return A; -})(); +}()); var B = (function (_super) { __extends(B, _super); function B() { @@ -44,7 +44,7 @@ var B = (function (_super) { } B.prototype.bar = function () { return 1; }; return B; -})(A); +}(A)); var C = (function (_super) { __extends(C, _super); function C() { @@ -52,7 +52,7 @@ var C = (function (_super) { } C.prototype.baz = function () { return 1; }; return C; -})(A); +}(A)); var a; var b; var c; diff --git a/tests/baselines/reference/genericTypeAssertions6.js b/tests/baselines/reference/genericTypeAssertions6.js index 30a5d5ff5e5..5bc7a943163 100644 --- a/tests/baselines/reference/genericTypeAssertions6.js +++ b/tests/baselines/reference/genericTypeAssertions6.js @@ -40,7 +40,7 @@ var A = (function () { y = x; }; return A; -})(); +}()); var B = (function (_super) { __extends(B, _super); function B() { @@ -54,6 +54,6 @@ var B = (function (_super) { var e = new Date(); }; return B; -})(A); +}(A)); var b; var c = b; diff --git a/tests/baselines/reference/genericTypeConstraints.js b/tests/baselines/reference/genericTypeConstraints.js index eb8bed1fb92..5f4bb41a83f 100644 --- a/tests/baselines/reference/genericTypeConstraints.js +++ b/tests/baselines/reference/genericTypeConstraints.js @@ -24,21 +24,21 @@ var Foo = (function () { } Foo.prototype.fooMethod = function () { }; return Foo; -})(); +}()); var FooExtended = (function () { function FooExtended() { } return FooExtended; -})(); +}()); var Bar = (function () { function Bar() { } return Bar; -})(); +}()); var BarExtended = (function (_super) { __extends(BarExtended, _super); function BarExtended() { _super.call(this); } return BarExtended; -})(Bar); +}(Bar)); diff --git a/tests/baselines/reference/genericTypeReferenceWithoutTypeArgument.js b/tests/baselines/reference/genericTypeReferenceWithoutTypeArgument.js index 0cbf3581706..7fe6c49d65e 100644 --- a/tests/baselines/reference/genericTypeReferenceWithoutTypeArgument.js +++ b/tests/baselines/reference/genericTypeReferenceWithoutTypeArgument.js @@ -49,7 +49,7 @@ var C = (function () { function C() { } return C; -})(); +}()); var c; var a; var b; @@ -63,14 +63,14 @@ var D = (function (_super) { _super.apply(this, arguments); } return D; -})(C); +}(C)); var M; (function (M) { var E = (function () { function E() { } return E; - })(); + }()); M.E = E; })(M || (M = {})); var D2 = (function (_super) { @@ -79,12 +79,12 @@ var D2 = (function (_super) { _super.apply(this, arguments); } return D2; -})(M.E); +}(M.E)); var D3 = (function () { function D3() { } return D3; -})(); +}()); function h(x) { } function i(x) { } var j = null; diff --git a/tests/baselines/reference/genericTypeReferenceWithoutTypeArgument2.js b/tests/baselines/reference/genericTypeReferenceWithoutTypeArgument2.js index 355030caa1b..12be456a8a8 100644 --- a/tests/baselines/reference/genericTypeReferenceWithoutTypeArgument2.js +++ b/tests/baselines/reference/genericTypeReferenceWithoutTypeArgument2.js @@ -58,14 +58,14 @@ var D = (function (_super) { _super.apply(this, arguments); } return D; -})(I); +}(I)); var D2 = (function (_super) { __extends(D2, _super); function D2() { _super.apply(this, arguments); } return D2; -})(M.C); +}(M.C)); function h(x) { } function i(x) { } var j = null; diff --git a/tests/baselines/reference/genericTypeReferencesRequireTypeArgs.js b/tests/baselines/reference/genericTypeReferencesRequireTypeArgs.js index 90ad9e1ff93..8e8060194b0 100644 --- a/tests/baselines/reference/genericTypeReferencesRequireTypeArgs.js +++ b/tests/baselines/reference/genericTypeReferencesRequireTypeArgs.js @@ -17,7 +17,7 @@ var C = (function () { } C.prototype.foo = function () { return null; }; return C; -})(); +}()); var c1; // error var i1; // error var c2; // should be an error diff --git a/tests/baselines/reference/genericTypeUsedWithoutTypeArguments1.js b/tests/baselines/reference/genericTypeUsedWithoutTypeArguments1.js index d651c5bea61..765d9733727 100644 --- a/tests/baselines/reference/genericTypeUsedWithoutTypeArguments1.js +++ b/tests/baselines/reference/genericTypeUsedWithoutTypeArguments1.js @@ -8,4 +8,4 @@ var Bar = (function () { function Bar() { } return Bar; -})(); +}()); diff --git a/tests/baselines/reference/genericTypeWithCallableMembers.js b/tests/baselines/reference/genericTypeWithCallableMembers.js index ebf95b41dcc..c1a28b384bb 100644 --- a/tests/baselines/reference/genericTypeWithCallableMembers.js +++ b/tests/baselines/reference/genericTypeWithCallableMembers.js @@ -23,4 +23,4 @@ var C = (function () { var x2 = new this.data2(); // was error, shouldn't be }; return C; -})(); +}()); diff --git a/tests/baselines/reference/genericTypeWithNonGenericBaseMisMatch.js b/tests/baselines/reference/genericTypeWithNonGenericBaseMisMatch.js index 1a57b866d99..3c3577b853e 100644 --- a/tests/baselines/reference/genericTypeWithNonGenericBaseMisMatch.js +++ b/tests/baselines/reference/genericTypeWithNonGenericBaseMisMatch.js @@ -15,6 +15,6 @@ var X = (function () { } X.prototype.f = function (a) { }; return X; -})(); +}()); var x = new X(); var i = x; // Should not be allowed -- type of 'f' is incompatible with 'I' diff --git a/tests/baselines/reference/genericWithCallSignatures1.js b/tests/baselines/reference/genericWithCallSignatures1.js index 0d512faa7e1..95145470ac3 100644 --- a/tests/baselines/reference/genericWithCallSignatures1.js +++ b/tests/baselines/reference/genericWithCallSignatures1.js @@ -28,4 +28,4 @@ var MyClass = (function () { var x = this.callableThing(); }; return MyClass; -})(); +}()); diff --git a/tests/baselines/reference/genericWithIndexerOfTypeParameterType1.js b/tests/baselines/reference/genericWithIndexerOfTypeParameterType1.js index 441123c9fd4..b7c0ca2a0db 100644 --- a/tests/baselines/reference/genericWithIndexerOfTypeParameterType1.js +++ b/tests/baselines/reference/genericWithIndexerOfTypeParameterType1.js @@ -17,6 +17,6 @@ var LazyArray = (function () { return this.objects; }; return LazyArray; -})(); +}()); var lazyArray = new LazyArray(); var value = lazyArray.array()["test"]; // used to be an error diff --git a/tests/baselines/reference/genericWithIndexerOfTypeParameterType2.js b/tests/baselines/reference/genericWithIndexerOfTypeParameterType2.js index 1a536132d15..1f016b401ed 100644 --- a/tests/baselines/reference/genericWithIndexerOfTypeParameterType2.js +++ b/tests/baselines/reference/genericWithIndexerOfTypeParameterType2.js @@ -26,7 +26,7 @@ define(["require", "exports"], function (require, exports) { function Collection() { } return Collection; - })(); + }()); exports.Collection = Collection; var List = (function (_super) { __extends(List, _super); @@ -35,13 +35,13 @@ define(["require", "exports"], function (require, exports) { } List.prototype.Bar = function () { }; return List; - })(Collection); + }(Collection)); exports.List = List; var CollectionItem = (function () { function CollectionItem() { } return CollectionItem; - })(); + }()); exports.CollectionItem = CollectionItem; var ListItem = (function (_super) { __extends(ListItem, _super); @@ -49,6 +49,6 @@ define(["require", "exports"], function (require, exports) { _super.apply(this, arguments); } return ListItem; - })(CollectionItem); + }(CollectionItem)); exports.ListItem = ListItem; }); diff --git a/tests/baselines/reference/genericWithOpenTypeParameters1.js b/tests/baselines/reference/genericWithOpenTypeParameters1.js index 90202767012..90ea23e43ef 100644 --- a/tests/baselines/reference/genericWithOpenTypeParameters1.js +++ b/tests/baselines/reference/genericWithOpenTypeParameters1.js @@ -17,7 +17,7 @@ var B = (function () { } B.prototype.foo = function (x) { return null; }; return B; -})(); +}()); var x; x.foo(1); // no error var f = function (x) { return x.foo(1); }; // error diff --git a/tests/baselines/reference/generics3.js b/tests/baselines/reference/generics3.js index d88ed1082cd..8c68384dd68 100644 --- a/tests/baselines/reference/generics3.js +++ b/tests/baselines/reference/generics3.js @@ -12,7 +12,7 @@ var C = (function () { function C() { } return C; -})(); +}()); var a; var b; a = b; // Ok - should be identical diff --git a/tests/baselines/reference/generics4.js b/tests/baselines/reference/generics4.js index 95d8aea4f55..42b64224eb2 100644 --- a/tests/baselines/reference/generics4.js +++ b/tests/baselines/reference/generics4.js @@ -12,7 +12,7 @@ var C = (function () { function C() { } return C; -})(); +}()); var a; var b; a = b; // Not ok - return types of "f" are different diff --git a/tests/baselines/reference/generics4NoError.js b/tests/baselines/reference/generics4NoError.js index 0076dc81fb6..b247a24b633 100644 --- a/tests/baselines/reference/generics4NoError.js +++ b/tests/baselines/reference/generics4NoError.js @@ -11,7 +11,7 @@ var C = (function () { function C() { } return C; -})(); +}()); var a; var b; diff --git a/tests/baselines/reference/genericsWithDuplicateTypeParameters1.js b/tests/baselines/reference/genericsWithDuplicateTypeParameters1.js index 72eeb1ab683..43e933cd0fc 100644 --- a/tests/baselines/reference/genericsWithDuplicateTypeParameters1.js +++ b/tests/baselines/reference/genericsWithDuplicateTypeParameters1.js @@ -25,7 +25,7 @@ var C = (function () { C.prototype.f = function () { }; C.prototype.f2 = function (a, b) { return null; }; return C; -})(); +}()); var m = { a: function f() { }, b: function f2(a, b) { return null; } diff --git a/tests/baselines/reference/genericsWithoutTypeParameters1.js b/tests/baselines/reference/genericsWithoutTypeParameters1.js index 41abffcb854..443dd72da23 100644 --- a/tests/baselines/reference/genericsWithoutTypeParameters1.js +++ b/tests/baselines/reference/genericsWithoutTypeParameters1.js @@ -39,7 +39,7 @@ var C = (function () { } C.prototype.foo = function () { return null; }; return C; -})(); +}()); var c1; var i1; var c2; @@ -52,12 +52,12 @@ var D = (function () { function D() { } return D; -})(); +}()); var A = (function () { function A() { } return A; -})(); +}()); function f(x) { return null; } diff --git a/tests/baselines/reference/getAccessorWithImpliedReturnTypeAndFunctionClassMerge.js b/tests/baselines/reference/getAccessorWithImpliedReturnTypeAndFunctionClassMerge.js index 0211ce55119..8b41cafa5b1 100644 --- a/tests/baselines/reference/getAccessorWithImpliedReturnTypeAndFunctionClassMerge.js +++ b/tests/baselines/reference/getAccessorWithImpliedReturnTypeAndFunctionClassMerge.js @@ -42,6 +42,6 @@ var MyModule; configurable: true }); return MyClass; - })(); + }()); MyModule.MyClass = MyClass; })(MyModule || (MyModule = {})); diff --git a/tests/baselines/reference/getAndSetAsMemberNames.js b/tests/baselines/reference/getAndSetAsMemberNames.js index 8b036cd0f73..0b0d8ff7e01 100644 --- a/tests/baselines/reference/getAndSetAsMemberNames.js +++ b/tests/baselines/reference/getAndSetAsMemberNames.js @@ -27,12 +27,12 @@ var C1 = (function () { this.get = 1; } return C1; -})(); +}()); var C2 = (function () { function C2() { } return C2; -})(); +}()); var C3 = (function () { function C3() { } @@ -40,13 +40,13 @@ var C3 = (function () { return x + 1; }; return C3; -})(); +}()); var C4 = (function () { function C4() { this.get = true; } return C4; -})(); +}()); var C5 = (function () { function C5() { this.set = function () { return true; }; @@ -58,4 +58,4 @@ var C5 = (function () { configurable: true }); return C5; -})(); +}()); diff --git a/tests/baselines/reference/getAndSetNotIdenticalType.js b/tests/baselines/reference/getAndSetNotIdenticalType.js index e6eb7fecc86..cf2cd75828b 100644 --- a/tests/baselines/reference/getAndSetNotIdenticalType.js +++ b/tests/baselines/reference/getAndSetNotIdenticalType.js @@ -19,4 +19,4 @@ var C = (function () { configurable: true }); return C; -})(); +}()); diff --git a/tests/baselines/reference/getAndSetNotIdenticalType2.js b/tests/baselines/reference/getAndSetNotIdenticalType2.js index d73f07ec388..82f4c553329 100644 --- a/tests/baselines/reference/getAndSetNotIdenticalType2.js +++ b/tests/baselines/reference/getAndSetNotIdenticalType2.js @@ -20,7 +20,7 @@ var A = (function () { function A() { } return A; -})(); +}()); var C = (function () { function C() { } @@ -35,7 +35,7 @@ var C = (function () { configurable: true }); return C; -})(); +}()); var x = new C(); var r = x.x; x.x = r; diff --git a/tests/baselines/reference/getAndSetNotIdenticalType3.js b/tests/baselines/reference/getAndSetNotIdenticalType3.js index 2f37a7cbfae..2841c4d6d8a 100644 --- a/tests/baselines/reference/getAndSetNotIdenticalType3.js +++ b/tests/baselines/reference/getAndSetNotIdenticalType3.js @@ -20,7 +20,7 @@ var A = (function () { function A() { } return A; -})(); +}()); var C = (function () { function C() { } @@ -35,7 +35,7 @@ var C = (function () { configurable: true }); return C; -})(); +}()); var x = new C(); var r = x.x; x.x = r; diff --git a/tests/baselines/reference/getEmitOutput-pp.baseline b/tests/baselines/reference/getEmitOutput-pp.baseline index d5487a14d95..d6952e4537d 100644 --- a/tests/baselines/reference/getEmitOutput-pp.baseline +++ b/tests/baselines/reference/getEmitOutput-pp.baseline @@ -5,7 +5,7 @@ var Bar = (function () { function Bar() { } return Bar; -})(); +}()); FileName : tests/cases/fourslash/shims-pp/inputFile1.d.ts declare var x: number; declare class Bar { @@ -20,7 +20,7 @@ var Foo = (function () { function Foo() { } return Foo; -})(); +}()); FileName : tests/cases/fourslash/shims-pp/inputFile2.d.ts declare var x1: string; declare class Foo { diff --git a/tests/baselines/reference/getEmitOutput.baseline b/tests/baselines/reference/getEmitOutput.baseline index fbc3296c7c4..52c7d8a7aae 100644 --- a/tests/baselines/reference/getEmitOutput.baseline +++ b/tests/baselines/reference/getEmitOutput.baseline @@ -5,7 +5,7 @@ var Bar = (function () { function Bar() { } return Bar; -})(); +}()); FileName : tests/cases/fourslash/shims/inputFile1.d.ts declare var x: number; declare class Bar { @@ -20,7 +20,7 @@ var Foo = (function () { function Foo() { } return Foo; -})(); +}()); FileName : tests/cases/fourslash/shims/inputFile2.d.ts declare var x1: string; declare class Foo { diff --git a/tests/baselines/reference/getEmitOutputDeclarationMultiFiles.baseline b/tests/baselines/reference/getEmitOutputDeclarationMultiFiles.baseline index 5552851dec4..5a6fb434b1f 100644 --- a/tests/baselines/reference/getEmitOutputDeclarationMultiFiles.baseline +++ b/tests/baselines/reference/getEmitOutputDeclarationMultiFiles.baseline @@ -5,7 +5,7 @@ var Bar = (function () { function Bar() { } return Bar; -})(); +}()); FileName : tests/cases/fourslash/inputFile1.d.ts declare var x: number; declare class Bar { @@ -20,7 +20,7 @@ var Foo = (function () { function Foo() { } return Foo; -})(); +}()); FileName : tests/cases/fourslash/inputFile2.d.ts declare var x1: string; declare class Foo { diff --git a/tests/baselines/reference/getEmitOutputDeclarationSingleFile.baseline b/tests/baselines/reference/getEmitOutputDeclarationSingleFile.baseline index 4abc99b05c2..a756897fffb 100644 --- a/tests/baselines/reference/getEmitOutputDeclarationSingleFile.baseline +++ b/tests/baselines/reference/getEmitOutputDeclarationSingleFile.baseline @@ -5,13 +5,13 @@ var Bar = (function () { function Bar() { } return Bar; -})(); +}()); var x1 = "hello world"; var Foo = (function () { function Foo() { } return Foo; -})(); +}()); FileName : declSingleFile.d.ts declare var x: number; declare class Bar { diff --git a/tests/baselines/reference/getEmitOutputExternalModule.baseline b/tests/baselines/reference/getEmitOutputExternalModule.baseline index ac2f7cb3dac..1b18ace6ab6 100644 --- a/tests/baselines/reference/getEmitOutputExternalModule.baseline +++ b/tests/baselines/reference/getEmitOutputExternalModule.baseline @@ -5,5 +5,5 @@ var Bar = (function () { function Bar() { } return Bar; -})(); +}()); diff --git a/tests/baselines/reference/getEmitOutputExternalModule2.baseline b/tests/baselines/reference/getEmitOutputExternalModule2.baseline index c32472d318f..0b6c4a9b1ff 100644 --- a/tests/baselines/reference/getEmitOutputExternalModule2.baseline +++ b/tests/baselines/reference/getEmitOutputExternalModule2.baseline @@ -5,11 +5,11 @@ var Bar = (function () { function Bar() { } return Bar; -})(); +}()); var x = "world"; var Bar2 = (function () { function Bar2() { } return Bar2; -})(); +}()); diff --git a/tests/baselines/reference/getEmitOutputMapRoots.baseline b/tests/baselines/reference/getEmitOutputMapRoots.baseline index 2c814ddb9b4..3b8792e3777 100644 --- a/tests/baselines/reference/getEmitOutputMapRoots.baseline +++ b/tests/baselines/reference/getEmitOutputMapRoots.baseline @@ -7,5 +7,5 @@ var M = (function () { function M() { } return M; -})(); +}()); //# sourceMappingURL=tests/cases/fourslash/mapRootDir/declSingleFile.js.map diff --git a/tests/baselines/reference/getEmitOutputNoErrors.baseline b/tests/baselines/reference/getEmitOutputNoErrors.baseline index a1efeecd321..461cba4ea05 100644 --- a/tests/baselines/reference/getEmitOutputNoErrors.baseline +++ b/tests/baselines/reference/getEmitOutputNoErrors.baseline @@ -5,5 +5,5 @@ var M = (function () { function M() { } return M; -})(); +}()); diff --git a/tests/baselines/reference/getEmitOutputOnlyOneFile.baseline b/tests/baselines/reference/getEmitOutputOnlyOneFile.baseline index 981b4710e41..4d1c88e45b4 100644 --- a/tests/baselines/reference/getEmitOutputOnlyOneFile.baseline +++ b/tests/baselines/reference/getEmitOutputOnlyOneFile.baseline @@ -5,5 +5,5 @@ var Foo = (function () { function Foo() { } return Foo; -})(); +}()); diff --git a/tests/baselines/reference/getEmitOutputOutFile.baseline b/tests/baselines/reference/getEmitOutputOutFile.baseline index 702097a7c03..0b5e93271e4 100644 --- a/tests/baselines/reference/getEmitOutputOutFile.baseline +++ b/tests/baselines/reference/getEmitOutputOutFile.baseline @@ -5,13 +5,13 @@ var Bar = (function () { function Bar() { } return Bar; -})(); +}()); var x1 = "hello world"; var Foo = (function () { function Foo() { } return Foo; -})(); +}()); FileName : outFile.d.ts declare var x: number; declare class Bar { diff --git a/tests/baselines/reference/getEmitOutputSingleFile.baseline b/tests/baselines/reference/getEmitOutputSingleFile.baseline index 4a71299dcc0..922f3ab8790 100644 --- a/tests/baselines/reference/getEmitOutputSingleFile.baseline +++ b/tests/baselines/reference/getEmitOutputSingleFile.baseline @@ -5,11 +5,11 @@ var Bar = (function () { function Bar() { } return Bar; -})(); +}()); var x; var Foo = (function () { function Foo() { } return Foo; -})(); +}()); diff --git a/tests/baselines/reference/getEmitOutputSingleFile2.baseline b/tests/baselines/reference/getEmitOutputSingleFile2.baseline index 21e28eb7feb..2a7b4ac367e 100644 --- a/tests/baselines/reference/getEmitOutputSingleFile2.baseline +++ b/tests/baselines/reference/getEmitOutputSingleFile2.baseline @@ -5,13 +5,13 @@ var Bar = (function () { function Bar() { } return Bar; -})(); +}()); var x1 = "hello world"; var Foo = (function () { function Foo() { } return Foo; -})(); +}()); FileName : declSingleFile.d.ts declare var x: number; declare class Bar { diff --git a/tests/baselines/reference/getEmitOutputSourceMap.baseline b/tests/baselines/reference/getEmitOutputSourceMap.baseline index 5859da0bb3e..65257d63607 100644 --- a/tests/baselines/reference/getEmitOutputSourceMap.baseline +++ b/tests/baselines/reference/getEmitOutputSourceMap.baseline @@ -7,5 +7,5 @@ var M = (function () { function M() { } return M; -})(); +}()); //# sourceMappingURL=inputFile.js.map diff --git a/tests/baselines/reference/getEmitOutputSourceMap2.baseline b/tests/baselines/reference/getEmitOutputSourceMap2.baseline index c07c134519f..33c23a7ee48 100644 --- a/tests/baselines/reference/getEmitOutputSourceMap2.baseline +++ b/tests/baselines/reference/getEmitOutputSourceMap2.baseline @@ -7,7 +7,7 @@ var M = (function () { function M() { } return M; -})(); +}()); //# sourceMappingURL=inputFile1.js.map EmitSkipped: false FileName : sample/outDir/inputFile2.js.map diff --git a/tests/baselines/reference/getEmitOutputSourceRoot.baseline b/tests/baselines/reference/getEmitOutputSourceRoot.baseline index 2c5e963b8b5..d38078a08e3 100644 --- a/tests/baselines/reference/getEmitOutputSourceRoot.baseline +++ b/tests/baselines/reference/getEmitOutputSourceRoot.baseline @@ -7,5 +7,5 @@ var M = (function () { function M() { } return M; -})(); +}()); //# sourceMappingURL=inputFile.js.map diff --git a/tests/baselines/reference/getEmitOutputSourceRootMultiFiles.baseline b/tests/baselines/reference/getEmitOutputSourceRootMultiFiles.baseline index fa4f3316822..50a6ad68605 100644 --- a/tests/baselines/reference/getEmitOutputSourceRootMultiFiles.baseline +++ b/tests/baselines/reference/getEmitOutputSourceRootMultiFiles.baseline @@ -7,7 +7,7 @@ var M = (function () { function M() { } return M; -})(); +}()); //# sourceMappingURL=inputFile1.js.map EmitSkipped: false FileName : tests/cases/fourslash/inputFile2.js.map @@ -17,5 +17,5 @@ var C = (function () { function C() { } return C; -})(); +}()); //# sourceMappingURL=inputFile2.js.map diff --git a/tests/baselines/reference/getEmitOutputTsxFile_Preserve.baseline b/tests/baselines/reference/getEmitOutputTsxFile_Preserve.baseline index 72167679f58..bebd1ff1dd1 100644 --- a/tests/baselines/reference/getEmitOutputTsxFile_Preserve.baseline +++ b/tests/baselines/reference/getEmitOutputTsxFile_Preserve.baseline @@ -7,7 +7,7 @@ var Bar = (function () { function Bar() { } return Bar; -})(); +}()); //# sourceMappingURL=inputFile1.js.mapFileName : tests/cases/fourslash/inputFile1.d.ts declare var t: number; declare class Bar { diff --git a/tests/baselines/reference/getEmitOutputTsxFile_React.baseline b/tests/baselines/reference/getEmitOutputTsxFile_React.baseline index 2606ea7adbb..5b668fd65e8 100644 --- a/tests/baselines/reference/getEmitOutputTsxFile_React.baseline +++ b/tests/baselines/reference/getEmitOutputTsxFile_React.baseline @@ -7,7 +7,7 @@ var Bar = (function () { function Bar() { } return Bar; -})(); +}()); //# sourceMappingURL=inputFile1.js.mapFileName : tests/cases/fourslash/inputFile1.d.ts declare var t: number; declare class Bar { diff --git a/tests/baselines/reference/getEmitOutputWithDeclarationFile.baseline b/tests/baselines/reference/getEmitOutputWithDeclarationFile.baseline index 4fda32ad7c4..af4ccd10580 100644 --- a/tests/baselines/reference/getEmitOutputWithDeclarationFile.baseline +++ b/tests/baselines/reference/getEmitOutputWithDeclarationFile.baseline @@ -7,5 +7,5 @@ var Foo = (function () { function Foo() { } return Foo; -})(); +}()); diff --git a/tests/baselines/reference/getEmitOutputWithDeclarationFile2.baseline b/tests/baselines/reference/getEmitOutputWithDeclarationFile2.baseline index 3f2e0064fc7..8e43219e005 100644 --- a/tests/baselines/reference/getEmitOutputWithDeclarationFile2.baseline +++ b/tests/baselines/reference/getEmitOutputWithDeclarationFile2.baseline @@ -7,7 +7,7 @@ var Foo = (function () { function Foo() { } return Foo; -})(); +}()); exports.Foo = Foo; EmitSkipped: false diff --git a/tests/baselines/reference/getEmitOutputWithEmitterErrors.baseline b/tests/baselines/reference/getEmitOutputWithEmitterErrors.baseline index 2f27152892b..8ba493e04b7 100644 --- a/tests/baselines/reference/getEmitOutputWithEmitterErrors.baseline +++ b/tests/baselines/reference/getEmitOutputWithEmitterErrors.baseline @@ -8,7 +8,7 @@ var M; function C() { } return C; - })(); + }()); M.foo = new C(); })(M || (M = {})); diff --git a/tests/baselines/reference/getEmitOutputWithEmitterErrors2.baseline b/tests/baselines/reference/getEmitOutputWithEmitterErrors2.baseline index 915eb121f5f..bf12bd35548 100644 --- a/tests/baselines/reference/getEmitOutputWithEmitterErrors2.baseline +++ b/tests/baselines/reference/getEmitOutputWithEmitterErrors2.baseline @@ -8,7 +8,7 @@ define(["require", "exports"], function (require, exports) { function C() { } return C; - })(); + }()); var M; (function (M) { M.foo = new C(); diff --git a/tests/baselines/reference/getSetAccessorContextualTyping.js b/tests/baselines/reference/getSetAccessorContextualTyping.js index d1415e1d4e7..c717fb7d5e3 100644 --- a/tests/baselines/reference/getSetAccessorContextualTyping.js +++ b/tests/baselines/reference/getSetAccessorContextualTyping.js @@ -65,4 +65,4 @@ var C = (function () { configurable: true }); return C; -})(); +}()); diff --git a/tests/baselines/reference/getterMissingReturnError.js b/tests/baselines/reference/getterMissingReturnError.js index 76566d9346e..63fd3f57db1 100644 --- a/tests/baselines/reference/getterMissingReturnError.js +++ b/tests/baselines/reference/getterMissingReturnError.js @@ -17,4 +17,4 @@ var test = (function () { configurable: true }); return test; -})(); +}()); diff --git a/tests/baselines/reference/getterThatThrowsShouldNotNeedReturn.js b/tests/baselines/reference/getterThatThrowsShouldNotNeedReturn.js index c48e5c9c6bc..e38058fbebf 100644 --- a/tests/baselines/reference/getterThatThrowsShouldNotNeedReturn.js +++ b/tests/baselines/reference/getterThatThrowsShouldNotNeedReturn.js @@ -24,4 +24,4 @@ var Greeter = (function () { throw ''; // should not raise an error }; return Greeter; -})(); +}()); diff --git a/tests/baselines/reference/gettersAndSetters.js b/tests/baselines/reference/gettersAndSetters.js index 92f959e5988..16d66c7dc71 100644 --- a/tests/baselines/reference/gettersAndSetters.js +++ b/tests/baselines/reference/gettersAndSetters.js @@ -67,7 +67,7 @@ var C = (function () { }); C.barBack = ""; return C; -})(); +}()); var c = new C(); var foo = c.Foo; c.Foo = "foov"; diff --git a/tests/baselines/reference/gettersAndSettersAccessibility.js b/tests/baselines/reference/gettersAndSettersAccessibility.js index e0cfa3d17c5..b3b8d008d1e 100644 --- a/tests/baselines/reference/gettersAndSettersAccessibility.js +++ b/tests/baselines/reference/gettersAndSettersAccessibility.js @@ -17,4 +17,4 @@ var C99 = (function () { configurable: true }); return C99; -})(); +}()); diff --git a/tests/baselines/reference/gettersAndSettersErrors.js b/tests/baselines/reference/gettersAndSettersErrors.js index d92f0d833f5..5c9c56b67cf 100644 --- a/tests/baselines/reference/gettersAndSettersErrors.js +++ b/tests/baselines/reference/gettersAndSettersErrors.js @@ -38,7 +38,7 @@ var C = (function () { configurable: true }); return C; -})(); +}()); var E = (function () { function E() { } @@ -50,4 +50,4 @@ var E = (function () { configurable: true }); return E; -})(); +}()); diff --git a/tests/baselines/reference/gettersAndSettersTypesAgree.js b/tests/baselines/reference/gettersAndSettersTypesAgree.js index 91d3d844981..86802a30431 100644 --- a/tests/baselines/reference/gettersAndSettersTypesAgree.js +++ b/tests/baselines/reference/gettersAndSettersTypesAgree.js @@ -31,6 +31,6 @@ var C = (function () { configurable: true }); return C; -})(); +}()); var o1 = { get Foo() { return 0; }, set Foo(val) { } }; // ok - types agree (inference) var o2 = { get Foo() { return 0; }, set Foo(val) { } }; // ok - types agree diff --git a/tests/baselines/reference/giant.js b/tests/baselines/reference/giant.js index 75387f6f2c2..2a04541ef28 100644 --- a/tests/baselines/reference/giant.js +++ b/tests/baselines/reference/giant.js @@ -743,7 +743,7 @@ define(["require", "exports"], function (require, exports) { configurable: true }); return C; - })(); + }()); var M; (function (M_1) { var V; @@ -792,7 +792,7 @@ define(["require", "exports"], function (require, exports) { configurable: true }); return C; - })(); + }()); var M; (function (M) { var V; @@ -802,7 +802,7 @@ define(["require", "exports"], function (require, exports) { function C() { } return C; - })(); + }()); ; ; ; @@ -813,7 +813,7 @@ define(["require", "exports"], function (require, exports) { function eC() { } return eC; - })(); + }()); M.eC = eC; ; ; @@ -868,7 +868,7 @@ define(["require", "exports"], function (require, exports) { configurable: true }); return eC; - })(); + }()); M_1.eC = eC; var eM; (function (eM) { @@ -879,7 +879,7 @@ define(["require", "exports"], function (require, exports) { function C() { } return C; - })(); + }()); ; ; ; @@ -890,7 +890,7 @@ define(["require", "exports"], function (require, exports) { function eC() { } return eC; - })(); + }()); eM.eC = eC; ; ; @@ -947,7 +947,7 @@ define(["require", "exports"], function (require, exports) { configurable: true }); return eC; - })(); + }()); exports.eC = eC; var eM; (function (eM_1) { @@ -997,7 +997,7 @@ define(["require", "exports"], function (require, exports) { configurable: true }); return C; - })(); + }()); var M; (function (M) { var V; @@ -1007,7 +1007,7 @@ define(["require", "exports"], function (require, exports) { function C() { } return C; - })(); + }()); ; ; ; @@ -1018,7 +1018,7 @@ define(["require", "exports"], function (require, exports) { function eC() { } return eC; - })(); + }()); M.eC = eC; ; ; @@ -1073,7 +1073,7 @@ define(["require", "exports"], function (require, exports) { configurable: true }); return eC; - })(); + }()); eM_1.eC = eC; var eM; (function (eM) { @@ -1084,7 +1084,7 @@ define(["require", "exports"], function (require, exports) { function C() { } return C; - })(); + }()); ; ; ; @@ -1095,7 +1095,7 @@ define(["require", "exports"], function (require, exports) { function eC() { } return eC; - })(); + }()); eM.eC = eC; ; ; diff --git a/tests/baselines/reference/grammarAmbiguities1.js b/tests/baselines/reference/grammarAmbiguities1.js index 1917acb7128..f650030fd44 100644 --- a/tests/baselines/reference/grammarAmbiguities1.js +++ b/tests/baselines/reference/grammarAmbiguities1.js @@ -16,13 +16,13 @@ var A = (function () { } A.prototype.foo = function () { }; return A; -})(); +}()); var B = (function () { function B() { } B.prototype.bar = function () { }; return B; -})(); +}()); function f(x) { return x; } function g(x) { return f(x); } g(7); diff --git a/tests/baselines/reference/heterogeneousArrayAndOverloads.js b/tests/baselines/reference/heterogeneousArrayAndOverloads.js index b816b87e3d1..b9ef4bc4b6e 100644 --- a/tests/baselines/reference/heterogeneousArrayAndOverloads.js +++ b/tests/baselines/reference/heterogeneousArrayAndOverloads.js @@ -23,4 +23,4 @@ var arrTest = (function () { this.test([1, 2, "hi", 5]); // Error }; return arrTest; -})(); +}()); diff --git a/tests/baselines/reference/heterogeneousArrayLiterals.js b/tests/baselines/reference/heterogeneousArrayLiterals.js index 45ea6429979..e482f0d33d3 100644 --- a/tests/baselines/reference/heterogeneousArrayLiterals.js +++ b/tests/baselines/reference/heterogeneousArrayLiterals.js @@ -156,21 +156,21 @@ var Base = (function () { function Base() { } return Base; -})(); +}()); var Derived = (function (_super) { __extends(Derived, _super); function Derived() { _super.apply(this, arguments); } return Derived; -})(Base); +}(Base)); var Derived2 = (function (_super) { __extends(Derived2, _super); function Derived2() { _super.apply(this, arguments); } return Derived2; -})(Base); +}(Base)); var base; var derived; var derived2; diff --git a/tests/baselines/reference/ifDoWhileStatements.js b/tests/baselines/reference/ifDoWhileStatements.js index a2553c674b0..75762ffbb54 100644 --- a/tests/baselines/reference/ifDoWhileStatements.js +++ b/tests/baselines/reference/ifDoWhileStatements.js @@ -173,19 +173,19 @@ var C = (function () { function C() { } return C; -})(); +}()); var C2 = (function (_super) { __extends(C2, _super); function C2() { _super.apply(this, arguments); } return C2; -})(C); +}(C)); var D = (function () { function D() { } return D; -})(); +}()); function F(x) { return 42; } function F2(x) { return x < 42; } var M; @@ -194,7 +194,7 @@ var M; function A() { } return A; - })(); + }()); M.A = A; function F2(x) { return x.toString(); } M.F2 = F2; @@ -205,7 +205,7 @@ var N; function A() { } return A; - })(); + }()); N.A = A; function F2(x) { return x.toString(); } N.F2 = F2; diff --git a/tests/baselines/reference/illegalModifiersOnClassElements.js b/tests/baselines/reference/illegalModifiersOnClassElements.js index b9a40fa6aa0..dc1b3682603 100644 --- a/tests/baselines/reference/illegalModifiersOnClassElements.js +++ b/tests/baselines/reference/illegalModifiersOnClassElements.js @@ -11,4 +11,4 @@ var C = (function () { this.bar = 1; } return C; -})(); +}()); diff --git a/tests/baselines/reference/illegalSuperCallsInConstructor.js b/tests/baselines/reference/illegalSuperCallsInConstructor.js index c3a52473744..88671ce1cee 100644 --- a/tests/baselines/reference/illegalSuperCallsInConstructor.js +++ b/tests/baselines/reference/illegalSuperCallsInConstructor.js @@ -30,7 +30,7 @@ var Base = (function () { function Base() { } return Base; -})(); +}()); var Derived = (function (_super) { __extends(Derived, _super); function Derived() { @@ -48,4 +48,4 @@ var Derived = (function (_super) { }; } return Derived; -})(Base); +}(Base)); diff --git a/tests/baselines/reference/implementClausePrecedingExtends.js b/tests/baselines/reference/implementClausePrecedingExtends.js index a929c2fb966..ba3583c3051 100644 --- a/tests/baselines/reference/implementClausePrecedingExtends.js +++ b/tests/baselines/reference/implementClausePrecedingExtends.js @@ -12,11 +12,11 @@ var C = (function () { function C() { } return C; -})(); +}()); var D = (function (_super) { __extends(D, _super); function D() { _super.apply(this, arguments); } return D; -})(C); +}(C)); diff --git a/tests/baselines/reference/implementGenericWithMismatchedTypes.js b/tests/baselines/reference/implementGenericWithMismatchedTypes.js index a030ebc3c1d..e9c3a0e0ffd 100644 --- a/tests/baselines/reference/implementGenericWithMismatchedTypes.js +++ b/tests/baselines/reference/implementGenericWithMismatchedTypes.js @@ -30,7 +30,7 @@ var C = (function () { return null; }; return C; -})(); +}()); var C2 = (function () { function C2() { } @@ -38,4 +38,4 @@ var C2 = (function () { return null; }; return C2; -})(); +}()); diff --git a/tests/baselines/reference/implementInterfaceAnyMemberWithVoid.js b/tests/baselines/reference/implementInterfaceAnyMemberWithVoid.js index 16e904c3497..ec2406f65fd 100644 --- a/tests/baselines/reference/implementInterfaceAnyMemberWithVoid.js +++ b/tests/baselines/reference/implementInterfaceAnyMemberWithVoid.js @@ -16,4 +16,4 @@ var Bug = (function () { Bug.prototype.foo = function (value) { }; return Bug; -})(); +}()); diff --git a/tests/baselines/reference/implementPublicPropertyAsPrivate.js b/tests/baselines/reference/implementPublicPropertyAsPrivate.js index 4a946801da3..8980fba52f3 100644 --- a/tests/baselines/reference/implementPublicPropertyAsPrivate.js +++ b/tests/baselines/reference/implementPublicPropertyAsPrivate.js @@ -12,4 +12,4 @@ var C = (function () { this.x = 0; // should raise error at class decl } return C; -})(); +}()); diff --git a/tests/baselines/reference/implementingAnInterfaceExtendingClassWithPrivates.js b/tests/baselines/reference/implementingAnInterfaceExtendingClassWithPrivates.js index adb0271e7a5..835f37a2eed 100644 --- a/tests/baselines/reference/implementingAnInterfaceExtendingClassWithPrivates.js +++ b/tests/baselines/reference/implementingAnInterfaceExtendingClassWithPrivates.js @@ -29,24 +29,24 @@ var Foo = (function () { function Foo() { } return Foo; -})(); +}()); var Bar = (function () { function Bar() { } return Bar; -})(); +}()); var Bar2 = (function () { function Bar2() { } return Bar2; -})(); +}()); var Bar3 = (function () { function Bar3() { } return Bar3; -})(); +}()); var Bar4 = (function () { function Bar4() { } return Bar4; -})(); +}()); diff --git a/tests/baselines/reference/implementingAnInterfaceExtendingClassWithPrivates2.js b/tests/baselines/reference/implementingAnInterfaceExtendingClassWithPrivates2.js index cfa5ccf4150..8fec5dc27da 100644 --- a/tests/baselines/reference/implementingAnInterfaceExtendingClassWithPrivates2.js +++ b/tests/baselines/reference/implementingAnInterfaceExtendingClassWithPrivates2.js @@ -95,28 +95,28 @@ var Foo = (function () { function Foo() { } return Foo; -})(); +}()); var Bar = (function (_super) { __extends(Bar, _super); function Bar() { _super.apply(this, arguments); } return Bar; -})(Foo); +}(Foo)); var Bar2 = (function (_super) { __extends(Bar2, _super); function Bar2() { _super.apply(this, arguments); } return Bar2; -})(Foo); +}(Foo)); var Bar3 = (function (_super) { __extends(Bar3, _super); function Bar3() { _super.apply(this, arguments); } return Bar3; -})(Foo); +}(Foo)); // another level of indirection var M; (function (M) { @@ -124,35 +124,35 @@ var M; function Foo() { } return Foo; - })(); + }()); var Baz = (function (_super) { __extends(Baz, _super); function Baz() { _super.apply(this, arguments); } return Baz; - })(Foo); + }(Foo)); var Bar = (function (_super) { __extends(Bar, _super); function Bar() { _super.apply(this, arguments); } return Bar; - })(Foo); + }(Foo)); var Bar2 = (function (_super) { __extends(Bar2, _super); function Bar2() { _super.apply(this, arguments); } return Bar2; - })(Foo); + }(Foo)); var Bar3 = (function (_super) { __extends(Bar3, _super); function Bar3() { _super.apply(this, arguments); } return Bar3; - })(Foo); + }(Foo)); })(M || (M = {})); // two levels of privates var M2; @@ -161,21 +161,21 @@ var M2; function Foo() { } return Foo; - })(); + }()); var Baz = (function (_super) { __extends(Baz, _super); function Baz() { _super.apply(this, arguments); } return Baz; - })(Foo); + }(Foo)); var Bar = (function (_super) { __extends(Bar, _super); function Bar() { _super.apply(this, arguments); } return Bar; - })(Foo); + }(Foo)); var b; var r1 = b.z; var r2 = b.x; // error @@ -186,12 +186,12 @@ var M2; _super.apply(this, arguments); } return Bar2; - })(Foo); + }(Foo)); var Bar3 = (function (_super) { __extends(Bar3, _super); function Bar3() { _super.apply(this, arguments); } return Bar3; - })(Foo); + }(Foo)); })(M2 || (M2 = {})); diff --git a/tests/baselines/reference/implementingAnInterfaceExtendingClassWithProtecteds.js b/tests/baselines/reference/implementingAnInterfaceExtendingClassWithProtecteds.js index 39f30424321..915e652056c 100644 --- a/tests/baselines/reference/implementingAnInterfaceExtendingClassWithProtecteds.js +++ b/tests/baselines/reference/implementingAnInterfaceExtendingClassWithProtecteds.js @@ -51,52 +51,52 @@ var Foo = (function () { function Foo() { } return Foo; -})(); +}()); var Bar = (function () { function Bar() { } return Bar; -})(); +}()); var Bar2 = (function () { function Bar2() { } return Bar2; -})(); +}()); var Bar3 = (function () { function Bar3() { } return Bar3; -})(); +}()); var Bar4 = (function () { function Bar4() { } return Bar4; -})(); +}()); var Bar5 = (function (_super) { __extends(Bar5, _super); function Bar5() { _super.apply(this, arguments); } return Bar5; -})(Foo); +}(Foo)); var Bar6 = (function (_super) { __extends(Bar6, _super); function Bar6() { _super.apply(this, arguments); } return Bar6; -})(Foo); +}(Foo)); var Bar7 = (function (_super) { __extends(Bar7, _super); function Bar7() { _super.apply(this, arguments); } return Bar7; -})(Foo); +}(Foo)); var Bar8 = (function (_super) { __extends(Bar8, _super); function Bar8() { _super.apply(this, arguments); } return Bar8; -})(Foo); +}(Foo)); diff --git a/tests/baselines/reference/implementsClauseAlreadySeen.js b/tests/baselines/reference/implementsClauseAlreadySeen.js index abb28886615..0aa3afe4b3e 100644 --- a/tests/baselines/reference/implementsClauseAlreadySeen.js +++ b/tests/baselines/reference/implementsClauseAlreadySeen.js @@ -11,10 +11,10 @@ var C = (function () { function C() { } return C; -})(); +}()); var D = (function () { function D() { } D.prototype.baz = function () { }; return D; -})(); +}()); diff --git a/tests/baselines/reference/implementsInClassExpression.js b/tests/baselines/reference/implementsInClassExpression.js index 9ac092289f5..eefd058ec2e 100644 --- a/tests/baselines/reference/implementsInClassExpression.js +++ b/tests/baselines/reference/implementsInClassExpression.js @@ -13,4 +13,4 @@ var cls = (function () { } class_1.prototype.doThing = function () { }; return class_1; -})(); +}()); diff --git a/tests/baselines/reference/implicitAnyAnyReturningFunction.js b/tests/baselines/reference/implicitAnyAnyReturningFunction.js index 2ba13835f28..13fe799a852 100644 --- a/tests/baselines/reference/implicitAnyAnyReturningFunction.js +++ b/tests/baselines/reference/implicitAnyAnyReturningFunction.js @@ -39,7 +39,7 @@ var C = (function () { return someLocal; }; return C; -})(); +}()); //// [implicitAnyAnyReturningFunction.d.ts] diff --git a/tests/baselines/reference/implicitAnyCastedValue.js b/tests/baselines/reference/implicitAnyCastedValue.js index be6bd1bfef3..372f14647a1 100644 --- a/tests/baselines/reference/implicitAnyCastedValue.js +++ b/tests/baselines/reference/implicitAnyCastedValue.js @@ -104,7 +104,7 @@ var C = (function () { return this.foo; // this should not be an error }; return C; -})(); +}()); var C1 = (function () { function C1() { this.getValue = null; // this should be an error @@ -124,7 +124,7 @@ var C1 = (function () { configurable: true }); return C1; -})(); +}()); function castedNull() { return null; // this should not be an error } diff --git a/tests/baselines/reference/implicitAnyDeclareMemberWithoutType2.js b/tests/baselines/reference/implicitAnyDeclareMemberWithoutType2.js index 59d625fff4a..a3a2e3d4b31 100644 --- a/tests/baselines/reference/implicitAnyDeclareMemberWithoutType2.js +++ b/tests/baselines/reference/implicitAnyDeclareMemberWithoutType2.js @@ -17,4 +17,4 @@ var C = (function () { } // error at "c1, c2" C.prototype.funcOfC = function (f1, f2, f3) { }; // error at "f1,f2" return C; -})(); +}()); diff --git a/tests/baselines/reference/implicitAnyDeclareTypePropertyWithoutType.js b/tests/baselines/reference/implicitAnyDeclareTypePropertyWithoutType.js index 63f90a1aaa7..70c90f4c484 100644 --- a/tests/baselines/reference/implicitAnyDeclareTypePropertyWithoutType.js +++ b/tests/baselines/reference/implicitAnyDeclareTypePropertyWithoutType.js @@ -22,7 +22,7 @@ var C = (function () { function C() { } return C; -})(); +}()); // this should be an error var x; // error at "y,z" var x1; // error at "z1" diff --git a/tests/baselines/reference/implicitAnyFromCircularInference.js b/tests/baselines/reference/implicitAnyFromCircularInference.js index d818ea17105..9fa4f3ff225 100644 --- a/tests/baselines/reference/implicitAnyFromCircularInference.js +++ b/tests/baselines/reference/implicitAnyFromCircularInference.js @@ -81,7 +81,7 @@ var C = (function () { this.s = foo(this); } return C; -})(); +}()); var D = (function () { function D() { } @@ -94,4 +94,4 @@ var D = (function () { configurable: true }); return D; -})(); +}()); diff --git a/tests/baselines/reference/implicitAnyFunctionInvocationWithAnyArguements.js b/tests/baselines/reference/implicitAnyFunctionInvocationWithAnyArguements.js index bc5b9453665..ce25562841c 100644 --- a/tests/baselines/reference/implicitAnyFunctionInvocationWithAnyArguements.js +++ b/tests/baselines/reference/implicitAnyFunctionInvocationWithAnyArguements.js @@ -65,7 +65,7 @@ var C = (function () { function C(emtpyArray, variable) { } return C; -})(); +}()); var newC = new C([], undefined); var newC1 = new C([], arg0); var newC2 = new C([], null); diff --git a/tests/baselines/reference/implicitAnyFunctionReturnNullOrUndefined.js b/tests/baselines/reference/implicitAnyFunctionReturnNullOrUndefined.js index 82eb56fbde6..69740a0ad31 100644 --- a/tests/baselines/reference/implicitAnyFunctionReturnNullOrUndefined.js +++ b/tests/baselines/reference/implicitAnyFunctionReturnNullOrUndefined.js @@ -38,7 +38,7 @@ var C = (function () { return undefined; }; return C; -})(); +}()); // this should not be an error function foo1() { return null; } function bar1() { return undefined; } diff --git a/tests/baselines/reference/implicitAnyGenerics.js b/tests/baselines/reference/implicitAnyGenerics.js index daea0dfe54c..07478cf0011 100644 --- a/tests/baselines/reference/implicitAnyGenerics.js +++ b/tests/baselines/reference/implicitAnyGenerics.js @@ -31,7 +31,7 @@ var C = (function () { function C() { } return C; -})(); +}()); var c = new C(); var c2 = new C(); var c3 = new C(); @@ -40,7 +40,7 @@ var D = (function () { function D(x) { } return D; -})(); +}()); var d = new D(null); var d2 = new D(1); var d3 = new D(1); diff --git a/tests/baselines/reference/implicitAnyGetAndSetAccessorWithAnyReturnType.js b/tests/baselines/reference/implicitAnyGetAndSetAccessorWithAnyReturnType.js index ac3b5e66493..3997a56db0d 100644 --- a/tests/baselines/reference/implicitAnyGetAndSetAccessorWithAnyReturnType.js +++ b/tests/baselines/reference/implicitAnyGetAndSetAccessorWithAnyReturnType.js @@ -41,7 +41,7 @@ var GetAndSet = (function () { configurable: true }); return GetAndSet; -})(); +}()); var SetterOnly = (function () { function SetterOnly() { } @@ -52,7 +52,7 @@ var SetterOnly = (function () { configurable: true }); return SetterOnly; -})(); +}()); var GetterOnly = (function () { function GetterOnly() { } @@ -64,4 +64,4 @@ var GetterOnly = (function () { configurable: true }); return GetterOnly; -})(); +}()); diff --git a/tests/baselines/reference/implicitAnyInCatch.js b/tests/baselines/reference/implicitAnyInCatch.js index c35e92372e3..f833135f00d 100644 --- a/tests/baselines/reference/implicitAnyInCatch.js +++ b/tests/baselines/reference/implicitAnyInCatch.js @@ -29,4 +29,4 @@ var C = (function () { } }; return C; -})(); +}()); diff --git a/tests/baselines/reference/implicitAnyWidenToAny.js b/tests/baselines/reference/implicitAnyWidenToAny.js index 838593a88ef..0779a166744 100644 --- a/tests/baselines/reference/implicitAnyWidenToAny.js +++ b/tests/baselines/reference/implicitAnyWidenToAny.js @@ -38,7 +38,7 @@ var AnimalObj = (function () { function AnimalObj() { } return AnimalObj; -})(); +}()); var foo = 5; var bar = "Hello World"; var foo1 = null; diff --git a/tests/baselines/reference/importAliasIdentifiers.js b/tests/baselines/reference/importAliasIdentifiers.js index 7bd15b28c66..084b6694e9c 100644 --- a/tests/baselines/reference/importAliasIdentifiers.js +++ b/tests/baselines/reference/importAliasIdentifiers.js @@ -55,7 +55,7 @@ var moduleA; this.y = y; } return Point; - })(); + }()); moduleA.Point = Point; })(moduleA || (moduleA = {})); var alias = moduleA; @@ -66,7 +66,7 @@ var clodule = (function () { function clodule() { } return clodule; -})(); +}()); var clodule; (function (clodule) { var Point = { x: 0, y: 0 }; diff --git a/tests/baselines/reference/importAndVariableDeclarationConflict2.js b/tests/baselines/reference/importAndVariableDeclarationConflict2.js index 6d188b373b7..221fd20e7ec 100644 --- a/tests/baselines/reference/importAndVariableDeclarationConflict2.js +++ b/tests/baselines/reference/importAndVariableDeclarationConflict2.js @@ -24,4 +24,4 @@ var C = (function () { var x = ''; }; return C; -})(); +}()); diff --git a/tests/baselines/reference/importAsBaseClass.js b/tests/baselines/reference/importAsBaseClass.js index 5340c3049a2..60e142dd5f7 100644 --- a/tests/baselines/reference/importAsBaseClass.js +++ b/tests/baselines/reference/importAsBaseClass.js @@ -17,7 +17,7 @@ var Greeter = (function () { } Greeter.prototype.greet = function () { return 'greet'; }; return Greeter; -})(); +}()); exports.Greeter = Greeter; //// [importAsBaseClass_1.js] "use strict"; @@ -33,4 +33,4 @@ var Hello = (function (_super) { _super.apply(this, arguments); } return Hello; -})(Greeter); +}(Greeter)); diff --git a/tests/baselines/reference/importDecl.js b/tests/baselines/reference/importDecl.js index c7cc4fe8332..47bf5a1b2a1 100644 --- a/tests/baselines/reference/importDecl.js +++ b/tests/baselines/reference/importDecl.js @@ -87,7 +87,7 @@ var d = (function () { function d() { } return d; -})(); +}()); exports.d = d; function foo() { return null; } exports.foo = foo; @@ -97,7 +97,7 @@ var d = (function () { function d() { } return d; -})(); +}()); exports.d = d; var x; function foo() { return null; } @@ -108,7 +108,7 @@ var d = (function () { function d() { } return d; -})(); +}()); exports.d = d; function foo() { return null; } exports.foo = foo; @@ -118,7 +118,7 @@ var d = (function () { function d() { } return d; -})(); +}()); exports.d = d; function foo() { return null; } exports.foo = foo; diff --git a/tests/baselines/reference/importDeclarationUsedAsTypeQuery.js b/tests/baselines/reference/importDeclarationUsedAsTypeQuery.js index 958b154cd28..c2cc0b8ea7a 100644 --- a/tests/baselines/reference/importDeclarationUsedAsTypeQuery.js +++ b/tests/baselines/reference/importDeclarationUsedAsTypeQuery.js @@ -17,7 +17,7 @@ var B = (function () { function B() { } return B; -})(); +}()); exports.B = B; //// [importDeclarationUsedAsTypeQuery_1.js] "use strict"; diff --git a/tests/baselines/reference/importImportOnlyModule.js b/tests/baselines/reference/importImportOnlyModule.js index 31932455784..7b41e4400c5 100644 --- a/tests/baselines/reference/importImportOnlyModule.js +++ b/tests/baselines/reference/importImportOnlyModule.js @@ -24,7 +24,7 @@ define(["require", "exports"], function (require, exports) { } C1.s1 = true; return C1; - })(); + }()); exports.C1 = C1; }); //// [foo_1.js] diff --git a/tests/baselines/reference/importInTypePosition.js b/tests/baselines/reference/importInTypePosition.js index c0d64a4ef7b..542c6f34a48 100644 --- a/tests/baselines/reference/importInTypePosition.js +++ b/tests/baselines/reference/importInTypePosition.js @@ -30,7 +30,7 @@ var A; this.y = y; } return Point; - })(); + }()); A.Point = Point; A.Origin = new Point(0, 0); })(A || (A = {})); diff --git a/tests/baselines/reference/importShadowsGlobalName.js b/tests/baselines/reference/importShadowsGlobalName.js index cd0cd1791eb..dbbf1710632 100644 --- a/tests/baselines/reference/importShadowsGlobalName.js +++ b/tests/baselines/reference/importShadowsGlobalName.js @@ -17,7 +17,7 @@ define(["require", "exports"], function (require, exports) { function Foo() { } return Foo; - })(); + }()); return Foo; }); //// [Bar.js] @@ -34,6 +34,6 @@ define(["require", "exports", 'Foo'], function (require, exports, Error) { _super.apply(this, arguments); } return Bar; - })(Error); + }(Error)); return Bar; }); diff --git a/tests/baselines/reference/importStatements.js b/tests/baselines/reference/importStatements.js index b8d06a3546e..a91b54f3a6d 100644 --- a/tests/baselines/reference/importStatements.js +++ b/tests/baselines/reference/importStatements.js @@ -43,7 +43,7 @@ var A; this.y = y; } return Point; - })(); + }()); A.Point = Point; A.Origin = new Point(0, 0); })(A || (A = {})); diff --git a/tests/baselines/reference/importUsedInExtendsList1.js b/tests/baselines/reference/importUsedInExtendsList1.js index 7fa341cd28a..1d242a53023 100644 --- a/tests/baselines/reference/importUsedInExtendsList1.js +++ b/tests/baselines/reference/importUsedInExtendsList1.js @@ -17,7 +17,7 @@ var Super = (function () { function Super() { } return Super; -})(); +}()); exports.Super = Super; //// [importUsedInExtendsList1_1.js] "use strict"; @@ -34,6 +34,6 @@ var Sub = (function (_super) { _super.apply(this, arguments); } return Sub; -})(foo.Super); +}(foo.Super)); var s; var r = s.foo; diff --git a/tests/baselines/reference/import_reference-exported-alias.js b/tests/baselines/reference/import_reference-exported-alias.js index 68d2ee34671..ffc4491e50a 100644 --- a/tests/baselines/reference/import_reference-exported-alias.js +++ b/tests/baselines/reference/import_reference-exported-alias.js @@ -35,7 +35,7 @@ define(["require", "exports"], function (require, exports) { return "Bill Gates"; }; return UserServices; - })(); + }()); Services.UserServices = UserServices; })(Services = App.Services || (App.Services = {})); })(App || (App = {})); diff --git a/tests/baselines/reference/import_reference-to-type-alias.js b/tests/baselines/reference/import_reference-to-type-alias.js index 6f329afbf54..1d91f10f672 100644 --- a/tests/baselines/reference/import_reference-to-type-alias.js +++ b/tests/baselines/reference/import_reference-to-type-alias.js @@ -31,7 +31,7 @@ define(["require", "exports"], function (require, exports) { return "Bill Gates"; }; return UserServices; - })(); + }()); Services.UserServices = UserServices; })(Services = App.Services || (App.Services = {})); })(App = exports.App || (exports.App = {})); diff --git a/tests/baselines/reference/import_var-referencing-an-imported-module-alias.js b/tests/baselines/reference/import_var-referencing-an-imported-module-alias.js index ed6470751ed..d67c53c6349 100644 --- a/tests/baselines/reference/import_var-referencing-an-imported-module-alias.js +++ b/tests/baselines/reference/import_var-referencing-an-imported-module-alias.js @@ -17,7 +17,7 @@ define(["require", "exports"], function (require, exports) { function Host() { } return Host; - })(); + }()); exports.Host = Host; }); //// [consumer.js] diff --git a/tests/baselines/reference/importedAliasesInTypePositions.js b/tests/baselines/reference/importedAliasesInTypePositions.js index d342deedef2..754bac96c2c 100644 --- a/tests/baselines/reference/importedAliasesInTypePositions.js +++ b/tests/baselines/reference/importedAliasesInTypePositions.js @@ -35,7 +35,7 @@ define(["require", "exports"], function (require, exports) { ReferredTo.prototype.doSomething = function () { }; return ReferredTo; - })(); + }()); name.ReferredTo = ReferredTo; })(name = mod.name || (mod.name = {})); })(mod = nested.mod || (nested.mod = {})); @@ -52,6 +52,6 @@ define(["require", "exports"], function (require, exports) { this.referred = referred; } return UsesReferredType; - })(); + }()); })(ImportingModule = exports.ImportingModule || (exports.ImportingModule = {})); }); diff --git a/tests/baselines/reference/importedModuleAddToGlobal.js b/tests/baselines/reference/importedModuleAddToGlobal.js index 015631dc965..b74b96f2eb6 100644 --- a/tests/baselines/reference/importedModuleAddToGlobal.js +++ b/tests/baselines/reference/importedModuleAddToGlobal.js @@ -23,7 +23,7 @@ var B; function B() { } return B; - })(); + }()); B_1.B = B; })(B || (B = {})); var C; diff --git a/tests/baselines/reference/importedModuleClassNameClash.js b/tests/baselines/reference/importedModuleClassNameClash.js index a12ab331c48..8f9649c6768 100644 --- a/tests/baselines/reference/importedModuleClassNameClash.js +++ b/tests/baselines/reference/importedModuleClassNameClash.js @@ -13,5 +13,5 @@ define(["require", "exports"], function (require, exports) { function foo() { } return foo; - })(); + }()); }); diff --git a/tests/baselines/reference/inOperatorWithGeneric.js b/tests/baselines/reference/inOperatorWithGeneric.js index b34d510f5a3..eb2df95bbde 100644 --- a/tests/baselines/reference/inOperatorWithGeneric.js +++ b/tests/baselines/reference/inOperatorWithGeneric.js @@ -15,4 +15,4 @@ var C = (function () { } }; return C; -})(); +}()); diff --git a/tests/baselines/reference/incompatibleTypes.js b/tests/baselines/reference/incompatibleTypes.js index 7e24afecf5f..6f786aee354 100644 --- a/tests/baselines/reference/incompatibleTypes.js +++ b/tests/baselines/reference/incompatibleTypes.js @@ -83,7 +83,7 @@ var C1 = (function () { return "s"; }; return C1; -})(); +}()); var C2 = (function () { function C2() { } @@ -91,17 +91,17 @@ var C2 = (function () { return 0; }; return C2; -})(); +}()); var C3 = (function () { function C3() { } return C3; -})(); +}()); var C4 = (function () { function C4() { } return C4; -})(); +}()); function if1(a) { } var c1; var c2; diff --git a/tests/baselines/reference/incorrectClassOverloadChain.js b/tests/baselines/reference/incorrectClassOverloadChain.js index bf02a09014c..8ebbc11d90e 100644 --- a/tests/baselines/reference/incorrectClassOverloadChain.js +++ b/tests/baselines/reference/incorrectClassOverloadChain.js @@ -11,4 +11,4 @@ var C = (function () { this.x = 1; } return C; -})(); +}()); diff --git a/tests/baselines/reference/incrementOnTypeParameter.js b/tests/baselines/reference/incrementOnTypeParameter.js index bec2bcd9d05..2f3de20c419 100644 --- a/tests/baselines/reference/incrementOnTypeParameter.js +++ b/tests/baselines/reference/incrementOnTypeParameter.js @@ -19,4 +19,4 @@ var C = (function () { } }; return C; -})(); +}()); diff --git a/tests/baselines/reference/incrementOperatorWithAnyOtherType.js b/tests/baselines/reference/incrementOperatorWithAnyOtherType.js index 6cd7afc5a60..e99340a53e2 100644 --- a/tests/baselines/reference/incrementOperatorWithAnyOtherType.js +++ b/tests/baselines/reference/incrementOperatorWithAnyOtherType.js @@ -58,7 +58,7 @@ var A = (function () { function A() { } return A; -})(); +}()); var M; (function (M) { })(M || (M = {})); diff --git a/tests/baselines/reference/incrementOperatorWithAnyOtherTypeInvalidOperations.js b/tests/baselines/reference/incrementOperatorWithAnyOtherTypeInvalidOperations.js index 73ec64dfc55..636ca74ba08 100644 --- a/tests/baselines/reference/incrementOperatorWithAnyOtherTypeInvalidOperations.js +++ b/tests/baselines/reference/incrementOperatorWithAnyOtherTypeInvalidOperations.js @@ -87,7 +87,7 @@ var A = (function () { return a; }; return A; -})(); +}()); var M; (function (M) { })(M || (M = {})); diff --git a/tests/baselines/reference/incrementOperatorWithNumberType.js b/tests/baselines/reference/incrementOperatorWithNumberType.js index cf7ce435cb0..16a56b45a20 100644 --- a/tests/baselines/reference/incrementOperatorWithNumberType.js +++ b/tests/baselines/reference/incrementOperatorWithNumberType.js @@ -47,7 +47,7 @@ var A = (function () { function A() { } return A; -})(); +}()); var M; (function (M) { })(M || (M = {})); diff --git a/tests/baselines/reference/incrementOperatorWithNumberTypeInvalidOperations.js b/tests/baselines/reference/incrementOperatorWithNumberTypeInvalidOperations.js index 17820b7bd86..0bdb75eb0fa 100644 --- a/tests/baselines/reference/incrementOperatorWithNumberTypeInvalidOperations.js +++ b/tests/baselines/reference/incrementOperatorWithNumberTypeInvalidOperations.js @@ -56,7 +56,7 @@ var A = (function () { } A.foo = function () { return 1; }; return A; -})(); +}()); var M; (function (M) { })(M || (M = {})); diff --git a/tests/baselines/reference/incrementOperatorWithUnsupportedBooleanType.js b/tests/baselines/reference/incrementOperatorWithUnsupportedBooleanType.js index 5bdba8dfee5..4e936e33514 100644 --- a/tests/baselines/reference/incrementOperatorWithUnsupportedBooleanType.js +++ b/tests/baselines/reference/incrementOperatorWithUnsupportedBooleanType.js @@ -63,7 +63,7 @@ var A = (function () { } A.foo = function () { return true; }; return A; -})(); +}()); var M; (function (M) { })(M || (M = {})); diff --git a/tests/baselines/reference/incrementOperatorWithUnsupportedStringType.js b/tests/baselines/reference/incrementOperatorWithUnsupportedStringType.js index baeaf9555fb..781251d56b9 100644 --- a/tests/baselines/reference/incrementOperatorWithUnsupportedStringType.js +++ b/tests/baselines/reference/incrementOperatorWithUnsupportedStringType.js @@ -75,7 +75,7 @@ var A = (function () { } A.foo = function () { return ""; }; return A; -})(); +}()); var M; (function (M) { })(M || (M = {})); diff --git a/tests/baselines/reference/indexClassByNumber.js b/tests/baselines/reference/indexClassByNumber.js index 1725e5bf6a1..8d5ecda30f5 100644 --- a/tests/baselines/reference/indexClassByNumber.js +++ b/tests/baselines/reference/indexClassByNumber.js @@ -13,6 +13,6 @@ var foo = (function () { function foo() { } return foo; -})(); +}()); var f = new foo(); f[0] = 4; // Shouldn't be allowed diff --git a/tests/baselines/reference/indexSignatureMustHaveTypeAnnotation.js b/tests/baselines/reference/indexSignatureMustHaveTypeAnnotation.js index f586a19bf0e..2aec01d1ff7 100644 --- a/tests/baselines/reference/indexSignatureMustHaveTypeAnnotation.js +++ b/tests/baselines/reference/indexSignatureMustHaveTypeAnnotation.js @@ -20,9 +20,9 @@ var C = (function () { function C() { } return C; -})(); +}()); var C2 = (function () { function C2() { } return C2; -})(); +}()); diff --git a/tests/baselines/reference/indexSignatureTypeCheck2.js b/tests/baselines/reference/indexSignatureTypeCheck2.js index 6dcc0f392a5..edc608d77e0 100644 --- a/tests/baselines/reference/indexSignatureTypeCheck2.js +++ b/tests/baselines/reference/indexSignatureTypeCheck2.js @@ -19,7 +19,7 @@ var IPropertySet = (function () { function IPropertySet() { } return IPropertySet; -})(); +}()); var ps = null; var index = "hello"; ps[index] = 12; diff --git a/tests/baselines/reference/indexSignatureWithAccessibilityModifier.js b/tests/baselines/reference/indexSignatureWithAccessibilityModifier.js index 798fef924b9..6055849062c 100644 --- a/tests/baselines/reference/indexSignatureWithAccessibilityModifier.js +++ b/tests/baselines/reference/indexSignatureWithAccessibilityModifier.js @@ -12,4 +12,4 @@ var C = (function () { function C() { } return C; -})(); +}()); diff --git a/tests/baselines/reference/indexSignatureWithInitializer.js b/tests/baselines/reference/indexSignatureWithInitializer.js index 490033dde0f..48b91c01d03 100644 --- a/tests/baselines/reference/indexSignatureWithInitializer.js +++ b/tests/baselines/reference/indexSignatureWithInitializer.js @@ -13,4 +13,4 @@ var C = (function () { function C() { } return C; -})(); +}()); diff --git a/tests/baselines/reference/indexSignatureWithInitializer1.js b/tests/baselines/reference/indexSignatureWithInitializer1.js index 16852fd4174..78a94d931ab 100644 --- a/tests/baselines/reference/indexSignatureWithInitializer1.js +++ b/tests/baselines/reference/indexSignatureWithInitializer1.js @@ -8,4 +8,4 @@ var C = (function () { function C() { } return C; -})(); +}()); diff --git a/tests/baselines/reference/indexSignatureWithoutTypeAnnotation1.js b/tests/baselines/reference/indexSignatureWithoutTypeAnnotation1.js index bef6af37931..8871299c102 100644 --- a/tests/baselines/reference/indexSignatureWithoutTypeAnnotation1.js +++ b/tests/baselines/reference/indexSignatureWithoutTypeAnnotation1.js @@ -8,4 +8,4 @@ var C = (function () { function C() { } return C; -})(); +}()); diff --git a/tests/baselines/reference/indexTypeCheck.js b/tests/baselines/reference/indexTypeCheck.js index 6e74111a357..bed15a58ae2 100644 --- a/tests/baselines/reference/indexTypeCheck.js +++ b/tests/baselines/reference/indexTypeCheck.js @@ -84,4 +84,4 @@ var Benchmark = (function () { this.results[name] = this.results[name]; }; return Benchmark; -})(); +}()); diff --git a/tests/baselines/reference/indexWithoutParamType2.js b/tests/baselines/reference/indexWithoutParamType2.js index 4197b0596ec..c84a5a8855b 100644 --- a/tests/baselines/reference/indexWithoutParamType2.js +++ b/tests/baselines/reference/indexWithoutParamType2.js @@ -9,4 +9,4 @@ var C = (function () { function C() { } return C; -})(); +}()); diff --git a/tests/baselines/reference/indexer2A.js b/tests/baselines/reference/indexer2A.js index 867c30205ae..5d5ef6e0aea 100644 --- a/tests/baselines/reference/indexer2A.js +++ b/tests/baselines/reference/indexer2A.js @@ -12,10 +12,10 @@ var IHeapObjectProperty = (function () { function IHeapObjectProperty() { } return IHeapObjectProperty; -})(); +}()); var IDirectChildrenMap = (function () { function IDirectChildrenMap() { } return IDirectChildrenMap; -})(); +}()); var directChildrenMap = {}; diff --git a/tests/baselines/reference/indexerA.js b/tests/baselines/reference/indexerA.js index 5216026f714..dc8e92f22cf 100644 --- a/tests/baselines/reference/indexerA.js +++ b/tests/baselines/reference/indexerA.js @@ -15,11 +15,11 @@ var JQueryElement = (function () { function JQueryElement() { } return JQueryElement; -})(); +}()); var JQuery = (function () { function JQuery() { } return JQuery; -})(); +}()); var jq = { 0: { id: "a" }, 1: { id: "b" } }; jq[0].id; diff --git a/tests/baselines/reference/indexerAsOptional.js b/tests/baselines/reference/indexerAsOptional.js index 509e3890ec8..afe713a1102 100644 --- a/tests/baselines/reference/indexerAsOptional.js +++ b/tests/baselines/reference/indexerAsOptional.js @@ -14,4 +14,4 @@ var indexSig2 = (function () { function indexSig2() { } return indexSig2; -})(); +}()); diff --git a/tests/baselines/reference/indexerConstraints2.js b/tests/baselines/reference/indexerConstraints2.js index 7e662bc66cc..dd143da97e6 100644 --- a/tests/baselines/reference/indexerConstraints2.js +++ b/tests/baselines/reference/indexerConstraints2.js @@ -38,50 +38,50 @@ var A = (function () { function A() { } return A; -})(); +}()); var B = (function (_super) { __extends(B, _super); function B() { _super.apply(this, arguments); } return B; -})(A); +}(A)); // Inheritance var F = (function () { function F() { } return F; -})(); +}()); var G = (function (_super) { __extends(G, _super); function G() { _super.apply(this, arguments); } return G; -})(F); +}(F)); // Other way var H = (function () { function H() { } return H; -})(); +}()); var I = (function (_super) { __extends(I, _super); function I() { _super.apply(this, arguments); } return I; -})(H); +}(H)); // With hidden indexer var J = (function () { function J() { } return J; -})(); +}()); var K = (function (_super) { __extends(K, _super); function K() { _super.apply(this, arguments); } return K; -})(J); +}(J)); diff --git a/tests/baselines/reference/indexerReturningTypeParameter1.js b/tests/baselines/reference/indexerReturningTypeParameter1.js index a4a385ff056..cdc1bdf19d1 100644 --- a/tests/baselines/reference/indexerReturningTypeParameter1.js +++ b/tests/baselines/reference/indexerReturningTypeParameter1.js @@ -23,6 +23,6 @@ var c = (function () { return null; }; return c; -})(); +}()); var a2; var r2 = a2.groupBy(); diff --git a/tests/baselines/reference/indexerSignatureWithRestParam.js b/tests/baselines/reference/indexerSignatureWithRestParam.js index 8a7defb049c..3f6f149bd7f 100644 --- a/tests/baselines/reference/indexerSignatureWithRestParam.js +++ b/tests/baselines/reference/indexerSignatureWithRestParam.js @@ -12,4 +12,4 @@ var C = (function () { function C() { } return C; -})(); +}()); diff --git a/tests/baselines/reference/indexersInClassType.js b/tests/baselines/reference/indexersInClassType.js index d8f33653953..9b085aa8fe2 100644 --- a/tests/baselines/reference/indexersInClassType.js +++ b/tests/baselines/reference/indexersInClassType.js @@ -25,7 +25,7 @@ var C = (function () { return this; }; return C; -})(); +}()); var c = new C(); var r = c.fn(); var r2 = r[1]; diff --git a/tests/baselines/reference/indirectSelfReference.js b/tests/baselines/reference/indirectSelfReference.js index bd838ed8810..66d23a45b72 100644 --- a/tests/baselines/reference/indirectSelfReference.js +++ b/tests/baselines/reference/indirectSelfReference.js @@ -14,11 +14,11 @@ var a = (function (_super) { _super.apply(this, arguments); } return a; -})(b); +}(b)); var b = (function (_super) { __extends(b, _super); function b() { _super.apply(this, arguments); } return b; -})(a); +}(a)); diff --git a/tests/baselines/reference/indirectSelfReferenceGeneric.js b/tests/baselines/reference/indirectSelfReferenceGeneric.js index c9b4478ec13..99ab918e631 100644 --- a/tests/baselines/reference/indirectSelfReferenceGeneric.js +++ b/tests/baselines/reference/indirectSelfReferenceGeneric.js @@ -14,11 +14,11 @@ var a = (function (_super) { _super.apply(this, arguments); } return a; -})(b); +}(b)); var b = (function (_super) { __extends(b, _super); function b() { _super.apply(this, arguments); } return b; -})(a); +}(a)); diff --git a/tests/baselines/reference/inferSetterParamType.js b/tests/baselines/reference/inferSetterParamType.js index c0be3a5c394..33f785aab62 100644 --- a/tests/baselines/reference/inferSetterParamType.js +++ b/tests/baselines/reference/inferSetterParamType.js @@ -32,7 +32,7 @@ var Foo = (function () { configurable: true }); return Foo; -})(); +}()); var Foo2 = (function () { function Foo2() { } @@ -46,4 +46,4 @@ var Foo2 = (function () { configurable: true }); return Foo2; -})(); +}()); diff --git a/tests/baselines/reference/inferentialTypingUsingApparentType3.js b/tests/baselines/reference/inferentialTypingUsingApparentType3.js index 819ca05098d..f6375375366 100644 --- a/tests/baselines/reference/inferentialTypingUsingApparentType3.js +++ b/tests/baselines/reference/inferentialTypingUsingApparentType3.js @@ -34,7 +34,7 @@ var CharField = (function () { return "Yup"; }; return CharField; -})(); +}()); var NumberField = (function () { function NumberField() { } @@ -42,13 +42,13 @@ var NumberField = (function () { return 123; }; return NumberField; -})(); +}()); var ObjectField = (function () { function ObjectField(fields) { this.fields = fields; } return ObjectField; -})(); +}()); var person = new ObjectField({ id: new NumberField(), name: new CharField() diff --git a/tests/baselines/reference/infinitelyExpandingOverloads.js b/tests/baselines/reference/infinitelyExpandingOverloads.js index 1e84eba27cf..a16baaa6d6c 100644 --- a/tests/baselines/reference/infinitelyExpandingOverloads.js +++ b/tests/baselines/reference/infinitelyExpandingOverloads.js @@ -31,13 +31,13 @@ var Validator2 = (function () { function Validator2() { } return Validator2; -})(); +}()); var ViewModel = (function () { function ViewModel() { this.validationPlacements = new Array(); } return ViewModel; -})(); +}()); var Widget = (function () { function Widget(viewModelType) { } @@ -49,4 +49,4 @@ var Widget = (function () { configurable: true }); return Widget; -})(); +}()); diff --git a/tests/baselines/reference/infinitelyExpandingTypesNonGenericBase.js b/tests/baselines/reference/infinitelyExpandingTypesNonGenericBase.js index f057b649cb6..6321f77d31f 100644 --- a/tests/baselines/reference/infinitelyExpandingTypesNonGenericBase.js +++ b/tests/baselines/reference/infinitelyExpandingTypesNonGenericBase.js @@ -34,19 +34,19 @@ var Functionality = (function () { function Functionality() { } return Functionality; -})(); +}()); var Base = (function () { function Base() { } return Base; -})(); +}()); var A = (function (_super) { __extends(A, _super); function A() { _super.apply(this, arguments); } return A; -})(Base); +}(Base)); function o(type) { } o(A); diff --git a/tests/baselines/reference/inheritFromGenericTypeParameter.js b/tests/baselines/reference/inheritFromGenericTypeParameter.js index ec6be00785f..f5bc099cb8d 100644 --- a/tests/baselines/reference/inheritFromGenericTypeParameter.js +++ b/tests/baselines/reference/inheritFromGenericTypeParameter.js @@ -14,4 +14,4 @@ var C = (function (_super) { _super.apply(this, arguments); } return C; -})(T); +}(T)); diff --git a/tests/baselines/reference/inheritSameNamePrivatePropertiesFromDifferentOrigins.js b/tests/baselines/reference/inheritSameNamePrivatePropertiesFromDifferentOrigins.js index 49bf2c8ac97..dec161d95ac 100644 --- a/tests/baselines/reference/inheritSameNamePrivatePropertiesFromDifferentOrigins.js +++ b/tests/baselines/reference/inheritSameNamePrivatePropertiesFromDifferentOrigins.js @@ -16,9 +16,9 @@ var C = (function () { function C() { } return C; -})(); +}()); var C2 = (function () { function C2() { } return C2; -})(); +}()); diff --git a/tests/baselines/reference/inheritSameNamePrivatePropertiesFromSameOrigin.js b/tests/baselines/reference/inheritSameNamePrivatePropertiesFromSameOrigin.js index 93494c7256e..9462df7a3c3 100644 --- a/tests/baselines/reference/inheritSameNamePrivatePropertiesFromSameOrigin.js +++ b/tests/baselines/reference/inheritSameNamePrivatePropertiesFromSameOrigin.js @@ -20,18 +20,18 @@ var B = (function () { function B() { } return B; -})(); +}()); var C = (function (_super) { __extends(C, _super); function C() { _super.apply(this, arguments); } return C; -})(B); +}(B)); var C2 = (function (_super) { __extends(C2, _super); function C2() { _super.apply(this, arguments); } return C2; -})(B); +}(B)); diff --git a/tests/baselines/reference/inheritSameNamePropertiesWithDifferentVisibility.js b/tests/baselines/reference/inheritSameNamePropertiesWithDifferentVisibility.js index 3c6181117a3..fff751e4cd7 100644 --- a/tests/baselines/reference/inheritSameNamePropertiesWithDifferentVisibility.js +++ b/tests/baselines/reference/inheritSameNamePropertiesWithDifferentVisibility.js @@ -16,9 +16,9 @@ var C = (function () { function C() { } return C; -})(); +}()); var C2 = (function () { function C2() { } return C2; -})(); +}()); diff --git a/tests/baselines/reference/inheritance.js b/tests/baselines/reference/inheritance.js index b581ae894ae..52fbfaffdde 100644 --- a/tests/baselines/reference/inheritance.js +++ b/tests/baselines/reference/inheritance.js @@ -44,45 +44,45 @@ var B1 = (function () { function B1() { } return B1; -})(); +}()); var B2 = (function () { function B2() { } return B2; -})(); +}()); var D1 = (function (_super) { __extends(D1, _super); function D1() { _super.apply(this, arguments); } return D1; -})(B1); +}(B1)); var D2 = (function (_super) { __extends(D2, _super); function D2() { _super.apply(this, arguments); } return D2; -})(B2); +}(B2)); var N = (function () { function N() { } return N; -})(); +}()); var ND = (function (_super) { __extends(ND, _super); function ND() { _super.apply(this, arguments); } return ND; -})(N); +}(N)); var Good = (function () { function Good() { this.f = function () { return 0; }; } Good.prototype.g = function () { return 0; }; return Good; -})(); +}()); var Baad = (function (_super) { __extends(Baad, _super); function Baad() { @@ -91,4 +91,4 @@ var Baad = (function (_super) { Baad.prototype.f = function () { return 0; }; Baad.prototype.g = function (n) { return 0; }; return Baad; -})(Good); +}(Good)); diff --git a/tests/baselines/reference/inheritance1.js b/tests/baselines/reference/inheritance1.js index aa7775b9904..c65155ee55c 100644 --- a/tests/baselines/reference/inheritance1.js +++ b/tests/baselines/reference/inheritance1.js @@ -71,7 +71,7 @@ var Control = (function () { function Control() { } return Control; -})(); +}()); var Button = (function (_super) { __extends(Button, _super); function Button() { @@ -79,7 +79,7 @@ var Button = (function (_super) { } Button.prototype.select = function () { }; return Button; -})(Control); +}(Control)); var TextBox = (function (_super) { __extends(TextBox, _super); function TextBox() { @@ -87,33 +87,33 @@ var TextBox = (function (_super) { } TextBox.prototype.select = function () { }; return TextBox; -})(Control); +}(Control)); var ImageBase = (function (_super) { __extends(ImageBase, _super); function ImageBase() { _super.apply(this, arguments); } return ImageBase; -})(Control); +}(Control)); var Image1 = (function (_super) { __extends(Image1, _super); function Image1() { _super.apply(this, arguments); } return Image1; -})(Control); +}(Control)); var Locations = (function () { function Locations() { } Locations.prototype.select = function () { }; return Locations; -})(); +}()); var Locations1 = (function () { function Locations1() { } Locations1.prototype.select = function () { }; return Locations1; -})(); +}()); var sc; var c; var b; diff --git a/tests/baselines/reference/inheritanceGrandParentPrivateMemberCollision.js b/tests/baselines/reference/inheritanceGrandParentPrivateMemberCollision.js index 927ae969049..b416cf3fb93 100644 --- a/tests/baselines/reference/inheritanceGrandParentPrivateMemberCollision.js +++ b/tests/baselines/reference/inheritanceGrandParentPrivateMemberCollision.js @@ -21,14 +21,14 @@ var A = (function () { } A.prototype.myMethod = function () { }; return A; -})(); +}()); var B = (function (_super) { __extends(B, _super); function B() { _super.apply(this, arguments); } return B; -})(A); +}(A)); var C = (function (_super) { __extends(C, _super); function C() { @@ -36,4 +36,4 @@ var C = (function (_super) { } C.prototype.myMethod = function () { }; return C; -})(B); +}(B)); diff --git a/tests/baselines/reference/inheritanceGrandParentPrivateMemberCollisionWithPublicMember.js b/tests/baselines/reference/inheritanceGrandParentPrivateMemberCollisionWithPublicMember.js index 05d8dc2a541..25a977531ca 100644 --- a/tests/baselines/reference/inheritanceGrandParentPrivateMemberCollisionWithPublicMember.js +++ b/tests/baselines/reference/inheritanceGrandParentPrivateMemberCollisionWithPublicMember.js @@ -21,14 +21,14 @@ var A = (function () { } A.prototype.myMethod = function () { }; return A; -})(); +}()); var B = (function (_super) { __extends(B, _super); function B() { _super.apply(this, arguments); } return B; -})(A); +}(A)); var C = (function (_super) { __extends(C, _super); function C() { @@ -36,4 +36,4 @@ var C = (function (_super) { } C.prototype.myMethod = function () { }; return C; -})(B); +}(B)); diff --git a/tests/baselines/reference/inheritanceGrandParentPublicMemberCollisionWithPrivateMember.js b/tests/baselines/reference/inheritanceGrandParentPublicMemberCollisionWithPrivateMember.js index ddd87251f9f..dfd05556925 100644 --- a/tests/baselines/reference/inheritanceGrandParentPublicMemberCollisionWithPrivateMember.js +++ b/tests/baselines/reference/inheritanceGrandParentPublicMemberCollisionWithPrivateMember.js @@ -21,14 +21,14 @@ var A = (function () { } A.prototype.myMethod = function () { }; return A; -})(); +}()); var B = (function (_super) { __extends(B, _super); function B() { _super.apply(this, arguments); } return B; -})(A); +}(A)); var C = (function (_super) { __extends(C, _super); function C() { @@ -36,4 +36,4 @@ var C = (function (_super) { } C.prototype.myMethod = function () { }; return C; -})(B); +}(B)); diff --git a/tests/baselines/reference/inheritanceMemberAccessorOverridingAccessor.js b/tests/baselines/reference/inheritanceMemberAccessorOverridingAccessor.js index eaf34df921b..b4efaa89621 100644 --- a/tests/baselines/reference/inheritanceMemberAccessorOverridingAccessor.js +++ b/tests/baselines/reference/inheritanceMemberAccessorOverridingAccessor.js @@ -36,7 +36,7 @@ var a = (function () { configurable: true }); return a; -})(); +}()); var b = (function (_super) { __extends(b, _super); function b() { @@ -52,4 +52,4 @@ var b = (function (_super) { configurable: true }); return b; -})(a); +}(a)); diff --git a/tests/baselines/reference/inheritanceMemberAccessorOverridingMethod.js b/tests/baselines/reference/inheritanceMemberAccessorOverridingMethod.js index cd79d8c6964..5044a8e03ac 100644 --- a/tests/baselines/reference/inheritanceMemberAccessorOverridingMethod.js +++ b/tests/baselines/reference/inheritanceMemberAccessorOverridingMethod.js @@ -27,7 +27,7 @@ var a = (function () { return "20"; }; return a; -})(); +}()); var b = (function (_super) { __extends(b, _super); function b() { @@ -43,4 +43,4 @@ var b = (function (_super) { configurable: true }); return b; -})(a); +}(a)); diff --git a/tests/baselines/reference/inheritanceMemberAccessorOverridingProperty.js b/tests/baselines/reference/inheritanceMemberAccessorOverridingProperty.js index 18c1ab33952..6ebdc336a64 100644 --- a/tests/baselines/reference/inheritanceMemberAccessorOverridingProperty.js +++ b/tests/baselines/reference/inheritanceMemberAccessorOverridingProperty.js @@ -22,7 +22,7 @@ var a = (function () { function a() { } return a; -})(); +}()); var b = (function (_super) { __extends(b, _super); function b() { @@ -38,4 +38,4 @@ var b = (function (_super) { configurable: true }); return b; -})(a); +}(a)); diff --git a/tests/baselines/reference/inheritanceMemberFuncOverridingAccessor.js b/tests/baselines/reference/inheritanceMemberFuncOverridingAccessor.js index 5c254251718..3ddff027c1a 100644 --- a/tests/baselines/reference/inheritanceMemberFuncOverridingAccessor.js +++ b/tests/baselines/reference/inheritanceMemberFuncOverridingAccessor.js @@ -33,7 +33,7 @@ var a = (function () { configurable: true }); return a; -})(); +}()); var b = (function (_super) { __extends(b, _super); function b() { @@ -43,4 +43,4 @@ var b = (function (_super) { return "20"; }; return b; -})(a); +}(a)); diff --git a/tests/baselines/reference/inheritanceMemberFuncOverridingMethod.js b/tests/baselines/reference/inheritanceMemberFuncOverridingMethod.js index e2d3d9551c2..a6c3beea4ef 100644 --- a/tests/baselines/reference/inheritanceMemberFuncOverridingMethod.js +++ b/tests/baselines/reference/inheritanceMemberFuncOverridingMethod.js @@ -24,7 +24,7 @@ var a = (function () { return "10"; }; return a; -})(); +}()); var b = (function (_super) { __extends(b, _super); function b() { @@ -34,4 +34,4 @@ var b = (function (_super) { return "20"; }; return b; -})(a); +}(a)); diff --git a/tests/baselines/reference/inheritanceMemberFuncOverridingProperty.js b/tests/baselines/reference/inheritanceMemberFuncOverridingProperty.js index b1d64aeb2c8..94b602d29d9 100644 --- a/tests/baselines/reference/inheritanceMemberFuncOverridingProperty.js +++ b/tests/baselines/reference/inheritanceMemberFuncOverridingProperty.js @@ -19,7 +19,7 @@ var a = (function () { function a() { } return a; -})(); +}()); var b = (function (_super) { __extends(b, _super); function b() { @@ -29,4 +29,4 @@ var b = (function (_super) { return "20"; }; return b; -})(a); +}(a)); diff --git a/tests/baselines/reference/inheritanceMemberPropertyOverridingAccessor.js b/tests/baselines/reference/inheritanceMemberPropertyOverridingAccessor.js index bfa5d3fb801..a8fc4d5a3dd 100644 --- a/tests/baselines/reference/inheritanceMemberPropertyOverridingAccessor.js +++ b/tests/baselines/reference/inheritanceMemberPropertyOverridingAccessor.js @@ -33,11 +33,11 @@ var a = (function () { configurable: true }); return a; -})(); +}()); var b = (function (_super) { __extends(b, _super); function b() { _super.apply(this, arguments); } return b; -})(a); +}(a)); diff --git a/tests/baselines/reference/inheritanceMemberPropertyOverridingMethod.js b/tests/baselines/reference/inheritanceMemberPropertyOverridingMethod.js index d84f4879632..7d5cdb43e96 100644 --- a/tests/baselines/reference/inheritanceMemberPropertyOverridingMethod.js +++ b/tests/baselines/reference/inheritanceMemberPropertyOverridingMethod.js @@ -22,11 +22,11 @@ var a = (function () { return "20"; }; return a; -})(); +}()); var b = (function (_super) { __extends(b, _super); function b() { _super.apply(this, arguments); } return b; -})(a); +}(a)); diff --git a/tests/baselines/reference/inheritanceMemberPropertyOverridingProperty.js b/tests/baselines/reference/inheritanceMemberPropertyOverridingProperty.js index 8677d502273..648f1d1622e 100644 --- a/tests/baselines/reference/inheritanceMemberPropertyOverridingProperty.js +++ b/tests/baselines/reference/inheritanceMemberPropertyOverridingProperty.js @@ -17,11 +17,11 @@ var a = (function () { function a() { } return a; -})(); +}()); var b = (function (_super) { __extends(b, _super); function b() { _super.apply(this, arguments); } return b; -})(a); +}(a)); diff --git a/tests/baselines/reference/inheritanceOfGenericConstructorMethod1.js b/tests/baselines/reference/inheritanceOfGenericConstructorMethod1.js index 73d3b4aa6cb..59675c56e5f 100644 --- a/tests/baselines/reference/inheritanceOfGenericConstructorMethod1.js +++ b/tests/baselines/reference/inheritanceOfGenericConstructorMethod1.js @@ -17,14 +17,14 @@ var A = (function () { function A() { } return A; -})(); +}()); var B = (function (_super) { __extends(B, _super); function B() { _super.apply(this, arguments); } return B; -})(A); +}(A)); var a = new A(); var b1 = new B(); // no error var b2 = new B(); // no error diff --git a/tests/baselines/reference/inheritanceOfGenericConstructorMethod2.js b/tests/baselines/reference/inheritanceOfGenericConstructorMethod2.js index e7e6228392c..97464233027 100644 --- a/tests/baselines/reference/inheritanceOfGenericConstructorMethod2.js +++ b/tests/baselines/reference/inheritanceOfGenericConstructorMethod2.js @@ -26,13 +26,13 @@ var M; function C1() { } return C1; - })(); + }()); M.C1 = C1; var C2 = (function () { function C2() { } return C2; - })(); + }()); M.C2 = C2; })(M || (M = {})); var N; @@ -43,7 +43,7 @@ var N; _super.apply(this, arguments); } return D1; - })(M.C1); + }(M.C1)); N.D1 = D1; var D2 = (function (_super) { __extends(D2, _super); @@ -51,7 +51,7 @@ var N; _super.apply(this, arguments); } return D2; - })(M.C2); + }(M.C2)); N.D2 = D2; })(N || (N = {})); var c = new M.C2(); // no error diff --git a/tests/baselines/reference/inheritanceStaticAccessorOverridingAccessor.js b/tests/baselines/reference/inheritanceStaticAccessorOverridingAccessor.js index 32f1d20eda1..49145b010d4 100644 --- a/tests/baselines/reference/inheritanceStaticAccessorOverridingAccessor.js +++ b/tests/baselines/reference/inheritanceStaticAccessorOverridingAccessor.js @@ -36,7 +36,7 @@ var a = (function () { configurable: true }); return a; -})(); +}()); var b = (function (_super) { __extends(b, _super); function b() { @@ -52,4 +52,4 @@ var b = (function (_super) { configurable: true }); return b; -})(a); +}(a)); diff --git a/tests/baselines/reference/inheritanceStaticAccessorOverridingMethod.js b/tests/baselines/reference/inheritanceStaticAccessorOverridingMethod.js index 7a1a86ced18..4a202b76497 100644 --- a/tests/baselines/reference/inheritanceStaticAccessorOverridingMethod.js +++ b/tests/baselines/reference/inheritanceStaticAccessorOverridingMethod.js @@ -27,7 +27,7 @@ var a = (function () { return "20"; }; return a; -})(); +}()); var b = (function (_super) { __extends(b, _super); function b() { @@ -43,4 +43,4 @@ var b = (function (_super) { configurable: true }); return b; -})(a); +}(a)); diff --git a/tests/baselines/reference/inheritanceStaticAccessorOverridingProperty.js b/tests/baselines/reference/inheritanceStaticAccessorOverridingProperty.js index 8a142d41c57..a0dd1177cfb 100644 --- a/tests/baselines/reference/inheritanceStaticAccessorOverridingProperty.js +++ b/tests/baselines/reference/inheritanceStaticAccessorOverridingProperty.js @@ -22,7 +22,7 @@ var a = (function () { function a() { } return a; -})(); +}()); var b = (function (_super) { __extends(b, _super); function b() { @@ -38,4 +38,4 @@ var b = (function (_super) { configurable: true }); return b; -})(a); +}(a)); diff --git a/tests/baselines/reference/inheritanceStaticFuncOverridingAccessor.js b/tests/baselines/reference/inheritanceStaticFuncOverridingAccessor.js index 7c08ec7649e..06f907371ea 100644 --- a/tests/baselines/reference/inheritanceStaticFuncOverridingAccessor.js +++ b/tests/baselines/reference/inheritanceStaticFuncOverridingAccessor.js @@ -33,7 +33,7 @@ var a = (function () { configurable: true }); return a; -})(); +}()); var b = (function (_super) { __extends(b, _super); function b() { @@ -43,4 +43,4 @@ var b = (function (_super) { return "20"; }; return b; -})(a); +}(a)); diff --git a/tests/baselines/reference/inheritanceStaticFuncOverridingAccessorOfFuncType.js b/tests/baselines/reference/inheritanceStaticFuncOverridingAccessorOfFuncType.js index acde620c100..ea36c40480f 100644 --- a/tests/baselines/reference/inheritanceStaticFuncOverridingAccessorOfFuncType.js +++ b/tests/baselines/reference/inheritanceStaticFuncOverridingAccessorOfFuncType.js @@ -28,7 +28,7 @@ var a = (function () { configurable: true }); return a; -})(); +}()); var b = (function (_super) { __extends(b, _super); function b() { @@ -38,4 +38,4 @@ var b = (function (_super) { return "20"; }; return b; -})(a); +}(a)); diff --git a/tests/baselines/reference/inheritanceStaticFuncOverridingMethod.js b/tests/baselines/reference/inheritanceStaticFuncOverridingMethod.js index abd4d7c1498..ae523d53d9b 100644 --- a/tests/baselines/reference/inheritanceStaticFuncOverridingMethod.js +++ b/tests/baselines/reference/inheritanceStaticFuncOverridingMethod.js @@ -24,7 +24,7 @@ var a = (function () { return "10"; }; return a; -})(); +}()); var b = (function (_super) { __extends(b, _super); function b() { @@ -34,4 +34,4 @@ var b = (function (_super) { return "20"; }; return b; -})(a); +}(a)); diff --git a/tests/baselines/reference/inheritanceStaticFuncOverridingProperty.js b/tests/baselines/reference/inheritanceStaticFuncOverridingProperty.js index c2d095e5527..93890bd8294 100644 --- a/tests/baselines/reference/inheritanceStaticFuncOverridingProperty.js +++ b/tests/baselines/reference/inheritanceStaticFuncOverridingProperty.js @@ -19,7 +19,7 @@ var a = (function () { function a() { } return a; -})(); +}()); var b = (function (_super) { __extends(b, _super); function b() { @@ -29,4 +29,4 @@ var b = (function (_super) { return "20"; }; return b; -})(a); +}(a)); diff --git a/tests/baselines/reference/inheritanceStaticFuncOverridingPropertyOfFuncType.js b/tests/baselines/reference/inheritanceStaticFuncOverridingPropertyOfFuncType.js index 979f0c36359..4d0f2438459 100644 --- a/tests/baselines/reference/inheritanceStaticFuncOverridingPropertyOfFuncType.js +++ b/tests/baselines/reference/inheritanceStaticFuncOverridingPropertyOfFuncType.js @@ -19,7 +19,7 @@ var a = (function () { function a() { } return a; -})(); +}()); var b = (function (_super) { __extends(b, _super); function b() { @@ -29,4 +29,4 @@ var b = (function (_super) { return "20"; }; return b; -})(a); +}(a)); diff --git a/tests/baselines/reference/inheritanceStaticFunctionOverridingInstanceProperty.js b/tests/baselines/reference/inheritanceStaticFunctionOverridingInstanceProperty.js index 5c6c0e06a6f..f2dfda4e48f 100644 --- a/tests/baselines/reference/inheritanceStaticFunctionOverridingInstanceProperty.js +++ b/tests/baselines/reference/inheritanceStaticFunctionOverridingInstanceProperty.js @@ -19,7 +19,7 @@ var a = (function () { function a() { } return a; -})(); +}()); var b = (function (_super) { __extends(b, _super); function b() { @@ -29,4 +29,4 @@ var b = (function (_super) { return new b().x; }; return b; -})(a); +}(a)); diff --git a/tests/baselines/reference/inheritanceStaticMembersCompatible.js b/tests/baselines/reference/inheritanceStaticMembersCompatible.js index 014d3276189..0dc736a375d 100644 --- a/tests/baselines/reference/inheritanceStaticMembersCompatible.js +++ b/tests/baselines/reference/inheritanceStaticMembersCompatible.js @@ -17,11 +17,11 @@ var a = (function () { function a() { } return a; -})(); +}()); var b = (function (_super) { __extends(b, _super); function b() { _super.apply(this, arguments); } return b; -})(a); +}(a)); diff --git a/tests/baselines/reference/inheritanceStaticMembersIncompatible.js b/tests/baselines/reference/inheritanceStaticMembersIncompatible.js index a1728dc6dcb..51c474430ad 100644 --- a/tests/baselines/reference/inheritanceStaticMembersIncompatible.js +++ b/tests/baselines/reference/inheritanceStaticMembersIncompatible.js @@ -17,11 +17,11 @@ var a = (function () { function a() { } return a; -})(); +}()); var b = (function (_super) { __extends(b, _super); function b() { _super.apply(this, arguments); } return b; -})(a); +}(a)); diff --git a/tests/baselines/reference/inheritanceStaticPropertyOverridingAccessor.js b/tests/baselines/reference/inheritanceStaticPropertyOverridingAccessor.js index fa9c6e2a8b5..d138ac3eba8 100644 --- a/tests/baselines/reference/inheritanceStaticPropertyOverridingAccessor.js +++ b/tests/baselines/reference/inheritanceStaticPropertyOverridingAccessor.js @@ -32,11 +32,11 @@ var a = (function () { configurable: true }); return a; -})(); +}()); var b = (function (_super) { __extends(b, _super); function b() { _super.apply(this, arguments); } return b; -})(a); +}(a)); diff --git a/tests/baselines/reference/inheritanceStaticPropertyOverridingMethod.js b/tests/baselines/reference/inheritanceStaticPropertyOverridingMethod.js index 9afa969af65..3d3f550713e 100644 --- a/tests/baselines/reference/inheritanceStaticPropertyOverridingMethod.js +++ b/tests/baselines/reference/inheritanceStaticPropertyOverridingMethod.js @@ -22,11 +22,11 @@ var a = (function () { return "20"; }; return a; -})(); +}()); var b = (function (_super) { __extends(b, _super); function b() { _super.apply(this, arguments); } return b; -})(a); +}(a)); diff --git a/tests/baselines/reference/inheritanceStaticPropertyOverridingProperty.js b/tests/baselines/reference/inheritanceStaticPropertyOverridingProperty.js index fcecca62774..e23917e40a4 100644 --- a/tests/baselines/reference/inheritanceStaticPropertyOverridingProperty.js +++ b/tests/baselines/reference/inheritanceStaticPropertyOverridingProperty.js @@ -17,11 +17,11 @@ var a = (function () { function a() { } return a; -})(); +}()); var b = (function (_super) { __extends(b, _super); function b() { _super.apply(this, arguments); } return b; -})(a); +}(a)); diff --git a/tests/baselines/reference/inheritedConstructorWithRestParams.js b/tests/baselines/reference/inheritedConstructorWithRestParams.js index a0bb2ed8dc1..2d312d9859d 100644 --- a/tests/baselines/reference/inheritedConstructorWithRestParams.js +++ b/tests/baselines/reference/inheritedConstructorWithRestParams.js @@ -28,14 +28,14 @@ var Base = (function () { } } return Base; -})(); +}()); var Derived = (function (_super) { __extends(Derived, _super); function Derived() { _super.apply(this, arguments); } return Derived; -})(Base); +}(Base)); // Ok new Derived("", ""); new Derived(""); diff --git a/tests/baselines/reference/inheritedConstructorWithRestParams2.js b/tests/baselines/reference/inheritedConstructorWithRestParams2.js index 9b87465233c..0ad25b302f0 100644 --- a/tests/baselines/reference/inheritedConstructorWithRestParams2.js +++ b/tests/baselines/reference/inheritedConstructorWithRestParams2.js @@ -44,26 +44,26 @@ var IBaseBase = (function () { function IBaseBase(x) { } return IBaseBase; -})(); +}()); var BaseBase2 = (function () { function BaseBase2(x) { } return BaseBase2; -})(); +}()); var Base = (function (_super) { __extends(Base, _super); function Base() { _super.apply(this, arguments); } return Base; -})(BaseBase); +}(BaseBase)); var Derived = (function (_super) { __extends(Derived, _super); function Derived() { _super.apply(this, arguments); } return Derived; -})(Base); +}(Base)); // Ok new Derived("", ""); new Derived("", 3); diff --git a/tests/baselines/reference/inheritedModuleMembersForClodule.js b/tests/baselines/reference/inheritedModuleMembersForClodule.js index 50f41af2c09..95b71069584 100644 --- a/tests/baselines/reference/inheritedModuleMembersForClodule.js +++ b/tests/baselines/reference/inheritedModuleMembersForClodule.js @@ -34,14 +34,14 @@ var C = (function () { return "123"; }; return C; -})(); +}()); var D = (function (_super) { __extends(D, _super); function D() { _super.apply(this, arguments); } return D; -})(C); +}(C)); var D; (function (D) { function foo() { @@ -59,4 +59,4 @@ var E = (function (_super) { return this.foo(); }; return E; -})(D); +}(D)); diff --git a/tests/baselines/reference/initializerReferencingConstructorLocals.js b/tests/baselines/reference/initializerReferencingConstructorLocals.js index f382b5b7010..a4922e954d7 100644 --- a/tests/baselines/reference/initializerReferencingConstructorLocals.js +++ b/tests/baselines/reference/initializerReferencingConstructorLocals.js @@ -31,7 +31,7 @@ var C = (function () { z = 1; } return C; -})(); +}()); var D = (function () { function D(x) { this.a = z; // error @@ -40,4 +40,4 @@ var D = (function () { z = 1; } return D; -})(); +}()); diff --git a/tests/baselines/reference/initializerReferencingConstructorParameters.js b/tests/baselines/reference/initializerReferencingConstructorParameters.js index 8314d5b7155..881913d5b5f 100644 --- a/tests/baselines/reference/initializerReferencingConstructorParameters.js +++ b/tests/baselines/reference/initializerReferencingConstructorParameters.js @@ -32,14 +32,14 @@ var C = (function () { this.a = x; // error } return C; -})(); +}()); var D = (function () { function D(x) { this.x = x; this.a = x; // error } return D; -})(); +}()); var E = (function () { function E(x) { this.x = x; @@ -47,7 +47,7 @@ var E = (function () { this.b = this.x; // error } return E; -})(); +}()); var F = (function () { function F(x) { this.x = x; @@ -55,4 +55,4 @@ var F = (function () { this.b = x; // error } return F; -})(); +}()); diff --git a/tests/baselines/reference/innerAliases.js b/tests/baselines/reference/innerAliases.js index 95a3712ca85..cda2be1c5a9 100644 --- a/tests/baselines/reference/innerAliases.js +++ b/tests/baselines/reference/innerAliases.js @@ -34,7 +34,7 @@ var A; function Class1() { } return Class1; - })(); + }()); C.Class1 = Class1; })(C = B.C || (B.C = {})); })(B = A.B || (A.B = {})); @@ -49,7 +49,7 @@ var D; function Class2() { } return Class2; - })(); + }()); E.Class2 = Class2; })(E = D.E || (D.E = {})); })(D || (D = {})); diff --git a/tests/baselines/reference/innerAliases2.js b/tests/baselines/reference/innerAliases2.js index 846e85504f2..6ac0a57a484 100644 --- a/tests/baselines/reference/innerAliases2.js +++ b/tests/baselines/reference/innerAliases2.js @@ -28,7 +28,7 @@ var _provider; UsefulClass.prototype.foo = function () { }; return UsefulClass; - })(); + }()); _provider.UsefulClass = UsefulClass; })(_provider || (_provider = {})); var consumer; diff --git a/tests/baselines/reference/innerBoundLambdaEmit.js b/tests/baselines/reference/innerBoundLambdaEmit.js index c09cc8e5a66..fe3981cd335 100644 --- a/tests/baselines/reference/innerBoundLambdaEmit.js +++ b/tests/baselines/reference/innerBoundLambdaEmit.js @@ -16,7 +16,7 @@ var M; function Foo() { } return Foo; - })(); + }()); M.Foo = Foo; var bar = function () { }; })(M || (M = {})); diff --git a/tests/baselines/reference/innerExtern.js b/tests/baselines/reference/innerExtern.js index 5b933f980f4..11f526c8310 100644 --- a/tests/baselines/reference/innerExtern.js +++ b/tests/baselines/reference/innerExtern.js @@ -23,7 +23,7 @@ var A; this.x = BB.Elephant.X; } return C; - })(); + }()); B.C = C; })(B = A.B || (A.B = {})); })(A || (A = {})); diff --git a/tests/baselines/reference/innerTypeParameterShadowingOuterOne2.js b/tests/baselines/reference/innerTypeParameterShadowingOuterOne2.js index 36a250d365d..02b0ccfb382 100644 --- a/tests/baselines/reference/innerTypeParameterShadowingOuterOne2.js +++ b/tests/baselines/reference/innerTypeParameterShadowingOuterOne2.js @@ -52,7 +52,7 @@ var C = (function () { x.getDate(); }; return C; -})(); +}()); var C2 = (function () { function C2() { } @@ -65,7 +65,7 @@ var C2 = (function () { x.getDate(); }; return C2; -})(); +}()); //class C2 { // g() { // var x: U; diff --git a/tests/baselines/reference/instanceAndStaticDeclarations1.js b/tests/baselines/reference/instanceAndStaticDeclarations1.js index 7dbd6dcbe7d..093e9c15cc8 100644 --- a/tests/baselines/reference/instanceAndStaticDeclarations1.js +++ b/tests/baselines/reference/instanceAndStaticDeclarations1.js @@ -27,4 +27,4 @@ var Point = (function () { Point.distance = function (p1, p2) { return p1.distance(p2); }; Point.origin = new Point(0, 0); return Point; -})(); +}()); diff --git a/tests/baselines/reference/instanceMemberAssignsToClassPrototype.js b/tests/baselines/reference/instanceMemberAssignsToClassPrototype.js index 51c38282a72..d6dc08f3850 100644 --- a/tests/baselines/reference/instanceMemberAssignsToClassPrototype.js +++ b/tests/baselines/reference/instanceMemberAssignsToClassPrototype.js @@ -26,4 +26,4 @@ var C = (function () { return 1; }; return C; -})(); +}()); diff --git a/tests/baselines/reference/instanceMemberInitialization.js b/tests/baselines/reference/instanceMemberInitialization.js index b62ac68bf52..dd9a0fc3b6f 100644 --- a/tests/baselines/reference/instanceMemberInitialization.js +++ b/tests/baselines/reference/instanceMemberInitialization.js @@ -14,7 +14,7 @@ var C = (function () { this.x = 1; } return C; -})(); +}()); var c = new C(); c.x = 3; var c2 = new C(); diff --git a/tests/baselines/reference/instanceOfAssignability.js b/tests/baselines/reference/instanceOfAssignability.js index 4a1e8b9e9de..775afe86946 100644 --- a/tests/baselines/reference/instanceOfAssignability.js +++ b/tests/baselines/reference/instanceOfAssignability.js @@ -100,32 +100,32 @@ var Derived1 = (function () { function Derived1() { } return Derived1; -})(); +}()); // Derived2 is a subtype of Base that is not assignable to Derived1 var Derived2 = (function () { function Derived2() { } return Derived2; -})(); +}()); var Animal = (function () { function Animal() { } return Animal; -})(); +}()); var Mammal = (function (_super) { __extends(Mammal, _super); function Mammal() { _super.apply(this, arguments); } return Mammal; -})(Animal); +}(Animal)); var Giraffe = (function (_super) { __extends(Giraffe, _super); function Giraffe() { _super.apply(this, arguments); } return Giraffe; -})(Mammal); +}(Mammal)); function fn1(x) { if (x instanceof Array) { // 1.5: y: Array|Array @@ -179,7 +179,7 @@ var ABC = (function () { function ABC() { } return ABC; -})(); +}()); function fn8(x) { if (x instanceof ABC) { var y = x; diff --git a/tests/baselines/reference/instanceOfInExternalModules.js b/tests/baselines/reference/instanceOfInExternalModules.js index 02c0eb0eea4..540549aef52 100644 --- a/tests/baselines/reference/instanceOfInExternalModules.js +++ b/tests/baselines/reference/instanceOfInExternalModules.js @@ -18,7 +18,7 @@ define(["require", "exports"], function (require, exports) { function Foo() { } return Foo; - })(); + }()); exports.Foo = Foo; }); //// [instanceOfInExternalModules_1.js] diff --git a/tests/baselines/reference/instancePropertiesInheritedIntoClassType.js b/tests/baselines/reference/instancePropertiesInheritedIntoClassType.js index 548cb77b878..a507a19a456 100644 --- a/tests/baselines/reference/instancePropertiesInheritedIntoClassType.js +++ b/tests/baselines/reference/instancePropertiesInheritedIntoClassType.js @@ -65,14 +65,14 @@ var NonGeneric; }); C.prototype.fn = function () { return this; }; return C; - })(); + }()); var D = (function (_super) { __extends(D, _super); function D() { _super.apply(this, arguments); } return D; - })(C); + }(C)); var d = new D(1, 2); var r = d.fn(); var r2 = r.x; @@ -97,14 +97,14 @@ var Generic; }); C.prototype.fn = function () { return this; }; return C; - })(); + }()); var D = (function (_super) { __extends(D, _super); function D() { _super.apply(this, arguments); } return D; - })(C); + }(C)); var d = new D(1, ''); var r = d.fn(); var r2 = r.x; diff --git a/tests/baselines/reference/instancePropertyInClassType.js b/tests/baselines/reference/instancePropertyInClassType.js index 863f18de323..ee447aa5233 100644 --- a/tests/baselines/reference/instancePropertyInClassType.js +++ b/tests/baselines/reference/instancePropertyInClassType.js @@ -56,7 +56,7 @@ var NonGeneric; }); C.prototype.fn = function () { return this; }; return C; - })(); + }()); var c = new C(1, 2); var r = c.fn(); var r2 = r.x; @@ -81,7 +81,7 @@ var Generic; }); C.prototype.fn = function () { return this; }; return C; - })(); + }()); var c = new C(1, ''); var r = c.fn(); var r2 = r.x; diff --git a/tests/baselines/reference/instanceSubtypeCheck2.js b/tests/baselines/reference/instanceSubtypeCheck2.js index 59043b29b4e..d72f29e93bf 100644 --- a/tests/baselines/reference/instanceSubtypeCheck2.js +++ b/tests/baselines/reference/instanceSubtypeCheck2.js @@ -17,11 +17,11 @@ var C1 = (function () { function C1() { } return C1; -})(); +}()); var C2 = (function (_super) { __extends(C2, _super); function C2() { _super.apply(this, arguments); } return C2; -})(C1); +}(C1)); diff --git a/tests/baselines/reference/instanceofOperator.js b/tests/baselines/reference/instanceofOperator.js index 3c6970b66a4..55e3d448b3b 100644 --- a/tests/baselines/reference/instanceofOperator.js +++ b/tests/baselines/reference/instanceofOperator.js @@ -35,7 +35,7 @@ var test; function Object() { } return Object; - })(); + }()); var obj; 4 instanceof null; // Error and should be error diff --git a/tests/baselines/reference/instanceofOperatorWithInvalidOperands.js b/tests/baselines/reference/instanceofOperatorWithInvalidOperands.js index 9f83181a146..90badcf8e92 100644 --- a/tests/baselines/reference/instanceofOperatorWithInvalidOperands.js +++ b/tests/baselines/reference/instanceofOperatorWithInvalidOperands.js @@ -52,7 +52,7 @@ var C = (function () { } C.prototype.foo = function () { }; return C; -})(); +}()); var x; // invalid left operand // the left operand is required to be of type Any, an object type, or a type parameter type diff --git a/tests/baselines/reference/instanceofOperatorWithLHSIsObject.js b/tests/baselines/reference/instanceofOperatorWithLHSIsObject.js index c687027ae9b..e7f35c8da4c 100644 --- a/tests/baselines/reference/instanceofOperatorWithLHSIsObject.js +++ b/tests/baselines/reference/instanceofOperatorWithLHSIsObject.js @@ -20,7 +20,7 @@ var C = (function () { function C() { } return C; -})(); +}()); var x1; var x2; var a; diff --git a/tests/baselines/reference/instantiateGenericClassWithWrongNumberOfTypeArguments.js b/tests/baselines/reference/instantiateGenericClassWithWrongNumberOfTypeArguments.js index 0602aec2dc1..f8b4f680f0f 100644 --- a/tests/baselines/reference/instantiateGenericClassWithWrongNumberOfTypeArguments.js +++ b/tests/baselines/reference/instantiateGenericClassWithWrongNumberOfTypeArguments.js @@ -23,12 +23,12 @@ var C = (function () { function C() { } return C; -})(); +}()); var c = new C(); var D = (function () { function D() { } return D; -})(); +}()); // BUG 794238 var d = new D(); diff --git a/tests/baselines/reference/instantiateGenericClassWithZeroTypeArguments.js b/tests/baselines/reference/instantiateGenericClassWithZeroTypeArguments.js index 4ded030922a..2e7e3f87d1b 100644 --- a/tests/baselines/reference/instantiateGenericClassWithZeroTypeArguments.js +++ b/tests/baselines/reference/instantiateGenericClassWithZeroTypeArguments.js @@ -21,11 +21,11 @@ var C = (function () { function C() { } return C; -})(); +}()); var c = new C(); var D = (function () { function D() { } return D; -})(); +}()); var d = new D(); diff --git a/tests/baselines/reference/instantiateNonGenericTypeWithTypeArguments.js b/tests/baselines/reference/instantiateNonGenericTypeWithTypeArguments.js index 3d7d2a7d017..4c750024e43 100644 --- a/tests/baselines/reference/instantiateNonGenericTypeWithTypeArguments.js +++ b/tests/baselines/reference/instantiateNonGenericTypeWithTypeArguments.js @@ -25,7 +25,7 @@ var C = (function () { function C() { } return C; -})(); +}()); var c = new C(); function Foo() { } var r = new Foo(); diff --git a/tests/baselines/reference/instantiatedBaseTypeConstraints.js b/tests/baselines/reference/instantiatedBaseTypeConstraints.js index 24e8e66310c..c333ed36e1f 100644 --- a/tests/baselines/reference/instantiatedBaseTypeConstraints.js +++ b/tests/baselines/reference/instantiatedBaseTypeConstraints.js @@ -18,4 +18,4 @@ var Bar = (function () { Bar.prototype.foo = function (bar) { }; return Bar; -})(); +}()); diff --git a/tests/baselines/reference/instantiatedModule.js b/tests/baselines/reference/instantiatedModule.js index 8cabdeabe49..d8ef427619a 100644 --- a/tests/baselines/reference/instantiatedModule.js +++ b/tests/baselines/reference/instantiatedModule.js @@ -85,7 +85,7 @@ var M2; return { x: 0, y: 0 }; }; return Point; - })(); + }()); M2.Point = Point; })(M2 || (M2 = {})); var m2; diff --git a/tests/baselines/reference/instantiatedReturnTypeContravariance.js b/tests/baselines/reference/instantiatedReturnTypeContravariance.js index 2484816fe33..4d5e4376308 100644 --- a/tests/baselines/reference/instantiatedReturnTypeContravariance.js +++ b/tests/baselines/reference/instantiatedReturnTypeContravariance.js @@ -43,7 +43,7 @@ var c = (function () { return null; }; return c; -})(); +}()); var d = (function (_super) { __extends(d, _super); function d() { @@ -53,4 +53,4 @@ var d = (function (_super) { return null; }; return d; -})(c); +}(c)); diff --git a/tests/baselines/reference/intTypeCheck.js b/tests/baselines/reference/intTypeCheck.js index fbbe1bb5d03..84eb19ac27d 100644 --- a/tests/baselines/reference/intTypeCheck.js +++ b/tests/baselines/reference/intTypeCheck.js @@ -211,7 +211,7 @@ var Base = (function () { } Base.prototype.foo = function () { }; return Base; -})(); +}()); var anyVar; // // Property signatures diff --git a/tests/baselines/reference/interfaceClassMerging.js b/tests/baselines/reference/interfaceClassMerging.js index 565884e95ef..8138e7888b3 100644 --- a/tests/baselines/reference/interfaceClassMerging.js +++ b/tests/baselines/reference/interfaceClassMerging.js @@ -53,7 +53,7 @@ var Foo = (function () { return this.method(0); }; return Foo; -})(); +}()); var Bar = (function (_super) { __extends(Bar, _super); function Bar() { @@ -63,7 +63,7 @@ var Bar = (function (_super) { return this.optionalProperty; }; return Bar; -})(Foo); +}(Foo)); var bar = new Bar(); bar.method(0); bar.optionalMethod(1); diff --git a/tests/baselines/reference/interfaceClassMerging2.js b/tests/baselines/reference/interfaceClassMerging2.js index 0b40067640c..99f5b07696d 100644 --- a/tests/baselines/reference/interfaceClassMerging2.js +++ b/tests/baselines/reference/interfaceClassMerging2.js @@ -49,7 +49,7 @@ var Foo = (function () { return this; }; return Foo; -})(); +}()); var Bar = (function (_super) { __extends(Bar, _super); function Bar() { @@ -59,7 +59,7 @@ var Bar = (function (_super) { return this; }; return Bar; -})(Foo); +}(Foo)); var bar = new Bar(); bar.interfaceBarMethod().interfaceFooMethod().classBarMethod().classFooMethod(); var foo = new Foo(); diff --git a/tests/baselines/reference/interfaceContextualType.js b/tests/baselines/reference/interfaceContextualType.js index a0012121c0d..653579c81eb 100644 --- a/tests/baselines/reference/interfaceContextualType.js +++ b/tests/baselines/reference/interfaceContextualType.js @@ -36,4 +36,4 @@ var Bug = (function () { }; }; return Bug; -})(); +}()); diff --git a/tests/baselines/reference/interfaceDeclaration1.js b/tests/baselines/reference/interfaceDeclaration1.js index a7ec1249a25..91c84fbbc81 100644 --- a/tests/baselines/reference/interfaceDeclaration1.js +++ b/tests/baselines/reference/interfaceDeclaration1.js @@ -61,4 +61,4 @@ var C1 = (function () { var prototype = 3; } return C1; -})(); +}()); diff --git a/tests/baselines/reference/interfaceDeclaration2.js b/tests/baselines/reference/interfaceDeclaration2.js index 30f9df0fac7..bdd061448be 100644 --- a/tests/baselines/reference/interfaceDeclaration2.js +++ b/tests/baselines/reference/interfaceDeclaration2.js @@ -18,6 +18,6 @@ var I2 = (function () { function I2() { } return I2; -})(); +}()); function I3() { } var I4; diff --git a/tests/baselines/reference/interfaceDeclaration3.js b/tests/baselines/reference/interfaceDeclaration3.js index c3cbf47771d..a4df8926fba 100644 --- a/tests/baselines/reference/interfaceDeclaration3.js +++ b/tests/baselines/reference/interfaceDeclaration3.js @@ -64,27 +64,27 @@ define(["require", "exports"], function (require, exports) { function C1() { } return C1; - })(); + }()); var C2 = (function () { function C2() { } return C2; - })(); + }()); var C3 = (function () { function C3() { } return C3; - })(); + }()); var C4 = (function () { function C4() { } return C4; - })(); + }()); var C5 = (function () { function C5() { } return C5; - })(); + }()); })(M1 || (M1 = {})); var M2; (function (M2) { @@ -92,31 +92,31 @@ define(["require", "exports"], function (require, exports) { function C1() { } return C1; - })(); + }()); var C2 = (function () { function C2() { } return C2; - })(); + }()); var C3 = (function () { function C3() { } return C3; - })(); + }()); })(M2 = exports.M2 || (exports.M2 = {})); var C1 = (function () { function C1() { } return C1; - })(); + }()); var C2 = (function () { function C2() { } return C2; - })(); + }()); var C3 = (function () { function C3() { } return C3; - })(); + }()); }); diff --git a/tests/baselines/reference/interfaceDeclaration4.js b/tests/baselines/reference/interfaceDeclaration4.js index 728ef7156e9..cf97cf66972 100644 --- a/tests/baselines/reference/interfaceDeclaration4.js +++ b/tests/baselines/reference/interfaceDeclaration4.js @@ -49,24 +49,24 @@ var Foo; function C1() { } return C1; - })(); + }()); Foo.C1 = C1; })(Foo || (Foo = {})); var C1 = (function () { function C1() { } return C1; -})(); +}()); // Err - not implemented item var C2 = (function () { function C2() { } return C2; -})(); +}()); var C3 = (function () { function C3() { } return C3; -})(); +}()); I1; { } diff --git a/tests/baselines/reference/interfaceDeclaration5.js b/tests/baselines/reference/interfaceDeclaration5.js index 6a643e4b066..6726971d208 100644 --- a/tests/baselines/reference/interfaceDeclaration5.js +++ b/tests/baselines/reference/interfaceDeclaration5.js @@ -10,6 +10,6 @@ define(["require", "exports"], function (require, exports) { function C1() { } return C1; - })(); + }()); exports.C1 = C1; }); diff --git a/tests/baselines/reference/interfaceExtendingClass.js b/tests/baselines/reference/interfaceExtendingClass.js index f1232d78245..e2ca3f89791 100644 --- a/tests/baselines/reference/interfaceExtendingClass.js +++ b/tests/baselines/reference/interfaceExtendingClass.js @@ -32,7 +32,7 @@ var Foo = (function () { configurable: true }); return Foo; -})(); +}()); var i; var r1 = i.x; var r2 = i.y(); diff --git a/tests/baselines/reference/interfaceExtendingClass2.js b/tests/baselines/reference/interfaceExtendingClass2.js index c4143659125..c04ecf1d1bb 100644 --- a/tests/baselines/reference/interfaceExtendingClass2.js +++ b/tests/baselines/reference/interfaceExtendingClass2.js @@ -29,6 +29,6 @@ var Foo = (function () { configurable: true }); return Foo; -})(); +}()); return 1; ; diff --git a/tests/baselines/reference/interfaceExtendingClassWithPrivates.js b/tests/baselines/reference/interfaceExtendingClassWithPrivates.js index 3634d088a98..576f1a10128 100644 --- a/tests/baselines/reference/interfaceExtendingClassWithPrivates.js +++ b/tests/baselines/reference/interfaceExtendingClassWithPrivates.js @@ -20,7 +20,7 @@ var Foo = (function () { function Foo() { } return Foo; -})(); +}()); var i; var r = i.y; var r2 = i.x; // error diff --git a/tests/baselines/reference/interfaceExtendingClassWithPrivates2.js b/tests/baselines/reference/interfaceExtendingClassWithPrivates2.js index 6726d560a8c..a6f966a8fac 100644 --- a/tests/baselines/reference/interfaceExtendingClassWithPrivates2.js +++ b/tests/baselines/reference/interfaceExtendingClassWithPrivates2.js @@ -32,17 +32,17 @@ var Foo = (function () { function Foo() { } return Foo; -})(); +}()); var Bar = (function () { function Bar() { } return Bar; -})(); +}()); var Baz = (function () { function Baz() { } return Baz; -})(); +}()); var i; var r = i.z; var r2 = i.x; // error diff --git a/tests/baselines/reference/interfaceExtendingClassWithProtecteds.js b/tests/baselines/reference/interfaceExtendingClassWithProtecteds.js index f2d95812fd2..18c145ab72e 100644 --- a/tests/baselines/reference/interfaceExtendingClassWithProtecteds.js +++ b/tests/baselines/reference/interfaceExtendingClassWithProtecteds.js @@ -20,7 +20,7 @@ var Foo = (function () { function Foo() { } return Foo; -})(); +}()); var i; var r = i.y; var r2 = i.x; // error diff --git a/tests/baselines/reference/interfaceExtendingClassWithProtecteds2.js b/tests/baselines/reference/interfaceExtendingClassWithProtecteds2.js index 277c32a10c1..6bf6b22120b 100644 --- a/tests/baselines/reference/interfaceExtendingClassWithProtecteds2.js +++ b/tests/baselines/reference/interfaceExtendingClassWithProtecteds2.js @@ -32,17 +32,17 @@ var Foo = (function () { function Foo() { } return Foo; -})(); +}()); var Bar = (function () { function Bar() { } return Bar; -})(); +}()); var Baz = (function () { function Baz() { } return Baz; -})(); +}()); var i; var r = i.z; var r2 = i.x; // error diff --git a/tests/baselines/reference/interfaceExtendsClass1.js b/tests/baselines/reference/interfaceExtendsClass1.js index 2fbe01bdf67..43c7c6f6fa4 100644 --- a/tests/baselines/reference/interfaceExtendsClass1.js +++ b/tests/baselines/reference/interfaceExtendsClass1.js @@ -28,7 +28,7 @@ var Control = (function () { function Control() { } return Control; -})(); +}()); var Button = (function (_super) { __extends(Button, _super); function Button() { @@ -36,7 +36,7 @@ var Button = (function (_super) { } Button.prototype.select = function () { }; return Button; -})(Control); +}(Control)); var TextBox = (function (_super) { __extends(TextBox, _super); function TextBox() { @@ -44,17 +44,17 @@ var TextBox = (function (_super) { } TextBox.prototype.select = function () { }; return TextBox; -})(Control); +}(Control)); var Image = (function (_super) { __extends(Image, _super); function Image() { _super.apply(this, arguments); } return Image; -})(Control); +}(Control)); var Location = (function () { function Location() { } Location.prototype.select = function () { }; return Location; -})(); +}()); diff --git a/tests/baselines/reference/interfaceExtendsClassWithPrivate1.js b/tests/baselines/reference/interfaceExtendsClassWithPrivate1.js index 9a6e92c3e2b..e1bdbff85dd 100644 --- a/tests/baselines/reference/interfaceExtendsClassWithPrivate1.js +++ b/tests/baselines/reference/interfaceExtendsClassWithPrivate1.js @@ -39,7 +39,7 @@ var C = (function () { } C.prototype.foo = function (x) { return x; }; return C; -})(); +}()); var D = (function (_super) { __extends(D, _super); function D() { @@ -49,7 +49,7 @@ var D = (function (_super) { D.prototype.other = function (x) { return x; }; D.prototype.bar = function () { }; return D; -})(C); +}(C)); var c; var i; var d; diff --git a/tests/baselines/reference/interfaceExtendsClassWithPrivate2.js b/tests/baselines/reference/interfaceExtendsClassWithPrivate2.js index 44738036f96..1592b1a723b 100644 --- a/tests/baselines/reference/interfaceExtendsClassWithPrivate2.js +++ b/tests/baselines/reference/interfaceExtendsClassWithPrivate2.js @@ -35,7 +35,7 @@ var C = (function () { } C.prototype.foo = function (x) { return x; }; return C; -})(); +}()); var D = (function (_super) { __extends(D, _super); function D() { @@ -47,7 +47,7 @@ var D = (function (_super) { D.prototype.other = function (x) { return x; }; D.prototype.bar = function () { }; return D; -})(C); +}(C)); var D2 = (function (_super) { __extends(D2, _super); function D2() { @@ -58,4 +58,4 @@ var D2 = (function (_super) { D2.prototype.other = function (x) { return x; }; D2.prototype.bar = function () { }; return D2; -})(C); +}(C)); diff --git a/tests/baselines/reference/interfaceImplementation1.js b/tests/baselines/reference/interfaceImplementation1.js index 8f02596682d..6a8d1b2d782 100644 --- a/tests/baselines/reference/interfaceImplementation1.js +++ b/tests/baselines/reference/interfaceImplementation1.js @@ -52,13 +52,13 @@ var C1 = (function () { } C1.prototype.iFn = function (n, s) { }; return C1; -})(); +}()); var C2 = (function () { function C2() { this.x = 1; } return C2; -})(); +}()); var a = function () { return new C2(); }; diff --git a/tests/baselines/reference/interfaceImplementation2.js b/tests/baselines/reference/interfaceImplementation2.js index ac571a364b5..747fb0a6da3 100644 --- a/tests/baselines/reference/interfaceImplementation2.js +++ b/tests/baselines/reference/interfaceImplementation2.js @@ -18,4 +18,4 @@ var C3 = (function () { function C3() { } return C3; -})(); +}()); diff --git a/tests/baselines/reference/interfaceImplementation3.js b/tests/baselines/reference/interfaceImplementation3.js index da85de545cd..ef713d517b7 100644 --- a/tests/baselines/reference/interfaceImplementation3.js +++ b/tests/baselines/reference/interfaceImplementation3.js @@ -21,4 +21,4 @@ var C4 = (function () { } C4.prototype.iFn = function () { }; return C4; -})(); +}()); diff --git a/tests/baselines/reference/interfaceImplementation4.js b/tests/baselines/reference/interfaceImplementation4.js index 4a093381b5d..07d2f85e311 100644 --- a/tests/baselines/reference/interfaceImplementation4.js +++ b/tests/baselines/reference/interfaceImplementation4.js @@ -19,4 +19,4 @@ var C5 = (function () { } C5.prototype.iFn = function () { }; return C5; -})(); +}()); diff --git a/tests/baselines/reference/interfaceImplementation5.js b/tests/baselines/reference/interfaceImplementation5.js index c710eda84f5..e2b1ad345a9 100644 --- a/tests/baselines/reference/interfaceImplementation5.js +++ b/tests/baselines/reference/interfaceImplementation5.js @@ -41,7 +41,7 @@ var C1 = (function () { configurable: true }); return C1; -})(); +}()); var C2 = (function () { function C2() { } @@ -51,7 +51,7 @@ var C2 = (function () { configurable: true }); return C2; -})(); +}()); var C3 = (function () { function C3() { } @@ -62,7 +62,7 @@ var C3 = (function () { configurable: true }); return C3; -})(); +}()); var C4 = (function () { function C4() { } @@ -72,7 +72,7 @@ var C4 = (function () { configurable: true }); return C4; -})(); +}()); var C5 = (function () { function C5() { } @@ -82,7 +82,7 @@ var C5 = (function () { configurable: true }); return C5; -})(); +}()); var C6 = (function () { function C6() { } @@ -93,4 +93,4 @@ var C6 = (function () { configurable: true }); return C6; -})(); +}()); diff --git a/tests/baselines/reference/interfaceImplementation6.js b/tests/baselines/reference/interfaceImplementation6.js index e21499a20f4..642300d9160 100644 --- a/tests/baselines/reference/interfaceImplementation6.js +++ b/tests/baselines/reference/interfaceImplementation6.js @@ -31,23 +31,23 @@ define(["require", "exports"], function (require, exports) { function C1() { } return C1; - })(); + }()); var C2 = (function () { function C2() { } return C2; - })(); + }()); var C3 = (function () { function C3() { var item; } return C3; - })(); + }()); var Test = (function () { function Test() { this.pt = { item: 1 }; } return Test; - })(); + }()); exports.Test = Test; }); diff --git a/tests/baselines/reference/interfaceImplementation7.js b/tests/baselines/reference/interfaceImplementation7.js index 2813d7ee0fe..7a1a29c65bf 100644 --- a/tests/baselines/reference/interfaceImplementation7.js +++ b/tests/baselines/reference/interfaceImplementation7.js @@ -16,4 +16,4 @@ var C1 = (function () { } C1.prototype.name = function () { return ""; }; return C1; -})(); +}()); diff --git a/tests/baselines/reference/interfaceImplementation8.js b/tests/baselines/reference/interfaceImplementation8.js index cb6eaa12450..edfb33bfe1b 100644 --- a/tests/baselines/reference/interfaceImplementation8.js +++ b/tests/baselines/reference/interfaceImplementation8.js @@ -50,47 +50,47 @@ var C1 = (function () { function C1() { } return C1; -})(); +}()); var C2 = (function () { function C2() { } return C2; -})(); +}()); var C3 = (function () { function C3() { } return C3; -})(); +}()); var C4 = (function (_super) { __extends(C4, _super); function C4() { _super.apply(this, arguments); } return C4; -})(C1); +}(C1)); var C5 = (function (_super) { __extends(C5, _super); function C5() { _super.apply(this, arguments); } return C5; -})(C2); +}(C2)); var C6 = (function (_super) { __extends(C6, _super); function C6() { _super.apply(this, arguments); } return C6; -})(C3); +}(C3)); var C7 = (function () { function C7() { } return C7; -})(); +}()); var C8 = (function (_super) { __extends(C8, _super); function C8() { _super.apply(this, arguments); } return C8; -})(C7); +}(C7)); diff --git a/tests/baselines/reference/interfaceInReopenedModule.js b/tests/baselines/reference/interfaceInReopenedModule.js index 1f9d0981590..1196cd4df29 100644 --- a/tests/baselines/reference/interfaceInReopenedModule.js +++ b/tests/baselines/reference/interfaceInReopenedModule.js @@ -19,6 +19,6 @@ var m; function n() { } return n; - })(); + }()); m.n = n; })(m || (m = {})); diff --git a/tests/baselines/reference/interfaceInheritance.js b/tests/baselines/reference/interfaceInheritance.js index beec0f35d86..85ae7287f4a 100644 --- a/tests/baselines/reference/interfaceInheritance.js +++ b/tests/baselines/reference/interfaceInheritance.js @@ -45,7 +45,7 @@ var C1 = (function () { function C1() { } return C1; -})(); +}()); var i2; var i1; var i3; diff --git a/tests/baselines/reference/interfacePropertiesWithSameName3.js b/tests/baselines/reference/interfacePropertiesWithSameName3.js index 2711eb46847..bf4b9edefc1 100644 --- a/tests/baselines/reference/interfacePropertiesWithSameName3.js +++ b/tests/baselines/reference/interfacePropertiesWithSameName3.js @@ -13,9 +13,9 @@ var D2 = (function () { function D2() { } return D2; -})(); +}()); var E2 = (function () { function E2() { } return E2; -})(); +}()); diff --git a/tests/baselines/reference/interfaceSubtyping.js b/tests/baselines/reference/interfaceSubtyping.js index 43004985782..e0552a964e9 100644 --- a/tests/baselines/reference/interfaceSubtyping.js +++ b/tests/baselines/reference/interfaceSubtyping.js @@ -16,4 +16,4 @@ var Camera = (function () { } Camera.prototype.foo = function () { return "s"; }; return Camera; -})(); +}()); diff --git a/tests/baselines/reference/interfaceWithMultipleDeclarations.js b/tests/baselines/reference/interfaceWithMultipleDeclarations.js index f4b4e733161..e2ba78877e6 100644 --- a/tests/baselines/reference/interfaceWithMultipleDeclarations.js +++ b/tests/baselines/reference/interfaceWithMultipleDeclarations.js @@ -42,4 +42,4 @@ var Foo = (function () { function Foo() { } return Foo; -})(); +}()); diff --git a/tests/baselines/reference/interfaceWithPropertyOfEveryType.js b/tests/baselines/reference/interfaceWithPropertyOfEveryType.js index 90c0d257d61..fef3d2457d8 100644 --- a/tests/baselines/reference/interfaceWithPropertyOfEveryType.js +++ b/tests/baselines/reference/interfaceWithPropertyOfEveryType.js @@ -47,7 +47,7 @@ var C = (function () { function C() { } return C; -})(); +}()); function f1() { } var M; (function (M) { diff --git a/tests/baselines/reference/interfaceWithPropertyThatIsPrivateInBaseType.js b/tests/baselines/reference/interfaceWithPropertyThatIsPrivateInBaseType.js index 5209c0e97b9..fb5c0bd147a 100644 --- a/tests/baselines/reference/interfaceWithPropertyThatIsPrivateInBaseType.js +++ b/tests/baselines/reference/interfaceWithPropertyThatIsPrivateInBaseType.js @@ -20,9 +20,9 @@ var Base = (function () { function Base() { } return Base; -})(); +}()); var Base2 = (function () { function Base2() { } return Base2; -})(); +}()); diff --git a/tests/baselines/reference/interfaceWithPropertyThatIsPrivateInBaseType2.js b/tests/baselines/reference/interfaceWithPropertyThatIsPrivateInBaseType2.js index d53ec04c183..783a1fe4c8b 100644 --- a/tests/baselines/reference/interfaceWithPropertyThatIsPrivateInBaseType2.js +++ b/tests/baselines/reference/interfaceWithPropertyThatIsPrivateInBaseType2.js @@ -21,10 +21,10 @@ var Base = (function () { } Base.prototype.x = function () { }; return Base; -})(); +}()); var Base2 = (function () { function Base2() { } Base2.prototype.x = function () { }; return Base2; -})(); +}()); diff --git a/tests/baselines/reference/interfacedecl.js b/tests/baselines/reference/interfacedecl.js index fc1468b2c72..24d9df256ca 100644 --- a/tests/baselines/reference/interfacedecl.js +++ b/tests/baselines/reference/interfacedecl.js @@ -51,7 +51,7 @@ var c1 = (function () { function c1() { } return c1; -})(); +}()); var instance2 = new c1(); diff --git a/tests/baselines/reference/interfacedeclWithIndexerErrors.js b/tests/baselines/reference/interfacedeclWithIndexerErrors.js index 177b392fd2d..0e979a09d63 100644 --- a/tests/baselines/reference/interfacedeclWithIndexerErrors.js +++ b/tests/baselines/reference/interfacedeclWithIndexerErrors.js @@ -51,5 +51,5 @@ var c1 = (function () { function c1() { } return c1; -})(); +}()); var instance2 = new c1(); diff --git a/tests/baselines/reference/internalAliasClass.js b/tests/baselines/reference/internalAliasClass.js index 6361d7fdf99..7f3c7b69581 100644 --- a/tests/baselines/reference/internalAliasClass.js +++ b/tests/baselines/reference/internalAliasClass.js @@ -16,7 +16,7 @@ var a; function c() { } return c; - })(); + }()); a.c = c; })(a || (a = {})); var c; diff --git a/tests/baselines/reference/internalAliasClassInsideLocalModuleWithExport.js b/tests/baselines/reference/internalAliasClassInsideLocalModuleWithExport.js index 6714c10411e..aa274838529 100644 --- a/tests/baselines/reference/internalAliasClassInsideLocalModuleWithExport.js +++ b/tests/baselines/reference/internalAliasClassInsideLocalModuleWithExport.js @@ -28,7 +28,7 @@ var x; return a; }; return c; - })(); + }()); x.c = c; })(x = exports.x || (exports.x = {})); var m2; diff --git a/tests/baselines/reference/internalAliasClassInsideLocalModuleWithoutExport.js b/tests/baselines/reference/internalAliasClassInsideLocalModuleWithoutExport.js index 64bfe61fa6a..03b3542eca4 100644 --- a/tests/baselines/reference/internalAliasClassInsideLocalModuleWithoutExport.js +++ b/tests/baselines/reference/internalAliasClassInsideLocalModuleWithoutExport.js @@ -26,7 +26,7 @@ var x; return a; }; return c; - })(); + }()); x.c = c; })(x = exports.x || (exports.x = {})); var m2; diff --git a/tests/baselines/reference/internalAliasClassInsideLocalModuleWithoutExportAccessError.js b/tests/baselines/reference/internalAliasClassInsideLocalModuleWithoutExportAccessError.js index 49b784a9e99..c15ca69e13f 100644 --- a/tests/baselines/reference/internalAliasClassInsideLocalModuleWithoutExportAccessError.js +++ b/tests/baselines/reference/internalAliasClassInsideLocalModuleWithoutExportAccessError.js @@ -28,7 +28,7 @@ var x; return a; }; return c; - })(); + }()); x.c = c; })(x = exports.x || (exports.x = {})); var m2; diff --git a/tests/baselines/reference/internalAliasClassInsideTopLevelModuleWithExport.js b/tests/baselines/reference/internalAliasClassInsideTopLevelModuleWithExport.js index 1fa90e62b82..f881032fa1e 100644 --- a/tests/baselines/reference/internalAliasClassInsideTopLevelModuleWithExport.js +++ b/tests/baselines/reference/internalAliasClassInsideTopLevelModuleWithExport.js @@ -22,7 +22,7 @@ var x; return a; }; return c; - })(); + }()); x.c = c; })(x = exports.x || (exports.x = {})); exports.xc = x.c; diff --git a/tests/baselines/reference/internalAliasClassInsideTopLevelModuleWithoutExport.js b/tests/baselines/reference/internalAliasClassInsideTopLevelModuleWithoutExport.js index d4e1f3fc8e3..ac5004a7606 100644 --- a/tests/baselines/reference/internalAliasClassInsideTopLevelModuleWithoutExport.js +++ b/tests/baselines/reference/internalAliasClassInsideTopLevelModuleWithoutExport.js @@ -22,7 +22,7 @@ var x; return a; }; return c; - })(); + }()); x.c = c; })(x = exports.x || (exports.x = {})); var xc = x.c; diff --git a/tests/baselines/reference/internalAliasInitializedModule.js b/tests/baselines/reference/internalAliasInitializedModule.js index d7f741b7228..1d5e773994e 100644 --- a/tests/baselines/reference/internalAliasInitializedModule.js +++ b/tests/baselines/reference/internalAliasInitializedModule.js @@ -20,7 +20,7 @@ var a; function c() { } return c; - })(); + }()); b.c = c; })(b = a.b || (a.b = {})); })(a || (a = {})); diff --git a/tests/baselines/reference/internalAliasInitializedModuleInsideLocalModuleWithExport.js b/tests/baselines/reference/internalAliasInitializedModuleInsideLocalModuleWithExport.js index 0906321df88..3bd4c7c2fbc 100644 --- a/tests/baselines/reference/internalAliasInitializedModuleInsideLocalModuleWithExport.js +++ b/tests/baselines/reference/internalAliasInitializedModuleInsideLocalModuleWithExport.js @@ -22,7 +22,7 @@ define(["require", "exports"], function (require, exports) { function c() { } return c; - })(); + }()); b.c = c; })(b = a.b || (a.b = {})); })(a = exports.a || (exports.a = {})); diff --git a/tests/baselines/reference/internalAliasInitializedModuleInsideLocalModuleWithoutExport.js b/tests/baselines/reference/internalAliasInitializedModuleInsideLocalModuleWithoutExport.js index 212f4f841eb..910319be5e8 100644 --- a/tests/baselines/reference/internalAliasInitializedModuleInsideLocalModuleWithoutExport.js +++ b/tests/baselines/reference/internalAliasInitializedModuleInsideLocalModuleWithoutExport.js @@ -21,7 +21,7 @@ var a; function c() { } return c; - })(); + }()); b.c = c; })(b = a.b || (a.b = {})); })(a = exports.a || (exports.a = {})); diff --git a/tests/baselines/reference/internalAliasInitializedModuleInsideLocalModuleWithoutExportAccessError.js b/tests/baselines/reference/internalAliasInitializedModuleInsideLocalModuleWithoutExportAccessError.js index e6a3cd9f938..02181f04f8d 100644 --- a/tests/baselines/reference/internalAliasInitializedModuleInsideLocalModuleWithoutExportAccessError.js +++ b/tests/baselines/reference/internalAliasInitializedModuleInsideLocalModuleWithoutExportAccessError.js @@ -23,7 +23,7 @@ var a; function c() { } return c; - })(); + }()); b.c = c; })(b = a.b || (a.b = {})); })(a = exports.a || (exports.a = {})); diff --git a/tests/baselines/reference/internalAliasInitializedModuleInsideTopLevelModuleWithExport.js b/tests/baselines/reference/internalAliasInitializedModuleInsideTopLevelModuleWithExport.js index ea7681a2a50..26915043496 100644 --- a/tests/baselines/reference/internalAliasInitializedModuleInsideTopLevelModuleWithExport.js +++ b/tests/baselines/reference/internalAliasInitializedModuleInsideTopLevelModuleWithExport.js @@ -19,7 +19,7 @@ var a; function c() { } return c; - })(); + }()); b.c = c; })(b = a.b || (a.b = {})); })(a = exports.a || (exports.a = {})); diff --git a/tests/baselines/reference/internalAliasInitializedModuleInsideTopLevelModuleWithoutExport.js b/tests/baselines/reference/internalAliasInitializedModuleInsideTopLevelModuleWithoutExport.js index 90fd7212794..a8a1d9ee047 100644 --- a/tests/baselines/reference/internalAliasInitializedModuleInsideTopLevelModuleWithoutExport.js +++ b/tests/baselines/reference/internalAliasInitializedModuleInsideTopLevelModuleWithoutExport.js @@ -20,7 +20,7 @@ define(["require", "exports"], function (require, exports) { function c() { } return c; - })(); + }()); b.c = c; })(b = a.b || (a.b = {})); })(a = exports.a || (exports.a = {})); diff --git a/tests/baselines/reference/internalImportInstantiatedModuleMergedWithClassNotReferencingInstance.js b/tests/baselines/reference/internalImportInstantiatedModuleMergedWithClassNotReferencingInstance.js index 28cc2c2b6b4..8feecb53f98 100644 --- a/tests/baselines/reference/internalImportInstantiatedModuleMergedWithClassNotReferencingInstance.js +++ b/tests/baselines/reference/internalImportInstantiatedModuleMergedWithClassNotReferencingInstance.js @@ -18,7 +18,7 @@ var A = (function () { function A() { } return A; -})(); +}()); var A; (function (A) { A.a = 10; diff --git a/tests/baselines/reference/internalImportInstantiatedModuleMergedWithClassNotReferencingInstanceNoConflict.js b/tests/baselines/reference/internalImportInstantiatedModuleMergedWithClassNotReferencingInstanceNoConflict.js index 23c4aed97d1..27101bba5f9 100644 --- a/tests/baselines/reference/internalImportInstantiatedModuleMergedWithClassNotReferencingInstanceNoConflict.js +++ b/tests/baselines/reference/internalImportInstantiatedModuleMergedWithClassNotReferencingInstanceNoConflict.js @@ -17,7 +17,7 @@ var A = (function () { function A() { } return A; -})(); +}()); var A; (function (A) { A.a = 10; diff --git a/tests/baselines/reference/internalImportUnInstantiatedModuleMergedWithClassNotReferencingInstance.js b/tests/baselines/reference/internalImportUnInstantiatedModuleMergedWithClassNotReferencingInstance.js index 883819975ef..1df5c768f97 100644 --- a/tests/baselines/reference/internalImportUnInstantiatedModuleMergedWithClassNotReferencingInstance.js +++ b/tests/baselines/reference/internalImportUnInstantiatedModuleMergedWithClassNotReferencingInstance.js @@ -17,7 +17,7 @@ var A = (function () { function A() { } return A; -})(); +}()); var B; (function (B) { var A = 1; diff --git a/tests/baselines/reference/internalImportUnInstantiatedModuleMergedWithClassNotReferencingInstanceNoConflict.js b/tests/baselines/reference/internalImportUnInstantiatedModuleMergedWithClassNotReferencingInstanceNoConflict.js index a5357edc78f..4706390148f 100644 --- a/tests/baselines/reference/internalImportUnInstantiatedModuleMergedWithClassNotReferencingInstanceNoConflict.js +++ b/tests/baselines/reference/internalImportUnInstantiatedModuleMergedWithClassNotReferencingInstanceNoConflict.js @@ -16,4 +16,4 @@ var A = (function () { function A() { } return A; -})(); +}()); diff --git a/tests/baselines/reference/intrinsics.js b/tests/baselines/reference/intrinsics.js index 736ffa020fa..548c72b1b40 100644 --- a/tests/baselines/reference/intrinsics.js +++ b/tests/baselines/reference/intrinsics.js @@ -23,7 +23,7 @@ var m1; function C() { } return C; - })(); + }()); })(m1 || (m1 = {})); __proto__ = 0; // Error, __proto__ not defined m1.__proto__ = 0; @@ -31,5 +31,5 @@ var Foo = (function () { function Foo() { } return Foo; -})(); +}()); var foo; diff --git a/tests/baselines/reference/invalidAssignmentsToVoid.js b/tests/baselines/reference/invalidAssignmentsToVoid.js index 218126d4108..5f3a8ddabfc 100644 --- a/tests/baselines/reference/invalidAssignmentsToVoid.js +++ b/tests/baselines/reference/invalidAssignmentsToVoid.js @@ -32,7 +32,7 @@ var C = (function () { function C() { } return C; -})(); +}()); var c; x = C; x = c; diff --git a/tests/baselines/reference/invalidBooleanAssignments.js b/tests/baselines/reference/invalidBooleanAssignments.js index d47787b4bf4..48951c77fb1 100644 --- a/tests/baselines/reference/invalidBooleanAssignments.js +++ b/tests/baselines/reference/invalidBooleanAssignments.js @@ -41,7 +41,7 @@ var C = (function () { function C() { } return C; -})(); +}()); var f = x; var g = x; var h = x; diff --git a/tests/baselines/reference/invalidImportAliasIdentifiers.js b/tests/baselines/reference/invalidImportAliasIdentifiers.js index 2b31f5abebd..312ce2ba3c2 100644 --- a/tests/baselines/reference/invalidImportAliasIdentifiers.js +++ b/tests/baselines/reference/invalidImportAliasIdentifiers.js @@ -31,7 +31,7 @@ var C = (function () { function C() { } return C; -})(); +}()); var E; (function (E) { E[E["Red"] = 0] = "Red"; diff --git a/tests/baselines/reference/invalidInstantiatedModule.js b/tests/baselines/reference/invalidInstantiatedModule.js index 13e46c800ca..65328dc15b5 100644 --- a/tests/baselines/reference/invalidInstantiatedModule.js +++ b/tests/baselines/reference/invalidInstantiatedModule.js @@ -22,7 +22,7 @@ var M; function Point() { } return Point; - })(); + }()); M.Point = Point; M.Point = 1; // Error })(M || (M = {})); diff --git a/tests/baselines/reference/invalidModuleWithStatementsOfEveryKind.js b/tests/baselines/reference/invalidModuleWithStatementsOfEveryKind.js index 0b662b56f06..cb3c22b52eb 100644 --- a/tests/baselines/reference/invalidModuleWithStatementsOfEveryKind.js +++ b/tests/baselines/reference/invalidModuleWithStatementsOfEveryKind.js @@ -91,14 +91,14 @@ var Y; function A() { } return A; - })(); + }()); var BB = (function (_super) { __extends(BB, _super); function BB() { _super.apply(this, arguments); } return BB; - })(A); + }(A)); })(Y || (Y = {})); var Y2; (function (Y2) { @@ -106,14 +106,14 @@ var Y2; function AA() { } return AA; - })(); + }()); var B = (function (_super) { __extends(B, _super); function B() { _super.apply(this, arguments); } return B; - })(AA); + }(AA)); })(Y2 || (Y2 = {})); var Y3; (function (Y3) { @@ -123,7 +123,7 @@ var Y3; function A() { } return A; - })(); + }()); })(Module || (Module = {})); })(Y3 || (Y3 = {})); var Y4; @@ -140,14 +140,14 @@ var YY; function A() { } return A; - })(); + }()); var BB = (function (_super) { __extends(BB, _super); function BB() { _super.apply(this, arguments); } return BB; - })(A); + }(A)); })(YY || (YY = {})); var YY2; (function (YY2) { @@ -155,14 +155,14 @@ var YY2; function AA() { } return AA; - })(); + }()); var B = (function (_super) { __extends(B, _super); function B() { _super.apply(this, arguments); } return B; - })(AA); + }(AA)); })(YY2 || (YY2 = {})); var YY3; (function (YY3) { @@ -172,7 +172,7 @@ var YY3; function A() { } return A; - })(); + }()); })(Module || (Module = {})); })(YY3 || (YY3 = {})); var YY4; @@ -189,14 +189,14 @@ var YYY; function A() { } return A; - })(); + }()); var BB = (function (_super) { __extends(BB, _super); function BB() { _super.apply(this, arguments); } return BB; - })(A); + }(A)); })(YYY || (YYY = {})); var YYY2; (function (YYY2) { @@ -204,14 +204,14 @@ var YYY2; function AA() { } return AA; - })(); + }()); var B = (function (_super) { __extends(B, _super); function B() { _super.apply(this, arguments); } return B; - })(AA); + }(AA)); })(YYY2 || (YYY2 = {})); var YYY3; (function (YYY3) { @@ -221,7 +221,7 @@ var YYY3; function A() { } return A; - })(); + }()); })(Module || (Module = {})); })(YYY3 || (YYY3 = {})); var YYY4; diff --git a/tests/baselines/reference/invalidMultipleVariableDeclarations.js b/tests/baselines/reference/invalidMultipleVariableDeclarations.js index b239a3dc1dd..0c90c6d0025 100644 --- a/tests/baselines/reference/invalidMultipleVariableDeclarations.js +++ b/tests/baselines/reference/invalidMultipleVariableDeclarations.js @@ -63,19 +63,19 @@ var C = (function () { function C() { } return C; -})(); +}()); var C2 = (function (_super) { __extends(C2, _super); function C2() { _super.apply(this, arguments); } return C2; -})(C); +}(C)); var D = (function () { function D() { } return D; -})(); +}()); function F(x) { return 42; } var M; (function (M) { @@ -83,7 +83,7 @@ var M; function A() { } return A; - })(); + }()); M.A = A; function F2(x) { return x.toString(); } M.F2 = F2; diff --git a/tests/baselines/reference/invalidNestedModules.js b/tests/baselines/reference/invalidNestedModules.js index bec6491a636..8b532ddd757 100644 --- a/tests/baselines/reference/invalidNestedModules.js +++ b/tests/baselines/reference/invalidNestedModules.js @@ -40,7 +40,7 @@ var A; function Point() { } return Point; - })(); + }()); C.Point = Point; })(C = B.C || (B.C = {})); })(B = A.B || (A.B = {})); @@ -53,7 +53,7 @@ var A; function C() { } return C; - })(); + }()); B.C = C; })(B = A.B || (A.B = {})); })(A || (A = {})); @@ -65,7 +65,7 @@ var M2; function Point() { } return Point; - })(); + }()); X.Point = Point; })(X = M2.X || (M2.X = {})); })(M2 || (M2 = {})); diff --git a/tests/baselines/reference/invalidNumberAssignments.js b/tests/baselines/reference/invalidNumberAssignments.js index b381f5b0502..674421b3791 100644 --- a/tests/baselines/reference/invalidNumberAssignments.js +++ b/tests/baselines/reference/invalidNumberAssignments.js @@ -33,7 +33,7 @@ var C = (function () { function C() { } return C; -})(); +}()); var e = x; var f = x; var g = 1; diff --git a/tests/baselines/reference/invalidReferenceSyntax1.js b/tests/baselines/reference/invalidReferenceSyntax1.js index 39ecf8e6ab4..e220c41dd6f 100644 --- a/tests/baselines/reference/invalidReferenceSyntax1.js +++ b/tests/baselines/reference/invalidReferenceSyntax1.js @@ -10,4 +10,4 @@ var C = (function () { function C() { } return C; -})(); +}()); diff --git a/tests/baselines/reference/invalidReturnStatements.js b/tests/baselines/reference/invalidReturnStatements.js index 5fbe8c4dc37..0f5b0d3e08d 100644 --- a/tests/baselines/reference/invalidReturnStatements.js +++ b/tests/baselines/reference/invalidReturnStatements.js @@ -37,13 +37,13 @@ var C = (function () { } C.prototype.dispose = function () { }; return C; -})(); +}()); var D = (function (_super) { __extends(D, _super); function D() { _super.apply(this, arguments); } return D; -})(C); +}(C)); function fn10() { return { id: 12 }; } function fn11() { return new C(); } diff --git a/tests/baselines/reference/invalidStaticField.js b/tests/baselines/reference/invalidStaticField.js index 620c019fc18..dc582e830c7 100644 --- a/tests/baselines/reference/invalidStaticField.js +++ b/tests/baselines/reference/invalidStaticField.js @@ -8,10 +8,10 @@ var A = (function () { } A.prototype.foo = function () { return B.NULL; }; return A; -})(); +}()); var B = (function () { function B() { } B.NOT_NULL = new B(); return B; -})(); +}()); diff --git a/tests/baselines/reference/invalidStringAssignments.js b/tests/baselines/reference/invalidStringAssignments.js index 1f746f53e00..ec0d228ed04 100644 --- a/tests/baselines/reference/invalidStringAssignments.js +++ b/tests/baselines/reference/invalidStringAssignments.js @@ -36,7 +36,7 @@ var C = (function () { function C() { } return C; -})(); +}()); var e = x; var f = x; var g = 1; diff --git a/tests/baselines/reference/invalidTypeNames.js b/tests/baselines/reference/invalidTypeNames.js index ddae3e4eeb9..bdb755ac6cb 100644 --- a/tests/baselines/reference/invalidTypeNames.js +++ b/tests/baselines/reference/invalidTypeNames.js @@ -10,4 +10,4 @@ var illegal_name_here = (function () { function illegal_name_here() { } return illegal_name_here; -})(); +}()); diff --git a/tests/baselines/reference/invalidUndefinedAssignments.js b/tests/baselines/reference/invalidUndefinedAssignments.js index dc846900ebb..004c641466c 100644 --- a/tests/baselines/reference/invalidUndefinedAssignments.js +++ b/tests/baselines/reference/invalidUndefinedAssignments.js @@ -33,7 +33,7 @@ var C = (function () { function C() { } return C; -})(); +}()); var f; C = x; var g; diff --git a/tests/baselines/reference/invalidUndefinedValues.js b/tests/baselines/reference/invalidUndefinedValues.js index a0ed1b4f98a..04a8eed6655 100644 --- a/tests/baselines/reference/invalidUndefinedValues.js +++ b/tests/baselines/reference/invalidUndefinedValues.js @@ -43,7 +43,7 @@ var C = (function () { function C() { } return C; -})(); +}()); var b; x = C; x = b; diff --git a/tests/baselines/reference/invalidVoidAssignments.js b/tests/baselines/reference/invalidVoidAssignments.js index 1ce03d1382a..79fd7fe5eac 100644 --- a/tests/baselines/reference/invalidVoidAssignments.js +++ b/tests/baselines/reference/invalidVoidAssignments.js @@ -39,7 +39,7 @@ var C = (function () { function C() { } return C; -})(); +}()); var e = x; var f = x; var g = 1; diff --git a/tests/baselines/reference/invalidVoidValues.js b/tests/baselines/reference/invalidVoidValues.js index 409df03ef37..7844c54f7b6 100644 --- a/tests/baselines/reference/invalidVoidValues.js +++ b/tests/baselines/reference/invalidVoidValues.js @@ -41,7 +41,7 @@ var C = (function () { function C() { } return C; -})(); +}()); var a; x = a; var b; diff --git a/tests/baselines/reference/invokingNonGenericMethodWithTypeArguments1.js b/tests/baselines/reference/invokingNonGenericMethodWithTypeArguments1.js index 5ac4976398c..01884ae2b08 100644 --- a/tests/baselines/reference/invokingNonGenericMethodWithTypeArguments1.js +++ b/tests/baselines/reference/invokingNonGenericMethodWithTypeArguments1.js @@ -12,4 +12,4 @@ var Foo = (function () { this.foo(); } return Foo; -})(); +}()); diff --git a/tests/baselines/reference/invokingNonGenericMethodWithTypeArguments2.js b/tests/baselines/reference/invokingNonGenericMethodWithTypeArguments2.js index 26719b80c81..96a9ec98d66 100644 --- a/tests/baselines/reference/invokingNonGenericMethodWithTypeArguments2.js +++ b/tests/baselines/reference/invokingNonGenericMethodWithTypeArguments2.js @@ -14,4 +14,4 @@ var Foo = (function () { this.foo(); } return Foo; -})(); +}()); diff --git a/tests/baselines/reference/isDeclarationVisibleNodeKinds.js b/tests/baselines/reference/isDeclarationVisibleNodeKinds.js index 8604ec493a2..99e1ac72acd 100644 --- a/tests/baselines/reference/isDeclarationVisibleNodeKinds.js +++ b/tests/baselines/reference/isDeclarationVisibleNodeKinds.js @@ -153,7 +153,7 @@ var schema; configurable: true }); return T; - })(); + }()); schema.T = T; })(schema || (schema = {})); diff --git a/tests/baselines/reference/isolatedModulesImportExportElision.js b/tests/baselines/reference/isolatedModulesImportExportElision.js index f5dcb65bc9a..2d391a64fe7 100644 --- a/tests/baselines/reference/isolatedModulesImportExportElision.js +++ b/tests/baselines/reference/isolatedModulesImportExportElision.js @@ -29,7 +29,7 @@ var C = (function (_super) { _super.apply(this, arguments); } return C; -})(module_2.c2.C); +}(module_2.c2.C)); var x = new module_1.c(); var y = ns.value; var module_3 = require("module"); diff --git a/tests/baselines/reference/jsFileCompilationClassMethodContainingArrowFunction.js b/tests/baselines/reference/jsFileCompilationClassMethodContainingArrowFunction.js index 836b39380ea..32b10dafad3 100644 --- a/tests/baselines/reference/jsFileCompilationClassMethodContainingArrowFunction.js +++ b/tests/baselines/reference/jsFileCompilationClassMethodContainingArrowFunction.js @@ -15,4 +15,4 @@ var c = (function () { var x = function (a) { return _this.method(a); }; }; return c; -})(); +}()); diff --git a/tests/baselines/reference/jsFileCompilationEmitBlockedCorrectly.js b/tests/baselines/reference/jsFileCompilationEmitBlockedCorrectly.js index ea9c9f62b8d..e1052c14bbc 100644 --- a/tests/baselines/reference/jsFileCompilationEmitBlockedCorrectly.js +++ b/tests/baselines/reference/jsFileCompilationEmitBlockedCorrectly.js @@ -20,4 +20,4 @@ var d = (function () { function d() { } return d; -})(); +}()); diff --git a/tests/baselines/reference/jsFileCompilationEmitDeclarations.js b/tests/baselines/reference/jsFileCompilationEmitDeclarations.js index d45ae325b0a..5ed349ded42 100644 --- a/tests/baselines/reference/jsFileCompilationEmitDeclarations.js +++ b/tests/baselines/reference/jsFileCompilationEmitDeclarations.js @@ -14,7 +14,7 @@ var c = (function () { function c() { } return c; -})(); +}()); function foo() { } diff --git a/tests/baselines/reference/jsFileCompilationEmitTrippleSlashReference.js b/tests/baselines/reference/jsFileCompilationEmitTrippleSlashReference.js index 2d7d2743805..73fd2aab6e1 100644 --- a/tests/baselines/reference/jsFileCompilationEmitTrippleSlashReference.js +++ b/tests/baselines/reference/jsFileCompilationEmitTrippleSlashReference.js @@ -18,7 +18,7 @@ var c = (function () { function c() { } return c; -})(); +}()); function bar() { } /// diff --git a/tests/baselines/reference/jsFileCompilationErrorOnDeclarationsWithJsFileReferenceWithNoOut.js b/tests/baselines/reference/jsFileCompilationErrorOnDeclarationsWithJsFileReferenceWithNoOut.js index cf2caab3600..22ca88de330 100644 --- a/tests/baselines/reference/jsFileCompilationErrorOnDeclarationsWithJsFileReferenceWithNoOut.js +++ b/tests/baselines/reference/jsFileCompilationErrorOnDeclarationsWithJsFileReferenceWithNoOut.js @@ -19,7 +19,7 @@ var c = (function () { function c() { } return c; -})(); +}()); //// [b.js] /// // b.d.ts should have c.js as the reference path since we dont emit declarations for js files diff --git a/tests/baselines/reference/jsFileCompilationErrorOnDeclarationsWithJsFileReferenceWithOut.js b/tests/baselines/reference/jsFileCompilationErrorOnDeclarationsWithJsFileReferenceWithOut.js index 67989f3e3e7..ba7eacd905b 100644 --- a/tests/baselines/reference/jsFileCompilationErrorOnDeclarationsWithJsFileReferenceWithOut.js +++ b/tests/baselines/reference/jsFileCompilationErrorOnDeclarationsWithJsFileReferenceWithOut.js @@ -19,7 +19,7 @@ var c = (function () { function c() { } return c; -})(); +}()); function bar() { } /// diff --git a/tests/baselines/reference/jsFileCompilationErrorOnDeclarationsWithJsFileReferenceWithOutDir.js b/tests/baselines/reference/jsFileCompilationErrorOnDeclarationsWithJsFileReferenceWithOutDir.js index afed8cd42e3..5856e124148 100644 --- a/tests/baselines/reference/jsFileCompilationErrorOnDeclarationsWithJsFileReferenceWithOutDir.js +++ b/tests/baselines/reference/jsFileCompilationErrorOnDeclarationsWithJsFileReferenceWithOutDir.js @@ -19,7 +19,7 @@ var c = (function () { function c() { } return c; -})(); +}()); //// [c.js] function bar() { } diff --git a/tests/baselines/reference/jsFileCompilationNoErrorWithoutDeclarationsWithJsFileReferenceWithNoOut.js b/tests/baselines/reference/jsFileCompilationNoErrorWithoutDeclarationsWithJsFileReferenceWithNoOut.js index 2d844207986..43831985e2a 100644 --- a/tests/baselines/reference/jsFileCompilationNoErrorWithoutDeclarationsWithJsFileReferenceWithNoOut.js +++ b/tests/baselines/reference/jsFileCompilationNoErrorWithoutDeclarationsWithJsFileReferenceWithNoOut.js @@ -19,7 +19,7 @@ var c = (function () { function c() { } return c; -})(); +}()); //// [b.js] /// // no error on above reference path since not emitting declarations diff --git a/tests/baselines/reference/jsFileCompilationNoErrorWithoutDeclarationsWithJsFileReferenceWithOut.js b/tests/baselines/reference/jsFileCompilationNoErrorWithoutDeclarationsWithJsFileReferenceWithOut.js index fae4936b6c9..f60aefd9ae4 100644 --- a/tests/baselines/reference/jsFileCompilationNoErrorWithoutDeclarationsWithJsFileReferenceWithOut.js +++ b/tests/baselines/reference/jsFileCompilationNoErrorWithoutDeclarationsWithJsFileReferenceWithOut.js @@ -19,7 +19,7 @@ var c = (function () { function c() { } return c; -})(); +}()); function bar() { } /// diff --git a/tests/baselines/reference/jsFileCompilationWithDeclarationEmitPathSameAsInput.js b/tests/baselines/reference/jsFileCompilationWithDeclarationEmitPathSameAsInput.js index a7ba8b49985..cc41c5b4140 100644 --- a/tests/baselines/reference/jsFileCompilationWithDeclarationEmitPathSameAsInput.js +++ b/tests/baselines/reference/jsFileCompilationWithDeclarationEmitPathSameAsInput.js @@ -12,4 +12,4 @@ var c = (function () { function c() { } return c; -})(); +}()); diff --git a/tests/baselines/reference/jsFileCompilationWithMapFileAsJs.js b/tests/baselines/reference/jsFileCompilationWithMapFileAsJs.js index a5351de087c..8e70b464c2f 100644 --- a/tests/baselines/reference/jsFileCompilationWithMapFileAsJs.js +++ b/tests/baselines/reference/jsFileCompilationWithMapFileAsJs.js @@ -18,5 +18,5 @@ var c = (function () { function c() { } return c; -})(); +}()); //# sourceMappingURL=a.js.map \ No newline at end of file diff --git a/tests/baselines/reference/jsFileCompilationWithMapFileAsJs.sourcemap.txt b/tests/baselines/reference/jsFileCompilationWithMapFileAsJs.sourcemap.txt index db0f57e5909..d8c66a888b3 100644 --- a/tests/baselines/reference/jsFileCompilationWithMapFileAsJs.sourcemap.txt +++ b/tests/baselines/reference/jsFileCompilationWithMapFileAsJs.sourcemap.txt @@ -39,7 +39,7 @@ sourceFile:a.ts 1->Emitted(4, 5) Source(3, 1) + SourceIndex(0) 2 >Emitted(4, 13) Source(3, 2) + SourceIndex(0) --- ->>>})(); +>>>}()); 1 > 2 >^ 3 > diff --git a/tests/baselines/reference/jsFileCompilationWithMapFileAsJsWithInlineSourceMap.js b/tests/baselines/reference/jsFileCompilationWithMapFileAsJsWithInlineSourceMap.js index e0395e553c5..c23d44b9cb8 100644 --- a/tests/baselines/reference/jsFileCompilationWithMapFileAsJsWithInlineSourceMap.js +++ b/tests/baselines/reference/jsFileCompilationWithMapFileAsJsWithInlineSourceMap.js @@ -18,5 +18,5 @@ var c = (function () { function c() { } return c; -})(); +}()); //# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiYS5qcyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbImEudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6IkFBQ0E7SUFBQTtJQUNBLENBQUM7SUFBRCxRQUFDO0FBQUQsQ0FBQyxBQURELElBQ0MifQ== \ No newline at end of file diff --git a/tests/baselines/reference/jsFileCompilationWithMapFileAsJsWithInlineSourceMap.sourcemap.txt b/tests/baselines/reference/jsFileCompilationWithMapFileAsJsWithInlineSourceMap.sourcemap.txt index 41b2ac54f0a..c7cb8afe696 100644 --- a/tests/baselines/reference/jsFileCompilationWithMapFileAsJsWithInlineSourceMap.sourcemap.txt +++ b/tests/baselines/reference/jsFileCompilationWithMapFileAsJsWithInlineSourceMap.sourcemap.txt @@ -39,7 +39,7 @@ sourceFile:a.ts 1->Emitted(4, 5) Source(3, 1) + SourceIndex(0) 2 >Emitted(4, 13) Source(3, 2) + SourceIndex(0) --- ->>>})(); +>>>}()); 1 > 2 >^ 3 > diff --git a/tests/baselines/reference/jsFileCompilationWithMapFileAsJsWithOutDir.js b/tests/baselines/reference/jsFileCompilationWithMapFileAsJsWithOutDir.js index 742e7af2799..b6c7efa9478 100644 --- a/tests/baselines/reference/jsFileCompilationWithMapFileAsJsWithOutDir.js +++ b/tests/baselines/reference/jsFileCompilationWithMapFileAsJsWithOutDir.js @@ -18,5 +18,5 @@ var c = (function () { function c() { } return c; -})(); +}()); //# sourceMappingURL=a.js.map \ No newline at end of file diff --git a/tests/baselines/reference/jsFileCompilationWithMapFileAsJsWithOutDir.sourcemap.txt b/tests/baselines/reference/jsFileCompilationWithMapFileAsJsWithOutDir.sourcemap.txt index 762af7a798a..5c37dd75409 100644 --- a/tests/baselines/reference/jsFileCompilationWithMapFileAsJsWithOutDir.sourcemap.txt +++ b/tests/baselines/reference/jsFileCompilationWithMapFileAsJsWithOutDir.sourcemap.txt @@ -39,7 +39,7 @@ sourceFile:../tests/cases/compiler/a.ts 1->Emitted(4, 5) Source(3, 1) + SourceIndex(0) 2 >Emitted(4, 13) Source(3, 2) + SourceIndex(0) --- ->>>})(); +>>>}()); 1 > 2 >^ 3 > diff --git a/tests/baselines/reference/jsFileCompilationWithOut.js b/tests/baselines/reference/jsFileCompilationWithOut.js index 32d0261061f..0ee9f08ebd4 100644 --- a/tests/baselines/reference/jsFileCompilationWithOut.js +++ b/tests/baselines/reference/jsFileCompilationWithOut.js @@ -14,6 +14,6 @@ var c = (function () { function c() { } return c; -})(); +}()); function foo() { } diff --git a/tests/baselines/reference/jsFileCompilationWithOutDeclarationFileNameSameAsInputJsFile.js b/tests/baselines/reference/jsFileCompilationWithOutDeclarationFileNameSameAsInputJsFile.js index d3b2f788d66..f87ce797d66 100644 --- a/tests/baselines/reference/jsFileCompilationWithOutDeclarationFileNameSameAsInputJsFile.js +++ b/tests/baselines/reference/jsFileCompilationWithOutDeclarationFileNameSameAsInputJsFile.js @@ -12,4 +12,4 @@ var c = (function () { function c() { } return c; -})(); +}()); diff --git a/tests/baselines/reference/jsFileCompilationWithoutOut.js b/tests/baselines/reference/jsFileCompilationWithoutOut.js index 4a60c54c3ab..5bed8b3a8bb 100644 --- a/tests/baselines/reference/jsFileCompilationWithoutOut.js +++ b/tests/baselines/reference/jsFileCompilationWithoutOut.js @@ -14,4 +14,4 @@ var c = (function () { function c() { } return c; -})(); +}()); diff --git a/tests/baselines/reference/jsxAndTypeAssertion.js b/tests/baselines/reference/jsxAndTypeAssertion.js index 0a493006dc6..f3a1b5ecbff 100644 --- a/tests/baselines/reference/jsxAndTypeAssertion.js +++ b/tests/baselines/reference/jsxAndTypeAssertion.js @@ -27,7 +27,7 @@ var foo = (function () { function foo() { } return foo; -})(); +}()); var x; x = {test} }; diff --git a/tests/baselines/reference/jsxViaImport.js b/tests/baselines/reference/jsxViaImport.js index c980dc256c6..ba8efc9e7ab 100644 --- a/tests/baselines/reference/jsxViaImport.js +++ b/tests/baselines/reference/jsxViaImport.js @@ -41,4 +41,4 @@ var TestComponent = (function (_super) { return ; }; return TestComponent; -})(React.Component); +}(React.Component)); diff --git a/tests/baselines/reference/lambdaArgCrash.js b/tests/baselines/reference/lambdaArgCrash.js index 5616b5d525f..822aa71efd0 100644 --- a/tests/baselines/reference/lambdaArgCrash.js +++ b/tests/baselines/reference/lambdaArgCrash.js @@ -52,7 +52,7 @@ var Event = (function () { this._listeners.push(listener); }; return Event; -})(); +}()); var ItemSetEvent = (function (_super) { __extends(ItemSetEvent, _super); function ItemSetEvent() { @@ -62,4 +62,4 @@ var ItemSetEvent = (function (_super) { _super.prototype.add.call(this, listener); }; return ItemSetEvent; -})(Event); +}(Event)); diff --git a/tests/baselines/reference/lambdaPropSelf.js b/tests/baselines/reference/lambdaPropSelf.js index 8d1b16e1431..5e19726f794 100644 --- a/tests/baselines/reference/lambdaPropSelf.js +++ b/tests/baselines/reference/lambdaPropSelf.js @@ -32,7 +32,7 @@ var Person = (function () { this.children = ko.observableArray(children); } return Person; -})(); +}()); var T = (function () { function T() { } @@ -40,7 +40,7 @@ var T = (function () { var x = this; }; return T; -})(); +}()); var M; (function (M) { var x = this; diff --git a/tests/baselines/reference/libMembers.js b/tests/baselines/reference/libMembers.js index 38d1356ccc3..46ef17bb651 100644 --- a/tests/baselines/reference/libMembers.js +++ b/tests/baselines/reference/libMembers.js @@ -27,7 +27,7 @@ var M; function C() { } return C; - })(); + }()); M.C = C; var a = new C[]; a.length; diff --git a/tests/baselines/reference/lift.js b/tests/baselines/reference/lift.js index a832b34641d..568379948bc 100644 --- a/tests/baselines/reference/lift.js +++ b/tests/baselines/reference/lift.js @@ -28,7 +28,7 @@ var B = (function () { this.y = y; } return B; -})(); +}()); var C = (function (_super) { __extends(C, _super); function C(y, z, w) { @@ -39,4 +39,4 @@ var C = (function (_super) { C.prototype.liftxyz = function () { return x + z + this.y; }; C.prototype.liftxylocllz = function () { return x + z + this.y + this.ll; }; return C; -})(B); +}(B)); diff --git a/tests/baselines/reference/listFailure.js b/tests/baselines/reference/listFailure.js index fa2fc9b3453..ab0e9ca5bff 100644 --- a/tests/baselines/reference/listFailure.js +++ b/tests/baselines/reference/listFailure.js @@ -54,7 +54,7 @@ var Editor; return lineEntry; }; return Buffer; - })(); + }()); Editor.Buffer = Buffer; function ListRemoveEntry(entry) { return entry; @@ -79,11 +79,11 @@ var Editor; return (ListRemoveEntry(this.next)); }; return List; - })(); + }()); var Line = (function () { function Line() { } return Line; - })(); + }()); Editor.Line = Line; })(Editor || (Editor = {})); diff --git a/tests/baselines/reference/literalsInComputedProperties1.js b/tests/baselines/reference/literalsInComputedProperties1.js index ef11dbff6ea..82a6367e5d2 100644 --- a/tests/baselines/reference/literalsInComputedProperties1.js +++ b/tests/baselines/reference/literalsInComputedProperties1.js @@ -73,7 +73,7 @@ var C = (function () { function C() { } return C; -})(); +}()); var z; z[1].toExponential(); z[2].toExponential(); diff --git a/tests/baselines/reference/localClassesInLoop.js b/tests/baselines/reference/localClassesInLoop.js index 7912b2ef0d6..0090ada863d 100644 --- a/tests/baselines/reference/localClassesInLoop.js +++ b/tests/baselines/reference/localClassesInLoop.js @@ -18,7 +18,7 @@ var _loop_1 = function(x) { function C() { } return C; - })(); + }()); data.push(function () { return C; }); }; for (var x = 0; x < 2; ++x) { diff --git a/tests/baselines/reference/localTypes1.js b/tests/baselines/reference/localTypes1.js index 00c65db2c96..a4f835c8669 100644 --- a/tests/baselines/reference/localTypes1.js +++ b/tests/baselines/reference/localTypes1.js @@ -158,7 +158,7 @@ function f1() { function C() { } return C; - })(); + }()); var a = [new C()]; a[0].x = E.B; return a; @@ -175,7 +175,7 @@ function f2() { function C() { } return C; - })(); + }()); var a = [new C()]; a[0].x = E.B; return a; @@ -195,7 +195,7 @@ function f3(b) { function C() { } return C; - })(); + }()); var a = [new C()]; a[0].x = E.B; return a; @@ -205,7 +205,7 @@ function f3(b) { function A_1() { } return A_1; - })(); + }()); var c = [new A_1()]; c[0].x = E.B; return c; @@ -224,7 +224,7 @@ function f5() { function C() { } return C; - })(); + }()); return new C(); }; var z2 = function () { @@ -238,7 +238,7 @@ function f5() { function C() { } return C; - })(); + }()); return new C(); }; } @@ -254,7 +254,7 @@ var A = (function () { function C() { } return C; - })(); + }()); } A.prototype.m = function () { var E; @@ -267,7 +267,7 @@ var A = (function () { function C() { } return C; - })(); + }()); return new C(); }; Object.defineProperty(A.prototype, "p", { @@ -282,20 +282,20 @@ var A = (function () { function C() { } return C; - })(); + }()); return new C(); }, enumerable: true, configurable: true }); return A; -})(); +}()); function f6() { var A = (function () { function A() { } return A; - })(); + }()); function g() { var B = (function (_super) { __extends(B, _super); @@ -303,7 +303,7 @@ function f6() { _super.apply(this, arguments); } return B; - })(A); + }(A)); function h() { var C = (function (_super) { __extends(C, _super); @@ -311,7 +311,7 @@ function f6() { _super.apply(this, arguments); } return C; - })(B); + }(B)); var x = new C(); x.a = "a"; x.b = "b"; diff --git a/tests/baselines/reference/localTypes2.js b/tests/baselines/reference/localTypes2.js index a95844f0794..e8713f75241 100644 --- a/tests/baselines/reference/localTypes2.js +++ b/tests/baselines/reference/localTypes2.js @@ -50,7 +50,7 @@ function f1() { this.y = y; } return C; - })(); + }()); return C; } var C = f(); @@ -66,7 +66,7 @@ function f2() { this.x = x; } return C; - })(); + }()); return C; } var C = f(10); @@ -82,7 +82,7 @@ function f3() { this.y = y; } return C; - })(); + }()); return C; } var C = f(10, 20); diff --git a/tests/baselines/reference/localTypes3.js b/tests/baselines/reference/localTypes3.js index 2d40bc922b9..462959e68d1 100644 --- a/tests/baselines/reference/localTypes3.js +++ b/tests/baselines/reference/localTypes3.js @@ -50,7 +50,7 @@ function f1() { this.y = y; } return C; - })(); + }()); return C; } var C = f(); @@ -66,7 +66,7 @@ function f2() { this.x = x; } return C; - })(); + }()); return C; } var C = f(10); @@ -82,7 +82,7 @@ function f3() { this.y = y; } return C; - })(); + }()); return C; } var C = f(10, "hello"); diff --git a/tests/baselines/reference/localTypes5.js b/tests/baselines/reference/localTypes5.js index 872629276d2..c7f0f722741 100644 --- a/tests/baselines/reference/localTypes5.js +++ b/tests/baselines/reference/localTypes5.js @@ -26,12 +26,12 @@ function foo() { function Y() { } return Y; - })(); + }()); return new Y(); })(); }; return X; - })(); + }()); var x = new X(); return x.m(); } diff --git a/tests/baselines/reference/logicalNotOperatorWithAnyOtherType.js b/tests/baselines/reference/logicalNotOperatorWithAnyOtherType.js index 61a1d4c01d1..6f51a3cdda0 100644 --- a/tests/baselines/reference/logicalNotOperatorWithAnyOtherType.js +++ b/tests/baselines/reference/logicalNotOperatorWithAnyOtherType.js @@ -78,7 +78,7 @@ var A = (function () { return a; }; return A; -})(); +}()); var M; (function (M) { })(M || (M = {})); diff --git a/tests/baselines/reference/logicalNotOperatorWithBooleanType.js b/tests/baselines/reference/logicalNotOperatorWithBooleanType.js index 6af1f67f7cf..bd273fffc36 100644 --- a/tests/baselines/reference/logicalNotOperatorWithBooleanType.js +++ b/tests/baselines/reference/logicalNotOperatorWithBooleanType.js @@ -47,7 +47,7 @@ var A = (function () { } A.foo = function () { return false; }; return A; -})(); +}()); var M; (function (M) { })(M || (M = {})); diff --git a/tests/baselines/reference/logicalNotOperatorWithNumberType.js b/tests/baselines/reference/logicalNotOperatorWithNumberType.js index b291d31f5b0..f643b5452bb 100644 --- a/tests/baselines/reference/logicalNotOperatorWithNumberType.js +++ b/tests/baselines/reference/logicalNotOperatorWithNumberType.js @@ -55,7 +55,7 @@ var A = (function () { } A.foo = function () { return 1; }; return A; -})(); +}()); var M; (function (M) { })(M || (M = {})); diff --git a/tests/baselines/reference/logicalNotOperatorWithStringType.js b/tests/baselines/reference/logicalNotOperatorWithStringType.js index caf31b78057..8a80ed8761a 100644 --- a/tests/baselines/reference/logicalNotOperatorWithStringType.js +++ b/tests/baselines/reference/logicalNotOperatorWithStringType.js @@ -54,7 +54,7 @@ var A = (function () { } A.foo = function () { return ""; }; return A; -})(); +}()); var M; (function (M) { })(M || (M = {})); diff --git a/tests/baselines/reference/m7Bugs.js b/tests/baselines/reference/m7Bugs.js index 86b5aa96c77..6292356faf5 100644 --- a/tests/baselines/reference/m7Bugs.js +++ b/tests/baselines/reference/m7Bugs.js @@ -38,14 +38,14 @@ var C1 = (function () { function C1() { } return C1; -})(); +}()); var C2 = (function (_super) { __extends(C2, _super); function C2() { _super.apply(this, arguments); } return C2; -})(C1); +}(C1)); var y1 = new C2(); var y2 = new C2(); var y3 = {}; diff --git a/tests/baselines/reference/matchReturnTypeInAllBranches.js b/tests/baselines/reference/matchReturnTypeInAllBranches.js index 5e9b88f61ac..4ac2c63eb4f 100644 --- a/tests/baselines/reference/matchReturnTypeInAllBranches.js +++ b/tests/baselines/reference/matchReturnTypeInAllBranches.js @@ -62,6 +62,6 @@ var IceCreamMonster = (function () { } }; return IceCreamMonster; -})(); +}()); var cookieMonster; cookieMonster = new IceCreamMonster("Chocolate Chip", false, "COOOOOKIE", "Cookie Monster"); diff --git a/tests/baselines/reference/memberAccessMustUseModuleInstances.js b/tests/baselines/reference/memberAccessMustUseModuleInstances.js index bbeafeab346..0071d0dfef0 100644 --- a/tests/baselines/reference/memberAccessMustUseModuleInstances.js +++ b/tests/baselines/reference/memberAccessMustUseModuleInstances.js @@ -24,7 +24,7 @@ define(["require", "exports"], function (require, exports) { return null; }; return Promise; - })(); + }()); exports.Promise = Promise; }); //// [memberAccessMustUseModuleInstances_1.js] diff --git a/tests/baselines/reference/memberFunctionOverloadMixingStaticAndInstance.js b/tests/baselines/reference/memberFunctionOverloadMixingStaticAndInstance.js index 80c7043552c..6555151ccd7 100644 --- a/tests/baselines/reference/memberFunctionOverloadMixingStaticAndInstance.js +++ b/tests/baselines/reference/memberFunctionOverloadMixingStaticAndInstance.js @@ -24,19 +24,19 @@ var C = (function () { function C() { } return C; -})(); +}()); var D = (function () { function D() { } return D; -})(); +}()); var E = (function () { function E() { } return E; -})(); +}()); var F = (function () { function F() { } return F; -})(); +}()); diff --git a/tests/baselines/reference/memberFunctionsWithPrivateOverloads.js b/tests/baselines/reference/memberFunctionsWithPrivateOverloads.js index 584bafad6f6..ecf9a14033b 100644 --- a/tests/baselines/reference/memberFunctionsWithPrivateOverloads.js +++ b/tests/baselines/reference/memberFunctionsWithPrivateOverloads.js @@ -58,7 +58,7 @@ var C = (function () { C.foo = function (x, y) { }; C.bar = function (x, y) { }; return C; -})(); +}()); var D = (function () { function D() { } @@ -67,7 +67,7 @@ var D = (function () { D.foo = function (x, y) { }; D.bar = function (x, y) { }; return D; -})(); +}()); var c; var r = c.foo(1); // error var d; diff --git a/tests/baselines/reference/memberFunctionsWithPublicOverloads.js b/tests/baselines/reference/memberFunctionsWithPublicOverloads.js index efdd6efaffa..91b9e829673 100644 --- a/tests/baselines/reference/memberFunctionsWithPublicOverloads.js +++ b/tests/baselines/reference/memberFunctionsWithPublicOverloads.js @@ -49,7 +49,7 @@ var C = (function () { C.foo = function (x, y) { }; C.bar = function (x, y) { }; return C; -})(); +}()); var D = (function () { function D() { } @@ -58,4 +58,4 @@ var D = (function () { D.foo = function (x, y) { }; D.bar = function (x, y) { }; return D; -})(); +}()); diff --git a/tests/baselines/reference/memberFunctionsWithPublicPrivateOverloads.js b/tests/baselines/reference/memberFunctionsWithPublicPrivateOverloads.js index 7738bf4fe4e..1d8d40533c6 100644 --- a/tests/baselines/reference/memberFunctionsWithPublicPrivateOverloads.js +++ b/tests/baselines/reference/memberFunctionsWithPublicPrivateOverloads.js @@ -73,7 +73,7 @@ var C = (function () { C.bar = function (x, y) { }; C.baz = function (x, y) { }; return C; -})(); +}()); var D = (function () { function D() { } @@ -84,7 +84,7 @@ var D = (function () { D.bar = function (x, y) { }; D.baz = function (x, y) { }; return D; -})(); +}()); var c; var r = c.foo(1); // error var d; diff --git a/tests/baselines/reference/memberScope.js b/tests/baselines/reference/memberScope.js index 05123460f97..f8600053b1e 100644 --- a/tests/baselines/reference/memberScope.js +++ b/tests/baselines/reference/memberScope.js @@ -14,7 +14,7 @@ var Salt; function Pepper() { } return Pepper; - })(); + }()); Salt.Pepper = Pepper; var z = Basil.Pepper; })(Salt || (Salt = {})); diff --git a/tests/baselines/reference/memberVariableDeclarations1.js b/tests/baselines/reference/memberVariableDeclarations1.js index 7fceee20d2d..f72633a7c83 100644 --- a/tests/baselines/reference/memberVariableDeclarations1.js +++ b/tests/baselines/reference/memberVariableDeclarations1.js @@ -36,7 +36,7 @@ var Employee = (function () { this.reports = []; } return Employee; -})(); +}()); var Employee2 = (function () { function Employee2() { this.retired = false; @@ -44,7 +44,7 @@ var Employee2 = (function () { this.reports = []; } return Employee2; -})(); +}()); var e1; var e2; e1 = e2; diff --git a/tests/baselines/reference/mergedClassInterface.js b/tests/baselines/reference/mergedClassInterface.js index 64b52c23713..913c0472cbd 100644 --- a/tests/baselines/reference/mergedClassInterface.js +++ b/tests/baselines/reference/mergedClassInterface.js @@ -59,12 +59,12 @@ var C3 = (function () { function C3() { } return C3; -})(); +}()); var C4 = (function () { function C4() { } return C4; -})(); +}()); // checks if properties actually were merged var c5; c5.x1; diff --git a/tests/baselines/reference/mergedInheritedClassInterface.js b/tests/baselines/reference/mergedInheritedClassInterface.js index 2cc88ac9431..72ac1c8a928 100644 --- a/tests/baselines/reference/mergedInheritedClassInterface.js +++ b/tests/baselines/reference/mergedInheritedClassInterface.js @@ -57,7 +57,7 @@ var BaseClass = (function () { } BaseClass.prototype.baseMethod = function () { }; return BaseClass; -})(); +}()); var Child = (function (_super) { __extends(Child, _super); function Child() { @@ -65,20 +65,20 @@ var Child = (function (_super) { } Child.prototype.method = function () { }; return Child; -})(BaseClass); +}(BaseClass)); var ChildNoBaseClass = (function () { function ChildNoBaseClass() { } ChildNoBaseClass.prototype.method2 = function () { }; return ChildNoBaseClass; -})(); +}()); var Grandchild = (function (_super) { __extends(Grandchild, _super); function Grandchild() { _super.apply(this, arguments); } return Grandchild; -})(ChildNoBaseClass); +}(ChildNoBaseClass)); // checks if properties actually were merged var child; child.required; diff --git a/tests/baselines/reference/mergedInterfacesWithInheritedPrivates.js b/tests/baselines/reference/mergedInterfacesWithInheritedPrivates.js index 2502b46b06b..2c9e7fc2da4 100644 --- a/tests/baselines/reference/mergedInterfacesWithInheritedPrivates.js +++ b/tests/baselines/reference/mergedInterfacesWithInheritedPrivates.js @@ -31,16 +31,16 @@ var C = (function () { function C() { } return C; -})(); +}()); var D = (function () { function D() { } return D; -})(); +}()); var E = (function () { function E() { } return E; -})(); +}()); var a; var r = a.x; // error diff --git a/tests/baselines/reference/mergedInterfacesWithInheritedPrivates2.js b/tests/baselines/reference/mergedInterfacesWithInheritedPrivates2.js index 26cd3c8bf7c..a7e341c31ce 100644 --- a/tests/baselines/reference/mergedInterfacesWithInheritedPrivates2.js +++ b/tests/baselines/reference/mergedInterfacesWithInheritedPrivates2.js @@ -41,26 +41,26 @@ var C = (function () { function C() { } return C; -})(); +}()); var C2 = (function () { function C2() { } return C2; -})(); +}()); var D = (function (_super) { __extends(D, _super); function D() { _super.apply(this, arguments); } return D; -})(C); +}(C)); var E = (function (_super) { __extends(E, _super); function E() { _super.apply(this, arguments); } return E; -})(C2); +}(C2)); var a; var r = a.x; // error var r2 = a.w; // error diff --git a/tests/baselines/reference/mergedInterfacesWithInheritedPrivates3.js b/tests/baselines/reference/mergedInterfacesWithInheritedPrivates3.js index 530595d54f6..3d9c4e1175e 100644 --- a/tests/baselines/reference/mergedInterfacesWithInheritedPrivates3.js +++ b/tests/baselines/reference/mergedInterfacesWithInheritedPrivates3.js @@ -48,29 +48,29 @@ var C = (function () { function C() { } return C; -})(); +}()); var C2 = (function () { function C2() { } return C2; -})(); +}()); var D = (function (_super) { __extends(D, _super); function D() { _super.apply(this, arguments); } return D; -})(C); +}(C)); var M; (function (M) { var C = (function () { function C() { } return C; - })(); + }()); var C2 = (function () { function C2() { } return C2; - })(); + }()); })(M || (M = {})); diff --git a/tests/baselines/reference/mergedInterfacesWithMultipleBases.js b/tests/baselines/reference/mergedInterfacesWithMultipleBases.js index 56a0b2dd90f..2bc5d1e0e36 100644 --- a/tests/baselines/reference/mergedInterfacesWithMultipleBases.js +++ b/tests/baselines/reference/mergedInterfacesWithMultipleBases.js @@ -61,17 +61,17 @@ var C = (function () { function C() { } return C; -})(); +}()); var C2 = (function () { function C2() { } return C2; -})(); +}()); var D = (function () { function D() { } return D; -})(); +}()); var a; var r = a.a; // generic interfaces in a module @@ -81,15 +81,15 @@ var M; function C() { } return C; - })(); + }()); var C2 = (function () { function C2() { } return C2; - })(); + }()); var D = (function () { function D() { } return D; - })(); + }()); })(M || (M = {})); diff --git a/tests/baselines/reference/mergedInterfacesWithMultipleBases2.js b/tests/baselines/reference/mergedInterfacesWithMultipleBases2.js index 47438374333..3253a8fc077 100644 --- a/tests/baselines/reference/mergedInterfacesWithMultipleBases2.js +++ b/tests/baselines/reference/mergedInterfacesWithMultipleBases2.js @@ -82,27 +82,27 @@ var C = (function () { function C() { } return C; -})(); +}()); var C2 = (function () { function C2() { } return C2; -})(); +}()); var C3 = (function () { function C3() { } return C3; -})(); +}()); var C4 = (function () { function C4() { } return C4; -})(); +}()); var D = (function () { function D() { } return D; -})(); +}()); var a; var r = a.a; // generic interfaces in a module @@ -112,25 +112,25 @@ var M; function C() { } return C; - })(); + }()); var C2 = (function () { function C2() { } return C2; - })(); + }()); var C3 = (function () { function C3() { } return C3; - })(); + }()); var C4 = (function () { function C4() { } return C4; - })(); + }()); var D = (function () { function D() { } return D; - })(); + }()); })(M || (M = {})); diff --git a/tests/baselines/reference/mergedInterfacesWithMultipleBases3.js b/tests/baselines/reference/mergedInterfacesWithMultipleBases3.js index 23260e13c45..1fb5455f82a 100644 --- a/tests/baselines/reference/mergedInterfacesWithMultipleBases3.js +++ b/tests/baselines/reference/mergedInterfacesWithMultipleBases3.js @@ -42,24 +42,24 @@ var C = (function () { function C() { } return C; -})(); +}()); var C2 = (function () { function C2() { } return C2; -})(); +}()); var C3 = (function () { function C3() { } return C3; -})(); +}()); var C4 = (function () { function C4() { } return C4; -})(); +}()); var D = (function () { function D() { } return D; -})(); +}()); diff --git a/tests/baselines/reference/mergedInterfacesWithMultipleBases4.js b/tests/baselines/reference/mergedInterfacesWithMultipleBases4.js index 2ee7ba892c2..40292d1a72f 100644 --- a/tests/baselines/reference/mergedInterfacesWithMultipleBases4.js +++ b/tests/baselines/reference/mergedInterfacesWithMultipleBases4.js @@ -40,24 +40,24 @@ var C = (function () { function C() { } return C; -})(); +}()); var C2 = (function () { function C2() { } return C2; -})(); +}()); var C3 = (function () { function C3() { } return C3; -})(); +}()); var C4 = (function () { function C4() { } return C4; -})(); +}()); var D = (function () { function D() { } return D; -})(); +}()); diff --git a/tests/baselines/reference/mergedModuleDeclarationCodeGen.js b/tests/baselines/reference/mergedModuleDeclarationCodeGen.js index 64a4b9d00bd..f71702386ec 100644 --- a/tests/baselines/reference/mergedModuleDeclarationCodeGen.js +++ b/tests/baselines/reference/mergedModuleDeclarationCodeGen.js @@ -26,7 +26,7 @@ var X; new Y_1.B(); } return A; - })(); + }()); })(Y = X.Y || (X.Y = {})); })(X = exports.X || (exports.X = {})); var X; @@ -37,7 +37,7 @@ var X; function B() { } return B; - })(); + }()); Y.B = B; })(Y = X.Y || (X.Y = {})); })(X = exports.X || (exports.X = {})); diff --git a/tests/baselines/reference/mergedModuleDeclarationCodeGen5.js b/tests/baselines/reference/mergedModuleDeclarationCodeGen5.js index 44ab49d24e0..a5bc2e8e56e 100644 --- a/tests/baselines/reference/mergedModuleDeclarationCodeGen5.js +++ b/tests/baselines/reference/mergedModuleDeclarationCodeGen5.js @@ -44,7 +44,7 @@ var M; function fudge() { } return fudge; - })(); + }()); plop_1.fudge = fudge; (function (plop) { })(plop_1.plop || (plop_1.plop = {})); diff --git a/tests/baselines/reference/methodContainingLocalFunction.js b/tests/baselines/reference/methodContainingLocalFunction.js index f2f336d38b7..d051d46bb1c 100644 --- a/tests/baselines/reference/methodContainingLocalFunction.js +++ b/tests/baselines/reference/methodContainingLocalFunction.js @@ -61,7 +61,7 @@ var BugExhibition = (function () { x = localFunction; }; return BugExhibition; -})(); +}()); var BugExhibition2 = (function () { function BugExhibition2() { } @@ -76,7 +76,7 @@ var BugExhibition2 = (function () { configurable: true }); return BugExhibition2; -})(); +}()); var BugExhibition3 = (function () { function BugExhibition3() { } @@ -86,7 +86,7 @@ var BugExhibition3 = (function () { x = localGenericFunction; }; return BugExhibition3; -})(); +}()); var C = (function () { function C() { } @@ -96,7 +96,7 @@ var C = (function () { x = funcExpr; }; return C; -})(); +}()); var M; (function (M) { function exhibitBug() { diff --git a/tests/baselines/reference/methodSignatureDeclarationEmit1.js b/tests/baselines/reference/methodSignatureDeclarationEmit1.js index df6e8d0afe1..d8697481c68 100644 --- a/tests/baselines/reference/methodSignatureDeclarationEmit1.js +++ b/tests/baselines/reference/methodSignatureDeclarationEmit1.js @@ -13,7 +13,7 @@ var C = (function () { C.prototype.foo = function (a) { }; return C; -})(); +}()); //// [methodSignatureDeclarationEmit1.d.ts] diff --git a/tests/baselines/reference/mismatchedClassConstructorVariable.js b/tests/baselines/reference/mismatchedClassConstructorVariable.js index ea3f95559c9..e0b4767f547 100644 --- a/tests/baselines/reference/mismatchedClassConstructorVariable.js +++ b/tests/baselines/reference/mismatchedClassConstructorVariable.js @@ -9,9 +9,9 @@ var baz = (function () { function baz() { } return baz; -})(); +}()); var foo = (function () { function foo() { } return foo; -})(); +}()); diff --git a/tests/baselines/reference/mismatchedGenericArguments1.js b/tests/baselines/reference/mismatchedGenericArguments1.js index a702e369e95..8a1f67db190 100644 --- a/tests/baselines/reference/mismatchedGenericArguments1.js +++ b/tests/baselines/reference/mismatchedGenericArguments1.js @@ -23,7 +23,7 @@ var C = (function () { return null; }; return C; -})(); +}()); var C2 = (function () { function C2() { } @@ -31,4 +31,4 @@ var C2 = (function () { return null; }; return C2; -})(); +}()); diff --git a/tests/baselines/reference/missingDecoratorType.js b/tests/baselines/reference/missingDecoratorType.js index 04af1be9d7b..7356be39798 100644 --- a/tests/baselines/reference/missingDecoratorType.js +++ b/tests/baselines/reference/missingDecoratorType.js @@ -37,4 +37,4 @@ var C = (function () { dec ], C.prototype, "method", null); return C; -})(); +}()); diff --git a/tests/baselines/reference/missingImportAfterModuleImport.js b/tests/baselines/reference/missingImportAfterModuleImport.js index 5312f8b0cf6..2739ced1cdd 100644 --- a/tests/baselines/reference/missingImportAfterModuleImport.js +++ b/tests/baselines/reference/missingImportAfterModuleImport.js @@ -30,7 +30,7 @@ var MainModule = (function () { function MainModule() { } return MainModule; -})(); +}()); module.exports = MainModule; diff --git a/tests/baselines/reference/missingPropertiesOfClassExpression.js b/tests/baselines/reference/missingPropertiesOfClassExpression.js index f427da20f0c..54834397b64 100644 --- a/tests/baselines/reference/missingPropertiesOfClassExpression.js +++ b/tests/baselines/reference/missingPropertiesOfClassExpression.js @@ -18,9 +18,9 @@ var George = (function (_super) { _super.call(this); } return George; -})((function () { +}((function () { function class_1() { } class_1.prototype.reset = function () { return this.y; }; return class_1; -})()); +}()))); diff --git a/tests/baselines/reference/missingReturnStatement.js b/tests/baselines/reference/missingReturnStatement.js index 91c461e4715..f09ccb4e26e 100644 --- a/tests/baselines/reference/missingReturnStatement.js +++ b/tests/baselines/reference/missingReturnStatement.js @@ -16,6 +16,6 @@ var Test; Bug.prototype.foo = function () { }; return Bug; - })(); + }()); Test.Bug = Bug; })(Test || (Test = {})); diff --git a/tests/baselines/reference/missingReturnStatement1.js b/tests/baselines/reference/missingReturnStatement1.js index 665194cd5fe..9e24623fa6c 100644 --- a/tests/baselines/reference/missingReturnStatement1.js +++ b/tests/baselines/reference/missingReturnStatement1.js @@ -14,4 +14,4 @@ var Foo = (function () { //return 4; }; return Foo; -})(); +}()); diff --git a/tests/baselines/reference/missingSelf.js b/tests/baselines/reference/missingSelf.js index 56dcc4f9fa0..e1020ea635b 100644 --- a/tests/baselines/reference/missingSelf.js +++ b/tests/baselines/reference/missingSelf.js @@ -25,7 +25,7 @@ var CalcButton = (function () { CalcButton.prototype.a = function () { this.onClick(); }; CalcButton.prototype.onClick = function () { }; return CalcButton; -})(); +}()); var CalcButton2 = (function () { function CalcButton2() { } @@ -35,7 +35,7 @@ var CalcButton2 = (function () { }; CalcButton2.prototype.onClick = function () { }; return CalcButton2; -})(); +}()); var c = new CalcButton(); c.a(); var c2 = new CalcButton2(); diff --git a/tests/baselines/reference/missingTypeArguments1.js b/tests/baselines/reference/missingTypeArguments1.js index 42847531421..3e22e6ce16b 100644 --- a/tests/baselines/reference/missingTypeArguments1.js +++ b/tests/baselines/reference/missingTypeArguments1.js @@ -59,64 +59,64 @@ var Y = (function () { function Y() { } return Y; -})(); +}()); var X = (function () { function X() { } return X; -})(); +}()); var a; var X2 = (function () { function X2() { } return X2; -})(); +}()); var a2; var X3 = (function () { function X3() { } return X3; -})(); +}()); var a3; var X4 = (function () { function X4() { } return X4; -})(); +}()); var a4; var X5 = (function () { function X5() { } return X5; -})(); +}()); var a5; var X6 = (function () { function X6() { } return X6; -})(); +}()); var a6; var X7 = (function () { function X7() { } return X7; -})(); +}()); var a7; var X8 = (function () { function X8() { } return X8; -})(); +}()); var a8; var X9 = (function () { function X9() { } return X9; -})(); +}()); var a9; var X10 = (function () { function X10() { } return X10; -})(); +}()); var a10; diff --git a/tests/baselines/reference/missingTypeArguments2.js b/tests/baselines/reference/missingTypeArguments2.js index bc5c1d88f46..6ede66f5598 100644 --- a/tests/baselines/reference/missingTypeArguments2.js +++ b/tests/baselines/reference/missingTypeArguments2.js @@ -11,7 +11,7 @@ var A = (function () { function A() { } return A; -})(); +}()); var x; (function (a) { }); var y; diff --git a/tests/baselines/reference/mixedStaticAndInstanceClassMembers.js b/tests/baselines/reference/mixedStaticAndInstanceClassMembers.js index 427bbf65aa1..eac3729abcd 100644 --- a/tests/baselines/reference/mixedStaticAndInstanceClassMembers.js +++ b/tests/baselines/reference/mixedStaticAndInstanceClassMembers.js @@ -23,7 +23,7 @@ var A = (function () { A.prototype.m1 = function (a) { }; return A; -})(); +}()); var B = (function () { function B() { } @@ -31,4 +31,4 @@ var B = (function () { B.prototype.m1 = function (a) { }; return B; -})(); +}()); diff --git a/tests/baselines/reference/mixingStaticAndInstanceOverloads.js b/tests/baselines/reference/mixingStaticAndInstanceOverloads.js index 22367461c2c..ee405be1f43 100644 --- a/tests/baselines/reference/mixingStaticAndInstanceOverloads.js +++ b/tests/baselines/reference/mixingStaticAndInstanceOverloads.js @@ -41,29 +41,29 @@ var C1 = (function () { } C1.foo1 = function (a) { }; return C1; -})(); +}()); var C2 = (function () { function C2() { } C2.prototype.foo2 = function (a) { }; return C2; -})(); +}()); var C3 = (function () { function C3() { } C3.prototype.foo3 = function (a) { }; return C3; -})(); +}()); var C4 = (function () { function C4() { } C4.foo4 = function (a) { }; return C4; -})(); +}()); var C5 = (function () { function C5() { } C5.prototype.foo5 = function (a) { }; C5.foo5 = function (a) { }; return C5; -})(); +}()); diff --git a/tests/baselines/reference/modifierOnClassDeclarationMemberInFunction.js b/tests/baselines/reference/modifierOnClassDeclarationMemberInFunction.js index d571a4143ee..f7c4db2ff2a 100644 --- a/tests/baselines/reference/modifierOnClassDeclarationMemberInFunction.js +++ b/tests/baselines/reference/modifierOnClassDeclarationMemberInFunction.js @@ -17,7 +17,7 @@ function f() { C.foo = function () { }; C.prototype.bar = function () { }; return C; - })(); + }()); } diff --git a/tests/baselines/reference/modifierOnClassExpressionMemberInFunction.js b/tests/baselines/reference/modifierOnClassExpressionMemberInFunction.js index e43e8dd8203..70eea5b2c5c 100644 --- a/tests/baselines/reference/modifierOnClassExpressionMemberInFunction.js +++ b/tests/baselines/reference/modifierOnClassExpressionMemberInFunction.js @@ -17,7 +17,7 @@ function g() { C.prototype.foo = function () { }; C.prop2 = 43; return C; - })(); + }()); } diff --git a/tests/baselines/reference/modifierOnParameter1.js b/tests/baselines/reference/modifierOnParameter1.js index 69b54a09384..7b76a805c99 100644 --- a/tests/baselines/reference/modifierOnParameter1.js +++ b/tests/baselines/reference/modifierOnParameter1.js @@ -8,4 +8,4 @@ var C = (function () { function C() { } return C; -})(); +}()); diff --git a/tests/baselines/reference/moduleAliasInterface.js b/tests/baselines/reference/moduleAliasInterface.js index 0678656bb02..2dee62dcca0 100644 --- a/tests/baselines/reference/moduleAliasInterface.js +++ b/tests/baselines/reference/moduleAliasInterface.js @@ -62,7 +62,7 @@ var _modes; function Mode() { } return Mode; - })(); + }()); _modes.Mode = Mode; })(_modes || (_modes = {})); // _modes. // produces an internal error - please implement in derived class @@ -76,7 +76,7 @@ var editor; Bug.prototype.foo = function (p1) { }; return Bug; - })(); + }()); })(editor || (editor = {})); var modesOuter = _modes; var editor2; @@ -86,21 +86,21 @@ var editor2; function Bug(p1, p2) { } // no error here, since modesOuter is declared externally return Bug; - })(); + }()); var Foo; (function (Foo) { var Bar = (function () { function Bar() { } return Bar; - })(); + }()); Foo.Bar = Bar; })(Foo || (Foo = {})); var Bug2 = (function () { function Bug2(p1, p2) { } return Bug2; - })(); + }()); })(editor2 || (editor2 = {})); var A1; (function (A1) { @@ -108,7 +108,7 @@ var A1; function A1C1() { } return A1C1; - })(); + }()); A1.A1C1 = A1C1; })(A1 || (A1 = {})); var B1; diff --git a/tests/baselines/reference/moduleAsBaseType.js b/tests/baselines/reference/moduleAsBaseType.js index 7e2af06480d..71f16846363 100644 --- a/tests/baselines/reference/moduleAsBaseType.js +++ b/tests/baselines/reference/moduleAsBaseType.js @@ -16,9 +16,9 @@ var C = (function (_super) { _super.apply(this, arguments); } return C; -})(M); +}(M)); var C2 = (function () { function C2() { } return C2; -})(); +}()); diff --git a/tests/baselines/reference/moduleAssignmentCompat1.js b/tests/baselines/reference/moduleAssignmentCompat1.js index 9df11af7270..ba545e96b33 100644 --- a/tests/baselines/reference/moduleAssignmentCompat1.js +++ b/tests/baselines/reference/moduleAssignmentCompat1.js @@ -23,7 +23,7 @@ var A; function C() { } return C; - })(); + }()); A.C = C; })(A || (A = {})); var B; @@ -32,13 +32,13 @@ var B; function C() { } return C; - })(); + }()); B.C = C; var D = (function () { function D() { } return D; - })(); + }()); })(B || (B = {})); var a; var b; diff --git a/tests/baselines/reference/moduleAssignmentCompat2.js b/tests/baselines/reference/moduleAssignmentCompat2.js index 2e54ba565ee..cce4f6addf1 100644 --- a/tests/baselines/reference/moduleAssignmentCompat2.js +++ b/tests/baselines/reference/moduleAssignmentCompat2.js @@ -20,7 +20,7 @@ var A; function C() { } return C; - })(); + }()); A.C = C; })(A || (A = {})); var B; @@ -29,13 +29,13 @@ var B; function C() { } return C; - })(); + }()); B.C = C; var D = (function () { function D() { } return D; - })(); + }()); B.D = D; })(B || (B = {})); var a; diff --git a/tests/baselines/reference/moduleAssignmentCompat4.js b/tests/baselines/reference/moduleAssignmentCompat4.js index 49e49a2e9fb..20f7979e43e 100644 --- a/tests/baselines/reference/moduleAssignmentCompat4.js +++ b/tests/baselines/reference/moduleAssignmentCompat4.js @@ -25,7 +25,7 @@ var A; function C() { } return C; - })(); + }()); })(M = A.M || (A.M = {})); })(A || (A = {})); var B; @@ -36,7 +36,7 @@ var B; function D() { } return D; - })(); + }()); M.D = D; })(M = B.M || (B.M = {})); })(B || (B = {})); diff --git a/tests/baselines/reference/moduleClassArrayCodeGenTest.js b/tests/baselines/reference/moduleClassArrayCodeGenTest.js index 569adcf672a..79945f681aa 100644 --- a/tests/baselines/reference/moduleClassArrayCodeGenTest.js +++ b/tests/baselines/reference/moduleClassArrayCodeGenTest.js @@ -18,13 +18,13 @@ var M; function A() { } return A; - })(); + }()); M.A = A; var B = (function () { function B() { } return B; - })(); + }()); })(M || (M = {})); var t = []; var t2 = []; diff --git a/tests/baselines/reference/moduleCodeGenTest5.js b/tests/baselines/reference/moduleCodeGenTest5.js index bfb1d0e56c3..fa09b432ab7 100644 --- a/tests/baselines/reference/moduleCodeGenTest5.js +++ b/tests/baselines/reference/moduleCodeGenTest5.js @@ -34,7 +34,7 @@ var C1 = (function () { } C1.prototype.p2 = function () { }; return C1; -})(); +}()); exports.C1 = C1; var C2 = (function () { function C2() { @@ -42,7 +42,7 @@ var C2 = (function () { } C2.prototype.p2 = function () { }; return C2; -})(); +}()); (function (E1) { E1[E1["A"] = 0] = "A"; })(exports.E1 || (exports.E1 = {})); diff --git a/tests/baselines/reference/moduleCrashBug1.js b/tests/baselines/reference/moduleCrashBug1.js index 1d8757f2396..2a01fa94b48 100644 --- a/tests/baselines/reference/moduleCrashBug1.js +++ b/tests/baselines/reference/moduleCrashBug1.js @@ -28,6 +28,6 @@ var _modes; function Mode() { } return Mode; - })(); + }()); })(_modes || (_modes = {})); var m; diff --git a/tests/baselines/reference/moduleDuplicateIdentifiers.js b/tests/baselines/reference/moduleDuplicateIdentifiers.js index 842d1587911..1d64c0490c5 100644 --- a/tests/baselines/reference/moduleDuplicateIdentifiers.js +++ b/tests/baselines/reference/moduleDuplicateIdentifiers.js @@ -57,14 +57,14 @@ var Kettle = (function () { this.member1 = 2; } return Kettle; -})(); +}()); exports.Kettle = Kettle; var Kettle = (function () { function Kettle() { this.member2 = 42; } return Kettle; -})(); +}()); exports.Kettle = Kettle; exports.Pot = 2; exports.Pot = 42; // Shouldn't error diff --git a/tests/baselines/reference/moduleElementsInWrongContext.js b/tests/baselines/reference/moduleElementsInWrongContext.js index df4935f9e19..26fd511a955 100644 --- a/tests/baselines/reference/moduleElementsInWrongContext.js +++ b/tests/baselines/reference/moduleElementsInWrongContext.js @@ -39,7 +39,7 @@ function C() { } return C; - })(); + }()); exports["default"] = C; function bee() { } exports.bee = bee; diff --git a/tests/baselines/reference/moduleElementsInWrongContext2.js b/tests/baselines/reference/moduleElementsInWrongContext2.js index b923bc7861e..24fccc02dc5 100644 --- a/tests/baselines/reference/moduleElementsInWrongContext2.js +++ b/tests/baselines/reference/moduleElementsInWrongContext2.js @@ -39,7 +39,7 @@ function blah() { function C() { } return C; - })(); + }()); exports["default"] = C; function bee() { } exports.bee = bee; diff --git a/tests/baselines/reference/moduleElementsInWrongContext3.js b/tests/baselines/reference/moduleElementsInWrongContext3.js index 2fa0b60dce4..c5c0d491cd3 100644 --- a/tests/baselines/reference/moduleElementsInWrongContext3.js +++ b/tests/baselines/reference/moduleElementsInWrongContext3.js @@ -42,7 +42,7 @@ var P; function C() { } return C; - })(); + }()); exports["default"] = C; function bee() { } P.bee = bee; diff --git a/tests/baselines/reference/moduleExports1.js b/tests/baselines/reference/moduleExports1.js index 724237c35cf..130091cd61c 100644 --- a/tests/baselines/reference/moduleExports1.js +++ b/tests/baselines/reference/moduleExports1.js @@ -26,7 +26,7 @@ define(["require", "exports"], function (require, exports) { function Rue() { } return Rue; - })(); + }()); Street.Rue = Rue; })(Street = Strasse.Street || (Strasse.Street = {})); })(Strasse = TypeScript.Strasse || (TypeScript.Strasse = {})); diff --git a/tests/baselines/reference/moduleImportedForTypeArgumentPosition.js b/tests/baselines/reference/moduleImportedForTypeArgumentPosition.js index 81be08f21c2..cd2df2633ae 100644 --- a/tests/baselines/reference/moduleImportedForTypeArgumentPosition.js +++ b/tests/baselines/reference/moduleImportedForTypeArgumentPosition.js @@ -27,12 +27,12 @@ define(["require", "exports"], function (require, exports) { function C1() { } return C1; - })(); + }()); var Test1 = (function (_super) { __extends(Test1, _super); function Test1() { _super.apply(this, arguments); } return Test1; - })(C1); + }(C1)); }); diff --git a/tests/baselines/reference/moduleInTypePosition1.js b/tests/baselines/reference/moduleInTypePosition1.js index 970cc300b17..a590e23f71e 100644 --- a/tests/baselines/reference/moduleInTypePosition1.js +++ b/tests/baselines/reference/moduleInTypePosition1.js @@ -17,7 +17,7 @@ var Promise = (function () { function Promise() { } return Promise; -})(); +}()); exports.Promise = Promise; //// [moduleInTypePosition1_1.js] "use strict"; diff --git a/tests/baselines/reference/moduleMemberWithoutTypeAnnotation1.js b/tests/baselines/reference/moduleMemberWithoutTypeAnnotation1.js index 1467ec18b91..090d6502d5b 100644 --- a/tests/baselines/reference/moduleMemberWithoutTypeAnnotation1.js +++ b/tests/baselines/reference/moduleMemberWithoutTypeAnnotation1.js @@ -58,7 +58,7 @@ var TypeScript; return null; }; return SyntaxCursor; - })(); + }()); })(Parser = TypeScript.Parser || (TypeScript.Parser = {})); })(TypeScript || (TypeScript = {})); var TypeScript; @@ -72,13 +72,13 @@ var TypeScript; return TypeScript.Syntax.childIndex(); }; return PositionedElement; - })(); + }()); TypeScript.PositionedElement = PositionedElement; var PositionedToken = (function () { function PositionedToken(parent, token, fullStart) { } return PositionedToken; - })(); + }()); TypeScript.PositionedToken = PositionedToken; })(TypeScript || (TypeScript = {})); var TypeScript; @@ -95,7 +95,7 @@ var TypeScript; return null; }; return SyntaxNode; - })(); + }()); TypeScript.SyntaxNode = SyntaxNode; })(TypeScript || (TypeScript = {})); var TypeScript; @@ -111,7 +111,7 @@ var TypeScript; return new TypeScript.PositionedToken(parent, this, fullStart); }; return VariableWidthTokenWithTrailingTrivia; - })(); + }()); Syntax.VariableWidthTokenWithTrailingTrivia = VariableWidthTokenWithTrailingTrivia; })(Syntax = TypeScript.Syntax || (TypeScript.Syntax = {})); })(TypeScript || (TypeScript = {})); diff --git a/tests/baselines/reference/moduleMerge.js b/tests/baselines/reference/moduleMerge.js index aa06bae1597..04f2f511b8d 100644 --- a/tests/baselines/reference/moduleMerge.js +++ b/tests/baselines/reference/moduleMerge.js @@ -34,7 +34,7 @@ var A; return "from private B"; }; return B; - })(); + }()); })(A || (A = {})); var A; (function (A) { @@ -45,6 +45,6 @@ var A; return "from export B"; }; return B; - })(); + }()); A.B = B; })(A || (A = {})); diff --git a/tests/baselines/reference/moduleMergeConstructor.js b/tests/baselines/reference/moduleMergeConstructor.js index 70e43e25bbb..5ab4ab381e0 100644 --- a/tests/baselines/reference/moduleMergeConstructor.js +++ b/tests/baselines/reference/moduleMergeConstructor.js @@ -35,5 +35,5 @@ define(["require", "exports", "foo"], function (require, exports, foo) { this.bar = new foo.Foo(); } return Test; - })(); + }()); }); diff --git a/tests/baselines/reference/moduleNewExportBug.js b/tests/baselines/reference/moduleNewExportBug.js index ce40915b2f6..b48f6dd73b0 100644 --- a/tests/baselines/reference/moduleNewExportBug.js +++ b/tests/baselines/reference/moduleNewExportBug.js @@ -21,6 +21,6 @@ var mod1; } C.prototype.moo = function () { }; return C; - })(); + }()); })(mod1 || (mod1 = {})); var c; // ERROR: C should not be visible diff --git a/tests/baselines/reference/modulePrologueAMD.js b/tests/baselines/reference/modulePrologueAMD.js index 904808b9f6b..c3512734f94 100644 --- a/tests/baselines/reference/modulePrologueAMD.js +++ b/tests/baselines/reference/modulePrologueAMD.js @@ -10,6 +10,6 @@ define(["require", "exports"], function (require, exports) { function Foo() { } return Foo; - })(); + }()); exports.Foo = Foo; }); diff --git a/tests/baselines/reference/modulePrologueCommonjs.js b/tests/baselines/reference/modulePrologueCommonjs.js index 67b704a3650..4a9594d254b 100644 --- a/tests/baselines/reference/modulePrologueCommonjs.js +++ b/tests/baselines/reference/modulePrologueCommonjs.js @@ -9,5 +9,5 @@ var Foo = (function () { function Foo() { } return Foo; -})(); +}()); exports.Foo = Foo; diff --git a/tests/baselines/reference/modulePrologueSystem.js b/tests/baselines/reference/modulePrologueSystem.js index 91703d1c7fb..80a46fb27fc 100644 --- a/tests/baselines/reference/modulePrologueSystem.js +++ b/tests/baselines/reference/modulePrologueSystem.js @@ -14,7 +14,7 @@ System.register([], function(exports_1) { function Foo() { } return Foo; - })(); + }()); exports_1("Foo", Foo); } } diff --git a/tests/baselines/reference/modulePrologueUmd.js b/tests/baselines/reference/modulePrologueUmd.js index 65803af6cad..a573559b7e9 100644 --- a/tests/baselines/reference/modulePrologueUmd.js +++ b/tests/baselines/reference/modulePrologueUmd.js @@ -17,6 +17,6 @@ export class Foo {} function Foo() { } return Foo; - })(); + }()); exports.Foo = Foo; }); diff --git a/tests/baselines/reference/moduleRedifinitionErrors.js b/tests/baselines/reference/moduleRedifinitionErrors.js index 12714632146..830ea03e1d3 100644 --- a/tests/baselines/reference/moduleRedifinitionErrors.js +++ b/tests/baselines/reference/moduleRedifinitionErrors.js @@ -10,4 +10,4 @@ var A = (function () { function A() { } return A; -})(); +}()); diff --git a/tests/baselines/reference/moduleReopenedTypeOtherBlock.js b/tests/baselines/reference/moduleReopenedTypeOtherBlock.js index 951c558ddfd..3380cd0ec7d 100644 --- a/tests/baselines/reference/moduleReopenedTypeOtherBlock.js +++ b/tests/baselines/reference/moduleReopenedTypeOtherBlock.js @@ -15,7 +15,7 @@ var M; function C1() { } return C1; - })(); + }()); M.C1 = C1; })(M || (M = {})); var M; @@ -25,6 +25,6 @@ var M; } C2.prototype.f = function () { return null; }; return C2; - })(); + }()); M.C2 = C2; })(M || (M = {})); diff --git a/tests/baselines/reference/moduleReopenedTypeSameBlock.js b/tests/baselines/reference/moduleReopenedTypeSameBlock.js index 92e7e9e5228..b9624e75b75 100644 --- a/tests/baselines/reference/moduleReopenedTypeSameBlock.js +++ b/tests/baselines/reference/moduleReopenedTypeSameBlock.js @@ -13,7 +13,7 @@ var M; function C1() { } return C1; - })(); + }()); M.C1 = C1; })(M || (M = {})); var M; @@ -23,6 +23,6 @@ var M; } C2.prototype.f = function () { return null; }; return C2; - })(); + }()); M.C2 = C2; })(M || (M = {})); diff --git a/tests/baselines/reference/moduleScopingBug.js b/tests/baselines/reference/moduleScopingBug.js index d9ac55e2b88..5d18b2de676 100644 --- a/tests/baselines/reference/moduleScopingBug.js +++ b/tests/baselines/reference/moduleScopingBug.js @@ -41,7 +41,7 @@ var M; var inner = outer; // Ok } return C; - })(); + }()); var X; (function (X) { var inner = outer; // Error: outer not visible diff --git a/tests/baselines/reference/moduleVisibilityTest1.js b/tests/baselines/reference/moduleVisibilityTest1.js index f4655513bec..3278613409d 100644 --- a/tests/baselines/reference/moduleVisibilityTest1.js +++ b/tests/baselines/reference/moduleVisibilityTest1.js @@ -99,7 +99,7 @@ var M; this.b = 0; } return B; - })(); + }()); var C = (function () { function C() { this.someProp = 1; @@ -111,7 +111,7 @@ var M; C.prototype.someMethodThatCallsAnOuterInnerMethod = function () { return OuterMod.someExportedOuterFunc(); }; C.prototype.someMethod = function () { return 0; }; return C; - })(); + }()); M.C = C; var someModuleVar = 4; function someModuleFunction() { return 5; } diff --git a/tests/baselines/reference/moduleVisibilityTest2.js b/tests/baselines/reference/moduleVisibilityTest2.js index 9102bd17ae2..51f3b00255b 100644 --- a/tests/baselines/reference/moduleVisibilityTest2.js +++ b/tests/baselines/reference/moduleVisibilityTest2.js @@ -100,7 +100,7 @@ var M; this.b = 0; } return B; - })(); + }()); var C = (function () { function C() { this.someProp = 1; @@ -112,7 +112,7 @@ var M; C.prototype.someMethodThatCallsAnOuterInnerMethod = function () { return OuterMod.someExportedOuterFunc(); }; C.prototype.someMethod = function () { return 0; }; return C; - })(); + }()); M.C = C; var someModuleVar = 4; function someModuleFunction() { return 5; } diff --git a/tests/baselines/reference/moduleVisibilityTest3.js b/tests/baselines/reference/moduleVisibilityTest3.js index 7032c8dc3d7..deeec304d98 100644 --- a/tests/baselines/reference/moduleVisibilityTest3.js +++ b/tests/baselines/reference/moduleVisibilityTest3.js @@ -33,7 +33,7 @@ var _modes; function Mode() { } return Mode; - })(); + }()); })(_modes || (_modes = {})); //_modes. // produces an internal error - please implement in derived class var editor; @@ -45,5 +45,5 @@ var editor; var x; } return Bug; - })(); + }()); })(editor || (editor = {})); diff --git a/tests/baselines/reference/moduleWithStatementsOfEveryKind.js b/tests/baselines/reference/moduleWithStatementsOfEveryKind.js index aeffc8d6e5b..ec434286f43 100644 --- a/tests/baselines/reference/moduleWithStatementsOfEveryKind.js +++ b/tests/baselines/reference/moduleWithStatementsOfEveryKind.js @@ -70,33 +70,33 @@ var A; function A() { } return A; - })(); + }()); var AA = (function () { function AA() { } return AA; - })(); + }()); var B = (function (_super) { __extends(B, _super); function B() { _super.apply(this, arguments); } return B; - })(AA); + }(AA)); var BB = (function (_super) { __extends(BB, _super); function BB() { _super.apply(this, arguments); } return BB; - })(A); + }(A)); var Module; (function (Module) { var A = (function () { function A() { } return A; - })(); + }()); })(Module || (Module = {})); var Color; (function (Color) { @@ -119,13 +119,13 @@ var Y; function A() { } return A; - })(); + }()); Y.A = A; var AA = (function () { function AA() { } return AA; - })(); + }()); Y.AA = AA; var B = (function (_super) { __extends(B, _super); @@ -133,7 +133,7 @@ var Y; _super.apply(this, arguments); } return B; - })(AA); + }(AA)); Y.B = B; var BB = (function (_super) { __extends(BB, _super); @@ -141,7 +141,7 @@ var Y; _super.apply(this, arguments); } return BB; - })(A); + }(A)); Y.BB = BB; var Module; (function (Module) { @@ -149,7 +149,7 @@ var Y; function A() { } return A; - })(); + }()); })(Module = Y.Module || (Y.Module = {})); (function (Color) { Color[Color["Blue"] = 0] = "Blue"; diff --git a/tests/baselines/reference/moduledecl.js b/tests/baselines/reference/moduledecl.js index f835729dc4d..2e765e512d8 100644 --- a/tests/baselines/reference/moduledecl.js +++ b/tests/baselines/reference/moduledecl.js @@ -244,7 +244,7 @@ var m0; function c1() { } return c1; - })(); + }()); })(m0 || (m0 = {})); var m1; (function (m1) { @@ -265,7 +265,7 @@ var m1; return "Hello"; }; return c1; - })(); + }()); m1.c1 = c1; })(m1 || (m1 = {})); var m; @@ -315,7 +315,7 @@ var exportTests; return "string"; }; return C1_public; - })(); + }()); exportTests.C1_public = C1_public; var C2_private = (function () { function C2_private() { @@ -327,7 +327,7 @@ var exportTests; return "string"; }; return C2_private; - })(); + }()); var C3_public = (function () { function C3_public() { } @@ -356,7 +356,7 @@ var exportTests; configurable: true }); return C3_public; - })(); + }()); exportTests.C3_public = C3_public; })(exportTests || (exportTests = {})); function foo() { diff --git a/tests/baselines/reference/multiImportExport.js b/tests/baselines/reference/multiImportExport.js index 28ebecdd0f0..34832c93966 100644 --- a/tests/baselines/reference/multiImportExport.js +++ b/tests/baselines/reference/multiImportExport.js @@ -33,7 +33,7 @@ var Adder = (function () { Adder.prototype.add = function (a, b) { }; return Adder; -})(); +}()); module.exports = Adder; //// [Math.js] "use strict"; diff --git a/tests/baselines/reference/multiModuleClodule1.js b/tests/baselines/reference/multiModuleClodule1.js index 9f6d7b5014c..b5b11058368 100644 --- a/tests/baselines/reference/multiModuleClodule1.js +++ b/tests/baselines/reference/multiModuleClodule1.js @@ -26,7 +26,7 @@ var C = (function () { C.prototype.bar = function () { }; C.boo = function () { }; return C; -})(); +}()); var C; (function (C) { C.x = 1; diff --git a/tests/baselines/reference/multipleClassPropertyModifiers.js b/tests/baselines/reference/multipleClassPropertyModifiers.js index 7dec786c447..294e303e254 100644 --- a/tests/baselines/reference/multipleClassPropertyModifiers.js +++ b/tests/baselines/reference/multipleClassPropertyModifiers.js @@ -11,4 +11,4 @@ var C = (function () { function C() { } return C; -})(); +}()); diff --git a/tests/baselines/reference/multipleClassPropertyModifiersErrors.js b/tests/baselines/reference/multipleClassPropertyModifiersErrors.js index 191476e9a62..5bfa6979ef2 100644 --- a/tests/baselines/reference/multipleClassPropertyModifiersErrors.js +++ b/tests/baselines/reference/multipleClassPropertyModifiersErrors.js @@ -14,4 +14,4 @@ var C = (function () { function C() { } return C; -})(); +}()); diff --git a/tests/baselines/reference/multipleDefaultExports01.js b/tests/baselines/reference/multipleDefaultExports01.js index 2a9dc18ca77..e15f8fc879c 100644 --- a/tests/baselines/reference/multipleDefaultExports01.js +++ b/tests/baselines/reference/multipleDefaultExports01.js @@ -24,7 +24,7 @@ var foo = (function () { function foo() { } return foo; -})(); +}()); Object.defineProperty(exports, "__esModule", { value: true }); exports.default = foo; function bar() { diff --git a/tests/baselines/reference/multipleDefaultExports03.js b/tests/baselines/reference/multipleDefaultExports03.js index d5699d850c0..748837baceb 100644 --- a/tests/baselines/reference/multipleDefaultExports03.js +++ b/tests/baselines/reference/multipleDefaultExports03.js @@ -12,13 +12,13 @@ var C = (function () { function C() { } return C; -})(); +}()); Object.defineProperty(exports, "__esModule", { value: true }); exports.default = C; var C = (function () { function C() { } return C; -})(); +}()); Object.defineProperty(exports, "__esModule", { value: true }); exports.default = C; diff --git a/tests/baselines/reference/multipleInheritance.js b/tests/baselines/reference/multipleInheritance.js index 901838b584b..26372bfb718 100644 --- a/tests/baselines/reference/multipleInheritance.js +++ b/tests/baselines/reference/multipleInheritance.js @@ -48,59 +48,59 @@ var B1 = (function () { function B1() { } return B1; -})(); +}()); var B2 = (function () { function B2() { } return B2; -})(); +}()); var C = (function (_super) { __extends(C, _super); function C() { _super.apply(this, arguments); } return C; -})(B1); +}(B1)); var D1 = (function (_super) { __extends(D1, _super); function D1() { _super.apply(this, arguments); } return D1; -})(B1); +}(B1)); var D2 = (function (_super) { __extends(D2, _super); function D2() { _super.apply(this, arguments); } return D2; -})(B2); +}(B2)); var E = (function (_super) { __extends(E, _super); function E() { _super.apply(this, arguments); } return E; -})(D1); +}(D1)); var N = (function () { function N() { } return N; -})(); +}()); var ND = (function (_super) { __extends(ND, _super); function ND() { _super.apply(this, arguments); } return ND; -})(N); +}(N)); var Good = (function () { function Good() { this.f = function () { return 0; }; } Good.prototype.g = function () { return 0; }; return Good; -})(); +}()); var Baad = (function (_super) { __extends(Baad, _super); function Baad() { @@ -109,4 +109,4 @@ var Baad = (function (_super) { Baad.prototype.f = function () { return 0; }; Baad.prototype.g = function (n) { return 0; }; return Baad; -})(Good); +}(Good)); diff --git a/tests/baselines/reference/multipleNumericIndexers.js b/tests/baselines/reference/multipleNumericIndexers.js index 638cf01569a..7b5207d2303 100644 --- a/tests/baselines/reference/multipleNumericIndexers.js +++ b/tests/baselines/reference/multipleNumericIndexers.js @@ -38,11 +38,11 @@ var C = (function () { function C() { } return C; -})(); +}()); var a; var b = { 1: '', "2": '' }; var C2 = (function () { function C2() { } return C2; -})(); +}()); diff --git a/tests/baselines/reference/multipleStringIndexers.js b/tests/baselines/reference/multipleStringIndexers.js index 55dd816e42b..98db93c7055 100644 --- a/tests/baselines/reference/multipleStringIndexers.js +++ b/tests/baselines/reference/multipleStringIndexers.js @@ -37,11 +37,11 @@ var C = (function () { function C() { } return C; -})(); +}()); var a; var b = { y: '' }; var C2 = (function () { function C2() { } return C2; -})(); +}()); diff --git a/tests/baselines/reference/multivar.js b/tests/baselines/reference/multivar.js index 3f9796d2944..f24728fef92 100644 --- a/tests/baselines/reference/multivar.js +++ b/tests/baselines/reference/multivar.js @@ -60,13 +60,13 @@ var m2; this.b = b; } return C; - })(); + }()); var C2 = (function () { function C2(b) { this.b = b; } return C2; - })(); + }()); m2.C2 = C2; var m; var b2; diff --git a/tests/baselines/reference/mutuallyRecursiveGenericBaseTypes2.js b/tests/baselines/reference/mutuallyRecursiveGenericBaseTypes2.js index 09f4be0c4e9..c8cca671327 100644 --- a/tests/baselines/reference/mutuallyRecursiveGenericBaseTypes2.js +++ b/tests/baselines/reference/mutuallyRecursiveGenericBaseTypes2.js @@ -21,12 +21,12 @@ var foo = (function () { } foo.prototype.bar = function () { return null; }; return foo; -})(); +}()); var foo2 = (function (_super) { __extends(foo2, _super); function foo2() { _super.apply(this, arguments); } return foo2; -})(foo); +}(foo)); var test = new foo(); diff --git a/tests/baselines/reference/nameCollision.js b/tests/baselines/reference/nameCollision.js index 0e559b7091c..4f41bf4a086 100644 --- a/tests/baselines/reference/nameCollision.js +++ b/tests/baselines/reference/nameCollision.js @@ -66,7 +66,7 @@ var B; function B() { } return B; - })(); + }()); })(B || (B = {})); var X; (function (X_1) { diff --git a/tests/baselines/reference/nameCollisions.js b/tests/baselines/reference/nameCollisions.js index 96ae2e9838b..a36f66e8dc9 100644 --- a/tests/baselines/reference/nameCollisions.js +++ b/tests/baselines/reference/nameCollisions.js @@ -57,7 +57,7 @@ var T; function Bar() { } return Bar; - })(); + }()); x.Bar = Bar; })(x || (x = {})); var z; @@ -73,7 +73,7 @@ var T; function y() { } return y; - })(); // error + }()); // error var w; var f; function f() { } //error @@ -84,23 +84,23 @@ var T; function C() { } return C; - })(); + }()); function C() { } // error function C2() { } var C2 = (function () { function C2() { } return C2; - })(); // error + }()); // error function fi() { } var cli = (function () { function cli() { } return cli; - })(); + }()); var cli2 = (function () { function cli2() { } return cli2; - })(); + }()); })(T || (T = {})); diff --git a/tests/baselines/reference/namedFunctionExpressionAssignedToClassProperty.js b/tests/baselines/reference/namedFunctionExpressionAssignedToClassProperty.js index 0ce927b78c7..a0aaa82e895 100644 --- a/tests/baselines/reference/namedFunctionExpressionAssignedToClassProperty.js +++ b/tests/baselines/reference/namedFunctionExpressionAssignedToClassProperty.js @@ -21,4 +21,4 @@ var Foo = (function () { }; // this shouldn't crash the compiler... } return Foo; -})(); +}()); diff --git a/tests/baselines/reference/namespaces2.js b/tests/baselines/reference/namespaces2.js index 980d6ea9243..b7b1c38f08d 100644 --- a/tests/baselines/reference/namespaces2.js +++ b/tests/baselines/reference/namespaces2.js @@ -16,7 +16,7 @@ var A; function C() { } return C; - })(); + }()); B.C = C; })(B = A.B || (A.B = {})); })(A || (A = {})); diff --git a/tests/baselines/reference/narrowTypeByInstanceof.js b/tests/baselines/reference/narrowTypeByInstanceof.js index 11f55089bda..0415c72b9fd 100644 --- a/tests/baselines/reference/narrowTypeByInstanceof.js +++ b/tests/baselines/reference/narrowTypeByInstanceof.js @@ -33,7 +33,7 @@ var Match = (function () { return undefined; }; return Match; -})(); +}()); var FileMatch = (function () { function FileMatch() { } @@ -41,7 +41,7 @@ var FileMatch = (function () { return undefined; }; return FileMatch; -})(); +}()); var elementA, elementB; if (elementA instanceof FileMatch && elementB instanceof FileMatch) { var a = elementA.resource().path; diff --git a/tests/baselines/reference/negateOperatorWithAnyOtherType.js b/tests/baselines/reference/negateOperatorWithAnyOtherType.js index e0dd9b184c3..6a2fe74c7ba 100644 --- a/tests/baselines/reference/negateOperatorWithAnyOtherType.js +++ b/tests/baselines/reference/negateOperatorWithAnyOtherType.js @@ -72,7 +72,7 @@ var A = (function () { return a; }; return A; -})(); +}()); var M; (function (M) { })(M || (M = {})); diff --git a/tests/baselines/reference/negateOperatorWithBooleanType.js b/tests/baselines/reference/negateOperatorWithBooleanType.js index c357849d8a5..07d404b0c6c 100644 --- a/tests/baselines/reference/negateOperatorWithBooleanType.js +++ b/tests/baselines/reference/negateOperatorWithBooleanType.js @@ -44,7 +44,7 @@ var A = (function () { } A.foo = function () { return false; }; return A; -})(); +}()); var M; (function (M) { })(M || (M = {})); diff --git a/tests/baselines/reference/negateOperatorWithNumberType.js b/tests/baselines/reference/negateOperatorWithNumberType.js index 8a29830e3e4..42b78dc0a2b 100644 --- a/tests/baselines/reference/negateOperatorWithNumberType.js +++ b/tests/baselines/reference/negateOperatorWithNumberType.js @@ -51,7 +51,7 @@ var A = (function () { } A.foo = function () { return 1; }; return A; -})(); +}()); var M; (function (M) { })(M || (M = {})); diff --git a/tests/baselines/reference/negateOperatorWithStringType.js b/tests/baselines/reference/negateOperatorWithStringType.js index 2b79819894c..8a70f5e2805 100644 --- a/tests/baselines/reference/negateOperatorWithStringType.js +++ b/tests/baselines/reference/negateOperatorWithStringType.js @@ -50,7 +50,7 @@ var A = (function () { } A.foo = function () { return ""; }; return A; -})(); +}()); var M; (function (M) { })(M || (M = {})); diff --git a/tests/baselines/reference/nestedClassDeclaration.js b/tests/baselines/reference/nestedClassDeclaration.js index 2fee6f08ab9..f9e3d08144d 100644 --- a/tests/baselines/reference/nestedClassDeclaration.js +++ b/tests/baselines/reference/nestedClassDeclaration.js @@ -24,18 +24,18 @@ var C = (function () { function C() { } return C; -})(); +}()); var C2 = (function () { function C2() { } return C2; -})(); +}()); function foo() { var C3 = (function () { function C3() { } return C3; - })(); + }()); } var x = { class: C4 }, _a = void 0; diff --git a/tests/baselines/reference/nestedSelf.js b/tests/baselines/reference/nestedSelf.js index 9c0feaa887f..ea6abc8e1e8 100644 --- a/tests/baselines/reference/nestedSelf.js +++ b/tests/baselines/reference/nestedSelf.js @@ -20,6 +20,6 @@ var M; [1, 2, 3].map(function (x) { return _this.n * x; }); }; return C; - })(); + }()); M.C = C; })(M || (M = {})); diff --git a/tests/baselines/reference/newArrays.js b/tests/baselines/reference/newArrays.js index adc51eb843a..d156ee24f1c 100644 --- a/tests/baselines/reference/newArrays.js +++ b/tests/baselines/reference/newArrays.js @@ -19,7 +19,7 @@ var M; function Foo() { } return Foo; - })(); + }()); var Gar = (function () { function Gar() { this.x = 10; @@ -29,5 +29,5 @@ var M; this.fa = new Array(this.x * this.y); }; return Gar; - })(); + }()); })(M || (M = {})); diff --git a/tests/baselines/reference/newOnInstanceSymbol.js b/tests/baselines/reference/newOnInstanceSymbol.js index a66e4d74255..755cc35e19e 100644 --- a/tests/baselines/reference/newOnInstanceSymbol.js +++ b/tests/baselines/reference/newOnInstanceSymbol.js @@ -8,6 +8,6 @@ var C = (function () { function C() { } return C; -})(); +}()); var x = new C(); // should be ok new x(); // should error diff --git a/tests/baselines/reference/newOperator.js b/tests/baselines/reference/newOperator.js index 95dc410142e..75ad42de8c3 100644 --- a/tests/baselines/reference/newOperator.js +++ b/tests/baselines/reference/newOperator.js @@ -75,7 +75,7 @@ var M; function T() { } return T; - })(); + }()); M.T = T; })(M || (M = {})); var S = (function () { @@ -89,4 +89,4 @@ var S = (function () { configurable: true }); return S; -})(); +}()); diff --git a/tests/baselines/reference/newOperatorConformance.js b/tests/baselines/reference/newOperatorConformance.js index a04b10dc8fe..3b84cbd6698 100644 --- a/tests/baselines/reference/newOperatorConformance.js +++ b/tests/baselines/reference/newOperatorConformance.js @@ -68,17 +68,17 @@ var C0 = (function () { function C0() { } return C0; -})(); +}()); var C1 = (function () { function C1(n, s) { } return C1; -})(); +}()); var T = (function () { function T(n) { } return T; -})(); +}()); var anyCtor; var anyCtor1; var nestedCtor; diff --git a/tests/baselines/reference/newOperatorErrorCases.js b/tests/baselines/reference/newOperatorErrorCases.js index b893beba02a..6d57f9a090e 100644 --- a/tests/baselines/reference/newOperatorErrorCases.js +++ b/tests/baselines/reference/newOperatorErrorCases.js @@ -43,17 +43,17 @@ var C0 = (function () { function C0() { } return C0; -})(); +}()); var C1 = (function () { function C1(n, s) { } return C1; -})(); +}()); var T = (function () { function T(n) { } return T; -})(); +}()); var anyCtor; var anyCtor1; var nestedCtor; diff --git a/tests/baselines/reference/newWithSpread.js b/tests/baselines/reference/newWithSpread.js index 3161eb9f67e..3b4a726b4d4 100644 --- a/tests/baselines/reference/newWithSpread.js +++ b/tests/baselines/reference/newWithSpread.js @@ -118,7 +118,7 @@ var B = (function () { } } return B; -})(); +}()); var a; var b; var c; diff --git a/tests/baselines/reference/newWithSpreadES5.js b/tests/baselines/reference/newWithSpreadES5.js index f7470266273..fffa53d7c90 100644 --- a/tests/baselines/reference/newWithSpreadES5.js +++ b/tests/baselines/reference/newWithSpreadES5.js @@ -117,7 +117,7 @@ var B = (function () { } } return B; -})(); +}()); var a; var b; var c; diff --git a/tests/baselines/reference/noCollisionThisExpressionAndClassInGlobal.js b/tests/baselines/reference/noCollisionThisExpressionAndClassInGlobal.js index 8a485a2ebe2..b31eccee9b5 100644 --- a/tests/baselines/reference/noCollisionThisExpressionAndClassInGlobal.js +++ b/tests/baselines/reference/noCollisionThisExpressionAndClassInGlobal.js @@ -8,5 +8,5 @@ var _this = (function () { function _this() { } return _this; -})(); +}()); var f = function () { return _this; }; diff --git a/tests/baselines/reference/noCollisionThisExpressionAndLocalVarInAccessors.js b/tests/baselines/reference/noCollisionThisExpressionAndLocalVarInAccessors.js index 727b1b6087a..43218ef9697 100644 --- a/tests/baselines/reference/noCollisionThisExpressionAndLocalVarInAccessors.js +++ b/tests/baselines/reference/noCollisionThisExpressionAndLocalVarInAccessors.js @@ -69,7 +69,7 @@ var class1 = (function () { configurable: true }); return class1; -})(); +}()); var class2 = (function () { function class2() { } @@ -95,4 +95,4 @@ var class2 = (function () { configurable: true }); return class2; -})(); +}()); diff --git a/tests/baselines/reference/noCollisionThisExpressionAndLocalVarInConstructor.js b/tests/baselines/reference/noCollisionThisExpressionAndLocalVarInConstructor.js index a01996848b1..79d0fd5549c 100644 --- a/tests/baselines/reference/noCollisionThisExpressionAndLocalVarInConstructor.js +++ b/tests/baselines/reference/noCollisionThisExpressionAndLocalVarInConstructor.js @@ -32,7 +32,7 @@ var class1 = (function () { }; } return class1; -})(); +}()); var class2 = (function () { function class2() { var _this = 2; @@ -43,4 +43,4 @@ var class2 = (function () { }; } return class2; -})(); +}()); diff --git a/tests/baselines/reference/noCollisionThisExpressionAndLocalVarInMethod.js b/tests/baselines/reference/noCollisionThisExpressionAndLocalVarInMethod.js index b7e9cc7561f..b7fdfc5a49d 100644 --- a/tests/baselines/reference/noCollisionThisExpressionAndLocalVarInMethod.js +++ b/tests/baselines/reference/noCollisionThisExpressionAndLocalVarInMethod.js @@ -41,4 +41,4 @@ var a = (function () { }; }; return a; -})(); +}()); diff --git a/tests/baselines/reference/noCollisionThisExpressionAndLocalVarInProperty.js b/tests/baselines/reference/noCollisionThisExpressionAndLocalVarInProperty.js index da989bed263..3265da26d14 100644 --- a/tests/baselines/reference/noCollisionThisExpressionAndLocalVarInProperty.js +++ b/tests/baselines/reference/noCollisionThisExpressionAndLocalVarInProperty.js @@ -30,7 +30,7 @@ var class1 = (function () { }; } return class1; -})(); +}()); var class2 = (function () { function class2() { this.prop1 = { @@ -41,4 +41,4 @@ var class2 = (function () { var _this = 2; } return class2; -})(); +}()); diff --git a/tests/baselines/reference/noConstraintInReturnType1.js b/tests/baselines/reference/noConstraintInReturnType1.js index 0402f9d83cb..03ce629c446 100644 --- a/tests/baselines/reference/noConstraintInReturnType1.js +++ b/tests/baselines/reference/noConstraintInReturnType1.js @@ -10,7 +10,7 @@ var List = (function () { } List.empty = function () { return null; }; return List; -})(); +}()); //// [noConstraintInReturnType1.d.ts] diff --git a/tests/baselines/reference/noEmitHelpers.js b/tests/baselines/reference/noEmitHelpers.js index bfe5a4f4445..b2c26c6af75 100644 --- a/tests/baselines/reference/noEmitHelpers.js +++ b/tests/baselines/reference/noEmitHelpers.js @@ -9,11 +9,11 @@ var A = (function () { function A() { } return A; -})(); +}()); var B = (function (_super) { __extends(B, _super); function B() { _super.apply(this, arguments); } return B; -})(A); +}(A)); diff --git a/tests/baselines/reference/noEmitHelpers2.js b/tests/baselines/reference/noEmitHelpers2.js index 66e2ff78b64..f3bbfe54896 100644 --- a/tests/baselines/reference/noEmitHelpers2.js +++ b/tests/baselines/reference/noEmitHelpers2.js @@ -18,4 +18,4 @@ var A = (function () { __metadata('design:paramtypes', [Number, String]) ], A); return A; -})(); +}()); diff --git a/tests/baselines/reference/noErrorsInCallback.js b/tests/baselines/reference/noErrorsInCallback.js index cb6c4e41f8c..6a08cee12cf 100644 --- a/tests/baselines/reference/noErrorsInCallback.js +++ b/tests/baselines/reference/noErrorsInCallback.js @@ -14,7 +14,7 @@ var Bar = (function () { this.foo = foo; } return Bar; -})(); +}()); var one = new Bar({}); // Error [].forEach(function () { var two = new Bar({}); // No error? diff --git a/tests/baselines/reference/noImplicitAnyForMethodParameters.js b/tests/baselines/reference/noImplicitAnyForMethodParameters.js index fc5b94d4768..ea868ee7503 100644 --- a/tests/baselines/reference/noImplicitAnyForMethodParameters.js +++ b/tests/baselines/reference/noImplicitAnyForMethodParameters.js @@ -20,10 +20,10 @@ var C = (function () { } C.prototype.foo = function (a) { }; // OK - non-ambient class and private method - error return C; -})(); +}()); var D = (function () { function D() { } D.prototype.foo = function (a) { }; // OK - non-ambient class and public method - error return D; -})(); +}()); diff --git a/tests/baselines/reference/noImplicitAnyParametersInClass.js b/tests/baselines/reference/noImplicitAnyParametersInClass.js index 0873935b600..0e247936529 100644 --- a/tests/baselines/reference/noImplicitAnyParametersInClass.js +++ b/tests/baselines/reference/noImplicitAnyParametersInClass.js @@ -196,4 +196,4 @@ var C = (function () { }; C.prototype.priv_f8 = function (x3, y3) { }; return C; -})(); +}()); diff --git a/tests/baselines/reference/noTypeArgumentOnReturnType1.js b/tests/baselines/reference/noTypeArgumentOnReturnType1.js index ca13067c15e..7ede1e57c3e 100644 --- a/tests/baselines/reference/noTypeArgumentOnReturnType1.js +++ b/tests/baselines/reference/noTypeArgumentOnReturnType1.js @@ -14,4 +14,4 @@ var A = (function () { return null; }; return A; -})(); +}()); diff --git a/tests/baselines/reference/nonGenericClassExtendingGenericClassWithAny.js b/tests/baselines/reference/nonGenericClassExtendingGenericClassWithAny.js index 7cdb702d6ff..b9927ebf193 100644 --- a/tests/baselines/reference/nonGenericClassExtendingGenericClassWithAny.js +++ b/tests/baselines/reference/nonGenericClassExtendingGenericClassWithAny.js @@ -15,11 +15,11 @@ var Foo = (function () { function Foo() { } return Foo; -})(); +}()); var Bar = (function (_super) { __extends(Bar, _super); function Bar() { _super.apply(this, arguments); } return Bar; -})(Foo); // Valid +}(Foo)); // Valid diff --git a/tests/baselines/reference/nonGenericTypeReferenceWithTypeArguments.js b/tests/baselines/reference/nonGenericTypeReferenceWithTypeArguments.js index 5558cb2fc8b..a1fa710d893 100644 --- a/tests/baselines/reference/nonGenericTypeReferenceWithTypeArguments.js +++ b/tests/baselines/reference/nonGenericTypeReferenceWithTypeArguments.js @@ -29,7 +29,7 @@ var C = (function () { function C() { } return C; -})(); +}()); var E; (function (E) { })(E || (E = {})); @@ -42,7 +42,7 @@ function f() { function C() { } return C; - })(); + }()); var E; (function (E) { })(E || (E = {})); diff --git a/tests/baselines/reference/nonInstantiatedModule.js b/tests/baselines/reference/nonInstantiatedModule.js index fc3ad19546f..f8063dd7b14 100644 --- a/tests/baselines/reference/nonInstantiatedModule.js +++ b/tests/baselines/reference/nonInstantiatedModule.js @@ -77,6 +77,6 @@ var M3; function Utils() { } return Utils; - })(); + }()); M3.Utils = Utils; })(M3 || (M3 = {})); diff --git a/tests/baselines/reference/nonMergedDeclarationsAndOverloads.js b/tests/baselines/reference/nonMergedDeclarationsAndOverloads.js index 3ca6a963515..d4ac9685f61 100644 --- a/tests/baselines/reference/nonMergedDeclarationsAndOverloads.js +++ b/tests/baselines/reference/nonMergedDeclarationsAndOverloads.js @@ -16,4 +16,4 @@ var A = (function () { A.prototype.m1 = function (a) { }; return A; -})(); +}()); diff --git a/tests/baselines/reference/null.js b/tests/baselines/reference/null.js index ee897643fb1..a58c5f7ed16 100644 --- a/tests/baselines/reference/null.js +++ b/tests/baselines/reference/null.js @@ -30,7 +30,7 @@ var C = (function () { function C() { } return C; -})(); +}()); function f() { return null; return new C(); diff --git a/tests/baselines/reference/nullAssignableToEveryType.js b/tests/baselines/reference/nullAssignableToEveryType.js index 9917ebeac9e..7d8ddd7fd74 100644 --- a/tests/baselines/reference/nullAssignableToEveryType.js +++ b/tests/baselines/reference/nullAssignableToEveryType.js @@ -48,7 +48,7 @@ var C = (function () { function C() { } return C; -})(); +}()); var ac; var ai; var E; diff --git a/tests/baselines/reference/nullIsSubtypeOfEverythingButUndefined.js b/tests/baselines/reference/nullIsSubtypeOfEverythingButUndefined.js index 646a3474536..d285818aaa9 100644 --- a/tests/baselines/reference/nullIsSubtypeOfEverythingButUndefined.js +++ b/tests/baselines/reference/nullIsSubtypeOfEverythingButUndefined.js @@ -121,7 +121,7 @@ var C1 = (function () { function C1() { } return C1; -})(); +}()); var c1; var r10 = true ? c1 : null; var r10 = true ? null : c1; @@ -129,7 +129,7 @@ var C2 = (function () { function C2() { } return C2; -})(); +}()); var c2; var r12 = true ? c2 : null; var r12 = true ? null : c2; @@ -153,7 +153,7 @@ var c = (function () { function c() { } return c; -})(); +}()); var c; (function (c) { c.bar = 1; diff --git a/tests/baselines/reference/numericClassMembers1.js b/tests/baselines/reference/numericClassMembers1.js index 4b17677b8a4..24434307125 100644 --- a/tests/baselines/reference/numericClassMembers1.js +++ b/tests/baselines/reference/numericClassMembers1.js @@ -22,18 +22,18 @@ var C234 = (function () { this[0.0] = 2; } return C234; -})(); +}()); var C235 = (function () { function C235() { this[0.0] = 1; this['0'] = 2; } return C235; -})(); +}()); var C236 = (function () { function C236() { this['0.0'] = 1; this['0'] = 2; } return C236; -})(); +}()); diff --git a/tests/baselines/reference/numericIndexerConstrainsPropertyDeclarations.js b/tests/baselines/reference/numericIndexerConstrainsPropertyDeclarations.js index cf08bb98217..33a03705965 100644 --- a/tests/baselines/reference/numericIndexerConstrainsPropertyDeclarations.js +++ b/tests/baselines/reference/numericIndexerConstrainsPropertyDeclarations.js @@ -123,7 +123,7 @@ var C = (function () { configurable: true }); return C; -})(); +}()); var a; // error var b = { diff --git a/tests/baselines/reference/numericIndexerConstrainsPropertyDeclarations2.js b/tests/baselines/reference/numericIndexerConstrainsPropertyDeclarations2.js index ade000d50ba..cef2759e1d5 100644 --- a/tests/baselines/reference/numericIndexerConstrainsPropertyDeclarations2.js +++ b/tests/baselines/reference/numericIndexerConstrainsPropertyDeclarations2.js @@ -57,7 +57,7 @@ var A = (function () { } A.prototype.foo = function () { return ''; }; return A; -})(); +}()); var B = (function (_super) { __extends(B, _super); function B() { @@ -65,12 +65,12 @@ var B = (function (_super) { } B.prototype.bar = function () { return ''; }; return B; -})(A); +}(A)); var Foo = (function () { function Foo() { } return Foo; -})(); +}()); var a; // error var b = { diff --git a/tests/baselines/reference/numericIndexerConstraint.js b/tests/baselines/reference/numericIndexerConstraint.js index 38fe6b58d66..1b1851428e0 100644 --- a/tests/baselines/reference/numericIndexerConstraint.js +++ b/tests/baselines/reference/numericIndexerConstraint.js @@ -9,4 +9,4 @@ var C = (function () { function C() { } return C; -})(); +}()); diff --git a/tests/baselines/reference/numericIndexerConstraint1.js b/tests/baselines/reference/numericIndexerConstraint1.js index ed51e3af066..1065f7d9dc8 100644 --- a/tests/baselines/reference/numericIndexerConstraint1.js +++ b/tests/baselines/reference/numericIndexerConstraint1.js @@ -10,6 +10,6 @@ var Foo = (function () { } Foo.prototype.foo = function () { }; return Foo; -})(); +}()); var x; var result = x["one"]; // error diff --git a/tests/baselines/reference/numericIndexerConstraint2.js b/tests/baselines/reference/numericIndexerConstraint2.js index 4d8ce742e73..a8063a2548d 100644 --- a/tests/baselines/reference/numericIndexerConstraint2.js +++ b/tests/baselines/reference/numericIndexerConstraint2.js @@ -10,7 +10,7 @@ var Foo = (function () { } Foo.prototype.foo = function () { }; return Foo; -})(); +}()); var x; var a; x = a; diff --git a/tests/baselines/reference/numericIndexerConstraint3.js b/tests/baselines/reference/numericIndexerConstraint3.js index dc3b6024eee..9f7a61fe30d 100644 --- a/tests/baselines/reference/numericIndexerConstraint3.js +++ b/tests/baselines/reference/numericIndexerConstraint3.js @@ -22,16 +22,16 @@ var A = (function () { function A() { } return A; -})(); +}()); var B = (function (_super) { __extends(B, _super); function B() { _super.apply(this, arguments); } return B; -})(A); +}(A)); var C = (function () { function C() { } return C; -})(); +}()); diff --git a/tests/baselines/reference/numericIndexerConstraint4.js b/tests/baselines/reference/numericIndexerConstraint4.js index 7509c64eac8..245569cb62e 100644 --- a/tests/baselines/reference/numericIndexerConstraint4.js +++ b/tests/baselines/reference/numericIndexerConstraint4.js @@ -21,12 +21,12 @@ var A = (function () { function A() { } return A; -})(); +}()); var B = (function (_super) { __extends(B, _super); function B() { _super.apply(this, arguments); } return B; -})(A); +}(A)); var x = { data: new B() }; diff --git a/tests/baselines/reference/numericIndexerTyping2.js b/tests/baselines/reference/numericIndexerTyping2.js index 2e3ba2ce74c..47fb46794f0 100644 --- a/tests/baselines/reference/numericIndexerTyping2.js +++ b/tests/baselines/reference/numericIndexerTyping2.js @@ -22,14 +22,14 @@ var I = (function () { function I() { } return I; -})(); +}()); var I2 = (function (_super) { __extends(I2, _super); function I2() { _super.apply(this, arguments); } return I2; -})(I); +}(I)); var i; var r = i[1]; // error: numeric indexer returns the type of the string indexer var i2; diff --git a/tests/baselines/reference/numericIndexingResults.js b/tests/baselines/reference/numericIndexingResults.js index 70c6e15d15a..780bba3d498 100644 --- a/tests/baselines/reference/numericIndexingResults.js +++ b/tests/baselines/reference/numericIndexingResults.js @@ -63,7 +63,7 @@ var C = (function () { this["2"] = ''; } return C; -})(); +}()); var c; var r1 = c['1']; var r2 = c['2']; diff --git a/tests/baselines/reference/numericMethodName1.js b/tests/baselines/reference/numericMethodName1.js index 294e5a1491b..8f68d10cd37 100644 --- a/tests/baselines/reference/numericMethodName1.js +++ b/tests/baselines/reference/numericMethodName1.js @@ -10,4 +10,4 @@ var C = (function () { this[1] = 2; } return C; -})(); +}()); diff --git a/tests/baselines/reference/numericNamedPropertyDuplicates.js b/tests/baselines/reference/numericNamedPropertyDuplicates.js index e4340d629ea..6c8af329318 100644 --- a/tests/baselines/reference/numericNamedPropertyDuplicates.js +++ b/tests/baselines/reference/numericNamedPropertyDuplicates.js @@ -26,7 +26,7 @@ var C = (function () { function C() { } return C; -})(); +}()); var a; var b = { 2: 1, diff --git a/tests/baselines/reference/numericStringNamedPropertyEquivalence.js b/tests/baselines/reference/numericStringNamedPropertyEquivalence.js index 9f141f6dd1c..a0f2268b98b 100644 --- a/tests/baselines/reference/numericStringNamedPropertyEquivalence.js +++ b/tests/baselines/reference/numericStringNamedPropertyEquivalence.js @@ -30,7 +30,7 @@ var C = (function () { function C() { } return C; -})(); +}()); var a; var b = { "0": '', diff --git a/tests/baselines/reference/objectCreationExpressionInFunctionParameter.js b/tests/baselines/reference/objectCreationExpressionInFunctionParameter.js index 55ac0c530e6..76e36420aca 100644 --- a/tests/baselines/reference/objectCreationExpressionInFunctionParameter.js +++ b/tests/baselines/reference/objectCreationExpressionInFunctionParameter.js @@ -12,7 +12,7 @@ var A = (function () { this.a1 = a1; } return A; -})(); +}()); function foo(x) { if (x === void 0) { x = new A(123); } } diff --git a/tests/baselines/reference/objectCreationOfElementAccessExpression.js b/tests/baselines/reference/objectCreationOfElementAccessExpression.js index 05457a559e9..dce09972c83 100644 --- a/tests/baselines/reference/objectCreationOfElementAccessExpression.js +++ b/tests/baselines/reference/objectCreationOfElementAccessExpression.js @@ -77,7 +77,7 @@ var Food = (function () { } }; return Food; -})(); +}()); var MonsterFood = (function (_super) { __extends(MonsterFood, _super); function MonsterFood(name, flavor) { @@ -85,7 +85,7 @@ var MonsterFood = (function (_super) { this.flavor = flavor; } return MonsterFood; -})(Food); +}(Food)); var IceCream = (function (_super) { __extends(IceCream, _super); function IceCream(flavor) { @@ -93,7 +93,7 @@ var IceCream = (function (_super) { this.flavor = flavor; } return IceCream; -})(MonsterFood); +}(MonsterFood)); var Cookie = (function (_super) { __extends(Cookie, _super); function Cookie(flavor, isGlutenFree) { @@ -102,7 +102,7 @@ var Cookie = (function (_super) { this.isGlutenFree = isGlutenFree; } return Cookie; -})(MonsterFood); +}(MonsterFood)); var PetFood = (function (_super) { __extends(PetFood, _super); function PetFood(name, whereToBuy) { @@ -110,7 +110,7 @@ var PetFood = (function (_super) { this.whereToBuy = whereToBuy; } return PetFood; -})(Food); +}(Food)); var ExpensiveOrganicDogFood = (function (_super) { __extends(ExpensiveOrganicDogFood, _super); function ExpensiveOrganicDogFood(whereToBuy) { @@ -118,7 +118,7 @@ var ExpensiveOrganicDogFood = (function (_super) { this.whereToBuy = whereToBuy; } return ExpensiveOrganicDogFood; -})(PetFood); +}(PetFood)); var ExpensiveOrganicCatFood = (function (_super) { __extends(ExpensiveOrganicCatFood, _super); function ExpensiveOrganicCatFood(whereToBuy, containsFish) { @@ -127,12 +127,12 @@ var ExpensiveOrganicCatFood = (function (_super) { this.containsFish = containsFish; } return ExpensiveOrganicCatFood; -})(PetFood); +}(PetFood)); var Slug = (function () { function Slug() { } return Slug; -})(); +}()); // ElementAccessExpressions can only contain one expression. There should be a parse error here. var foods = new PetFood[new IceCream('Mint chocolate chip'), Cookie('Chocolate chip', false), new Cookie('Peanut butter', true)]; var foods2 = new PetFood[new IceCream('Mint chocolate chip'), Cookie('Chocolate chip', false), new Cookie('Peanut butter', true)]; diff --git a/tests/baselines/reference/objectIndexer.js b/tests/baselines/reference/objectIndexer.js index 1e58f89501f..f5bf47e3475 100644 --- a/tests/baselines/reference/objectIndexer.js +++ b/tests/baselines/reference/objectIndexer.js @@ -23,5 +23,5 @@ define(["require", "exports"], function (require, exports) { this.listeners = {}; } return Emitter; - })(); + }()); }); diff --git a/tests/baselines/reference/objectLitArrayDeclNoNew.js b/tests/baselines/reference/objectLitArrayDeclNoNew.js index a52ff55fc4d..f4642a1d2f6 100644 --- a/tests/baselines/reference/objectLitArrayDeclNoNew.js +++ b/tests/baselines/reference/objectLitArrayDeclNoNew.js @@ -36,7 +36,7 @@ var Test; this.moo = 0; } return Gar; - })(); + }()); Test.Gar = Gar; function bug() { var state = null; diff --git a/tests/baselines/reference/objectLiteralDeclarationGeneration1.js b/tests/baselines/reference/objectLiteralDeclarationGeneration1.js index 39ea91daf81..eacf9463abc 100644 --- a/tests/baselines/reference/objectLiteralDeclarationGeneration1.js +++ b/tests/baselines/reference/objectLiteralDeclarationGeneration1.js @@ -6,7 +6,7 @@ var y = (function () { function y() { } return y; -})(); +}()); //// [objectLiteralDeclarationGeneration1.d.ts] diff --git a/tests/baselines/reference/objectMembersOnTypes.js b/tests/baselines/reference/objectMembersOnTypes.js index f0c33e8d897..88a97feb0f7 100644 --- a/tests/baselines/reference/objectMembersOnTypes.js +++ b/tests/baselines/reference/objectMembersOnTypes.js @@ -14,7 +14,7 @@ var AAA = (function () { function AAA() { } return AAA; -})(); +}()); var x; x.toString(); var i; diff --git a/tests/baselines/reference/objectTypeHidingMembersOfExtendedObject.js b/tests/baselines/reference/objectTypeHidingMembersOfExtendedObject.js index 5d30e0faecf..9c5bcfb8e2d 100644 --- a/tests/baselines/reference/objectTypeHidingMembersOfExtendedObject.js +++ b/tests/baselines/reference/objectTypeHidingMembersOfExtendedObject.js @@ -64,20 +64,20 @@ var A = (function () { function A() { } return A; -})(); +}()); var B = (function (_super) { __extends(B, _super); function B() { _super.apply(this, arguments); } return B; -})(A); +}(A)); var C = (function () { function C() { } C.prototype.valueOf = function () { }; return C; -})(); +}()); var c; var r1 = c.valueOf(); var r1b = c.data; diff --git a/tests/baselines/reference/objectTypeHidingMembersOfObject.js b/tests/baselines/reference/objectTypeHidingMembersOfObject.js index 291cc1858fd..bae6b56ff38 100644 --- a/tests/baselines/reference/objectTypeHidingMembersOfObject.js +++ b/tests/baselines/reference/objectTypeHidingMembersOfObject.js @@ -34,7 +34,7 @@ var C = (function () { } C.prototype.valueOf = function () { }; return C; -})(); +}()); var c; var r1 = c.valueOf(); var i; diff --git a/tests/baselines/reference/objectTypeHidingMembersOfObjectAssignmentCompat.js b/tests/baselines/reference/objectTypeHidingMembersOfObjectAssignmentCompat.js index 5ae0c2fb1bb..65fc548ed6e 100644 --- a/tests/baselines/reference/objectTypeHidingMembersOfObjectAssignmentCompat.js +++ b/tests/baselines/reference/objectTypeHidingMembersOfObjectAssignmentCompat.js @@ -31,7 +31,7 @@ var C = (function () { } C.prototype.toString = function () { }; return C; -})(); +}()); var c; o = c; // error c = o; // ok diff --git a/tests/baselines/reference/objectTypeHidingMembersOfObjectAssignmentCompat2.js b/tests/baselines/reference/objectTypeHidingMembersOfObjectAssignmentCompat2.js index 7a2b5e2ec2f..6898e69cedc 100644 --- a/tests/baselines/reference/objectTypeHidingMembersOfObjectAssignmentCompat2.js +++ b/tests/baselines/reference/objectTypeHidingMembersOfObjectAssignmentCompat2.js @@ -31,7 +31,7 @@ var C = (function () { } C.prototype.toString = function () { return 1; }; return C; -})(); +}()); var c; o = c; // error c = o; // error diff --git a/tests/baselines/reference/objectTypePropertyAccess.js b/tests/baselines/reference/objectTypePropertyAccess.js index 143439aaa04..d7856f2a978 100644 --- a/tests/baselines/reference/objectTypePropertyAccess.js +++ b/tests/baselines/reference/objectTypePropertyAccess.js @@ -35,7 +35,7 @@ var C = (function () { function C() { } return C; -})(); +}()); var c; var r1 = c.toString(); var r2 = c['toString'](); diff --git a/tests/baselines/reference/objectTypeWithDuplicateNumericProperty.js b/tests/baselines/reference/objectTypeWithDuplicateNumericProperty.js index 4772fedf17b..f3bc471f973 100644 --- a/tests/baselines/reference/objectTypeWithDuplicateNumericProperty.js +++ b/tests/baselines/reference/objectTypeWithDuplicateNumericProperty.js @@ -39,7 +39,7 @@ var C = (function () { function C() { } return C; -})(); +}()); var a; var b = { 1: 1, diff --git a/tests/baselines/reference/objectTypeWithNumericProperty.js b/tests/baselines/reference/objectTypeWithNumericProperty.js index e6a9f3ac666..0001bc40f2f 100644 --- a/tests/baselines/reference/objectTypeWithNumericProperty.js +++ b/tests/baselines/reference/objectTypeWithNumericProperty.js @@ -49,7 +49,7 @@ var C = (function () { function C() { } return C; -})(); +}()); var c; var r1 = c[1]; var r2 = c[1.1]; diff --git a/tests/baselines/reference/objectTypeWithRecursiveWrappedProperty.js b/tests/baselines/reference/objectTypeWithRecursiveWrappedProperty.js index 8c4a89aab68..09dbc24b5b5 100644 --- a/tests/baselines/reference/objectTypeWithRecursiveWrappedProperty.js +++ b/tests/baselines/reference/objectTypeWithRecursiveWrappedProperty.js @@ -19,7 +19,7 @@ var List = (function () { function List() { } return List; -})(); +}()); var list1 = new List(); var list2 = new List(); var list3 = new List(); diff --git a/tests/baselines/reference/objectTypeWithRecursiveWrappedProperty2.js b/tests/baselines/reference/objectTypeWithRecursiveWrappedProperty2.js index cbb3032f00f..0f4451f28cf 100644 --- a/tests/baselines/reference/objectTypeWithRecursiveWrappedProperty2.js +++ b/tests/baselines/reference/objectTypeWithRecursiveWrappedProperty2.js @@ -19,7 +19,7 @@ var List = (function () { function List() { } return List; -})(); +}()); var list1 = new List(); var list2 = new List(); var list3 = new List(); diff --git a/tests/baselines/reference/objectTypeWithRecursiveWrappedPropertyCheckedNominally.js b/tests/baselines/reference/objectTypeWithRecursiveWrappedPropertyCheckedNominally.js index 388c4009a74..5aec3feb442 100644 --- a/tests/baselines/reference/objectTypeWithRecursiveWrappedPropertyCheckedNominally.js +++ b/tests/baselines/reference/objectTypeWithRecursiveWrappedPropertyCheckedNominally.js @@ -58,12 +58,12 @@ var List = (function () { function List() { } return List; -})(); +}()); var MyList = (function () { function MyList() { } return MyList; -})(); +}()); var list1 = new List(); var list2 = new List(); var myList1 = new MyList(); diff --git a/tests/baselines/reference/objectTypeWithStringIndexerHidingObjectIndexer.js b/tests/baselines/reference/objectTypeWithStringIndexerHidingObjectIndexer.js index 088a5b7f637..7aa60382c6e 100644 --- a/tests/baselines/reference/objectTypeWithStringIndexerHidingObjectIndexer.js +++ b/tests/baselines/reference/objectTypeWithStringIndexerHidingObjectIndexer.js @@ -40,7 +40,7 @@ var C = (function () { function C() { } return C; -})(); +}()); var c; var r2 = c['']; var i; diff --git a/tests/baselines/reference/objectTypeWithStringNamedNumericProperty.js b/tests/baselines/reference/objectTypeWithStringNamedNumericProperty.js index a52d74b9f2d..3ff5817692b 100644 --- a/tests/baselines/reference/objectTypeWithStringNamedNumericProperty.js +++ b/tests/baselines/reference/objectTypeWithStringNamedNumericProperty.js @@ -135,7 +135,7 @@ var C = (function () { function C() { } return C; -})(); +}()); var c; var r1 = c['0.1']; var r2 = c['.1']; diff --git a/tests/baselines/reference/objectTypeWithStringNamedPropertyOfIllegalCharacters.js b/tests/baselines/reference/objectTypeWithStringNamedPropertyOfIllegalCharacters.js index 5d7073db876..7188c12a9ee 100644 --- a/tests/baselines/reference/objectTypeWithStringNamedPropertyOfIllegalCharacters.js +++ b/tests/baselines/reference/objectTypeWithStringNamedPropertyOfIllegalCharacters.js @@ -58,7 +58,7 @@ var C = (function () { function C() { } return C; -})(); +}()); var c; var r = c[" "]; var r2 = c[" "]; diff --git a/tests/baselines/reference/objectTypesIdentity.js b/tests/baselines/reference/objectTypesIdentity.js index 7eccee23651..c357986fd89 100644 --- a/tests/baselines/reference/objectTypesIdentity.js +++ b/tests/baselines/reference/objectTypesIdentity.js @@ -94,17 +94,17 @@ var A = (function () { function A() { } return A; -})(); +}()); var B = (function () { function B() { } return B; -})(); +}()); var C = (function () { function C() { } return C; -})(); +}()); var a; var b = { foo: '' }; function foo1(x) { } diff --git a/tests/baselines/reference/objectTypesIdentity2.js b/tests/baselines/reference/objectTypesIdentity2.js index 87057754cab..b33485564ee 100644 --- a/tests/baselines/reference/objectTypesIdentity2.js +++ b/tests/baselines/reference/objectTypesIdentity2.js @@ -71,17 +71,17 @@ var A = (function () { function A() { } return A; -})(); +}()); var B = (function () { function B() { } return B; -})(); +}()); var C = (function () { function C() { } return C; -})(); +}()); var a; var E; (function (E) { diff --git a/tests/baselines/reference/objectTypesIdentityWithCallSignatures.js b/tests/baselines/reference/objectTypesIdentityWithCallSignatures.js index 0c6952291f9..a3e1e4fa444 100644 --- a/tests/baselines/reference/objectTypesIdentityWithCallSignatures.js +++ b/tests/baselines/reference/objectTypesIdentityWithCallSignatures.js @@ -107,19 +107,19 @@ var A = (function () { } A.prototype.foo = function (x) { return null; }; return A; -})(); +}()); var B = (function () { function B() { } B.prototype.foo = function (x) { return null; }; return B; -})(); +}()); var C = (function () { function C() { } C.prototype.foo = function (x) { return null; }; return C; -})(); +}()); var a; var b = { foo: function (x) { return ''; } }; function foo1(x) { } diff --git a/tests/baselines/reference/objectTypesIdentityWithCallSignatures2.js b/tests/baselines/reference/objectTypesIdentityWithCallSignatures2.js index 43473d88e0a..3b6956435f9 100644 --- a/tests/baselines/reference/objectTypesIdentityWithCallSignatures2.js +++ b/tests/baselines/reference/objectTypesIdentityWithCallSignatures2.js @@ -107,19 +107,19 @@ var A = (function () { } A.prototype.foo = function (x) { return null; }; return A; -})(); +}()); var B = (function () { function B() { } B.prototype.foo = function (x) { return null; }; return B; -})(); +}()); var C = (function () { function C() { } C.prototype.foo = function (x) { return null; }; return C; -})(); +}()); var a; var b = { foo: function (x) { return ''; } }; function foo1(x) { } diff --git a/tests/baselines/reference/objectTypesIdentityWithCallSignaturesDifferingParamCounts.js b/tests/baselines/reference/objectTypesIdentityWithCallSignaturesDifferingParamCounts.js index 498867f0a02..a9909c7283f 100644 --- a/tests/baselines/reference/objectTypesIdentityWithCallSignaturesDifferingParamCounts.js +++ b/tests/baselines/reference/objectTypesIdentityWithCallSignaturesDifferingParamCounts.js @@ -107,19 +107,19 @@ var A = (function () { } A.prototype.foo = function (x) { return null; }; return A; -})(); +}()); var B = (function () { function B() { } B.prototype.foo = function (x, y) { return null; }; return B; -})(); +}()); var C = (function () { function C() { } C.prototype.foo = function (x, y) { return null; }; return C; -})(); +}()); var a; var b = { foo: function (x) { return ''; } }; function foo1(x) { } diff --git a/tests/baselines/reference/objectTypesIdentityWithCallSignaturesWithOverloads.js b/tests/baselines/reference/objectTypesIdentityWithCallSignaturesWithOverloads.js index 54400ad81d1..3f72347a00f 100644 --- a/tests/baselines/reference/objectTypesIdentityWithCallSignaturesWithOverloads.js +++ b/tests/baselines/reference/objectTypesIdentityWithCallSignaturesWithOverloads.js @@ -123,19 +123,19 @@ var A = (function () { } A.prototype.foo = function (x) { return null; }; return A; -})(); +}()); var B = (function () { function B() { } B.prototype.foo = function (x) { return null; }; return B; -})(); +}()); var C = (function () { function C() { } C.prototype.foo = function (x) { return null; }; return C; -})(); +}()); var a; var b = { foo: function (x) { return ''; } diff --git a/tests/baselines/reference/objectTypesIdentityWithConstructSignatures.js b/tests/baselines/reference/objectTypesIdentityWithConstructSignatures.js index 91208da5b90..9acf62da71c 100644 --- a/tests/baselines/reference/objectTypesIdentityWithConstructSignatures.js +++ b/tests/baselines/reference/objectTypesIdentityWithConstructSignatures.js @@ -93,17 +93,17 @@ var A = (function () { function A(x) { } return A; -})(); +}()); var B = (function () { function B(x) { } return B; -})(); +}()); var C = (function () { function C(x) { } return C; -})(); +}()); var a; function foo1(x) { } function foo1b(x) { } diff --git a/tests/baselines/reference/objectTypesIdentityWithConstructSignatures2.js b/tests/baselines/reference/objectTypesIdentityWithConstructSignatures2.js index 87067b6be28..315e079d429 100644 --- a/tests/baselines/reference/objectTypesIdentityWithConstructSignatures2.js +++ b/tests/baselines/reference/objectTypesIdentityWithConstructSignatures2.js @@ -83,13 +83,13 @@ var B = (function () { return null; } return B; -})(); +}()); var C = (function () { function C(x) { return null; } return C; -})(); +}()); var a; var b = { new: function (x) { return ''; } }; // not a construct signature, function called new function foo1b(x) { } diff --git a/tests/baselines/reference/objectTypesIdentityWithConstructSignaturesDifferingParamCounts.js b/tests/baselines/reference/objectTypesIdentityWithConstructSignaturesDifferingParamCounts.js index c95159ed997..a61bedfd52f 100644 --- a/tests/baselines/reference/objectTypesIdentityWithConstructSignaturesDifferingParamCounts.js +++ b/tests/baselines/reference/objectTypesIdentityWithConstructSignaturesDifferingParamCounts.js @@ -83,13 +83,13 @@ var B = (function () { return null; } return B; -})(); +}()); var C = (function () { function C(x, y) { return null; } return C; -})(); +}()); var a; var b = { new: function (x) { return ''; } }; // not a construct signature, function called new function foo1b(x) { } diff --git a/tests/baselines/reference/objectTypesIdentityWithGenericCallSignatures.js b/tests/baselines/reference/objectTypesIdentityWithGenericCallSignatures.js index c8bed1a47ab..2289665621c 100644 --- a/tests/baselines/reference/objectTypesIdentityWithGenericCallSignatures.js +++ b/tests/baselines/reference/objectTypesIdentityWithGenericCallSignatures.js @@ -107,19 +107,19 @@ var A = (function () { } A.prototype.foo = function (x) { return null; }; return A; -})(); +}()); var B = (function () { function B() { } B.prototype.foo = function (x) { return null; }; return B; -})(); +}()); var C = (function () { function C() { } C.prototype.foo = function (x) { return null; }; return C; -})(); +}()); var a; var b = { foo: function (x) { return x; } }; function foo1(x) { } diff --git a/tests/baselines/reference/objectTypesIdentityWithGenericCallSignatures2.js b/tests/baselines/reference/objectTypesIdentityWithGenericCallSignatures2.js index 6ef5d15fd98..d6a61b8d304 100644 --- a/tests/baselines/reference/objectTypesIdentityWithGenericCallSignatures2.js +++ b/tests/baselines/reference/objectTypesIdentityWithGenericCallSignatures2.js @@ -107,19 +107,19 @@ var A = (function () { } A.prototype.foo = function (x, y) { return null; }; return A; -})(); +}()); var B = (function () { function B() { } B.prototype.foo = function (x, y) { return null; }; return B; -})(); +}()); var C = (function () { function C() { } C.prototype.foo = function (x, y) { return null; }; return C; -})(); +}()); var a; var b = { foo: function (x, y) { return x; } }; function foo1(x) { } diff --git a/tests/baselines/reference/objectTypesIdentityWithGenericCallSignaturesDifferingByConstraints.js b/tests/baselines/reference/objectTypesIdentityWithGenericCallSignaturesDifferingByConstraints.js index 2b83064afed..a1b383a70e3 100644 --- a/tests/baselines/reference/objectTypesIdentityWithGenericCallSignaturesDifferingByConstraints.js +++ b/tests/baselines/reference/objectTypesIdentityWithGenericCallSignaturesDifferingByConstraints.js @@ -111,19 +111,19 @@ var A = (function () { } A.prototype.foo = function (x) { return null; }; return A; -})(); +}()); var B = (function () { function B() { } B.prototype.foo = function (x) { return null; }; return B; -})(); +}()); var C = (function () { function C() { } C.prototype.foo = function (x) { return null; }; return C; -})(); +}()); var a; var b = { foo: function (x) { return ''; } }; function foo1(x) { } diff --git a/tests/baselines/reference/objectTypesIdentityWithGenericCallSignaturesDifferingByConstraints2.js b/tests/baselines/reference/objectTypesIdentityWithGenericCallSignaturesDifferingByConstraints2.js index 1f9c5fa5256..fbcba9d121e 100644 --- a/tests/baselines/reference/objectTypesIdentityWithGenericCallSignaturesDifferingByConstraints2.js +++ b/tests/baselines/reference/objectTypesIdentityWithGenericCallSignaturesDifferingByConstraints2.js @@ -123,25 +123,25 @@ var A = (function () { } A.prototype.foo = function (x, y) { return null; }; return A; -})(); +}()); var B = (function () { function B() { } B.prototype.foo = function (x, y) { return null; }; return B; -})(); +}()); var C = (function () { function C() { } C.prototype.foo = function (x, y) { return null; }; return C; -})(); +}()); var D = (function () { function D() { } D.prototype.foo = function (x, y) { return null; }; return D; -})(); +}()); var a; var b = { foo: function (x, y) { return ''; } }; function foo1(x) { } diff --git a/tests/baselines/reference/objectTypesIdentityWithGenericCallSignaturesDifferingByConstraints3.js b/tests/baselines/reference/objectTypesIdentityWithGenericCallSignaturesDifferingByConstraints3.js index 21106b56b00..48131af3212 100644 --- a/tests/baselines/reference/objectTypesIdentityWithGenericCallSignaturesDifferingByConstraints3.js +++ b/tests/baselines/reference/objectTypesIdentityWithGenericCallSignaturesDifferingByConstraints3.js @@ -131,36 +131,36 @@ var One = (function () { function One() { } return One; -})(); +}()); var Two = (function () { function Two() { } return Two; -})(); +}()); var A = (function () { function A() { } A.prototype.foo = function (x, y) { return null; }; return A; -})(); +}()); var B = (function () { function B() { } B.prototype.foo = function (x, y) { return null; }; return B; -})(); +}()); var C = (function () { function C() { } C.prototype.foo = function (x, y) { return null; }; return C; -})(); +}()); var D = (function () { function D() { } D.prototype.foo = function (x, y) { return null; }; return D; -})(); +}()); var a; var b = { foo: function (x, y) { return ''; } }; function foo1(x) { } diff --git a/tests/baselines/reference/objectTypesIdentityWithGenericCallSignaturesDifferingByReturnType.js b/tests/baselines/reference/objectTypesIdentityWithGenericCallSignaturesDifferingByReturnType.js index 99188347d36..43147c28f55 100644 --- a/tests/baselines/reference/objectTypesIdentityWithGenericCallSignaturesDifferingByReturnType.js +++ b/tests/baselines/reference/objectTypesIdentityWithGenericCallSignaturesDifferingByReturnType.js @@ -111,19 +111,19 @@ var A = (function () { } A.prototype.foo = function (x) { return null; }; return A; -})(); +}()); var B = (function () { function B() { } B.prototype.foo = function (x) { return null; }; return B; -})(); +}()); var C = (function () { function C() { } C.prototype.foo = function (x) { return null; }; return C; -})(); +}()); var a; var b = { foo: function (x) { return null; } }; function foo1(x) { } diff --git a/tests/baselines/reference/objectTypesIdentityWithGenericCallSignaturesDifferingByReturnType2.js b/tests/baselines/reference/objectTypesIdentityWithGenericCallSignaturesDifferingByReturnType2.js index 10d72bde0b3..c3758bc6c08 100644 --- a/tests/baselines/reference/objectTypesIdentityWithGenericCallSignaturesDifferingByReturnType2.js +++ b/tests/baselines/reference/objectTypesIdentityWithGenericCallSignaturesDifferingByReturnType2.js @@ -111,19 +111,19 @@ var A = (function () { } A.prototype.foo = function (x) { return null; }; return A; -})(); +}()); var B = (function () { function B() { } B.prototype.foo = function (x) { return null; }; return B; -})(); +}()); var C = (function () { function C() { } C.prototype.foo = function (x) { return null; }; return C; -})(); +}()); var a; var b = { foo: function (x) { return null; } }; function foo1(x) { } diff --git a/tests/baselines/reference/objectTypesIdentityWithGenericCallSignaturesDifferingTypeParameterCounts.js b/tests/baselines/reference/objectTypesIdentityWithGenericCallSignaturesDifferingTypeParameterCounts.js index 5a20dfdecb6..de6a4724cd7 100644 --- a/tests/baselines/reference/objectTypesIdentityWithGenericCallSignaturesDifferingTypeParameterCounts.js +++ b/tests/baselines/reference/objectTypesIdentityWithGenericCallSignaturesDifferingTypeParameterCounts.js @@ -107,19 +107,19 @@ var A = (function () { } A.prototype.foo = function (x) { return null; }; return A; -})(); +}()); var B = (function () { function B() { } B.prototype.foo = function (x) { return null; }; return B; -})(); +}()); var C = (function () { function C() { } C.prototype.foo = function (x) { return null; }; return C; -})(); +}()); var a; var b = { foo: function (x) { return x; } }; function foo1(x) { } diff --git a/tests/baselines/reference/objectTypesIdentityWithGenericCallSignaturesDifferingTypeParameterNames.js b/tests/baselines/reference/objectTypesIdentityWithGenericCallSignaturesDifferingTypeParameterNames.js index ec9c786b890..c27f7095d16 100644 --- a/tests/baselines/reference/objectTypesIdentityWithGenericCallSignaturesDifferingTypeParameterNames.js +++ b/tests/baselines/reference/objectTypesIdentityWithGenericCallSignaturesDifferingTypeParameterNames.js @@ -107,19 +107,19 @@ var A = (function () { } A.prototype.foo = function (x) { return null; }; return A; -})(); +}()); var B = (function () { function B() { } B.prototype.foo = function (x) { return null; }; return B; -})(); +}()); var C = (function () { function C() { } C.prototype.foo = function (x) { return null; }; return C; -})(); +}()); var a; var b = { foo: function (x) { return x; } }; function foo1(x) { } diff --git a/tests/baselines/reference/objectTypesIdentityWithGenericCallSignaturesOptionalParams.js b/tests/baselines/reference/objectTypesIdentityWithGenericCallSignaturesOptionalParams.js index a4af2bc820e..327cc15eddb 100644 --- a/tests/baselines/reference/objectTypesIdentityWithGenericCallSignaturesOptionalParams.js +++ b/tests/baselines/reference/objectTypesIdentityWithGenericCallSignaturesOptionalParams.js @@ -111,19 +111,19 @@ var A = (function () { } A.prototype.foo = function (x, y) { return null; }; return A; -})(); +}()); var B = (function () { function B() { } B.prototype.foo = function (x, y) { return null; }; return B; -})(); +}()); var C = (function () { function C() { } C.prototype.foo = function (x, y) { return null; }; return C; -})(); +}()); var a; var b = { foo: function (x, y) { return x; } }; function foo1(x) { } diff --git a/tests/baselines/reference/objectTypesIdentityWithGenericCallSignaturesOptionalParams2.js b/tests/baselines/reference/objectTypesIdentityWithGenericCallSignaturesOptionalParams2.js index 28b2f978b55..753548bc360 100644 --- a/tests/baselines/reference/objectTypesIdentityWithGenericCallSignaturesOptionalParams2.js +++ b/tests/baselines/reference/objectTypesIdentityWithGenericCallSignaturesOptionalParams2.js @@ -111,19 +111,19 @@ var A = (function () { } A.prototype.foo = function (x, y) { return null; }; return A; -})(); +}()); var B = (function () { function B() { } B.prototype.foo = function (x, y) { return null; }; return B; -})(); +}()); var C = (function () { function C() { } C.prototype.foo = function (x, y) { return null; }; return C; -})(); +}()); var a; var b = { foo: function (x, y) { return x; } }; function foo1(x) { } diff --git a/tests/baselines/reference/objectTypesIdentityWithGenericCallSignaturesOptionalParams3.js b/tests/baselines/reference/objectTypesIdentityWithGenericCallSignaturesOptionalParams3.js index de9b4859fa1..da4bb20591b 100644 --- a/tests/baselines/reference/objectTypesIdentityWithGenericCallSignaturesOptionalParams3.js +++ b/tests/baselines/reference/objectTypesIdentityWithGenericCallSignaturesOptionalParams3.js @@ -111,19 +111,19 @@ var A = (function () { } A.prototype.foo = function (x, y) { return null; }; return A; -})(); +}()); var B = (function () { function B() { } B.prototype.foo = function (x, y) { return null; }; return B; -})(); +}()); var C = (function () { function C() { } C.prototype.foo = function (x, y) { return null; }; return C; -})(); +}()); var a; var b = { foo: function (x, y) { return x; } }; function foo1(x) { } diff --git a/tests/baselines/reference/objectTypesIdentityWithGenericConstructSignaturesDifferingByConstraints.js b/tests/baselines/reference/objectTypesIdentityWithGenericConstructSignaturesDifferingByConstraints.js index fdc67d4b84a..c15c53b9bf8 100644 --- a/tests/baselines/reference/objectTypesIdentityWithGenericConstructSignaturesDifferingByConstraints.js +++ b/tests/baselines/reference/objectTypesIdentityWithGenericConstructSignaturesDifferingByConstraints.js @@ -84,13 +84,13 @@ var B = (function () { return null; } return B; -})(); +}()); var C = (function () { function C(x) { return null; } return C; -})(); +}()); var a; var b = { new: function (x) { return ''; } }; // not a construct signature, function called new function foo1b(x) { } diff --git a/tests/baselines/reference/objectTypesIdentityWithGenericConstructSignaturesDifferingByConstraints2.js b/tests/baselines/reference/objectTypesIdentityWithGenericConstructSignaturesDifferingByConstraints2.js index 11dcdf0a609..f8aff596dc9 100644 --- a/tests/baselines/reference/objectTypesIdentityWithGenericConstructSignaturesDifferingByConstraints2.js +++ b/tests/baselines/reference/objectTypesIdentityWithGenericConstructSignaturesDifferingByConstraints2.js @@ -95,19 +95,19 @@ var B = (function () { return null; } return B; -})(); +}()); var C = (function () { function C(x, y) { return null; } return C; -})(); +}()); var D = (function () { function D(x, y) { return null; } return D; -})(); +}()); var a; var b = { new: function (x, y) { return ''; } }; // not a construct signature, function called new function foo1b(x) { } diff --git a/tests/baselines/reference/objectTypesIdentityWithGenericConstructSignaturesDifferingByConstraints3.js b/tests/baselines/reference/objectTypesIdentityWithGenericConstructSignaturesDifferingByConstraints3.js index 5c6f59eef24..141aa86823b 100644 --- a/tests/baselines/reference/objectTypesIdentityWithGenericConstructSignaturesDifferingByConstraints3.js +++ b/tests/baselines/reference/objectTypesIdentityWithGenericConstructSignaturesDifferingByConstraints3.js @@ -103,30 +103,30 @@ var One = (function () { function One() { } return One; -})(); +}()); var Two = (function () { function Two() { } return Two; -})(); +}()); var B = (function () { function B(x, y) { return null; } return B; -})(); +}()); var C = (function () { function C(x, y) { return null; } return C; -})(); +}()); var D = (function () { function D(x, y) { return null; } return D; -})(); +}()); var a; var b = { new: function (x, y) { return ''; } }; // not a construct signature, function called new function foo1b(x) { } diff --git a/tests/baselines/reference/objectTypesIdentityWithGenericConstructSignaturesDifferingByReturnType.js b/tests/baselines/reference/objectTypesIdentityWithGenericConstructSignaturesDifferingByReturnType.js index 556d1bcaee0..b651d368f33 100644 --- a/tests/baselines/reference/objectTypesIdentityWithGenericConstructSignaturesDifferingByReturnType.js +++ b/tests/baselines/reference/objectTypesIdentityWithGenericConstructSignaturesDifferingByReturnType.js @@ -91,13 +91,13 @@ var B = (function () { return null; } return B; -})(); +}()); var C = (function () { function C(x) { return null; } return C; -})(); +}()); var a; var b = { new: function (x) { return null; } }; // not a construct signature, function called new function foo1b(x) { } diff --git a/tests/baselines/reference/objectTypesIdentityWithGenericConstructSignaturesDifferingByReturnType2.js b/tests/baselines/reference/objectTypesIdentityWithGenericConstructSignaturesDifferingByReturnType2.js index 68c32cb0e71..ff7095c4ea1 100644 --- a/tests/baselines/reference/objectTypesIdentityWithGenericConstructSignaturesDifferingByReturnType2.js +++ b/tests/baselines/reference/objectTypesIdentityWithGenericConstructSignaturesDifferingByReturnType2.js @@ -87,13 +87,13 @@ var B = (function () { return null; } return B; -})(); +}()); var C = (function () { function C(x) { return null; } return C; -})(); +}()); var a; var b = { new: function (x) { return null; } }; // not a construct signature, function called new function foo1b(x) { } diff --git a/tests/baselines/reference/objectTypesIdentityWithGenericConstructSignaturesDifferingTypeParameterCounts.js b/tests/baselines/reference/objectTypesIdentityWithGenericConstructSignaturesDifferingTypeParameterCounts.js index 789e02d2d7b..314eb700c4b 100644 --- a/tests/baselines/reference/objectTypesIdentityWithGenericConstructSignaturesDifferingTypeParameterCounts.js +++ b/tests/baselines/reference/objectTypesIdentityWithGenericConstructSignaturesDifferingTypeParameterCounts.js @@ -79,13 +79,13 @@ var B = (function () { return null; } return B; -})(); +}()); var C = (function () { function C(x) { return null; } return C; -})(); +}()); var a; var b = { new: function (x) { return x; } }; function foo1b(x) { } diff --git a/tests/baselines/reference/objectTypesIdentityWithGenericConstructSignaturesDifferingTypeParameterNames.js b/tests/baselines/reference/objectTypesIdentityWithGenericConstructSignaturesDifferingTypeParameterNames.js index 5a501d05834..182cf8263b7 100644 --- a/tests/baselines/reference/objectTypesIdentityWithGenericConstructSignaturesDifferingTypeParameterNames.js +++ b/tests/baselines/reference/objectTypesIdentityWithGenericConstructSignaturesDifferingTypeParameterNames.js @@ -79,13 +79,13 @@ var B = (function () { return null; } return B; -})(); +}()); var C = (function () { function C(x) { return null; } return C; -})(); +}()); var a; var b = { new: function (x) { return new C(x); } }; function foo1b(x) { } diff --git a/tests/baselines/reference/objectTypesIdentityWithGenericConstructSignaturesOptionalParams.js b/tests/baselines/reference/objectTypesIdentityWithGenericConstructSignaturesOptionalParams.js index 685a8441d97..5c5dd26c331 100644 --- a/tests/baselines/reference/objectTypesIdentityWithGenericConstructSignaturesOptionalParams.js +++ b/tests/baselines/reference/objectTypesIdentityWithGenericConstructSignaturesOptionalParams.js @@ -83,13 +83,13 @@ var B = (function () { return null; } return B; -})(); +}()); var C = (function () { function C(x, y) { return null; } return C; -})(); +}()); var a; var b = { new: function (x, y) { return new C(x, y); } }; // not a construct signature, function called new function foo1b(x) { } diff --git a/tests/baselines/reference/objectTypesIdentityWithGenericConstructSignaturesOptionalParams2.js b/tests/baselines/reference/objectTypesIdentityWithGenericConstructSignaturesOptionalParams2.js index f16d69acaa1..14b2ec3c0ca 100644 --- a/tests/baselines/reference/objectTypesIdentityWithGenericConstructSignaturesOptionalParams2.js +++ b/tests/baselines/reference/objectTypesIdentityWithGenericConstructSignaturesOptionalParams2.js @@ -83,13 +83,13 @@ var B = (function () { return null; } return B; -})(); +}()); var C = (function () { function C(x, y) { return null; } return C; -})(); +}()); var a; var b = { new: function (x, y) { return new C(x, y); } }; // not a construct signature, function called new function foo1b(x) { } diff --git a/tests/baselines/reference/objectTypesIdentityWithGenericConstructSignaturesOptionalParams3.js b/tests/baselines/reference/objectTypesIdentityWithGenericConstructSignaturesOptionalParams3.js index 25c628e9e15..ffc238cacae 100644 --- a/tests/baselines/reference/objectTypesIdentityWithGenericConstructSignaturesOptionalParams3.js +++ b/tests/baselines/reference/objectTypesIdentityWithGenericConstructSignaturesOptionalParams3.js @@ -83,13 +83,13 @@ var B = (function () { return null; } return B; -})(); +}()); var C = (function () { function C(x, y) { return null; } return C; -})(); +}()); var a; var b = { new: function (x, y) { return new C(x, y); } }; // not a construct signature, function called new function foo1b(x) { } diff --git a/tests/baselines/reference/objectTypesIdentityWithNumericIndexers1.js b/tests/baselines/reference/objectTypesIdentityWithNumericIndexers1.js index e0f626ae083..c0bd423cd79 100644 --- a/tests/baselines/reference/objectTypesIdentityWithNumericIndexers1.js +++ b/tests/baselines/reference/objectTypesIdentityWithNumericIndexers1.js @@ -133,31 +133,31 @@ var A = (function () { function A() { } return A; -})(); +}()); var B = (function () { function B() { } return B; -})(); +}()); var C = (function () { function C() { } return C; -})(); +}()); var PA = (function (_super) { __extends(PA, _super); function PA() { _super.apply(this, arguments); } return PA; -})(A); +}(A)); var PB = (function (_super) { __extends(PB, _super); function PB() { _super.apply(this, arguments); } return PB; -})(B); +}(B)); var a; var b = { foo: '' }; function foo1(x) { } diff --git a/tests/baselines/reference/objectTypesIdentityWithNumericIndexers2.js b/tests/baselines/reference/objectTypesIdentityWithNumericIndexers2.js index f0417a7ca23..98c29e96a86 100644 --- a/tests/baselines/reference/objectTypesIdentityWithNumericIndexers2.js +++ b/tests/baselines/reference/objectTypesIdentityWithNumericIndexers2.js @@ -136,43 +136,43 @@ var Base = (function () { function Base() { } return Base; -})(); +}()); var Derived = (function (_super) { __extends(Derived, _super); function Derived() { _super.apply(this, arguments); } return Derived; -})(Base); +}(Base)); var A = (function () { function A() { } return A; -})(); +}()); var B = (function () { function B() { } return B; -})(); +}()); var C = (function () { function C() { } return C; -})(); +}()); var PA = (function (_super) { __extends(PA, _super); function PA() { _super.apply(this, arguments); } return PA; -})(A); +}(A)); var PB = (function (_super) { __extends(PB, _super); function PB() { _super.apply(this, arguments); } return PB; -})(B); +}(B)); var a; var b = { foo: null }; function foo1(x) { } diff --git a/tests/baselines/reference/objectTypesIdentityWithNumericIndexers3.js b/tests/baselines/reference/objectTypesIdentityWithNumericIndexers3.js index e1473790553..ea85b8b3c67 100644 --- a/tests/baselines/reference/objectTypesIdentityWithNumericIndexers3.js +++ b/tests/baselines/reference/objectTypesIdentityWithNumericIndexers3.js @@ -133,31 +133,31 @@ var A = (function () { function A() { } return A; -})(); +}()); var B = (function () { function B() { } return B; -})(); +}()); var C = (function () { function C() { } return C; -})(); +}()); var PA = (function (_super) { __extends(PA, _super); function PA() { _super.apply(this, arguments); } return PA; -})(A); +}(A)); var PB = (function (_super) { __extends(PB, _super); function PB() { _super.apply(this, arguments); } return PB; -})(B); +}(B)); var a; var b = { foo: '' }; function foo1(x) { } diff --git a/tests/baselines/reference/objectTypesIdentityWithOptionality.js b/tests/baselines/reference/objectTypesIdentityWithOptionality.js index 2a61cda1bb9..a45d474614a 100644 --- a/tests/baselines/reference/objectTypesIdentityWithOptionality.js +++ b/tests/baselines/reference/objectTypesIdentityWithOptionality.js @@ -62,17 +62,17 @@ var A = (function () { function A() { } return A; -})(); +}()); var B = (function () { function B() { } return B; -})(); +}()); var C = (function () { function C() { } return C; -})(); +}()); var a; var b = { foo: '' }; function foo2(x) { } diff --git a/tests/baselines/reference/objectTypesIdentityWithPrivates.js b/tests/baselines/reference/objectTypesIdentityWithPrivates.js index bf4f80da15a..7d6be5eaf8f 100644 --- a/tests/baselines/reference/objectTypesIdentityWithPrivates.js +++ b/tests/baselines/reference/objectTypesIdentityWithPrivates.js @@ -131,31 +131,31 @@ var A = (function () { function A() { } return A; -})(); +}()); var B = (function () { function B() { } return B; -})(); +}()); var C = (function () { function C() { } return C; -})(); +}()); var PA = (function (_super) { __extends(PA, _super); function PA() { _super.apply(this, arguments); } return PA; -})(A); +}(A)); var PB = (function (_super) { __extends(PB, _super); function PB() { _super.apply(this, arguments); } return PB; -})(B); +}(B)); var a; var b = { foo: '' }; function foo1(x) { } diff --git a/tests/baselines/reference/objectTypesIdentityWithPrivates2.js b/tests/baselines/reference/objectTypesIdentityWithPrivates2.js index c8cd12cff30..cb9c677f024 100644 --- a/tests/baselines/reference/objectTypesIdentityWithPrivates2.js +++ b/tests/baselines/reference/objectTypesIdentityWithPrivates2.js @@ -49,14 +49,14 @@ var C = (function () { function C() { } return C; -})(); +}()); var D = (function (_super) { __extends(D, _super); function D() { _super.apply(this, arguments); } return D; -})(C); +}(C)); function foo1(x) { } function foo2(x) { } function foo3(x) { } diff --git a/tests/baselines/reference/objectTypesIdentityWithPrivates3.js b/tests/baselines/reference/objectTypesIdentityWithPrivates3.js index a812a1fc4bd..241fbcaf27e 100644 --- a/tests/baselines/reference/objectTypesIdentityWithPrivates3.js +++ b/tests/baselines/reference/objectTypesIdentityWithPrivates3.js @@ -35,27 +35,27 @@ var C1 = (function () { function C1() { } return C1; -})(); +}()); var C2 = (function (_super) { __extends(C2, _super); function C2() { _super.apply(this, arguments); } return C2; -})(C1); +}(C1)); var c1; c1; // Should succeed (private x originates in the same declaration) var C3 = (function () { function C3() { } return C3; -})(); +}()); var C4 = (function (_super) { __extends(C4, _super); function C4() { _super.apply(this, arguments); } return C4; -})(C3); +}(C3)); var c3; c3; // Should fail (private x originates in the same declaration, but different types) diff --git a/tests/baselines/reference/objectTypesIdentityWithPublics.js b/tests/baselines/reference/objectTypesIdentityWithPublics.js index 7c36eb48f2c..0abc8a9b5cc 100644 --- a/tests/baselines/reference/objectTypesIdentityWithPublics.js +++ b/tests/baselines/reference/objectTypesIdentityWithPublics.js @@ -94,17 +94,17 @@ var A = (function () { function A() { } return A; -})(); +}()); var B = (function () { function B() { } return B; -})(); +}()); var C = (function () { function C() { } return C; -})(); +}()); var a; var b = { foo: '' }; function foo1(x) { } diff --git a/tests/baselines/reference/objectTypesIdentityWithStringIndexers.js b/tests/baselines/reference/objectTypesIdentityWithStringIndexers.js index 9cf9e99cb4b..c0578c2fba1 100644 --- a/tests/baselines/reference/objectTypesIdentityWithStringIndexers.js +++ b/tests/baselines/reference/objectTypesIdentityWithStringIndexers.js @@ -133,31 +133,31 @@ var A = (function () { function A() { } return A; -})(); +}()); var B = (function () { function B() { } return B; -})(); +}()); var C = (function () { function C() { } return C; -})(); +}()); var PA = (function (_super) { __extends(PA, _super); function PA() { _super.apply(this, arguments); } return PA; -})(A); +}(A)); var PB = (function (_super) { __extends(PB, _super); function PB() { _super.apply(this, arguments); } return PB; -})(B); +}(B)); var a; var b = { foo: '' }; function foo1(x) { } diff --git a/tests/baselines/reference/objectTypesIdentityWithStringIndexers2.js b/tests/baselines/reference/objectTypesIdentityWithStringIndexers2.js index 84f3d04e7bf..0670d45a5a5 100644 --- a/tests/baselines/reference/objectTypesIdentityWithStringIndexers2.js +++ b/tests/baselines/reference/objectTypesIdentityWithStringIndexers2.js @@ -136,43 +136,43 @@ var Base = (function () { function Base() { } return Base; -})(); +}()); var Derived = (function (_super) { __extends(Derived, _super); function Derived() { _super.apply(this, arguments); } return Derived; -})(Base); +}(Base)); var A = (function () { function A() { } return A; -})(); +}()); var B = (function () { function B() { } return B; -})(); +}()); var C = (function () { function C() { } return C; -})(); +}()); var PA = (function (_super) { __extends(PA, _super); function PA() { _super.apply(this, arguments); } return PA; -})(A); +}(A)); var PB = (function (_super) { __extends(PB, _super); function PB() { _super.apply(this, arguments); } return PB; -})(B); +}(B)); var a; var b = { foo: null }; function foo1(x) { } diff --git a/tests/baselines/reference/objectTypesWithOptionalProperties.js b/tests/baselines/reference/objectTypesWithOptionalProperties.js index c2177e63762..98141c048dd 100644 --- a/tests/baselines/reference/objectTypesWithOptionalProperties.js +++ b/tests/baselines/reference/objectTypesWithOptionalProperties.js @@ -32,12 +32,12 @@ var C = (function () { function C() { } return C; -})(); +}()); var C2 = (function () { function C2() { } return C2; -})(); +}()); var b = { x: 1 // error }; diff --git a/tests/baselines/reference/objectTypesWithOptionalProperties2.js b/tests/baselines/reference/objectTypesWithOptionalProperties2.js index e5ffbf09c10..eabb1a153a6 100644 --- a/tests/baselines/reference/objectTypesWithOptionalProperties2.js +++ b/tests/baselines/reference/objectTypesWithOptionalProperties2.js @@ -34,13 +34,13 @@ var C = (function () { } C.prototype.x = ; return C; -})(); +}()); var C2 = (function () { function C2() { } C2.prototype.x = ; return C2; -})(); +}()); var b = { x: function () { }, 1: // error // error diff --git a/tests/baselines/reference/objectTypesWithPredefinedTypesAsName.js b/tests/baselines/reference/objectTypesWithPredefinedTypesAsName.js index 650ceb664df..6c3637e2d0e 100644 --- a/tests/baselines/reference/objectTypesWithPredefinedTypesAsName.js +++ b/tests/baselines/reference/objectTypesWithPredefinedTypesAsName.js @@ -19,24 +19,24 @@ var any = (function () { function any() { } return any; -})(); +}()); var number = (function () { function number() { } return number; -})(); +}()); var boolean = (function () { function boolean() { } return boolean; -})(); +}()); var bool = (function () { function bool() { } return bool; -})(); // not a predefined type anymore +}()); // not a predefined type anymore var string = (function () { function string() { } return string; -})(); +}()); diff --git a/tests/baselines/reference/objectTypesWithPredefinedTypesAsName2.js b/tests/baselines/reference/objectTypesWithPredefinedTypesAsName2.js index 974744f1870..57176900886 100644 --- a/tests/baselines/reference/objectTypesWithPredefinedTypesAsName2.js +++ b/tests/baselines/reference/objectTypesWithPredefinedTypesAsName2.js @@ -9,5 +9,5 @@ var default_1 = (function () { function default_1() { } return default_1; -})(); +}()); void {}; // parse error unlike the others diff --git a/tests/baselines/reference/optionalArgsWithDefaultValues.js b/tests/baselines/reference/optionalArgsWithDefaultValues.js index 12ab7c9f330..b2bdc7a9a65 100644 --- a/tests/baselines/reference/optionalArgsWithDefaultValues.js +++ b/tests/baselines/reference/optionalArgsWithDefaultValues.js @@ -26,7 +26,7 @@ var CCC = (function () { if (z === void 0) { z = 0; } }; return CCC; -})(); +}()); var a = function (x) { if (x === void 0) { x = 0; } return 1; diff --git a/tests/baselines/reference/optionalConstructorArgInSuper.js b/tests/baselines/reference/optionalConstructorArgInSuper.js index e8b65ea5119..3e6a47b4de2 100644 --- a/tests/baselines/reference/optionalConstructorArgInSuper.js +++ b/tests/baselines/reference/optionalConstructorArgInSuper.js @@ -21,14 +21,14 @@ var Base = (function () { } Base.prototype.foo = function (other) { }; return Base; -})(); +}()); var Derived = (function (_super) { __extends(Derived, _super); function Derived() { _super.apply(this, arguments); } return Derived; -})(Base); +}(Base)); var d = new Derived(); // bug caused an error here, couldn't select overload var d2; d2.foo(); diff --git a/tests/baselines/reference/optionalParamArgsTest.js b/tests/baselines/reference/optionalParamArgsTest.js index 0c5a5d82814..6d42c38f907 100644 --- a/tests/baselines/reference/optionalParamArgsTest.js +++ b/tests/baselines/reference/optionalParamArgsTest.js @@ -157,7 +157,7 @@ var C1 = (function () { return C1M5A1 + C1M5A2; }; return C1; -})(); +}()); var C2 = (function (_super) { __extends(C2, _super); function C2(v2) { @@ -165,7 +165,7 @@ var C2 = (function (_super) { _super.call(this, v2); } return C2; -})(C1); +}(C1)); function F1() { return 0; } function F2(F2A1) { return F2A1; } function F3(F3A1, F3A2) { diff --git a/tests/baselines/reference/optionalParamInOverride.js b/tests/baselines/reference/optionalParamInOverride.js index 4a72953bdad..f6ccdbe3fab 100644 --- a/tests/baselines/reference/optionalParamInOverride.js +++ b/tests/baselines/reference/optionalParamInOverride.js @@ -18,7 +18,7 @@ var Z = (function () { } Z.prototype.func = function () { }; return Z; -})(); +}()); var Y = (function (_super) { __extends(Y, _super); function Y() { @@ -26,4 +26,4 @@ var Y = (function (_super) { } Y.prototype.func = function (value) { }; return Y; -})(Z); +}(Z)); diff --git a/tests/baselines/reference/optionalPropertiesInClasses.js b/tests/baselines/reference/optionalPropertiesInClasses.js index 24f52e9d76a..0adbec827cf 100644 --- a/tests/baselines/reference/optionalPropertiesInClasses.js +++ b/tests/baselines/reference/optionalPropertiesInClasses.js @@ -22,14 +22,14 @@ var C1 = (function () { function C1() { } return C1; -})(); +}()); var C2 = (function () { function C2() { } return C2; -})(); +}()); var C3 = (function () { function C3() { } return C3; -})(); +}()); diff --git a/tests/baselines/reference/optionalSetterParam.js b/tests/baselines/reference/optionalSetterParam.js index 1632f33be9f..22cc2cdc067 100644 --- a/tests/baselines/reference/optionalSetterParam.js +++ b/tests/baselines/reference/optionalSetterParam.js @@ -15,4 +15,4 @@ var foo = (function () { configurable: true }); return foo; -})(); +}()); diff --git a/tests/baselines/reference/out-flag.js b/tests/baselines/reference/out-flag.js index 755703a12fe..a8c689f9736 100644 --- a/tests/baselines/reference/out-flag.js +++ b/tests/baselines/reference/out-flag.js @@ -30,7 +30,7 @@ var MyClass = (function () { // }; return MyClass; -})(); +}()); //# sourceMappingURL=out-flag.js.map //// [out-flag.d.ts] diff --git a/tests/baselines/reference/out-flag.sourcemap.txt b/tests/baselines/reference/out-flag.sourcemap.txt index 82989f69583..6bc04d8c453 100644 --- a/tests/baselines/reference/out-flag.sourcemap.txt +++ b/tests/baselines/reference/out-flag.sourcemap.txt @@ -160,7 +160,7 @@ sourceFile:out-flag.ts 1->Emitted(13, 5) Source(16, 1) + SourceIndex(0) 2 >Emitted(13, 19) Source(16, 2) + SourceIndex(0) --- ->>>})(); +>>>}()); 1 > 2 >^ 3 > diff --git a/tests/baselines/reference/out-flag2.js b/tests/baselines/reference/out-flag2.js index e2a30f169e3..6d452daca66 100644 --- a/tests/baselines/reference/out-flag2.js +++ b/tests/baselines/reference/out-flag2.js @@ -12,12 +12,12 @@ var A = (function () { function A() { } return A; -})(); +}()); var B = (function () { function B() { } return B; -})(); +}()); //# sourceMappingURL=c.js.map //// [c.d.ts] diff --git a/tests/baselines/reference/out-flag2.sourcemap.txt b/tests/baselines/reference/out-flag2.sourcemap.txt index 160e00bd28e..a4966bf9f82 100644 --- a/tests/baselines/reference/out-flag2.sourcemap.txt +++ b/tests/baselines/reference/out-flag2.sourcemap.txt @@ -38,7 +38,7 @@ sourceFile:tests/cases/compiler/a.ts 1->Emitted(4, 5) Source(2, 11) + SourceIndex(0) 2 >Emitted(4, 13) Source(2, 12) + SourceIndex(0) --- ->>>})(); +>>>}()); 1 > 2 >^ 3 > @@ -86,7 +86,7 @@ sourceFile:tests/cases/compiler/b.ts 1->Emitted(9, 5) Source(1, 11) + SourceIndex(1) 2 >Emitted(9, 13) Source(1, 12) + SourceIndex(1) --- ->>>})(); +>>>}()); 1 > 2 >^ 3 > diff --git a/tests/baselines/reference/out-flag3.js b/tests/baselines/reference/out-flag3.js index 8327c3429d3..134bbfa9e03 100644 --- a/tests/baselines/reference/out-flag3.js +++ b/tests/baselines/reference/out-flag3.js @@ -15,12 +15,12 @@ var A = (function () { function A() { } return A; -})(); +}()); var B = (function () { function B() { } return B; -})(); +}()); //# sourceMappingURL=c.js.map //// [c.d.ts] diff --git a/tests/baselines/reference/out-flag3.sourcemap.txt b/tests/baselines/reference/out-flag3.sourcemap.txt index a14ca70e617..8801fd11143 100644 --- a/tests/baselines/reference/out-flag3.sourcemap.txt +++ b/tests/baselines/reference/out-flag3.sourcemap.txt @@ -48,7 +48,7 @@ sourceFile:tests/cases/compiler/a.ts 1->Emitted(5, 5) Source(4, 11) + SourceIndex(0) 2 >Emitted(5, 13) Source(4, 12) + SourceIndex(0) --- ->>>})(); +>>>}()); 1 > 2 >^ 3 > @@ -96,7 +96,7 @@ sourceFile:tests/cases/compiler/b.ts 1->Emitted(10, 5) Source(1, 11) + SourceIndex(1) 2 >Emitted(10, 13) Source(1, 12) + SourceIndex(1) --- ->>>})(); +>>>}()); 1 > 2 >^ 3 > diff --git a/tests/baselines/reference/outModuleConcatAmd.js b/tests/baselines/reference/outModuleConcatAmd.js index 6408511f2ec..8a478e675c6 100644 --- a/tests/baselines/reference/outModuleConcatAmd.js +++ b/tests/baselines/reference/outModuleConcatAmd.js @@ -20,7 +20,7 @@ define("ref/a", ["require", "exports"], function (require, exports) { function A() { } return A; - })(); + }()); exports.A = A; }); define("b", ["require", "exports", "ref/a"], function (require, exports, a_1) { @@ -31,7 +31,7 @@ define("b", ["require", "exports", "ref/a"], function (require, exports, a_1) { _super.apply(this, arguments); } return B; - })(a_1.A); + }(a_1.A)); exports.B = B; }); //# sourceMappingURL=all.js.map diff --git a/tests/baselines/reference/outModuleConcatAmd.js.map b/tests/baselines/reference/outModuleConcatAmd.js.map index 963fba4a847..5c34fd866a4 100644 --- a/tests/baselines/reference/outModuleConcatAmd.js.map +++ b/tests/baselines/reference/outModuleConcatAmd.js.map @@ -1,2 +1,2 @@ //// [all.js.map] -{"version":3,"file":"all.js","sourceRoot":"","sources":["tests/cases/compiler/ref/a.ts","tests/cases/compiler/b.ts"],"names":[],"mappings":";;;;;;;IACA;QAAA;QAAiB,CAAC;QAAD,QAAC;IAAD,CAAC,AAAlB,IAAkB;IAAL,SAAC,IAAI,CAAA;;;;ICAlB;QAAuB,qBAAC;QAAxB;YAAuB,8BAAC;QAAG,CAAC;QAAD,QAAC;IAAD,CAAC,AAA5B,EAAuB,KAAC,EAAI;IAAf,SAAC,IAAc,CAAA"} \ No newline at end of file +{"version":3,"file":"all.js","sourceRoot":"","sources":["tests/cases/compiler/ref/a.ts","tests/cases/compiler/b.ts"],"names":[],"mappings":";;;;;;;IACA;QAAA;QAAiB,CAAC;QAAD,QAAC;IAAD,CAAC,AAAlB,IAAkB;IAAL,SAAC,IAAI,CAAA;;;;ICAlB;QAAuB,qBAAC;QAAxB;YAAuB,8BAAC;QAAG,CAAC;QAAD,QAAC;IAAD,CAAC,AAA5B,CAAuB,KAAC,GAAI;IAAf,SAAC,IAAc,CAAA"} \ No newline at end of file diff --git a/tests/baselines/reference/outModuleConcatAmd.sourcemap.txt b/tests/baselines/reference/outModuleConcatAmd.sourcemap.txt index b8fe92f082c..76370d95c32 100644 --- a/tests/baselines/reference/outModuleConcatAmd.sourcemap.txt +++ b/tests/baselines/reference/outModuleConcatAmd.sourcemap.txt @@ -45,7 +45,7 @@ sourceFile:tests/cases/compiler/ref/a.ts 1->Emitted(11, 9) Source(2, 18) + SourceIndex(0) 2 >Emitted(11, 17) Source(2, 19) + SourceIndex(0) --- ->>> })(); +>>> }()); 1 >^^^^ 2 > ^ 3 > @@ -127,25 +127,25 @@ sourceFile:tests/cases/compiler/b.ts 1->Emitted(22, 9) Source(2, 28) + SourceIndex(1) 2 >Emitted(22, 17) Source(2, 29) + SourceIndex(1) --- ->>> })(a_1.A); +>>> }(a_1.A)); 1 >^^^^ 2 > ^ 3 > -4 > ^^ -5 > ^^^^^ -6 > ^^ +4 > ^ +5 > ^^^^^ +6 > ^^^ 7 > ^^^^^-> 1 > 2 > } 3 > 4 > export class B extends -5 > A -6 > { } +5 > A +6 > { } 1 >Emitted(23, 5) Source(2, 28) + SourceIndex(1) 2 >Emitted(23, 6) Source(2, 29) + SourceIndex(1) 3 >Emitted(23, 6) Source(2, 1) + SourceIndex(1) -4 >Emitted(23, 8) Source(2, 24) + SourceIndex(1) -5 >Emitted(23, 13) Source(2, 25) + SourceIndex(1) +4 >Emitted(23, 7) Source(2, 24) + SourceIndex(1) +5 >Emitted(23, 12) Source(2, 25) + SourceIndex(1) 6 >Emitted(23, 15) Source(2, 29) + SourceIndex(1) --- >>> exports.B = B; diff --git a/tests/baselines/reference/outModuleConcatSystem.js b/tests/baselines/reference/outModuleConcatSystem.js index 5ac811ea9a0..d4552d33167 100644 --- a/tests/baselines/reference/outModuleConcatSystem.js +++ b/tests/baselines/reference/outModuleConcatSystem.js @@ -24,7 +24,7 @@ System.register("ref/a", [], function(exports_1) { function A() { } return A; - })(); + }()); exports_1("A", A); } } @@ -45,7 +45,7 @@ System.register("b", ["ref/a"], function(exports_2) { _super.apply(this, arguments); } return B; - })(a_1.A); + }(a_1.A)); exports_2("B", B); } } diff --git a/tests/baselines/reference/outModuleConcatSystem.js.map b/tests/baselines/reference/outModuleConcatSystem.js.map index c2289af1df4..47d3ba2d39c 100644 --- a/tests/baselines/reference/outModuleConcatSystem.js.map +++ b/tests/baselines/reference/outModuleConcatSystem.js.map @@ -1,2 +1,2 @@ //// [all.js.map] -{"version":3,"file":"all.js","sourceRoot":"","sources":["tests/cases/compiler/ref/a.ts","tests/cases/compiler/b.ts"],"names":[],"mappings":";;;;;;;;;;;YACA;gBAAA;gBAAiB,CAAC;gBAAD,QAAC;YAAD,CAAC,AAAlB,IAAkB;YAAlB,iBAAkB,CAAA;;;;;;;;;;;;;;YCAlB;gBAAuB,qBAAC;gBAAxB;oBAAuB,8BAAC;gBAAG,CAAC;gBAAD,QAAC;YAAD,CAAC,AAA5B,EAAuB,KAAC,EAAI;YAA5B,iBAA4B,CAAA"} \ No newline at end of file +{"version":3,"file":"all.js","sourceRoot":"","sources":["tests/cases/compiler/ref/a.ts","tests/cases/compiler/b.ts"],"names":[],"mappings":";;;;;;;;;;;YACA;gBAAA;gBAAiB,CAAC;gBAAD,QAAC;YAAD,CAAC,AAAlB,IAAkB;YAAlB,iBAAkB,CAAA;;;;;;;;;;;;;;YCAlB;gBAAuB,qBAAC;gBAAxB;oBAAuB,8BAAC;gBAAG,CAAC;gBAAD,QAAC;YAAD,CAAC,AAA5B,CAAuB,KAAC,GAAI;YAA5B,iBAA4B,CAAA"} \ No newline at end of file diff --git a/tests/baselines/reference/outModuleConcatSystem.sourcemap.txt b/tests/baselines/reference/outModuleConcatSystem.sourcemap.txt index 88ff65a88a3..e3f521c828c 100644 --- a/tests/baselines/reference/outModuleConcatSystem.sourcemap.txt +++ b/tests/baselines/reference/outModuleConcatSystem.sourcemap.txt @@ -49,7 +49,7 @@ sourceFile:tests/cases/compiler/ref/a.ts 1->Emitted(15, 17) Source(2, 18) + SourceIndex(0) 2 >Emitted(15, 25) Source(2, 19) + SourceIndex(0) --- ->>> })(); +>>> }()); 1 >^^^^^^^^^^^^ 2 > ^ 3 > @@ -138,25 +138,25 @@ sourceFile:tests/cases/compiler/b.ts 1->Emitted(36, 17) Source(2, 28) + SourceIndex(1) 2 >Emitted(36, 25) Source(2, 29) + SourceIndex(1) --- ->>> })(a_1.A); +>>> }(a_1.A)); 1 >^^^^^^^^^^^^ 2 > ^ 3 > -4 > ^^ -5 > ^^^^^ -6 > ^^ +4 > ^ +5 > ^^^^^ +6 > ^^^ 7 > ^^^^^^^^^-> 1 > 2 > } 3 > 4 > export class B extends -5 > A -6 > { } +5 > A +6 > { } 1 >Emitted(37, 13) Source(2, 28) + SourceIndex(1) 2 >Emitted(37, 14) Source(2, 29) + SourceIndex(1) 3 >Emitted(37, 14) Source(2, 1) + SourceIndex(1) -4 >Emitted(37, 16) Source(2, 24) + SourceIndex(1) -5 >Emitted(37, 21) Source(2, 25) + SourceIndex(1) +4 >Emitted(37, 15) Source(2, 24) + SourceIndex(1) +5 >Emitted(37, 20) Source(2, 25) + SourceIndex(1) 6 >Emitted(37, 23) Source(2, 29) + SourceIndex(1) --- >>> exports_2("B", B); diff --git a/tests/baselines/reference/outModuleTripleSlashRefs.js b/tests/baselines/reference/outModuleTripleSlashRefs.js index 0aabf2b4835..90f8feab7bc 100644 --- a/tests/baselines/reference/outModuleTripleSlashRefs.js +++ b/tests/baselines/reference/outModuleTripleSlashRefs.js @@ -41,7 +41,7 @@ var Foo = (function () { function Foo() { } return Foo; -})(); +}()); define("ref/a", ["require", "exports"], function (require, exports) { "use strict"; /// @@ -49,7 +49,7 @@ define("ref/a", ["require", "exports"], function (require, exports) { function A() { } return A; - })(); + }()); exports.A = A; }); define("b", ["require", "exports", "ref/a"], function (require, exports, a_1) { @@ -60,7 +60,7 @@ define("b", ["require", "exports", "ref/a"], function (require, exports, a_1) { _super.apply(this, arguments); } return B; - })(a_1.A); + }(a_1.A)); exports.B = B; }); //# sourceMappingURL=all.js.map diff --git a/tests/baselines/reference/outModuleTripleSlashRefs.js.map b/tests/baselines/reference/outModuleTripleSlashRefs.js.map index 324f0e9374f..7d0c11de99c 100644 --- a/tests/baselines/reference/outModuleTripleSlashRefs.js.map +++ b/tests/baselines/reference/outModuleTripleSlashRefs.js.map @@ -1,2 +1,2 @@ //// [all.js.map] -{"version":3,"file":"all.js","sourceRoot":"","sources":["tests/cases/compiler/ref/b.ts","tests/cases/compiler/ref/a.ts","tests/cases/compiler/b.ts"],"names":[],"mappings":";;;;;AAAA,iCAAiC;AACjC;IAAA;IAEA,CAAC;IAAD,UAAC;AAAD,CAAC,AAFD,IAEC;;;ICFD,+BAA+B;IAC/B;QAAA;QAEA,CAAC;QAAD,QAAC;IAAD,CAAC,AAFD,IAEC;IAFY,SAAC,IAEb,CAAA;;;;ICHD;QAAuB,qBAAC;QAAxB;YAAuB,8BAAC;QAAG,CAAC;QAAD,QAAC;IAAD,CAAC,AAA5B,EAAuB,KAAC,EAAI;IAAf,SAAC,IAAc,CAAA"} \ No newline at end of file +{"version":3,"file":"all.js","sourceRoot":"","sources":["tests/cases/compiler/ref/b.ts","tests/cases/compiler/ref/a.ts","tests/cases/compiler/b.ts"],"names":[],"mappings":";;;;;AAAA,iCAAiC;AACjC;IAAA;IAEA,CAAC;IAAD,UAAC;AAAD,CAAC,AAFD,IAEC;;;ICFD,+BAA+B;IAC/B;QAAA;QAEA,CAAC;QAAD,QAAC;IAAD,CAAC,AAFD,IAEC;IAFY,SAAC,IAEb,CAAA;;;;ICHD;QAAuB,qBAAC;QAAxB;YAAuB,8BAAC;QAAG,CAAC;QAAD,QAAC;IAAD,CAAC,AAA5B,CAAuB,KAAC,GAAI;IAAf,SAAC,IAAc,CAAA"} \ No newline at end of file diff --git a/tests/baselines/reference/outModuleTripleSlashRefs.sourcemap.txt b/tests/baselines/reference/outModuleTripleSlashRefs.sourcemap.txt index b80246ed9f7..a689c611ef0 100644 --- a/tests/baselines/reference/outModuleTripleSlashRefs.sourcemap.txt +++ b/tests/baselines/reference/outModuleTripleSlashRefs.sourcemap.txt @@ -53,7 +53,7 @@ sourceFile:tests/cases/compiler/ref/b.ts 1->Emitted(10, 5) Source(4, 1) + SourceIndex(0) 2 >Emitted(10, 15) Source(4, 2) + SourceIndex(0) --- ->>>})(); +>>>}()); 1 > 2 >^ 3 > @@ -117,7 +117,7 @@ sourceFile:tests/cases/compiler/ref/a.ts 1->Emitted(18, 9) Source(5, 1) + SourceIndex(1) 2 >Emitted(18, 17) Source(5, 2) + SourceIndex(1) --- ->>> })(); +>>> }()); 1 >^^^^ 2 > ^ 3 > @@ -203,25 +203,25 @@ sourceFile:tests/cases/compiler/b.ts 1->Emitted(29, 9) Source(2, 28) + SourceIndex(2) 2 >Emitted(29, 17) Source(2, 29) + SourceIndex(2) --- ->>> })(a_1.A); +>>> }(a_1.A)); 1 >^^^^ 2 > ^ 3 > -4 > ^^ -5 > ^^^^^ -6 > ^^ +4 > ^ +5 > ^^^^^ +6 > ^^^ 7 > ^^^^^-> 1 > 2 > } 3 > 4 > export class B extends -5 > A -6 > { } +5 > A +6 > { } 1 >Emitted(30, 5) Source(2, 28) + SourceIndex(2) 2 >Emitted(30, 6) Source(2, 29) + SourceIndex(2) 3 >Emitted(30, 6) Source(2, 1) + SourceIndex(2) -4 >Emitted(30, 8) Source(2, 24) + SourceIndex(2) -5 >Emitted(30, 13) Source(2, 25) + SourceIndex(2) +4 >Emitted(30, 7) Source(2, 24) + SourceIndex(2) +5 >Emitted(30, 12) Source(2, 25) + SourceIndex(2) 6 >Emitted(30, 15) Source(2, 29) + SourceIndex(2) --- >>> exports.B = B; diff --git a/tests/baselines/reference/overload1.js b/tests/baselines/reference/overload1.js index af3aebde4ee..fd05873c647 100644 --- a/tests/baselines/reference/overload1.js +++ b/tests/baselines/reference/overload1.js @@ -51,7 +51,7 @@ var O; function A() { } return A; - })(); + }()); O.A = A; var B = (function (_super) { __extends(B, _super); @@ -59,7 +59,7 @@ var O; _super.apply(this, arguments); } return B; - })(A); + }(A)); O.B = B; var C = (function (_super) { __extends(C, _super); @@ -67,7 +67,7 @@ var O; _super.apply(this, arguments); } return C; - })(B); + }(B)); O.C = C; })(O || (O = {})); var e = x.g(new O.A()); // matches overload but bad assignment diff --git a/tests/baselines/reference/overload2.js b/tests/baselines/reference/overload2.js index 70d950e5420..667d0fb1db4 100644 --- a/tests/baselines/reference/overload2.js +++ b/tests/baselines/reference/overload2.js @@ -30,7 +30,7 @@ var C = (function () { function C() { } return C; -})(); +}()); // should be ok function foo1(x) { } diff --git a/tests/baselines/reference/overloadAssignmentCompat.js b/tests/baselines/reference/overloadAssignmentCompat.js index 2d4bd931844..7915edd5446 100644 --- a/tests/baselines/reference/overloadAssignmentCompat.js +++ b/tests/baselines/reference/overloadAssignmentCompat.js @@ -44,7 +44,7 @@ var Accessor = (function () { function Accessor() { } return Accessor; -})(); +}()); function attr(nameOrMap, value) { if (nameOrMap && typeof nameOrMap === "object") { // handle map case diff --git a/tests/baselines/reference/overloadCallTest.js b/tests/baselines/reference/overloadCallTest.js index 38930b7aea3..369c68923df 100644 --- a/tests/baselines/reference/overloadCallTest.js +++ b/tests/baselines/reference/overloadCallTest.js @@ -25,4 +25,4 @@ var foo = (function () { goo = bar("test"); } return foo; -})(); +}()); diff --git a/tests/baselines/reference/overloadConsecutiveness.js b/tests/baselines/reference/overloadConsecutiveness.js index 8c0d3d26b72..68e478a30b5 100644 --- a/tests/baselines/reference/overloadConsecutiveness.js +++ b/tests/baselines/reference/overloadConsecutiveness.js @@ -24,4 +24,4 @@ var C = (function () { C.prototype.m2 = function () { }; C.prototype.m3 = function () { }; return C; -})(); +}()); diff --git a/tests/baselines/reference/overloadEquivalenceWithStatics.js b/tests/baselines/reference/overloadEquivalenceWithStatics.js index 72692c4d89f..4c296410aa6 100644 --- a/tests/baselines/reference/overloadEquivalenceWithStatics.js +++ b/tests/baselines/reference/overloadEquivalenceWithStatics.js @@ -16,4 +16,4 @@ var A1 = (function () { return null; }; return A1; -})(); +}()); diff --git a/tests/baselines/reference/overloadGenericFunctionWithRestArgs.js b/tests/baselines/reference/overloadGenericFunctionWithRestArgs.js index c4b133ea44c..356cece5ab6 100644 --- a/tests/baselines/reference/overloadGenericFunctionWithRestArgs.js +++ b/tests/baselines/reference/overloadGenericFunctionWithRestArgs.js @@ -15,12 +15,12 @@ var B = (function () { function B() { } return B; -})(); +}()); var A = (function () { function A() { } return A; -})(); +}()); function Choice() { var v_args = []; for (var _i = 0; _i < arguments.length; _i++) { diff --git a/tests/baselines/reference/overloadModifiersMustAgree.js b/tests/baselines/reference/overloadModifiersMustAgree.js index afcc0f829c8..e7256562e76 100644 --- a/tests/baselines/reference/overloadModifiersMustAgree.js +++ b/tests/baselines/reference/overloadModifiersMustAgree.js @@ -22,5 +22,5 @@ var baz = (function () { } baz.prototype.foo = function (bar) { }; // error - access modifiers do not agree return baz; -})(); +}()); function bar(s) { } diff --git a/tests/baselines/reference/overloadOnConstConstraintChecks1.js b/tests/baselines/reference/overloadOnConstConstraintChecks1.js index 67aa365ee39..a3b7a329861 100644 --- a/tests/baselines/reference/overloadOnConstConstraintChecks1.js +++ b/tests/baselines/reference/overloadOnConstConstraintChecks1.js @@ -33,7 +33,7 @@ var Base = (function () { } Base.prototype.foo = function () { }; return Base; -})(); +}()); var Derived1 = (function (_super) { __extends(Derived1, _super); function Derived1() { @@ -41,7 +41,7 @@ var Derived1 = (function (_super) { } Derived1.prototype.bar = function () { }; return Derived1; -})(Base); +}(Base)); var Derived2 = (function (_super) { __extends(Derived2, _super); function Derived2() { @@ -49,7 +49,7 @@ var Derived2 = (function (_super) { } Derived2.prototype.baz = function () { }; return Derived2; -})(Base); +}(Base)); var Derived3 = (function (_super) { __extends(Derived3, _super); function Derived3() { @@ -57,7 +57,7 @@ var Derived3 = (function (_super) { } Derived3.prototype.biz = function () { }; return Derived3; -})(Base); +}(Base)); var D = (function () { function D() { } @@ -65,4 +65,4 @@ var D = (function () { return null; }; return D; -})(); +}()); diff --git a/tests/baselines/reference/overloadOnConstConstraintChecks2.js b/tests/baselines/reference/overloadOnConstConstraintChecks2.js index 353680bb92e..efb57153b13 100644 --- a/tests/baselines/reference/overloadOnConstConstraintChecks2.js +++ b/tests/baselines/reference/overloadOnConstConstraintChecks2.js @@ -21,14 +21,14 @@ var A = (function () { function A() { } return A; -})(); +}()); var B = (function (_super) { __extends(B, _super); function B() { _super.apply(this, arguments); } return B; -})(A); +}(A)); var C = (function (_super) { __extends(C, _super); function C() { @@ -36,7 +36,7 @@ var C = (function (_super) { } C.prototype.foo = function () { }; return C; -})(A); +}(A)); function foo(name) { return null; } diff --git a/tests/baselines/reference/overloadOnConstConstraintChecks3.js b/tests/baselines/reference/overloadOnConstConstraintChecks3.js index 2debaa589f5..181f9d8129c 100644 --- a/tests/baselines/reference/overloadOnConstConstraintChecks3.js +++ b/tests/baselines/reference/overloadOnConstConstraintChecks3.js @@ -23,14 +23,14 @@ var A = (function () { this.x = 1; } return A; -})(); +}()); var B = (function (_super) { __extends(B, _super); function B() { _super.apply(this, arguments); } return B; -})(A); +}(A)); var C = (function (_super) { __extends(C, _super); function C() { @@ -38,7 +38,7 @@ var C = (function (_super) { } C.prototype.foo = function () { }; return C; -})(A); +}(A)); function foo(name) { return null; } diff --git a/tests/baselines/reference/overloadOnConstConstraintChecks4.js b/tests/baselines/reference/overloadOnConstConstraintChecks4.js index 17ec3779620..10733fa8ea3 100644 --- a/tests/baselines/reference/overloadOnConstConstraintChecks4.js +++ b/tests/baselines/reference/overloadOnConstConstraintChecks4.js @@ -23,7 +23,7 @@ var Z = (function () { function Z() { } return Z; -})(); +}()); var A = (function (_super) { __extends(A, _super); function A() { @@ -31,14 +31,14 @@ var A = (function (_super) { this.x = 1; } return A; -})(Z); +}(Z)); var B = (function (_super) { __extends(B, _super); function B() { _super.apply(this, arguments); } return B; -})(A); +}(A)); var C = (function (_super) { __extends(C, _super); function C() { @@ -46,7 +46,7 @@ var C = (function (_super) { } C.prototype.foo = function () { }; return C; -})(A); +}(A)); function foo(name) { return null; } diff --git a/tests/baselines/reference/overloadOnConstInBaseWithBadImplementationInDerived.js b/tests/baselines/reference/overloadOnConstInBaseWithBadImplementationInDerived.js index 1b6062e7b21..188e4d02140 100644 --- a/tests/baselines/reference/overloadOnConstInBaseWithBadImplementationInDerived.js +++ b/tests/baselines/reference/overloadOnConstInBaseWithBadImplementationInDerived.js @@ -15,4 +15,4 @@ var C = (function () { C.prototype.x1 = function (a, callback) { }; return C; -})(); +}()); diff --git a/tests/baselines/reference/overloadOnConstInCallback1.js b/tests/baselines/reference/overloadOnConstInCallback1.js index 90bffd4e75c..d0077908177 100644 --- a/tests/baselines/reference/overloadOnConstInCallback1.js +++ b/tests/baselines/reference/overloadOnConstInCallback1.js @@ -20,4 +20,4 @@ var C = (function () { callback(hm); }; return C; -})(); +}()); diff --git a/tests/baselines/reference/overloadOnConstInheritance4.js b/tests/baselines/reference/overloadOnConstInheritance4.js index 7bfad88a7a7..f493d9ef2de 100644 --- a/tests/baselines/reference/overloadOnConstInheritance4.js +++ b/tests/baselines/reference/overloadOnConstInheritance4.js @@ -16,4 +16,4 @@ var C = (function () { C.prototype.x1 = function (a, callback) { }; return C; -})(); +}()); diff --git a/tests/baselines/reference/overloadOnConstNoAnyImplementation2.js b/tests/baselines/reference/overloadOnConstNoAnyImplementation2.js index 52f6639e352..5e3110abd3d 100644 --- a/tests/baselines/reference/overloadOnConstNoAnyImplementation2.js +++ b/tests/baselines/reference/overloadOnConstNoAnyImplementation2.js @@ -33,7 +33,7 @@ var C = (function () { callback(1); // error }; return C; -})(); +}()); var c; c.x1(1, function (x) { return 1; }); c.x1(1, function (x) { return 1; }); diff --git a/tests/baselines/reference/overloadOnConstNoNonSpecializedSignature.js b/tests/baselines/reference/overloadOnConstNoNonSpecializedSignature.js index 980dfcb2145..8a610f30922 100644 --- a/tests/baselines/reference/overloadOnConstNoNonSpecializedSignature.js +++ b/tests/baselines/reference/overloadOnConstNoNonSpecializedSignature.js @@ -11,4 +11,4 @@ var C = (function () { } C.prototype.x1 = function (a) { }; return C; -})(); +}()); diff --git a/tests/baselines/reference/overloadOnConstNoStringImplementation2.js b/tests/baselines/reference/overloadOnConstNoStringImplementation2.js index 71d7a4e4a3f..98ee0f45c15 100644 --- a/tests/baselines/reference/overloadOnConstNoStringImplementation2.js +++ b/tests/baselines/reference/overloadOnConstNoStringImplementation2.js @@ -32,7 +32,7 @@ var C = (function () { callback(1); }; return C; -})(); +}()); var c; c.x1(1, function (x) { return 1; }); c.x1(1, function (x) { return 1; }); diff --git a/tests/baselines/reference/overloadOnConstantsInvalidOverload1.js b/tests/baselines/reference/overloadOnConstantsInvalidOverload1.js index a8dfcde9ada..c98075c04a1 100644 --- a/tests/baselines/reference/overloadOnConstantsInvalidOverload1.js +++ b/tests/baselines/reference/overloadOnConstantsInvalidOverload1.js @@ -22,7 +22,7 @@ var Base = (function () { } Base.prototype.foo = function () { }; return Base; -})(); +}()); var Derived1 = (function (_super) { __extends(Derived1, _super); function Derived1() { @@ -30,7 +30,7 @@ var Derived1 = (function (_super) { } Derived1.prototype.bar = function () { }; return Derived1; -})(Base); +}(Base)); var Derived2 = (function (_super) { __extends(Derived2, _super); function Derived2() { @@ -38,7 +38,7 @@ var Derived2 = (function (_super) { } Derived2.prototype.baz = function () { }; return Derived2; -})(Base); +}(Base)); var Derived3 = (function (_super) { __extends(Derived3, _super); function Derived3() { @@ -46,7 +46,7 @@ var Derived3 = (function (_super) { } Derived3.prototype.biz = function () { }; return Derived3; -})(Base); +}(Base)); function foo(name) { return null; } diff --git a/tests/baselines/reference/overloadOnGenericClassAndNonGenericClass.js b/tests/baselines/reference/overloadOnGenericClassAndNonGenericClass.js index d88cd2bceb8..d7f992564db 100644 --- a/tests/baselines/reference/overloadOnGenericClassAndNonGenericClass.js +++ b/tests/baselines/reference/overloadOnGenericClassAndNonGenericClass.js @@ -21,32 +21,32 @@ var A = (function () { function A() { } return A; -})(); +}()); var B = (function () { function B() { } return B; -})(); +}()); var C = (function () { function C() { } return C; -})(); +}()); var X = (function () { function X() { } return X; -})(); +}()); var X1 = (function () { function X1() { } return X1; -})(); +}()); var X2 = (function () { function X2() { } return X2; -})(); +}()); function f(a) { } var xs; diff --git a/tests/baselines/reference/overloadResolution.js b/tests/baselines/reference/overloadResolution.js index 287c5ccdb8e..0d25322fdfc 100644 --- a/tests/baselines/reference/overloadResolution.js +++ b/tests/baselines/reference/overloadResolution.js @@ -104,28 +104,28 @@ var SomeBase = (function () { function SomeBase() { } return SomeBase; -})(); +}()); var SomeDerived1 = (function (_super) { __extends(SomeDerived1, _super); function SomeDerived1() { _super.apply(this, arguments); } return SomeDerived1; -})(SomeBase); +}(SomeBase)); var SomeDerived2 = (function (_super) { __extends(SomeDerived2, _super); function SomeDerived2() { _super.apply(this, arguments); } return SomeDerived2; -})(SomeBase); +}(SomeBase)); var SomeDerived3 = (function (_super) { __extends(SomeDerived3, _super); function SomeDerived3() { _super.apply(this, arguments); } return SomeDerived3; -})(SomeBase); +}(SomeBase)); function fn1() { return null; } var s = fn1(undefined); var s; diff --git a/tests/baselines/reference/overloadResolutionClassConstructors.js b/tests/baselines/reference/overloadResolutionClassConstructors.js index 14306b7873b..9fa55fe1e95 100644 --- a/tests/baselines/reference/overloadResolutionClassConstructors.js +++ b/tests/baselines/reference/overloadResolutionClassConstructors.js @@ -111,34 +111,34 @@ var SomeBase = (function () { function SomeBase() { } return SomeBase; -})(); +}()); var SomeDerived1 = (function (_super) { __extends(SomeDerived1, _super); function SomeDerived1() { _super.apply(this, arguments); } return SomeDerived1; -})(SomeBase); +}(SomeBase)); var SomeDerived2 = (function (_super) { __extends(SomeDerived2, _super); function SomeDerived2() { _super.apply(this, arguments); } return SomeDerived2; -})(SomeBase); +}(SomeBase)); var SomeDerived3 = (function (_super) { __extends(SomeDerived3, _super); function SomeDerived3() { _super.apply(this, arguments); } return SomeDerived3; -})(SomeBase); +}(SomeBase)); // Ambiguous call picks the first overload in declaration order var fn1 = (function () { function fn1() { } return fn1; -})(); +}()); new fn1(undefined); // No candidate overloads found new fn1({}); // Error @@ -147,7 +147,7 @@ var fn2 = (function () { function fn2() { } return fn2; -})(); +}()); var d = new fn2(0, undefined); // Generic and non - generic overload where generic overload is the only candidate when called without type arguments var s = new fn2(0, ''); @@ -160,7 +160,7 @@ var fn3 = (function () { function fn3() { } return fn3; -})(); +}()); new fn3(3); new fn3('', 3, ''); new fn3(5, 5, 5); @@ -175,7 +175,7 @@ var fn4 = (function () { function fn4() { } return fn4; -})(); +}()); new fn4('', 3); new fn4(3, ''); // Error new fn4('', 3); // Error @@ -196,7 +196,7 @@ var fn5 = (function () { return undefined; } return fn5; -})(); +}()); new fn5(function (n) { return n.toFixed(); }); new fn5(function (n) { return n.substr(0); }); new fn5(function (n) { return n.blah; }); // Error diff --git a/tests/baselines/reference/overloadResolutionConstructors.js b/tests/baselines/reference/overloadResolutionConstructors.js index 788e6362f86..12d8480eefb 100644 --- a/tests/baselines/reference/overloadResolutionConstructors.js +++ b/tests/baselines/reference/overloadResolutionConstructors.js @@ -112,28 +112,28 @@ var SomeBase = (function () { function SomeBase() { } return SomeBase; -})(); +}()); var SomeDerived1 = (function (_super) { __extends(SomeDerived1, _super); function SomeDerived1() { _super.apply(this, arguments); } return SomeDerived1; -})(SomeBase); +}(SomeBase)); var SomeDerived2 = (function (_super) { __extends(SomeDerived2, _super); function SomeDerived2() { _super.apply(this, arguments); } return SomeDerived2; -})(SomeBase); +}(SomeBase)); var SomeDerived3 = (function (_super) { __extends(SomeDerived3, _super); function SomeDerived3() { _super.apply(this, arguments); } return SomeDerived3; -})(SomeBase); +}(SomeBase)); var fn1; // Ambiguous call picks the first overload in declaration order var s = new fn1(undefined); diff --git a/tests/baselines/reference/overloadResolutionOnDefaultConstructor1.js b/tests/baselines/reference/overloadResolutionOnDefaultConstructor1.js index 3c7f6bc7609..49ac12e6152 100644 --- a/tests/baselines/reference/overloadResolutionOnDefaultConstructor1.js +++ b/tests/baselines/reference/overloadResolutionOnDefaultConstructor1.js @@ -13,4 +13,4 @@ var Bar = (function () { return new Bar(0); }; return Bar; -})(); +}()); diff --git a/tests/baselines/reference/overloadResolutionOverNonCTLambdas.js b/tests/baselines/reference/overloadResolutionOverNonCTLambdas.js index 170f2dd2137..210e45c27d6 100644 --- a/tests/baselines/reference/overloadResolutionOverNonCTLambdas.js +++ b/tests/baselines/reference/overloadResolutionOverNonCTLambdas.js @@ -30,7 +30,7 @@ var Bugs; function A() { } return A; - })(); + }()); // replace(searchValue: RegExp, replaceValue: (substring: string, ...args: any[]) => string): string; function bug2(message) { var args = []; diff --git a/tests/baselines/reference/overloadReturnTypes.js b/tests/baselines/reference/overloadReturnTypes.js index 127063caaae..9a49a550f40 100644 --- a/tests/baselines/reference/overloadReturnTypes.js +++ b/tests/baselines/reference/overloadReturnTypes.js @@ -28,7 +28,7 @@ var Accessor = (function () { function Accessor() { } return Accessor; -})(); +}()); function attr(nameOrMap, value) { if (nameOrMap && typeof nameOrMap === "object") { // handle map case diff --git a/tests/baselines/reference/overloadedStaticMethodSpecialization.js b/tests/baselines/reference/overloadedStaticMethodSpecialization.js index db50cbc992c..d63b185419a 100644 --- a/tests/baselines/reference/overloadedStaticMethodSpecialization.js +++ b/tests/baselines/reference/overloadedStaticMethodSpecialization.js @@ -16,4 +16,4 @@ var A = (function () { return null; }; return A; -})(); +}()); diff --git a/tests/baselines/reference/overloadingOnConstants1.js b/tests/baselines/reference/overloadingOnConstants1.js index bd08f70498d..b261201be40 100644 --- a/tests/baselines/reference/overloadingOnConstants1.js +++ b/tests/baselines/reference/overloadingOnConstants1.js @@ -36,7 +36,7 @@ var Base = (function () { } Base.prototype.foo = function () { }; return Base; -})(); +}()); var Derived1 = (function (_super) { __extends(Derived1, _super); function Derived1() { @@ -44,7 +44,7 @@ var Derived1 = (function (_super) { } Derived1.prototype.bar = function () { }; return Derived1; -})(Base); +}(Base)); var Derived2 = (function (_super) { __extends(Derived2, _super); function Derived2() { @@ -52,7 +52,7 @@ var Derived2 = (function (_super) { } Derived2.prototype.baz = function () { }; return Derived2; -})(Base); +}(Base)); var Derived3 = (function (_super) { __extends(Derived3, _super); function Derived3() { @@ -60,7 +60,7 @@ var Derived3 = (function (_super) { } Derived3.prototype.biz = function () { }; return Derived3; -})(Base); +}(Base)); var d2; // these are ok var htmlElement = d2.createElement("yo"); diff --git a/tests/baselines/reference/overloadingOnConstants2.js b/tests/baselines/reference/overloadingOnConstants2.js index eaec0054f66..977ae7ec5b9 100644 --- a/tests/baselines/reference/overloadingOnConstants2.js +++ b/tests/baselines/reference/overloadingOnConstants2.js @@ -38,20 +38,20 @@ var C = (function () { this.x = 1; } return C; -})(); +}()); var D = (function (_super) { __extends(D, _super); function D() { _super.apply(this, arguments); } return D; -})(C); +}(C)); var E = (function () { function E() { this.y = 1; } return E; -})(); +}()); function foo(x, items) { return null; } diff --git a/tests/baselines/reference/overloadresolutionWithConstraintCheckingDeferred.js b/tests/baselines/reference/overloadresolutionWithConstraintCheckingDeferred.js index 63b4a2b1e93..b5ddd0adebc 100644 --- a/tests/baselines/reference/overloadresolutionWithConstraintCheckingDeferred.js +++ b/tests/baselines/reference/overloadresolutionWithConstraintCheckingDeferred.js @@ -27,7 +27,7 @@ var G = (function () { function G(x) { } return G; -})(); +}()); var result = foo(function (x) { return new G(x); }); // x has type D, new G(x) fails, so first overload is picked. var result2 = foo(function (x) { return new G(x); }); // x has type D, new G(x) fails, so first overload is picked. var result3 = foo(function (x) { diff --git a/tests/baselines/reference/overloadsWithinClasses.js b/tests/baselines/reference/overloadsWithinClasses.js index 4ac612502c7..0cd191c8f44 100644 --- a/tests/baselines/reference/overloadsWithinClasses.js +++ b/tests/baselines/reference/overloadsWithinClasses.js @@ -30,17 +30,17 @@ var foo = (function () { foo.fnOverload = function () { }; foo.fnOverload = function (foo) { }; // error return foo; -})(); +}()); var bar = (function () { function bar() { } bar.fnOverload = function (foo) { }; // no error return bar; -})(); +}()); var X = (function () { function X() { } X.prototype.attr = function (first, second) { }; return X; -})(); +}()); diff --git a/tests/baselines/reference/overridingPrivateStaticMembers.js b/tests/baselines/reference/overridingPrivateStaticMembers.js index a155bb1b830..ddd9fae6429 100644 --- a/tests/baselines/reference/overridingPrivateStaticMembers.js +++ b/tests/baselines/reference/overridingPrivateStaticMembers.js @@ -17,11 +17,11 @@ var Base2 = (function () { function Base2() { } return Base2; -})(); +}()); var Derived2 = (function (_super) { __extends(Derived2, _super); function Derived2() { _super.apply(this, arguments); } return Derived2; -})(Base2); +}(Base2)); diff --git a/tests/baselines/reference/paramPropertiesInSignatures.js b/tests/baselines/reference/paramPropertiesInSignatures.js index 15d7f616bdf..690052e589b 100644 --- a/tests/baselines/reference/paramPropertiesInSignatures.js +++ b/tests/baselines/reference/paramPropertiesInSignatures.js @@ -17,4 +17,4 @@ var C1 = (function () { this.p3 = p3; } // OK return C1; -})(); +}()); diff --git a/tests/baselines/reference/parameterInitializersForwardReferencing.js b/tests/baselines/reference/parameterInitializersForwardReferencing.js index 188a104f3af..e43ba42fbb8 100644 --- a/tests/baselines/reference/parameterInitializersForwardReferencing.js +++ b/tests/baselines/reference/parameterInitializersForwardReferencing.js @@ -91,7 +91,7 @@ var C = (function () { if (b === void 0) { b = 1; } }; return C; -})(); +}()); // Function expressions var x = function (a, b, c) { if (a === void 0) { a = b; } diff --git a/tests/baselines/reference/parameterNamesInTypeParameterList.js b/tests/baselines/reference/parameterNamesInTypeParameterList.js index 2fbd7fad3cb..f4d74b89782 100644 --- a/tests/baselines/reference/parameterNamesInTypeParameterList.js +++ b/tests/baselines/reference/parameterNamesInTypeParameterList.js @@ -50,4 +50,4 @@ var A = (function () { a.b; }; return A; -})(); +}()); diff --git a/tests/baselines/reference/parameterPropertyInConstructor2.js b/tests/baselines/reference/parameterPropertyInConstructor2.js index 595f3f3d0ff..23e891ce384 100644 --- a/tests/baselines/reference/parameterPropertyInConstructor2.js +++ b/tests/baselines/reference/parameterPropertyInConstructor2.js @@ -17,5 +17,5 @@ var mod; this.ages = ages; } return Customers; - })(); + }()); })(mod || (mod = {})); diff --git a/tests/baselines/reference/parameterPropertyInitializerInInitializers.js b/tests/baselines/reference/parameterPropertyInitializerInInitializers.js index d3cd88764f4..a689ab2df79 100644 --- a/tests/baselines/reference/parameterPropertyInitializerInInitializers.js +++ b/tests/baselines/reference/parameterPropertyInitializerInInitializers.js @@ -11,4 +11,4 @@ var Foo = (function () { this.y = y; } return Foo; -})(); +}()); diff --git a/tests/baselines/reference/parameterPropertyOutsideConstructor.js b/tests/baselines/reference/parameterPropertyOutsideConstructor.js index 43e20d4fa63..151b766cf5d 100644 --- a/tests/baselines/reference/parameterPropertyOutsideConstructor.js +++ b/tests/baselines/reference/parameterPropertyOutsideConstructor.js @@ -11,4 +11,4 @@ var C = (function () { C.prototype.foo = function (x) { }; return C; -})(); +}()); diff --git a/tests/baselines/reference/parameterPropertyReferencingOtherParameter.js b/tests/baselines/reference/parameterPropertyReferencingOtherParameter.js index 18cb0e4a41c..35715e5feab 100644 --- a/tests/baselines/reference/parameterPropertyReferencingOtherParameter.js +++ b/tests/baselines/reference/parameterPropertyReferencingOtherParameter.js @@ -12,4 +12,4 @@ var Foo = (function () { this.y = y; } return Foo; -})(); +}()); diff --git a/tests/baselines/reference/parameterReferencesOtherParameter1.js b/tests/baselines/reference/parameterReferencesOtherParameter1.js index 6c8bb8a06a8..97058974f4f 100644 --- a/tests/baselines/reference/parameterReferencesOtherParameter1.js +++ b/tests/baselines/reference/parameterReferencesOtherParameter1.js @@ -14,10 +14,10 @@ var Model = (function () { function Model() { } return Model; -})(); +}()); var UI = (function () { function UI(model, foo) { if (foo === void 0) { foo = model.name; } } return UI; -})(); +}()); diff --git a/tests/baselines/reference/parameterReferencesOtherParameter2.js b/tests/baselines/reference/parameterReferencesOtherParameter2.js index e9c9ff4e5d4..fd84f833e97 100644 --- a/tests/baselines/reference/parameterReferencesOtherParameter2.js +++ b/tests/baselines/reference/parameterReferencesOtherParameter2.js @@ -14,10 +14,10 @@ var Model = (function () { function Model() { } return Model; -})(); +}()); var UI = (function () { function UI(model, foo) { if (foo === void 0) { foo = model.name; } } return UI; -})(); +}()); diff --git a/tests/baselines/reference/parametersWithNoAnnotationAreAny.js b/tests/baselines/reference/parametersWithNoAnnotationAreAny.js index a8d06125d25..54d9d1b6e03 100644 --- a/tests/baselines/reference/parametersWithNoAnnotationAreAny.js +++ b/tests/baselines/reference/parametersWithNoAnnotationAreAny.js @@ -41,7 +41,7 @@ var C = (function () { return x; }; return C; -})(); +}()); var a; var b = { foo: function (x) { diff --git a/tests/baselines/reference/parseErrorInHeritageClause1.js b/tests/baselines/reference/parseErrorInHeritageClause1.js index b6640b64257..e2f66bfadd7 100644 --- a/tests/baselines/reference/parseErrorInHeritageClause1.js +++ b/tests/baselines/reference/parseErrorInHeritageClause1.js @@ -14,4 +14,4 @@ var C = (function (_super) { _super.apply(this, arguments); } return C; -})(A); +}(A)); diff --git a/tests/baselines/reference/parser0_004152.js b/tests/baselines/reference/parser0_004152.js index 87248eb8d83..333b64811c8 100644 --- a/tests/baselines/reference/parser0_004152.js +++ b/tests/baselines/reference/parser0_004152.js @@ -12,5 +12,5 @@ var Game = (function () { } ; return Game; -})(); +}()); exports.Game = Game; diff --git a/tests/baselines/reference/parser509546.js b/tests/baselines/reference/parser509546.js index 9a38cdc8b61..ceaf9b3572c 100644 --- a/tests/baselines/reference/parser509546.js +++ b/tests/baselines/reference/parser509546.js @@ -10,5 +10,5 @@ var Logger = (function () { function Logger() { } return Logger; -})(); +}()); exports.Logger = Logger; diff --git a/tests/baselines/reference/parser509546_1.js b/tests/baselines/reference/parser509546_1.js index 847ded1fdba..9d07172c509 100644 --- a/tests/baselines/reference/parser509546_1.js +++ b/tests/baselines/reference/parser509546_1.js @@ -10,5 +10,5 @@ var Logger = (function () { function Logger() { } return Logger; -})(); +}()); exports.Logger = Logger; diff --git a/tests/baselines/reference/parser509546_2.js b/tests/baselines/reference/parser509546_2.js index 976bbd1e471..b8822b52541 100644 --- a/tests/baselines/reference/parser509546_2.js +++ b/tests/baselines/reference/parser509546_2.js @@ -12,5 +12,5 @@ var Logger = (function () { function Logger() { } return Logger; -})(); +}()); exports.Logger = Logger; diff --git a/tests/baselines/reference/parser509630.js b/tests/baselines/reference/parser509630.js index 6862eef4a93..4d94ea619ec 100644 --- a/tests/baselines/reference/parser509630.js +++ b/tests/baselines/reference/parser509630.js @@ -17,11 +17,11 @@ var Type = (function () { this.examples = []; // typing here } return Type; -})(); +}()); var Any = (function (_super) { __extends(Any, _super); function Any() { _super.apply(this, arguments); } return Any; -})(Type); +}(Type)); diff --git a/tests/baselines/reference/parser509667.js b/tests/baselines/reference/parser509667.js index 0938613b295..0b68d0e0f59 100644 --- a/tests/baselines/reference/parser509667.js +++ b/tests/baselines/reference/parser509667.js @@ -25,4 +25,4 @@ var Foo = (function () { Foo.prototype.f3 = function () { }; return Foo; -})(); +}()); diff --git a/tests/baselines/reference/parser509668.js b/tests/baselines/reference/parser509668.js index 63c5d8a1a95..97a51d8a5e7 100644 --- a/tests/baselines/reference/parser509668.js +++ b/tests/baselines/reference/parser509668.js @@ -14,4 +14,4 @@ var Foo3 = (function () { } } return Foo3; -})(); +}()); diff --git a/tests/baselines/reference/parser512084.js b/tests/baselines/reference/parser512084.js index 967c8db3cb0..b109a3643b2 100644 --- a/tests/baselines/reference/parser512084.js +++ b/tests/baselines/reference/parser512084.js @@ -7,4 +7,4 @@ var foo = (function () { function foo() { } return foo; -})(); +}()); diff --git a/tests/baselines/reference/parser553699.js b/tests/baselines/reference/parser553699.js index 8570780e74a..a8a39c9bea6 100644 --- a/tests/baselines/reference/parser553699.js +++ b/tests/baselines/reference/parser553699.js @@ -14,9 +14,9 @@ var Foo = (function () { } Foo.prototype.banana = function (x) { }; return Foo; -})(); +}()); var Bar = (function () { function Bar(c) { } return Bar; -})(); +}()); diff --git a/tests/baselines/reference/parser585151.js b/tests/baselines/reference/parser585151.js index 16085ab3f16..977d90ad538 100644 --- a/tests/baselines/reference/parser585151.js +++ b/tests/baselines/reference/parser585151.js @@ -9,5 +9,5 @@ var Foo2 = (function () { function Foo2() { } return Foo2; -})(); +}()); var icecream = "chocolate"; diff --git a/tests/baselines/reference/parser618973.js b/tests/baselines/reference/parser618973.js index dbcad3e3d6e..df9b2e4433a 100644 --- a/tests/baselines/reference/parser618973.js +++ b/tests/baselines/reference/parser618973.js @@ -12,5 +12,5 @@ var Foo = (function () { Foo.prototype.Bar = function () { }; return Foo; -})(); +}()); exports.Foo = Foo; diff --git a/tests/baselines/reference/parser642331.js b/tests/baselines/reference/parser642331.js index 056ea7dd384..7d267973f47 100644 --- a/tests/baselines/reference/parser642331.js +++ b/tests/baselines/reference/parser642331.js @@ -9,4 +9,4 @@ var test = (function () { function test(static) { } return test; -})(); +}()); diff --git a/tests/baselines/reference/parser642331_1.js b/tests/baselines/reference/parser642331_1.js index 83833ee6612..65c7fac6c23 100644 --- a/tests/baselines/reference/parser642331_1.js +++ b/tests/baselines/reference/parser642331_1.js @@ -12,4 +12,4 @@ var test = (function () { function test(static) { } return test; -})(); +}()); diff --git a/tests/baselines/reference/parserAccessibilityAfterStatic1.js b/tests/baselines/reference/parserAccessibilityAfterStatic1.js index 263efaf5dd2..9e35ee6f25e 100644 --- a/tests/baselines/reference/parserAccessibilityAfterStatic1.js +++ b/tests/baselines/reference/parserAccessibilityAfterStatic1.js @@ -10,4 +10,4 @@ var Outer = (function () { function Outer() { } return Outer; -})(); +}()); diff --git a/tests/baselines/reference/parserAccessibilityAfterStatic10.js b/tests/baselines/reference/parserAccessibilityAfterStatic10.js index 6756a57ce7e..0fe0da80156 100644 --- a/tests/baselines/reference/parserAccessibilityAfterStatic10.js +++ b/tests/baselines/reference/parserAccessibilityAfterStatic10.js @@ -11,4 +11,4 @@ var Outer = (function () { } Outer.intI = function () { }; return Outer; -})(); +}()); diff --git a/tests/baselines/reference/parserAccessibilityAfterStatic11.js b/tests/baselines/reference/parserAccessibilityAfterStatic11.js index 8b16153b797..65d618934a1 100644 --- a/tests/baselines/reference/parserAccessibilityAfterStatic11.js +++ b/tests/baselines/reference/parserAccessibilityAfterStatic11.js @@ -11,4 +11,4 @@ var Outer = (function () { } Outer.public = function () { }; return Outer; -})(); +}()); diff --git a/tests/baselines/reference/parserAccessibilityAfterStatic14.js b/tests/baselines/reference/parserAccessibilityAfterStatic14.js index 4455936a859..ebb3ad88a00 100644 --- a/tests/baselines/reference/parserAccessibilityAfterStatic14.js +++ b/tests/baselines/reference/parserAccessibilityAfterStatic14.js @@ -11,4 +11,4 @@ var Outer = (function () { } Outer.public = function () { }; return Outer; -})(); +}()); diff --git a/tests/baselines/reference/parserAccessibilityAfterStatic2.js b/tests/baselines/reference/parserAccessibilityAfterStatic2.js index 9a0a6b02722..b677e4c96fb 100644 --- a/tests/baselines/reference/parserAccessibilityAfterStatic2.js +++ b/tests/baselines/reference/parserAccessibilityAfterStatic2.js @@ -10,4 +10,4 @@ var Outer = (function () { function Outer() { } return Outer; -})(); +}()); diff --git a/tests/baselines/reference/parserAccessibilityAfterStatic3.js b/tests/baselines/reference/parserAccessibilityAfterStatic3.js index bd3697fdbdb..7a9ae06e439 100644 --- a/tests/baselines/reference/parserAccessibilityAfterStatic3.js +++ b/tests/baselines/reference/parserAccessibilityAfterStatic3.js @@ -11,4 +11,4 @@ var Outer = (function () { } Outer.public = 1; return Outer; -})(); +}()); diff --git a/tests/baselines/reference/parserAccessibilityAfterStatic4.js b/tests/baselines/reference/parserAccessibilityAfterStatic4.js index 094b947957e..9db3e362487 100644 --- a/tests/baselines/reference/parserAccessibilityAfterStatic4.js +++ b/tests/baselines/reference/parserAccessibilityAfterStatic4.js @@ -10,4 +10,4 @@ var Outer = (function () { function Outer() { } return Outer; -})(); +}()); diff --git a/tests/baselines/reference/parserAccessibilityAfterStatic5.js b/tests/baselines/reference/parserAccessibilityAfterStatic5.js index 8373276dd00..10be7761a87 100644 --- a/tests/baselines/reference/parserAccessibilityAfterStatic5.js +++ b/tests/baselines/reference/parserAccessibilityAfterStatic5.js @@ -10,4 +10,4 @@ var Outer = (function () { function Outer() { } return Outer; -})(); +}()); diff --git a/tests/baselines/reference/parserAccessibilityAfterStatic6.js b/tests/baselines/reference/parserAccessibilityAfterStatic6.js index de4fc048785..7b6e8eed7fd 100644 --- a/tests/baselines/reference/parserAccessibilityAfterStatic6.js +++ b/tests/baselines/reference/parserAccessibilityAfterStatic6.js @@ -8,4 +8,4 @@ var Outer = (function () { function Outer() { } return Outer; -})(); +}()); diff --git a/tests/baselines/reference/parserAccessibilityAfterStatic7.js b/tests/baselines/reference/parserAccessibilityAfterStatic7.js index 2d94be8ea50..3bee7db9ddf 100644 --- a/tests/baselines/reference/parserAccessibilityAfterStatic7.js +++ b/tests/baselines/reference/parserAccessibilityAfterStatic7.js @@ -11,4 +11,4 @@ var Outer = (function () { } Outer.intI = function () { }; return Outer; -})(); +}()); diff --git a/tests/baselines/reference/parserAccessors1.js b/tests/baselines/reference/parserAccessors1.js index 6b47a46ede1..fcf8a6e14ff 100644 --- a/tests/baselines/reference/parserAccessors1.js +++ b/tests/baselines/reference/parserAccessors1.js @@ -13,4 +13,4 @@ var C = (function () { configurable: true }); return C; -})(); +}()); diff --git a/tests/baselines/reference/parserAccessors2.js b/tests/baselines/reference/parserAccessors2.js index 482daa74a64..6a76cf0671a 100644 --- a/tests/baselines/reference/parserAccessors2.js +++ b/tests/baselines/reference/parserAccessors2.js @@ -13,4 +13,4 @@ var C = (function () { configurable: true }); return C; -})(); +}()); diff --git a/tests/baselines/reference/parserAstSpans1.js b/tests/baselines/reference/parserAstSpans1.js index 5de3cb8f9f1..41f07380e97 100644 --- a/tests/baselines/reference/parserAstSpans1.js +++ b/tests/baselines/reference/parserAstSpans1.js @@ -239,7 +239,7 @@ var c1 = (function () { c1.prototype.nc_f1 = function () { }; return c1; -})(); +}()); var i1_i; i1_i.i1_f1(); i1_i.i1_nc_f1(); @@ -314,7 +314,7 @@ var c2 = (function () { configurable: true }); return c2; -})(); +}()); var c3 = (function (_super) { __extends(c3, _super); function c3() { @@ -342,7 +342,7 @@ var c3 = (function (_super) { configurable: true }); return c3; -})(c2); +}(c2)); var c2_i = new c2(10); var c3_i = new c3(); c2_i.c2_f1(); @@ -365,7 +365,7 @@ var c4 = (function (_super) { _super.apply(this, arguments); } return c4; -})(c2); +}(c2)); var c4_i = new c4(10); var i2_i; var i3_i; @@ -400,7 +400,7 @@ var c5 = (function () { function c5() { } return c5; -})(); +}()); var c6 = (function (_super) { __extends(c6, _super); function c6() { @@ -408,4 +408,4 @@ var c6 = (function (_super) { this.d = _super.prototype.b; } return c6; -})(c5); +}(c5)); diff --git a/tests/baselines/reference/parserClass1.js b/tests/baselines/reference/parserClass1.js index 3f772a2f692..50d2fb179dc 100644 --- a/tests/baselines/reference/parserClass1.js +++ b/tests/baselines/reference/parserClass1.js @@ -22,5 +22,5 @@ var NullLogger = (function () { NullLogger.prototype.log = function (s) { }; return NullLogger; -})(); +}()); exports.NullLogger = NullLogger; diff --git a/tests/baselines/reference/parserClass2.js b/tests/baselines/reference/parserClass2.js index 1fe84f37a07..c1d3b87e892 100644 --- a/tests/baselines/reference/parserClass2.js +++ b/tests/baselines/reference/parserClass2.js @@ -15,5 +15,5 @@ var LoggerAdapter = (function () { this._information = this.logger.information(); } return LoggerAdapter; -})(); +}()); exports.LoggerAdapter = LoggerAdapter; diff --git a/tests/baselines/reference/parserClassDeclaration1.js b/tests/baselines/reference/parserClassDeclaration1.js index f430b8e644a..41ecc9135c0 100644 --- a/tests/baselines/reference/parserClassDeclaration1.js +++ b/tests/baselines/reference/parserClassDeclaration1.js @@ -14,4 +14,4 @@ var C = (function (_super) { _super.apply(this, arguments); } return C; -})(A); +}(A)); diff --git a/tests/baselines/reference/parserClassDeclaration10.js b/tests/baselines/reference/parserClassDeclaration10.js index 9b912f9eaac..9af82a82f52 100644 --- a/tests/baselines/reference/parserClassDeclaration10.js +++ b/tests/baselines/reference/parserClassDeclaration10.js @@ -9,4 +9,4 @@ var C = (function () { function C() { } return C; -})(); +}()); diff --git a/tests/baselines/reference/parserClassDeclaration11.js b/tests/baselines/reference/parserClassDeclaration11.js index 078d3553a43..5749fa24f85 100644 --- a/tests/baselines/reference/parserClassDeclaration11.js +++ b/tests/baselines/reference/parserClassDeclaration11.js @@ -10,4 +10,4 @@ var C = (function () { } C.prototype.foo = function () { }; return C; -})(); +}()); diff --git a/tests/baselines/reference/parserClassDeclaration12.js b/tests/baselines/reference/parserClassDeclaration12.js index 709bae1b29f..e4458c09ef6 100644 --- a/tests/baselines/reference/parserClassDeclaration12.js +++ b/tests/baselines/reference/parserClassDeclaration12.js @@ -9,4 +9,4 @@ var C = (function () { function C(a) { } return C; -})(); +}()); diff --git a/tests/baselines/reference/parserClassDeclaration13.js b/tests/baselines/reference/parserClassDeclaration13.js index 93ce76fb168..ad0ca6d502f 100644 --- a/tests/baselines/reference/parserClassDeclaration13.js +++ b/tests/baselines/reference/parserClassDeclaration13.js @@ -10,4 +10,4 @@ var C = (function () { } C.prototype.bar = function () { }; return C; -})(); +}()); diff --git a/tests/baselines/reference/parserClassDeclaration14.js b/tests/baselines/reference/parserClassDeclaration14.js index 9fbfc598168..724337abf00 100644 --- a/tests/baselines/reference/parserClassDeclaration14.js +++ b/tests/baselines/reference/parserClassDeclaration14.js @@ -9,4 +9,4 @@ var C = (function () { function C() { } return C; -})(); +}()); diff --git a/tests/baselines/reference/parserClassDeclaration15.js b/tests/baselines/reference/parserClassDeclaration15.js index 4d0a285690a..5d96374d18d 100644 --- a/tests/baselines/reference/parserClassDeclaration15.js +++ b/tests/baselines/reference/parserClassDeclaration15.js @@ -9,4 +9,4 @@ var C = (function () { function C() { } return C; -})(); +}()); diff --git a/tests/baselines/reference/parserClassDeclaration16.js b/tests/baselines/reference/parserClassDeclaration16.js index a6a92d73afa..94ce889b9ba 100644 --- a/tests/baselines/reference/parserClassDeclaration16.js +++ b/tests/baselines/reference/parserClassDeclaration16.js @@ -10,4 +10,4 @@ var C = (function () { } C.prototype.foo = function () { }; return C; -})(); +}()); diff --git a/tests/baselines/reference/parserClassDeclaration19.js b/tests/baselines/reference/parserClassDeclaration19.js index 7900aa4d552..9be5032e698 100644 --- a/tests/baselines/reference/parserClassDeclaration19.js +++ b/tests/baselines/reference/parserClassDeclaration19.js @@ -10,4 +10,4 @@ var C = (function () { } C.prototype["foo"] = function () { }; return C; -})(); +}()); diff --git a/tests/baselines/reference/parserClassDeclaration2.js b/tests/baselines/reference/parserClassDeclaration2.js index 18bb068b23f..b462ee6e31e 100644 --- a/tests/baselines/reference/parserClassDeclaration2.js +++ b/tests/baselines/reference/parserClassDeclaration2.js @@ -7,4 +7,4 @@ var C = (function () { function C() { } return C; -})(); +}()); diff --git a/tests/baselines/reference/parserClassDeclaration20.js b/tests/baselines/reference/parserClassDeclaration20.js index 7c99f2d8ee6..56dc7c2ce9d 100644 --- a/tests/baselines/reference/parserClassDeclaration20.js +++ b/tests/baselines/reference/parserClassDeclaration20.js @@ -10,4 +10,4 @@ var C = (function () { } C.prototype["0"] = function () { }; return C; -})(); +}()); diff --git a/tests/baselines/reference/parserClassDeclaration21.js b/tests/baselines/reference/parserClassDeclaration21.js index fa4cef46e0e..c28d25963c2 100644 --- a/tests/baselines/reference/parserClassDeclaration21.js +++ b/tests/baselines/reference/parserClassDeclaration21.js @@ -10,4 +10,4 @@ var C = (function () { } C.prototype[1] = function () { }; return C; -})(); +}()); diff --git a/tests/baselines/reference/parserClassDeclaration22.js b/tests/baselines/reference/parserClassDeclaration22.js index 596f7a4474b..2b979579dda 100644 --- a/tests/baselines/reference/parserClassDeclaration22.js +++ b/tests/baselines/reference/parserClassDeclaration22.js @@ -10,4 +10,4 @@ var C = (function () { } C.prototype["bar"] = function () { }; return C; -})(); +}()); diff --git a/tests/baselines/reference/parserClassDeclaration23.js b/tests/baselines/reference/parserClassDeclaration23.js index 40b291bb007..f9d8d0f8f5a 100644 --- a/tests/baselines/reference/parserClassDeclaration23.js +++ b/tests/baselines/reference/parserClassDeclaration23.js @@ -7,4 +7,4 @@ var C\u0032 = (function () { function C\u0032() { } return C\u0032; -})(); +}()); diff --git a/tests/baselines/reference/parserClassDeclaration24.js b/tests/baselines/reference/parserClassDeclaration24.js index 8cf6e634cb2..b4b086253dc 100644 --- a/tests/baselines/reference/parserClassDeclaration24.js +++ b/tests/baselines/reference/parserClassDeclaration24.js @@ -7,4 +7,4 @@ var any = (function () { function any() { } return any; -})(); +}()); diff --git a/tests/baselines/reference/parserClassDeclaration25.js b/tests/baselines/reference/parserClassDeclaration25.js index 69a8fded51e..f8ab42f19bd 100644 --- a/tests/baselines/reference/parserClassDeclaration25.js +++ b/tests/baselines/reference/parserClassDeclaration25.js @@ -14,4 +14,4 @@ var List = (function () { function List() { } return List; -})(); +}()); diff --git a/tests/baselines/reference/parserClassDeclaration26.js b/tests/baselines/reference/parserClassDeclaration26.js index 94b56f521dd..3b5751b07cb 100644 --- a/tests/baselines/reference/parserClassDeclaration26.js +++ b/tests/baselines/reference/parserClassDeclaration26.js @@ -9,4 +9,4 @@ var C = (function () { function C() { } return C; -})(); +}()); diff --git a/tests/baselines/reference/parserClassDeclaration3.js b/tests/baselines/reference/parserClassDeclaration3.js index 8ea681a668f..c375b4b5a21 100644 --- a/tests/baselines/reference/parserClassDeclaration3.js +++ b/tests/baselines/reference/parserClassDeclaration3.js @@ -14,4 +14,4 @@ var C = (function (_super) { _super.apply(this, arguments); } return C; -})(B); +}(B)); diff --git a/tests/baselines/reference/parserClassDeclaration4.js b/tests/baselines/reference/parserClassDeclaration4.js index 2bbbd134ed4..f19ac06c35c 100644 --- a/tests/baselines/reference/parserClassDeclaration4.js +++ b/tests/baselines/reference/parserClassDeclaration4.js @@ -14,4 +14,4 @@ var C = (function (_super) { _super.apply(this, arguments); } return C; -})(A); +}(A)); diff --git a/tests/baselines/reference/parserClassDeclaration5.js b/tests/baselines/reference/parserClassDeclaration5.js index 146cbda9563..272edc89fb6 100644 --- a/tests/baselines/reference/parserClassDeclaration5.js +++ b/tests/baselines/reference/parserClassDeclaration5.js @@ -14,4 +14,4 @@ var C = (function (_super) { _super.apply(this, arguments); } return C; -})(A); +}(A)); diff --git a/tests/baselines/reference/parserClassDeclaration6.js b/tests/baselines/reference/parserClassDeclaration6.js index 0f65ad53f07..88d8481d52a 100644 --- a/tests/baselines/reference/parserClassDeclaration6.js +++ b/tests/baselines/reference/parserClassDeclaration6.js @@ -14,4 +14,4 @@ var C = (function (_super) { _super.apply(this, arguments); } return C; -})(A); +}(A)); diff --git a/tests/baselines/reference/parserClassDeclaration8.js b/tests/baselines/reference/parserClassDeclaration8.js index 2d1a830c650..1698fa169dd 100644 --- a/tests/baselines/reference/parserClassDeclaration8.js +++ b/tests/baselines/reference/parserClassDeclaration8.js @@ -8,4 +8,4 @@ var C = (function () { function C() { } return C; -})(); +}()); diff --git a/tests/baselines/reference/parserClassDeclaration9.js b/tests/baselines/reference/parserClassDeclaration9.js index f1c87f582a9..b45962eacf7 100644 --- a/tests/baselines/reference/parserClassDeclaration9.js +++ b/tests/baselines/reference/parserClassDeclaration9.js @@ -8,4 +8,4 @@ var C = (function () { function C() { } return C; -})(); +}()); diff --git a/tests/baselines/reference/parserClassDeclarationIndexSignature1.js b/tests/baselines/reference/parserClassDeclarationIndexSignature1.js index 8a401b17ab2..430ee220db8 100644 --- a/tests/baselines/reference/parserClassDeclarationIndexSignature1.js +++ b/tests/baselines/reference/parserClassDeclarationIndexSignature1.js @@ -8,4 +8,4 @@ var C = (function () { function C() { } return C; -})(); +}()); diff --git a/tests/baselines/reference/parserConstructorDeclaration1.js b/tests/baselines/reference/parserConstructorDeclaration1.js index 6de0ec3332b..bd29f61c884 100644 --- a/tests/baselines/reference/parserConstructorDeclaration1.js +++ b/tests/baselines/reference/parserConstructorDeclaration1.js @@ -8,4 +8,4 @@ var C = (function () { function C() { } return C; -})(); +}()); diff --git a/tests/baselines/reference/parserConstructorDeclaration10.js b/tests/baselines/reference/parserConstructorDeclaration10.js index 9289636e919..96470c80624 100644 --- a/tests/baselines/reference/parserConstructorDeclaration10.js +++ b/tests/baselines/reference/parserConstructorDeclaration10.js @@ -8,4 +8,4 @@ var C = (function () { function C() { } return C; -})(); +}()); diff --git a/tests/baselines/reference/parserConstructorDeclaration11.js b/tests/baselines/reference/parserConstructorDeclaration11.js index a21fa87f694..60e012ded4b 100644 --- a/tests/baselines/reference/parserConstructorDeclaration11.js +++ b/tests/baselines/reference/parserConstructorDeclaration11.js @@ -8,4 +8,4 @@ var C = (function () { function C() { } return C; -})(); +}()); diff --git a/tests/baselines/reference/parserConstructorDeclaration12.js b/tests/baselines/reference/parserConstructorDeclaration12.js index dc540c3323e..025b994ff04 100644 --- a/tests/baselines/reference/parserConstructorDeclaration12.js +++ b/tests/baselines/reference/parserConstructorDeclaration12.js @@ -15,4 +15,4 @@ var C = (function () { function C() { } return C; -})(); +}()); diff --git a/tests/baselines/reference/parserConstructorDeclaration2.js b/tests/baselines/reference/parserConstructorDeclaration2.js index 142bf5a5314..929b4dd295d 100644 --- a/tests/baselines/reference/parserConstructorDeclaration2.js +++ b/tests/baselines/reference/parserConstructorDeclaration2.js @@ -8,4 +8,4 @@ var C = (function () { function C() { } return C; -})(); +}()); diff --git a/tests/baselines/reference/parserConstructorDeclaration3.js b/tests/baselines/reference/parserConstructorDeclaration3.js index 6e7531f1e66..f45e854d878 100644 --- a/tests/baselines/reference/parserConstructorDeclaration3.js +++ b/tests/baselines/reference/parserConstructorDeclaration3.js @@ -8,4 +8,4 @@ var C = (function () { function C() { } return C; -})(); +}()); diff --git a/tests/baselines/reference/parserConstructorDeclaration4.js b/tests/baselines/reference/parserConstructorDeclaration4.js index 2b1ae1cdb68..46e1602a21f 100644 --- a/tests/baselines/reference/parserConstructorDeclaration4.js +++ b/tests/baselines/reference/parserConstructorDeclaration4.js @@ -8,4 +8,4 @@ var C = (function () { function C() { } return C; -})(); +}()); diff --git a/tests/baselines/reference/parserConstructorDeclaration5.js b/tests/baselines/reference/parserConstructorDeclaration5.js index c0d8c03458e..a18d5351c77 100644 --- a/tests/baselines/reference/parserConstructorDeclaration5.js +++ b/tests/baselines/reference/parserConstructorDeclaration5.js @@ -8,4 +8,4 @@ var C = (function () { function C() { } return C; -})(); +}()); diff --git a/tests/baselines/reference/parserConstructorDeclaration6.js b/tests/baselines/reference/parserConstructorDeclaration6.js index abee73fe0b8..eca0638116d 100644 --- a/tests/baselines/reference/parserConstructorDeclaration6.js +++ b/tests/baselines/reference/parserConstructorDeclaration6.js @@ -8,4 +8,4 @@ var C = (function () { function C() { } return C; -})(); +}()); diff --git a/tests/baselines/reference/parserConstructorDeclaration7.js b/tests/baselines/reference/parserConstructorDeclaration7.js index 8c3b4db9d22..2b19cfab111 100644 --- a/tests/baselines/reference/parserConstructorDeclaration7.js +++ b/tests/baselines/reference/parserConstructorDeclaration7.js @@ -8,4 +8,4 @@ var C = (function () { function C() { } return C; -})(); +}()); diff --git a/tests/baselines/reference/parserConstructorDeclaration8.js b/tests/baselines/reference/parserConstructorDeclaration8.js index 26c06b591c0..4ad3f93a1d8 100644 --- a/tests/baselines/reference/parserConstructorDeclaration8.js +++ b/tests/baselines/reference/parserConstructorDeclaration8.js @@ -9,4 +9,4 @@ var C = (function () { function C() { } return C; -})(); +}()); diff --git a/tests/baselines/reference/parserConstructorDeclaration9.js b/tests/baselines/reference/parserConstructorDeclaration9.js index 8393d35f5e7..d30ed12f313 100644 --- a/tests/baselines/reference/parserConstructorDeclaration9.js +++ b/tests/baselines/reference/parserConstructorDeclaration9.js @@ -8,4 +8,4 @@ var C = (function () { function C() { } return C; -})(); +}()); diff --git a/tests/baselines/reference/parserES3Accessors1.js b/tests/baselines/reference/parserES3Accessors1.js index b4d0b9d6576..df1d416ced0 100644 --- a/tests/baselines/reference/parserES3Accessors1.js +++ b/tests/baselines/reference/parserES3Accessors1.js @@ -13,4 +13,4 @@ var C = (function () { configurable: true }); return C; -})(); +}()); diff --git a/tests/baselines/reference/parserES3Accessors2.js b/tests/baselines/reference/parserES3Accessors2.js index 3d18e8ac280..68f4ac67377 100644 --- a/tests/baselines/reference/parserES3Accessors2.js +++ b/tests/baselines/reference/parserES3Accessors2.js @@ -13,4 +13,4 @@ var C = (function () { configurable: true }); return C; -})(); +}()); diff --git a/tests/baselines/reference/parserES5ComputedPropertyName10.js b/tests/baselines/reference/parserES5ComputedPropertyName10.js index a69165a192a..d648ce29e9a 100644 --- a/tests/baselines/reference/parserES5ComputedPropertyName10.js +++ b/tests/baselines/reference/parserES5ComputedPropertyName10.js @@ -9,4 +9,4 @@ var C = (function () { this[e] = 1; } return C; -})(); +}()); diff --git a/tests/baselines/reference/parserES5ComputedPropertyName11.js b/tests/baselines/reference/parserES5ComputedPropertyName11.js index dfa74b03a5f..dd777f53080 100644 --- a/tests/baselines/reference/parserES5ComputedPropertyName11.js +++ b/tests/baselines/reference/parserES5ComputedPropertyName11.js @@ -8,4 +8,4 @@ var C = (function () { function C() { } return C; -})(); +}()); diff --git a/tests/baselines/reference/parserES5ComputedPropertyName7.js b/tests/baselines/reference/parserES5ComputedPropertyName7.js index 8634682c660..b707d7ea747 100644 --- a/tests/baselines/reference/parserES5ComputedPropertyName7.js +++ b/tests/baselines/reference/parserES5ComputedPropertyName7.js @@ -8,4 +8,4 @@ var C = (function () { function C() { } return C; -})(); +}()); diff --git a/tests/baselines/reference/parserES5ComputedPropertyName9.js b/tests/baselines/reference/parserES5ComputedPropertyName9.js index fdefc8649d0..904bd3b0e32 100644 --- a/tests/baselines/reference/parserES5ComputedPropertyName9.js +++ b/tests/baselines/reference/parserES5ComputedPropertyName9.js @@ -8,4 +8,4 @@ var C = (function () { function C() { } return C; -})(); +}()); diff --git a/tests/baselines/reference/parserES5SymbolIndexer2.js b/tests/baselines/reference/parserES5SymbolIndexer2.js index c511b6acafa..fbd0ff168fa 100644 --- a/tests/baselines/reference/parserES5SymbolIndexer2.js +++ b/tests/baselines/reference/parserES5SymbolIndexer2.js @@ -8,4 +8,4 @@ var C = (function () { function C() { } return C; -})(); +}()); diff --git a/tests/baselines/reference/parserES5SymbolProperty5.js b/tests/baselines/reference/parserES5SymbolProperty5.js index e2448432542..e50c6ad93ad 100644 --- a/tests/baselines/reference/parserES5SymbolProperty5.js +++ b/tests/baselines/reference/parserES5SymbolProperty5.js @@ -8,4 +8,4 @@ var C = (function () { function C() { } return C; -})(); +}()); diff --git a/tests/baselines/reference/parserES5SymbolProperty6.js b/tests/baselines/reference/parserES5SymbolProperty6.js index ce2050688c3..67e77d29dfb 100644 --- a/tests/baselines/reference/parserES5SymbolProperty6.js +++ b/tests/baselines/reference/parserES5SymbolProperty6.js @@ -9,4 +9,4 @@ var C = (function () { this[Symbol.toStringTag] = ""; } return C; -})(); +}()); diff --git a/tests/baselines/reference/parserES5SymbolProperty7.js b/tests/baselines/reference/parserES5SymbolProperty7.js index 102d10af417..4965f7867c3 100644 --- a/tests/baselines/reference/parserES5SymbolProperty7.js +++ b/tests/baselines/reference/parserES5SymbolProperty7.js @@ -9,4 +9,4 @@ var C = (function () { } C.prototype[Symbol.toStringTag] = function () { }; return C; -})(); +}()); diff --git a/tests/baselines/reference/parserErrantSemicolonInClass1.js b/tests/baselines/reference/parserErrantSemicolonInClass1.js index f3834da7e78..7dbe9f579d2 100644 --- a/tests/baselines/reference/parserErrantSemicolonInClass1.js +++ b/tests/baselines/reference/parserErrantSemicolonInClass1.js @@ -70,4 +70,4 @@ var a = (function () { return ns.toString(); }; return a; -})(); +}()); diff --git a/tests/baselines/reference/parserErrorRecoveryIfStatement1.js b/tests/baselines/reference/parserErrorRecoveryIfStatement1.js index 662f3056a3d..03e3de32cc1 100644 --- a/tests/baselines/reference/parserErrorRecoveryIfStatement1.js +++ b/tests/baselines/reference/parserErrorRecoveryIfStatement1.js @@ -22,4 +22,4 @@ var Foo = (function () { Foo.prototype.f3 = function () { }; return Foo; -})(); +}()); diff --git a/tests/baselines/reference/parserErrorRecoveryIfStatement2.js b/tests/baselines/reference/parserErrorRecoveryIfStatement2.js index 171f3072535..84daa435711 100644 --- a/tests/baselines/reference/parserErrorRecoveryIfStatement2.js +++ b/tests/baselines/reference/parserErrorRecoveryIfStatement2.js @@ -22,4 +22,4 @@ var Foo = (function () { Foo.prototype.f3 = function () { }; return Foo; -})(); +}()); diff --git a/tests/baselines/reference/parserErrorRecoveryIfStatement3.js b/tests/baselines/reference/parserErrorRecoveryIfStatement3.js index 117525bcba0..b58c0ccd524 100644 --- a/tests/baselines/reference/parserErrorRecoveryIfStatement3.js +++ b/tests/baselines/reference/parserErrorRecoveryIfStatement3.js @@ -22,4 +22,4 @@ var Foo = (function () { Foo.prototype.f3 = function () { }; return Foo; -})(); +}()); diff --git a/tests/baselines/reference/parserErrorRecoveryIfStatement4.js b/tests/baselines/reference/parserErrorRecoveryIfStatement4.js index 460ca957c02..3d5e6af1fe6 100644 --- a/tests/baselines/reference/parserErrorRecoveryIfStatement4.js +++ b/tests/baselines/reference/parserErrorRecoveryIfStatement4.js @@ -22,4 +22,4 @@ var Foo = (function () { Foo.prototype.f3 = function () { }; return Foo; -})(); +}()); diff --git a/tests/baselines/reference/parserErrorRecoveryIfStatement5.js b/tests/baselines/reference/parserErrorRecoveryIfStatement5.js index 8df07082c42..b3a4f897aa7 100644 --- a/tests/baselines/reference/parserErrorRecoveryIfStatement5.js +++ b/tests/baselines/reference/parserErrorRecoveryIfStatement5.js @@ -24,4 +24,4 @@ var Foo = (function () { } }; return Foo; -})(); +}()); diff --git a/tests/baselines/reference/parserErrorRecoveryIfStatement6.js b/tests/baselines/reference/parserErrorRecoveryIfStatement6.js index fa327a73814..86454bed4f2 100644 --- a/tests/baselines/reference/parserErrorRecoveryIfStatement6.js +++ b/tests/baselines/reference/parserErrorRecoveryIfStatement6.js @@ -23,4 +23,4 @@ var Foo = (function () { Foo.prototype.f3 = function () { }; return Foo; -})(); +}()); diff --git a/tests/baselines/reference/parserErrorRecovery_Block3.js b/tests/baselines/reference/parserErrorRecovery_Block3.js index 55b0a4d65e7..1851d148bc8 100644 --- a/tests/baselines/reference/parserErrorRecovery_Block3.js +++ b/tests/baselines/reference/parserErrorRecovery_Block3.js @@ -14,4 +14,4 @@ var C = (function () { C.prototype.b = function () { }; return C; -})(); +}()); diff --git a/tests/baselines/reference/parserErrorRecovery_ClassElement1.js b/tests/baselines/reference/parserErrorRecovery_ClassElement1.js index 7a3bf441e47..16f796a0fac 100644 --- a/tests/baselines/reference/parserErrorRecovery_ClassElement1.js +++ b/tests/baselines/reference/parserErrorRecovery_ClassElement1.js @@ -11,11 +11,11 @@ var C = (function () { function C() { } return C; -})(); +}()); // Classes can't be nested. So we should bail out of parsing here and recover // this as a source unit element. var D = (function () { function D() { } return D; -})(); +}()); diff --git a/tests/baselines/reference/parserErrorRecovery_ClassElement2.js b/tests/baselines/reference/parserErrorRecovery_ClassElement2.js index fca227a4e8a..bab50d52751 100644 --- a/tests/baselines/reference/parserErrorRecovery_ClassElement2.js +++ b/tests/baselines/reference/parserErrorRecovery_ClassElement2.js @@ -13,7 +13,7 @@ var M; function C() { } return C; - })(); + }()); var E; (function (E) { })(E || (E = {})); diff --git a/tests/baselines/reference/parserErrorRecovery_ClassElement3.js b/tests/baselines/reference/parserErrorRecovery_ClassElement3.js index 39e701628bb..b5021218ada 100644 --- a/tests/baselines/reference/parserErrorRecovery_ClassElement3.js +++ b/tests/baselines/reference/parserErrorRecovery_ClassElement3.js @@ -14,7 +14,7 @@ var M; function C() { } return C; - })(); + }()); var E; (function (E) { })(E || (E = {})); diff --git a/tests/baselines/reference/parserErrorRecovery_ExtendsOrImplementsClause1.js b/tests/baselines/reference/parserErrorRecovery_ExtendsOrImplementsClause1.js index b6557221c65..1215631857e 100644 --- a/tests/baselines/reference/parserErrorRecovery_ExtendsOrImplementsClause1.js +++ b/tests/baselines/reference/parserErrorRecovery_ExtendsOrImplementsClause1.js @@ -7,4 +7,4 @@ var C = (function () { function C() { } return C; -})(); +}()); diff --git a/tests/baselines/reference/parserErrorRecovery_ExtendsOrImplementsClause2.js b/tests/baselines/reference/parserErrorRecovery_ExtendsOrImplementsClause2.js index 3c2f96f54fd..b53c41fb45c 100644 --- a/tests/baselines/reference/parserErrorRecovery_ExtendsOrImplementsClause2.js +++ b/tests/baselines/reference/parserErrorRecovery_ExtendsOrImplementsClause2.js @@ -14,4 +14,4 @@ var C = (function (_super) { _super.apply(this, arguments); } return C; -})(A); +}(A)); diff --git a/tests/baselines/reference/parserErrorRecovery_ExtendsOrImplementsClause3.js b/tests/baselines/reference/parserErrorRecovery_ExtendsOrImplementsClause3.js index b420e12cccb..33bba3cf860 100644 --- a/tests/baselines/reference/parserErrorRecovery_ExtendsOrImplementsClause3.js +++ b/tests/baselines/reference/parserErrorRecovery_ExtendsOrImplementsClause3.js @@ -7,4 +7,4 @@ var C = (function () { function C() { } return C; -})(); +}()); diff --git a/tests/baselines/reference/parserErrorRecovery_ExtendsOrImplementsClause4.js b/tests/baselines/reference/parserErrorRecovery_ExtendsOrImplementsClause4.js index 594c4575eab..500f6d38c6d 100644 --- a/tests/baselines/reference/parserErrorRecovery_ExtendsOrImplementsClause4.js +++ b/tests/baselines/reference/parserErrorRecovery_ExtendsOrImplementsClause4.js @@ -14,4 +14,4 @@ var C = (function (_super) { _super.apply(this, arguments); } return C; -})(A); +}(A)); diff --git a/tests/baselines/reference/parserErrorRecovery_ExtendsOrImplementsClause5.js b/tests/baselines/reference/parserErrorRecovery_ExtendsOrImplementsClause5.js index 3d2447e0b8c..8c02a996ea5 100644 --- a/tests/baselines/reference/parserErrorRecovery_ExtendsOrImplementsClause5.js +++ b/tests/baselines/reference/parserErrorRecovery_ExtendsOrImplementsClause5.js @@ -14,4 +14,4 @@ var C = (function (_super) { _super.apply(this, arguments); } return C; -})(A); +}(A)); diff --git a/tests/baselines/reference/parserErrorRecovery_IncompleteMemberVariable1.js b/tests/baselines/reference/parserErrorRecovery_IncompleteMemberVariable1.js index 8055cd9d494..9bb4395e556 100644 --- a/tests/baselines/reference/parserErrorRecovery_IncompleteMemberVariable1.js +++ b/tests/baselines/reference/parserErrorRecovery_IncompleteMemberVariable1.js @@ -44,7 +44,7 @@ var Shapes; // Static member Point.origin = new Point(0, 0); return Point; - })(); + }()); Shapes.Point = Point; })(Shapes || (Shapes = {})); // Local variables diff --git a/tests/baselines/reference/parserErrorRecovery_IncompleteMemberVariable2.js b/tests/baselines/reference/parserErrorRecovery_IncompleteMemberVariable2.js index 4936b1ea8bc..0ee73b8b1e5 100644 --- a/tests/baselines/reference/parserErrorRecovery_IncompleteMemberVariable2.js +++ b/tests/baselines/reference/parserErrorRecovery_IncompleteMemberVariable2.js @@ -45,7 +45,7 @@ var Shapes; // Static member Point.origin = new Point(0, 0); return Point; - })(); + }()); Shapes.Point = Point; })(Shapes || (Shapes = {})); // Local variables diff --git a/tests/baselines/reference/parserErrorRecovery_ParameterList6.js b/tests/baselines/reference/parserErrorRecovery_ParameterList6.js index 060ad14766b..21e43f31512 100644 --- a/tests/baselines/reference/parserErrorRecovery_ParameterList6.js +++ b/tests/baselines/reference/parserErrorRecovery_ParameterList6.js @@ -9,6 +9,6 @@ var Foo = (function () { } Foo.prototype.banana = ; return Foo; -})(); +}()); break ; { } diff --git a/tests/baselines/reference/parserErrorRecovery_SourceUnit1.js b/tests/baselines/reference/parserErrorRecovery_SourceUnit1.js index a4b6427508f..a763012e0e6 100644 --- a/tests/baselines/reference/parserErrorRecovery_SourceUnit1.js +++ b/tests/baselines/reference/parserErrorRecovery_SourceUnit1.js @@ -10,9 +10,9 @@ var C = (function () { function C() { } return C; -})(); +}()); var D = (function () { function D() { } return D; -})(); +}()); diff --git a/tests/baselines/reference/parserErrorRecovery_SwitchStatement2.js b/tests/baselines/reference/parserErrorRecovery_SwitchStatement2.js index 0fd532dde15..093b8ae7231 100644 --- a/tests/baselines/reference/parserErrorRecovery_SwitchStatement2.js +++ b/tests/baselines/reference/parserErrorRecovery_SwitchStatement2.js @@ -15,7 +15,7 @@ var C = (function () { function D() { } return D; - })(); + }()); } return C; -})(); +}()); diff --git a/tests/baselines/reference/parserExportAssignment7.js b/tests/baselines/reference/parserExportAssignment7.js index 4e3982e4295..baf8ec5b6bb 100644 --- a/tests/baselines/reference/parserExportAssignment7.js +++ b/tests/baselines/reference/parserExportAssignment7.js @@ -10,5 +10,5 @@ var C = (function () { function C() { } return C; -})(); +}()); exports.C = C; diff --git a/tests/baselines/reference/parserExportAssignment8.js b/tests/baselines/reference/parserExportAssignment8.js index 580a0bfe804..23f94dbe1e3 100644 --- a/tests/baselines/reference/parserExportAssignment8.js +++ b/tests/baselines/reference/parserExportAssignment8.js @@ -10,5 +10,5 @@ var C = (function () { function C() { } return C; -})(); +}()); exports.C = C; diff --git a/tests/baselines/reference/parserGenericClass1.js b/tests/baselines/reference/parserGenericClass1.js index a946cd1ec15..1ba9b0f49c5 100644 --- a/tests/baselines/reference/parserGenericClass1.js +++ b/tests/baselines/reference/parserGenericClass1.js @@ -7,4 +7,4 @@ var C = (function () { function C() { } return C; -})(); +}()); diff --git a/tests/baselines/reference/parserGenericClass2.js b/tests/baselines/reference/parserGenericClass2.js index 57e63777522..ef40783ab79 100644 --- a/tests/baselines/reference/parserGenericClass2.js +++ b/tests/baselines/reference/parserGenericClass2.js @@ -7,4 +7,4 @@ var C = (function () { function C() { } return C; -})(); +}()); diff --git a/tests/baselines/reference/parserGenericConstraint1.js b/tests/baselines/reference/parserGenericConstraint1.js index d4e9d3242c4..395a65a52fb 100644 --- a/tests/baselines/reference/parserGenericConstraint1.js +++ b/tests/baselines/reference/parserGenericConstraint1.js @@ -7,4 +7,4 @@ var C = (function () { function C() { } return C; -})(); +}()); diff --git a/tests/baselines/reference/parserGenericConstraint2.js b/tests/baselines/reference/parserGenericConstraint2.js index 9538530bb26..18218ecd992 100644 --- a/tests/baselines/reference/parserGenericConstraint2.js +++ b/tests/baselines/reference/parserGenericConstraint2.js @@ -7,4 +7,4 @@ var C = (function () { function C() { } return C; -})(); +}()); diff --git a/tests/baselines/reference/parserGenericConstraint3.js b/tests/baselines/reference/parserGenericConstraint3.js index 259377da4f6..a8a6669186c 100644 --- a/tests/baselines/reference/parserGenericConstraint3.js +++ b/tests/baselines/reference/parserGenericConstraint3.js @@ -7,4 +7,4 @@ var C = (function () { function C() { } return C; -})(); +}()); diff --git a/tests/baselines/reference/parserGenericConstraint4.js b/tests/baselines/reference/parserGenericConstraint4.js index 15c19cb40ad..69e26feba8f 100644 --- a/tests/baselines/reference/parserGenericConstraint4.js +++ b/tests/baselines/reference/parserGenericConstraint4.js @@ -7,4 +7,4 @@ var C = (function () { function C() { } return C; -})(); +}()); diff --git a/tests/baselines/reference/parserGenericConstraint5.js b/tests/baselines/reference/parserGenericConstraint5.js index 1cf637fd08d..46b19594937 100644 --- a/tests/baselines/reference/parserGenericConstraint5.js +++ b/tests/baselines/reference/parserGenericConstraint5.js @@ -7,4 +7,4 @@ var C = (function () { function C() { } return C; -})(); +}()); diff --git a/tests/baselines/reference/parserGenericConstraint6.js b/tests/baselines/reference/parserGenericConstraint6.js index fb41cf17d24..1dd809e4118 100644 --- a/tests/baselines/reference/parserGenericConstraint6.js +++ b/tests/baselines/reference/parserGenericConstraint6.js @@ -7,4 +7,4 @@ var C = (function () { function C() { } return C; -})(); +}()); diff --git a/tests/baselines/reference/parserGenericConstraint7.js b/tests/baselines/reference/parserGenericConstraint7.js index 2d85afcdb5b..6d3107a1c4f 100644 --- a/tests/baselines/reference/parserGenericConstraint7.js +++ b/tests/baselines/reference/parserGenericConstraint7.js @@ -7,4 +7,4 @@ var C = (function () { function C() { } return C; -})(); +}()); diff --git a/tests/baselines/reference/parserGenericsInTypeContexts1.js b/tests/baselines/reference/parserGenericsInTypeContexts1.js index 9cea884bcfb..f6f4f39393f 100644 --- a/tests/baselines/reference/parserGenericsInTypeContexts1.js +++ b/tests/baselines/reference/parserGenericsInTypeContexts1.js @@ -29,7 +29,7 @@ var C = (function (_super) { _super.apply(this, arguments); } return C; -})(A); +}(A)); var v1; var v2 = null; var v3; diff --git a/tests/baselines/reference/parserGenericsInTypeContexts2.js b/tests/baselines/reference/parserGenericsInTypeContexts2.js index b5e5e010d56..99e19586c52 100644 --- a/tests/baselines/reference/parserGenericsInTypeContexts2.js +++ b/tests/baselines/reference/parserGenericsInTypeContexts2.js @@ -29,7 +29,7 @@ var C = (function (_super) { _super.apply(this, arguments); } return C; -})(A); +}(A)); var v1; var v2 = null; var v3; diff --git a/tests/baselines/reference/parserGetAccessorWithTypeParameters1.js b/tests/baselines/reference/parserGetAccessorWithTypeParameters1.js index 5a226dab628..467eb93d0da 100644 --- a/tests/baselines/reference/parserGetAccessorWithTypeParameters1.js +++ b/tests/baselines/reference/parserGetAccessorWithTypeParameters1.js @@ -13,4 +13,4 @@ var C = (function () { configurable: true }); return C; -})(); +}()); diff --git a/tests/baselines/reference/parserIndexMemberDeclaration1.js b/tests/baselines/reference/parserIndexMemberDeclaration1.js index 6da7cdb0a76..5db1aebd683 100644 --- a/tests/baselines/reference/parserIndexMemberDeclaration1.js +++ b/tests/baselines/reference/parserIndexMemberDeclaration1.js @@ -8,4 +8,4 @@ var C = (function () { function C() { } return C; -})(); +}()); diff --git a/tests/baselines/reference/parserIndexMemberDeclaration10.js b/tests/baselines/reference/parserIndexMemberDeclaration10.js index cba928413a3..99d41e5410b 100644 --- a/tests/baselines/reference/parserIndexMemberDeclaration10.js +++ b/tests/baselines/reference/parserIndexMemberDeclaration10.js @@ -8,4 +8,4 @@ var C = (function () { function C() { } return C; -})(); +}()); diff --git a/tests/baselines/reference/parserIndexMemberDeclaration2.js b/tests/baselines/reference/parserIndexMemberDeclaration2.js index 6a351698516..afd60f7e2b1 100644 --- a/tests/baselines/reference/parserIndexMemberDeclaration2.js +++ b/tests/baselines/reference/parserIndexMemberDeclaration2.js @@ -9,4 +9,4 @@ var C = (function () { function C() { } return C; -})(); +}()); diff --git a/tests/baselines/reference/parserIndexMemberDeclaration3.js b/tests/baselines/reference/parserIndexMemberDeclaration3.js index caa9bedf449..1f06401dc0c 100644 --- a/tests/baselines/reference/parserIndexMemberDeclaration3.js +++ b/tests/baselines/reference/parserIndexMemberDeclaration3.js @@ -9,4 +9,4 @@ var C = (function () { function C() { } return C; -})(); +}()); diff --git a/tests/baselines/reference/parserIndexMemberDeclaration4.js b/tests/baselines/reference/parserIndexMemberDeclaration4.js index ebf05909c2f..9b054efcec3 100644 --- a/tests/baselines/reference/parserIndexMemberDeclaration4.js +++ b/tests/baselines/reference/parserIndexMemberDeclaration4.js @@ -8,4 +8,4 @@ var C = (function () { function C() { } return C; -})(); +}()); diff --git a/tests/baselines/reference/parserIndexMemberDeclaration5.js b/tests/baselines/reference/parserIndexMemberDeclaration5.js index 209e26ae4c0..df681657a15 100644 --- a/tests/baselines/reference/parserIndexMemberDeclaration5.js +++ b/tests/baselines/reference/parserIndexMemberDeclaration5.js @@ -8,4 +8,4 @@ var C = (function () { function C() { } return C; -})(); +}()); diff --git a/tests/baselines/reference/parserIndexMemberDeclaration6.js b/tests/baselines/reference/parserIndexMemberDeclaration6.js index 9dae6a786b4..c5356f58a65 100644 --- a/tests/baselines/reference/parserIndexMemberDeclaration6.js +++ b/tests/baselines/reference/parserIndexMemberDeclaration6.js @@ -8,4 +8,4 @@ var C = (function () { function C() { } return C; -})(); +}()); diff --git a/tests/baselines/reference/parserIndexMemberDeclaration7.js b/tests/baselines/reference/parserIndexMemberDeclaration7.js index 550063e6659..214f0d244af 100644 --- a/tests/baselines/reference/parserIndexMemberDeclaration7.js +++ b/tests/baselines/reference/parserIndexMemberDeclaration7.js @@ -8,4 +8,4 @@ var C = (function () { function C() { } return C; -})(); +}()); diff --git a/tests/baselines/reference/parserIndexMemberDeclaration8.js b/tests/baselines/reference/parserIndexMemberDeclaration8.js index c1f40ad0f15..c97df0c2948 100644 --- a/tests/baselines/reference/parserIndexMemberDeclaration8.js +++ b/tests/baselines/reference/parserIndexMemberDeclaration8.js @@ -8,4 +8,4 @@ var C = (function () { function C() { } return C; -})(); +}()); diff --git a/tests/baselines/reference/parserIndexMemberDeclaration9.js b/tests/baselines/reference/parserIndexMemberDeclaration9.js index bd547be3bd3..3289715b3a3 100644 --- a/tests/baselines/reference/parserIndexMemberDeclaration9.js +++ b/tests/baselines/reference/parserIndexMemberDeclaration9.js @@ -8,4 +8,4 @@ var C = (function () { function C() { } return C; -})(); +}()); diff --git a/tests/baselines/reference/parserInvalidIdentifiersInVariableStatements1.js b/tests/baselines/reference/parserInvalidIdentifiersInVariableStatements1.js index e6b9c9fa1b8..039d9d8926f 100644 --- a/tests/baselines/reference/parserInvalidIdentifiersInVariableStatements1.js +++ b/tests/baselines/reference/parserInvalidIdentifiersInVariableStatements1.js @@ -13,6 +13,6 @@ var default_1 = (function () { function default_1() { } return default_1; -})(); +}()); ; var bar; diff --git a/tests/baselines/reference/parserMemberAccessor1.js b/tests/baselines/reference/parserMemberAccessor1.js index 866a171bc43..ffbc62c8300 100644 --- a/tests/baselines/reference/parserMemberAccessor1.js +++ b/tests/baselines/reference/parserMemberAccessor1.js @@ -15,4 +15,4 @@ var C = (function () { configurable: true }); return C; -})(); +}()); diff --git a/tests/baselines/reference/parserMemberAccessorDeclaration1.js b/tests/baselines/reference/parserMemberAccessorDeclaration1.js index 30534735cfc..eec8364cacb 100644 --- a/tests/baselines/reference/parserMemberAccessorDeclaration1.js +++ b/tests/baselines/reference/parserMemberAccessorDeclaration1.js @@ -13,4 +13,4 @@ var C = (function () { configurable: true }); return C; -})(); +}()); diff --git a/tests/baselines/reference/parserMemberAccessorDeclaration10.js b/tests/baselines/reference/parserMemberAccessorDeclaration10.js index d778b192279..fd02058d06c 100644 --- a/tests/baselines/reference/parserMemberAccessorDeclaration10.js +++ b/tests/baselines/reference/parserMemberAccessorDeclaration10.js @@ -14,4 +14,4 @@ var C = (function () { configurable: true }); return C; -})(); +}()); diff --git a/tests/baselines/reference/parserMemberAccessorDeclaration11.js b/tests/baselines/reference/parserMemberAccessorDeclaration11.js index da8d7fc6425..d2ed28ec1b4 100644 --- a/tests/baselines/reference/parserMemberAccessorDeclaration11.js +++ b/tests/baselines/reference/parserMemberAccessorDeclaration11.js @@ -13,4 +13,4 @@ var C = (function () { configurable: true }); return C; -})(); +}()); diff --git a/tests/baselines/reference/parserMemberAccessorDeclaration12.js b/tests/baselines/reference/parserMemberAccessorDeclaration12.js index 72923e060c4..85ad8ec231d 100644 --- a/tests/baselines/reference/parserMemberAccessorDeclaration12.js +++ b/tests/baselines/reference/parserMemberAccessorDeclaration12.js @@ -13,4 +13,4 @@ var C = (function () { configurable: true }); return C; -})(); +}()); diff --git a/tests/baselines/reference/parserMemberAccessorDeclaration13.js b/tests/baselines/reference/parserMemberAccessorDeclaration13.js index 14b0f1b0a05..0882cb84bd4 100644 --- a/tests/baselines/reference/parserMemberAccessorDeclaration13.js +++ b/tests/baselines/reference/parserMemberAccessorDeclaration13.js @@ -13,4 +13,4 @@ var C = (function () { configurable: true }); return C; -})(); +}()); diff --git a/tests/baselines/reference/parserMemberAccessorDeclaration14.js b/tests/baselines/reference/parserMemberAccessorDeclaration14.js index 21b11219ca1..a40b5eafa5d 100644 --- a/tests/baselines/reference/parserMemberAccessorDeclaration14.js +++ b/tests/baselines/reference/parserMemberAccessorDeclaration14.js @@ -13,4 +13,4 @@ var C = (function () { configurable: true }); return C; -})(); +}()); diff --git a/tests/baselines/reference/parserMemberAccessorDeclaration15.js b/tests/baselines/reference/parserMemberAccessorDeclaration15.js index 0d01c75840c..333ae538473 100644 --- a/tests/baselines/reference/parserMemberAccessorDeclaration15.js +++ b/tests/baselines/reference/parserMemberAccessorDeclaration15.js @@ -13,4 +13,4 @@ var C = (function () { configurable: true }); return C; -})(); +}()); diff --git a/tests/baselines/reference/parserMemberAccessorDeclaration16.js b/tests/baselines/reference/parserMemberAccessorDeclaration16.js index a6cd0aaa7e9..aa70918914b 100644 --- a/tests/baselines/reference/parserMemberAccessorDeclaration16.js +++ b/tests/baselines/reference/parserMemberAccessorDeclaration16.js @@ -15,4 +15,4 @@ var C = (function () { configurable: true }); return C; -})(); +}()); diff --git a/tests/baselines/reference/parserMemberAccessorDeclaration17.js b/tests/baselines/reference/parserMemberAccessorDeclaration17.js index d61fa2e8409..10334e7881c 100644 --- a/tests/baselines/reference/parserMemberAccessorDeclaration17.js +++ b/tests/baselines/reference/parserMemberAccessorDeclaration17.js @@ -13,4 +13,4 @@ var C = (function () { configurable: true }); return C; -})(); +}()); diff --git a/tests/baselines/reference/parserMemberAccessorDeclaration18.js b/tests/baselines/reference/parserMemberAccessorDeclaration18.js index 9483a1f2daf..e25aa69f465 100644 --- a/tests/baselines/reference/parserMemberAccessorDeclaration18.js +++ b/tests/baselines/reference/parserMemberAccessorDeclaration18.js @@ -18,4 +18,4 @@ var C = (function () { configurable: true }); return C; -})(); +}()); diff --git a/tests/baselines/reference/parserMemberAccessorDeclaration2.js b/tests/baselines/reference/parserMemberAccessorDeclaration2.js index f29efc846ee..01d98d67694 100644 --- a/tests/baselines/reference/parserMemberAccessorDeclaration2.js +++ b/tests/baselines/reference/parserMemberAccessorDeclaration2.js @@ -13,4 +13,4 @@ var C = (function () { configurable: true }); return C; -})(); +}()); diff --git a/tests/baselines/reference/parserMemberAccessorDeclaration3.js b/tests/baselines/reference/parserMemberAccessorDeclaration3.js index 9c64bf02522..acde7a1daed 100644 --- a/tests/baselines/reference/parserMemberAccessorDeclaration3.js +++ b/tests/baselines/reference/parserMemberAccessorDeclaration3.js @@ -13,4 +13,4 @@ var C = (function () { configurable: true }); return C; -})(); +}()); diff --git a/tests/baselines/reference/parserMemberAccessorDeclaration4.js b/tests/baselines/reference/parserMemberAccessorDeclaration4.js index e65f6431a7c..f0cea8d239a 100644 --- a/tests/baselines/reference/parserMemberAccessorDeclaration4.js +++ b/tests/baselines/reference/parserMemberAccessorDeclaration4.js @@ -13,4 +13,4 @@ var C = (function () { configurable: true }); return C; -})(); +}()); diff --git a/tests/baselines/reference/parserMemberAccessorDeclaration5.js b/tests/baselines/reference/parserMemberAccessorDeclaration5.js index d304a44d64d..6c990debd85 100644 --- a/tests/baselines/reference/parserMemberAccessorDeclaration5.js +++ b/tests/baselines/reference/parserMemberAccessorDeclaration5.js @@ -13,4 +13,4 @@ var C = (function () { configurable: true }); return C; -})(); +}()); diff --git a/tests/baselines/reference/parserMemberAccessorDeclaration6.js b/tests/baselines/reference/parserMemberAccessorDeclaration6.js index 9c6f3ce8a55..3f9f6d9bea9 100644 --- a/tests/baselines/reference/parserMemberAccessorDeclaration6.js +++ b/tests/baselines/reference/parserMemberAccessorDeclaration6.js @@ -13,4 +13,4 @@ var C = (function () { configurable: true }); return C; -})(); +}()); diff --git a/tests/baselines/reference/parserMemberAccessorDeclaration7.js b/tests/baselines/reference/parserMemberAccessorDeclaration7.js index ce103accf61..fd4ed1b4923 100644 --- a/tests/baselines/reference/parserMemberAccessorDeclaration7.js +++ b/tests/baselines/reference/parserMemberAccessorDeclaration7.js @@ -13,4 +13,4 @@ var C = (function () { configurable: true }); return C; -})(); +}()); diff --git a/tests/baselines/reference/parserMemberAccessorDeclaration8.js b/tests/baselines/reference/parserMemberAccessorDeclaration8.js index 07f12acae40..edcca9cabc2 100644 --- a/tests/baselines/reference/parserMemberAccessorDeclaration8.js +++ b/tests/baselines/reference/parserMemberAccessorDeclaration8.js @@ -13,4 +13,4 @@ var C = (function () { configurable: true }); return C; -})(); +}()); diff --git a/tests/baselines/reference/parserMemberAccessorDeclaration9.js b/tests/baselines/reference/parserMemberAccessorDeclaration9.js index 02183d46ef1..5872d37203b 100644 --- a/tests/baselines/reference/parserMemberAccessorDeclaration9.js +++ b/tests/baselines/reference/parserMemberAccessorDeclaration9.js @@ -13,4 +13,4 @@ var C = (function () { configurable: true }); return C; -})(); +}()); diff --git a/tests/baselines/reference/parserMemberFunctionDeclaration1.js b/tests/baselines/reference/parserMemberFunctionDeclaration1.js index 1d40fa94700..21a4793b190 100644 --- a/tests/baselines/reference/parserMemberFunctionDeclaration1.js +++ b/tests/baselines/reference/parserMemberFunctionDeclaration1.js @@ -9,4 +9,4 @@ var C = (function () { } C.prototype.Foo = function () { }; return C; -})(); +}()); diff --git a/tests/baselines/reference/parserMemberFunctionDeclaration2.js b/tests/baselines/reference/parserMemberFunctionDeclaration2.js index fed1a6a0743..2b94b05aea2 100644 --- a/tests/baselines/reference/parserMemberFunctionDeclaration2.js +++ b/tests/baselines/reference/parserMemberFunctionDeclaration2.js @@ -9,4 +9,4 @@ var C = (function () { } C.Foo = function () { }; return C; -})(); +}()); diff --git a/tests/baselines/reference/parserMemberFunctionDeclaration3.js b/tests/baselines/reference/parserMemberFunctionDeclaration3.js index 18bbec7ba5f..9754db2c1a8 100644 --- a/tests/baselines/reference/parserMemberFunctionDeclaration3.js +++ b/tests/baselines/reference/parserMemberFunctionDeclaration3.js @@ -9,4 +9,4 @@ var C = (function () { } C.Foo = function () { }; return C; -})(); +}()); diff --git a/tests/baselines/reference/parserMemberFunctionDeclaration4.js b/tests/baselines/reference/parserMemberFunctionDeclaration4.js index cd12f23442c..f082a450346 100644 --- a/tests/baselines/reference/parserMemberFunctionDeclaration4.js +++ b/tests/baselines/reference/parserMemberFunctionDeclaration4.js @@ -10,4 +10,4 @@ var C = (function () { C.prototype.Foo = function () { } exports.Foo = Foo;; return C; -})(); +}()); diff --git a/tests/baselines/reference/parserMemberFunctionDeclaration5.js b/tests/baselines/reference/parserMemberFunctionDeclaration5.js index 75630d34551..8d060cb7cc9 100644 --- a/tests/baselines/reference/parserMemberFunctionDeclaration5.js +++ b/tests/baselines/reference/parserMemberFunctionDeclaration5.js @@ -9,4 +9,4 @@ var C = (function () { } C.prototype.Foo = function () { }; return C; -})(); +}()); diff --git a/tests/baselines/reference/parserMemberFunctionDeclarationAmbiguities1.js b/tests/baselines/reference/parserMemberFunctionDeclarationAmbiguities1.js index e0a0f7860cc..f8412376210 100644 --- a/tests/baselines/reference/parserMemberFunctionDeclarationAmbiguities1.js +++ b/tests/baselines/reference/parserMemberFunctionDeclarationAmbiguities1.js @@ -26,4 +26,4 @@ var C = (function () { C.public = function () { }; C.static = function () { }; return C; -})(); +}()); diff --git a/tests/baselines/reference/parserMemberVariableDeclaration1.js b/tests/baselines/reference/parserMemberVariableDeclaration1.js index 7c59fa7db4c..aac616cc10e 100644 --- a/tests/baselines/reference/parserMemberVariableDeclaration1.js +++ b/tests/baselines/reference/parserMemberVariableDeclaration1.js @@ -8,4 +8,4 @@ var C = (function () { function C() { } return C; -})(); +}()); diff --git a/tests/baselines/reference/parserMemberVariableDeclaration2.js b/tests/baselines/reference/parserMemberVariableDeclaration2.js index 7f4ae15a7ee..9d9032f7fb0 100644 --- a/tests/baselines/reference/parserMemberVariableDeclaration2.js +++ b/tests/baselines/reference/parserMemberVariableDeclaration2.js @@ -8,4 +8,4 @@ var C = (function () { function C() { } return C; -})(); +}()); diff --git a/tests/baselines/reference/parserMemberVariableDeclaration3.js b/tests/baselines/reference/parserMemberVariableDeclaration3.js index e03279abed9..3518443cf6e 100644 --- a/tests/baselines/reference/parserMemberVariableDeclaration3.js +++ b/tests/baselines/reference/parserMemberVariableDeclaration3.js @@ -8,4 +8,4 @@ var C = (function () { function C() { } return C; -})(); +}()); diff --git a/tests/baselines/reference/parserMemberVariableDeclaration4.js b/tests/baselines/reference/parserMemberVariableDeclaration4.js index d52dd0f4a08..6e0c8903899 100644 --- a/tests/baselines/reference/parserMemberVariableDeclaration4.js +++ b/tests/baselines/reference/parserMemberVariableDeclaration4.js @@ -8,4 +8,4 @@ var C = (function () { function C() { } return C; -})(); +}()); diff --git a/tests/baselines/reference/parserMemberVariableDeclaration5.js b/tests/baselines/reference/parserMemberVariableDeclaration5.js index bc8a49ff3f5..47b563e8a78 100644 --- a/tests/baselines/reference/parserMemberVariableDeclaration5.js +++ b/tests/baselines/reference/parserMemberVariableDeclaration5.js @@ -8,4 +8,4 @@ var C = (function () { function C() { } return C; -})(); +}()); diff --git a/tests/baselines/reference/parserMissingLambdaOpenBrace1.js b/tests/baselines/reference/parserMissingLambdaOpenBrace1.js index 8280d8dc9b2..36b3d92fcd7 100644 --- a/tests/baselines/reference/parserMissingLambdaOpenBrace1.js +++ b/tests/baselines/reference/parserMissingLambdaOpenBrace1.js @@ -20,4 +20,4 @@ var C = (function () { }); }; return C; -})(); +}()); diff --git a/tests/baselines/reference/parserParameterList1.js b/tests/baselines/reference/parserParameterList1.js index 86b0690728d..7fabad715e1 100644 --- a/tests/baselines/reference/parserParameterList1.js +++ b/tests/baselines/reference/parserParameterList1.js @@ -9,4 +9,4 @@ var C = (function () { } C.prototype.F = function (A, B) { }; return C; -})(); +}()); diff --git a/tests/baselines/reference/parserParameterList10.js b/tests/baselines/reference/parserParameterList10.js index 7a4e8132868..93ed8c60e8b 100644 --- a/tests/baselines/reference/parserParameterList10.js +++ b/tests/baselines/reference/parserParameterList10.js @@ -14,4 +14,4 @@ var C = (function () { } }; return C; -})(); +}()); diff --git a/tests/baselines/reference/parserParameterList16.js b/tests/baselines/reference/parserParameterList16.js index 50c58215478..9565cba53c1 100644 --- a/tests/baselines/reference/parserParameterList16.js +++ b/tests/baselines/reference/parserParameterList16.js @@ -10,4 +10,4 @@ var C = (function () { } C.prototype.foo = function (a, b) { }; return C; -})(); +}()); diff --git a/tests/baselines/reference/parserParameterList17.js b/tests/baselines/reference/parserParameterList17.js index 069c4975cdd..f38c9d062c9 100644 --- a/tests/baselines/reference/parserParameterList17.js +++ b/tests/baselines/reference/parserParameterList17.js @@ -9,4 +9,4 @@ var C = (function () { function C(a, b) { } return C; -})(); +}()); diff --git a/tests/baselines/reference/parserParameterList2.js b/tests/baselines/reference/parserParameterList2.js index c6a7f48c43e..8fcddb532dc 100644 --- a/tests/baselines/reference/parserParameterList2.js +++ b/tests/baselines/reference/parserParameterList2.js @@ -11,4 +11,4 @@ var C = (function () { if (A === void 0) { A = 0; } }; return C; -})(); +}()); diff --git a/tests/baselines/reference/parserParameterList3.js b/tests/baselines/reference/parserParameterList3.js index 3992dc548ef..d2cf7c5c9f5 100644 --- a/tests/baselines/reference/parserParameterList3.js +++ b/tests/baselines/reference/parserParameterList3.js @@ -9,4 +9,4 @@ var C = (function () { } C.prototype.F = function (A, B) { }; return C; -})(); +}()); diff --git a/tests/baselines/reference/parserParameterList6.js b/tests/baselines/reference/parserParameterList6.js index a535bcfe1b0..4713cf91978 100644 --- a/tests/baselines/reference/parserParameterList6.js +++ b/tests/baselines/reference/parserParameterList6.js @@ -9,4 +9,4 @@ var C = (function () { function C(C) { } return C; -})(); +}()); diff --git a/tests/baselines/reference/parserParameterList7.js b/tests/baselines/reference/parserParameterList7.js index 5485d74315a..391d3158127 100644 --- a/tests/baselines/reference/parserParameterList7.js +++ b/tests/baselines/reference/parserParameterList7.js @@ -11,4 +11,4 @@ var C1 = (function () { this.p3 = p3; } // OK return C1; -})(); +}()); diff --git a/tests/baselines/reference/parserParameterList9.js b/tests/baselines/reference/parserParameterList9.js index 965b92a7ef6..ec08b48f572 100644 --- a/tests/baselines/reference/parserParameterList9.js +++ b/tests/baselines/reference/parserParameterList9.js @@ -14,4 +14,4 @@ var C = (function () { } }; return C; -})(); +}()); diff --git a/tests/baselines/reference/parserRealSource1.js b/tests/baselines/reference/parserRealSource1.js index d19c2242f0b..d26e749a667 100644 --- a/tests/baselines/reference/parserRealSource1.js +++ b/tests/baselines/reference/parserRealSource1.js @@ -197,7 +197,7 @@ var TypeScript; NullLogger.prototype.log = function (s) { }; return NullLogger; - })(); + }()); TypeScript.NullLogger = NullLogger; var LoggerAdapter = (function () { function LoggerAdapter(logger) { @@ -217,7 +217,7 @@ var TypeScript; this.logger.log(s); }; return LoggerAdapter; - })(); + }()); TypeScript.LoggerAdapter = LoggerAdapter; var BufferedLogger = (function () { function BufferedLogger() { @@ -232,7 +232,7 @@ var TypeScript; this.logContents.push(s); }; return BufferedLogger; - })(); + }()); TypeScript.BufferedLogger = BufferedLogger; function timeFunction(logger, funcDescription, func) { var start = +new Date(); diff --git a/tests/baselines/reference/parserRealSource10.js b/tests/baselines/reference/parserRealSource10.js index f184db9173c..255cad3ca21 100644 --- a/tests/baselines/reference/parserRealSource10.js +++ b/tests/baselines/reference/parserRealSource10.js @@ -644,7 +644,7 @@ var TypeScript; this.ers = ers; } return TokenInfo; - })(); + }()); TypeScript.TokenInfo = TokenInfo; function setTokenInfo(tokenId, reservation, binopPrecedence, binopNodeType, unopPrecedence, unopNodeType, text, ers) { if (tokenId !== undefined) { @@ -790,7 +790,7 @@ var TypeScript; this.limChar = limChar; } return SavedToken; - })(); + }()); TypeScript.SavedToken = SavedToken; var Token = (function () { function Token(tokenId) { @@ -821,7 +821,7 @@ var TypeScript; return TokenClass.Punctuation; }; return Token; - })(); + }()); TypeScript.Token = Token; var NumberLiteralToken = (function (_super) { __extends(NumberLiteralToken, _super); @@ -837,7 +837,7 @@ var TypeScript; return TokenClass.Literal; }; return NumberLiteralToken; - })(Token); + }(Token)); TypeScript.NumberLiteralToken = NumberLiteralToken; var StringLiteralToken = (function (_super) { __extends(StringLiteralToken, _super); @@ -852,7 +852,7 @@ var TypeScript; return TokenClass.Literal; }; return StringLiteralToken; - })(Token); + }(Token)); TypeScript.StringLiteralToken = StringLiteralToken; var IdentifierToken = (function (_super) { __extends(IdentifierToken, _super); @@ -868,7 +868,7 @@ var TypeScript; return TokenClass.Identifier; }; return IdentifierToken; - })(Token); + }(Token)); TypeScript.IdentifierToken = IdentifierToken; var WhitespaceToken = (function (_super) { __extends(WhitespaceToken, _super); @@ -883,7 +883,7 @@ var TypeScript; return TokenClass.Whitespace; }; return WhitespaceToken; - })(Token); + }(Token)); TypeScript.WhitespaceToken = WhitespaceToken; var CommentToken = (function (_super) { __extends(CommentToken, _super); @@ -902,7 +902,7 @@ var TypeScript; return TokenClass.Comment; }; return CommentToken; - })(Token); + }(Token)); TypeScript.CommentToken = CommentToken; var RegularExpressionLiteralToken = (function (_super) { __extends(RegularExpressionLiteralToken, _super); @@ -917,7 +917,7 @@ var TypeScript; return TokenClass.Literal; }; return RegularExpressionLiteralToken; - })(Token); + }(Token)); TypeScript.RegularExpressionLiteralToken = RegularExpressionLiteralToken; // TODO: new with length TokenID.LimFixed TypeScript.staticTokens = new Token[]; diff --git a/tests/baselines/reference/parserRealSource11.js b/tests/baselines/reference/parserRealSource11.js index 4091eb290d1..0c1d1064255 100644 --- a/tests/baselines/reference/parserRealSource11.js +++ b/tests/baselines/reference/parserRealSource11.js @@ -2381,7 +2381,7 @@ var TypeScript; this.limChar = -1; // -1 = "undefined" or "compiler generated" } return ASTSpan; - })(); + }()); TypeScript.ASTSpan = ASTSpan; var AST = (function (_super) { __extends(AST, _super); @@ -2537,7 +2537,7 @@ var TypeScript; return resolved; }; return AST; - })(ASTSpan); + }(ASTSpan)); TypeScript.AST = AST; var IncompleteAST = (function (_super) { __extends(IncompleteAST, _super); @@ -2547,7 +2547,7 @@ var TypeScript; this.limChar = lim; } return IncompleteAST; - })(AST); + }(AST)); TypeScript.IncompleteAST = IncompleteAST; var ASTList = (function (_super) { __extends(ASTList, _super); @@ -2602,7 +2602,7 @@ var TypeScript; return this; }; return ASTList; - })(AST); + }(AST)); TypeScript.ASTList = ASTList; var Identifier = (function (_super) { __extends(Identifier, _super); @@ -2658,7 +2658,7 @@ var TypeScript; return new Identifier(token.getText(), token.hasEscapeSequence); }; return Identifier; - })(AST); + }(AST)); TypeScript.Identifier = Identifier; var MissingIdentifier = (function (_super) { __extends(MissingIdentifier, _super); @@ -2672,7 +2672,7 @@ var TypeScript; // Emit nothing for a missing ID }; return MissingIdentifier; - })(Identifier); + }(Identifier)); TypeScript.MissingIdentifier = MissingIdentifier; var Label = (function (_super) { __extends(Label, _super); @@ -2696,7 +2696,7 @@ var TypeScript; emitter.emitParensAndCommentsInPlace(this, false); }; return Label; - })(AST); + }(AST)); TypeScript.Label = Label; var Expression = (function (_super) { __extends(Expression, _super); @@ -2706,7 +2706,7 @@ var TypeScript; Expression.prototype.isExpression = function () { return true; }; Expression.prototype.isStatementOrExpression = function () { return true; }; return Expression; - })(AST); + }(AST)); TypeScript.Expression = Expression; var UnaryExpression = (function (_super) { __extends(UnaryExpression, _super); @@ -2850,7 +2850,7 @@ var TypeScript; emitter.emitParensAndCommentsInPlace(this, false); }; return UnaryExpression; - })(Expression); + }(Expression)); TypeScript.UnaryExpression = UnaryExpression; var CallExpression = (function (_super) { __extends(CallExpression, _super); @@ -2882,7 +2882,7 @@ var TypeScript; emitter.emitParensAndCommentsInPlace(this, false); }; return CallExpression; - })(Expression); + }(Expression)); TypeScript.CallExpression = CallExpression; var BinaryExpression = (function (_super) { __extends(BinaryExpression, _super); @@ -3034,7 +3034,7 @@ var TypeScript; emitter.emitParensAndCommentsInPlace(this, false); }; return BinaryExpression; - })(Expression); + }(Expression)); TypeScript.BinaryExpression = BinaryExpression; var ConditionalExpression = (function (_super) { __extends(ConditionalExpression, _super); @@ -3059,7 +3059,7 @@ var TypeScript; emitter.emitParensAndCommentsInPlace(this, false); }; return ConditionalExpression; - })(Expression); + }(Expression)); TypeScript.ConditionalExpression = ConditionalExpression; var NumberLiteral = (function (_super) { __extends(NumberLiteral, _super); @@ -3100,7 +3100,7 @@ var TypeScript; } }; return NumberLiteral; - })(Expression); + }(Expression)); TypeScript.NumberLiteral = NumberLiteral; var RegexLiteral = (function (_super) { __extends(RegexLiteral, _super); @@ -3120,7 +3120,7 @@ var TypeScript; emitter.emitParensAndCommentsInPlace(this, false); }; return RegexLiteral; - })(Expression); + }(Expression)); TypeScript.RegexLiteral = RegexLiteral; var StringLiteral = (function (_super) { __extends(StringLiteral, _super); @@ -3146,7 +3146,7 @@ var TypeScript; return this.text; }; return StringLiteral; - })(Expression); + }(Expression)); TypeScript.StringLiteral = StringLiteral; var ModuleElement = (function (_super) { __extends(ModuleElement, _super); @@ -3154,7 +3154,7 @@ var TypeScript; _super.call(this, nodeType); } return ModuleElement; - })(AST); + }(AST)); TypeScript.ModuleElement = ModuleElement; var ImportDeclaration = (function (_super) { __extends(ImportDeclaration, _super); @@ -3213,7 +3213,7 @@ var TypeScript; } }; return ImportDeclaration; - })(ModuleElement); + }(ModuleElement)); TypeScript.ImportDeclaration = ImportDeclaration; var BoundDecl = (function (_super) { __extends(BoundDecl, _super); @@ -3237,7 +3237,7 @@ var TypeScript; return this.treeViewLabel(); }; return BoundDecl; - })(AST); + }(AST)); TypeScript.BoundDecl = BoundDecl; var VarDecl = (function (_super) { __extends(VarDecl, _super); @@ -3254,7 +3254,7 @@ var TypeScript; return "var " + this.id.actualText; }; return VarDecl; - })(BoundDecl); + }(BoundDecl)); TypeScript.VarDecl = VarDecl; var ArgDecl = (function (_super) { __extends(ArgDecl, _super); @@ -3275,7 +3275,7 @@ var TypeScript; emitter.emitParensAndCommentsInPlace(this, false); }; return ArgDecl; - })(BoundDecl); + }(BoundDecl)); TypeScript.ArgDecl = ArgDecl; var internalId = 0; var FuncDecl = (function (_super) { @@ -3406,7 +3406,7 @@ var TypeScript; FuncDecl.prototype.isSignature = function () { return (this.fncFlags & FncFlags.Signature) != FncFlags.None; }; FuncDecl.prototype.hasStaticDeclarations = function () { return (!this.isConstructor && (this.statics.members.length > 0 || this.innerStaticFuncs.length > 0)); }; return FuncDecl; - })(AST); + }(AST)); TypeScript.FuncDecl = FuncDecl; var LocationInfo = (function () { function LocationInfo(filename, lineMap, unitIndex) { @@ -3415,7 +3415,7 @@ var TypeScript; this.unitIndex = unitIndex; } return LocationInfo; - })(); + }()); TypeScript.LocationInfo = LocationInfo; TypeScript.unknownLocationInfo = new LocationInfo("unknown", null, -1); var Script = (function (_super) { @@ -3485,7 +3485,7 @@ var TypeScript; } }; return Script; - })(FuncDecl); + }(FuncDecl)); TypeScript.Script = Script; var NamedDeclaration = (function (_super) { __extends(NamedDeclaration, _super); @@ -3497,7 +3497,7 @@ var TypeScript; this.rightCurlyCount = 0; } return NamedDeclaration; - })(ModuleElement); + }(ModuleElement)); TypeScript.NamedDeclaration = NamedDeclaration; var ModuleDeclaration = (function (_super) { __extends(ModuleDeclaration, _super); @@ -3532,7 +3532,7 @@ var TypeScript; } }; return ModuleDeclaration; - })(NamedDeclaration); + }(NamedDeclaration)); TypeScript.ModuleDeclaration = ModuleDeclaration; var TypeDeclaration = (function (_super) { __extends(TypeDeclaration, _super); @@ -3549,7 +3549,7 @@ var TypeScript; return hasFlag(this.varFlags, VarFlags.Ambient); }; return TypeDeclaration; - })(NamedDeclaration); + }(NamedDeclaration)); TypeScript.TypeDeclaration = TypeDeclaration; var ClassDeclaration = (function (_super) { __extends(ClassDeclaration, _super); @@ -3567,7 +3567,7 @@ var TypeScript; emitter.emitJavascriptClass(this); }; return ClassDeclaration; - })(TypeDeclaration); + }(TypeDeclaration)); TypeScript.ClassDeclaration = ClassDeclaration; var InterfaceDeclaration = (function (_super) { __extends(InterfaceDeclaration, _super); @@ -3580,7 +3580,7 @@ var TypeScript; InterfaceDeclaration.prototype.emit = function (emitter, tokenId, startLine) { }; return InterfaceDeclaration; - })(TypeDeclaration); + }(TypeDeclaration)); TypeScript.InterfaceDeclaration = InterfaceDeclaration; var Statement = (function (_super) { __extends(Statement, _super); @@ -3596,7 +3596,7 @@ var TypeScript; return this; }; return Statement; - })(ModuleElement); + }(ModuleElement)); TypeScript.Statement = Statement; var LabeledStatement = (function (_super) { __extends(LabeledStatement, _super); @@ -3630,7 +3630,7 @@ var TypeScript; beforeBB.addSuccessor(bb); }; return LabeledStatement; - })(Statement); + }(Statement)); TypeScript.LabeledStatement = LabeledStatement; var Block = (function (_super) { __extends(Block, _super); @@ -3685,7 +3685,7 @@ var TypeScript; return this; }; return Block; - })(Statement); + }(Statement)); TypeScript.Block = Block; var Jump = (function (_super) { __extends(Jump, _super); @@ -3736,7 +3736,7 @@ var TypeScript; emitter.emitParensAndCommentsInPlace(this, false); }; return Jump; - })(Statement); + }(Statement)); TypeScript.Jump = Jump; var WhileStatement = (function (_super) { __extends(WhileStatement, _super); @@ -3788,7 +3788,7 @@ var TypeScript; context.walker.options.goChildren = false; }; return WhileStatement; - })(Statement); + }(Statement)); TypeScript.WhileStatement = WhileStatement; var DoWhileStatement = (function (_super) { __extends(DoWhileStatement, _super); @@ -3844,7 +3844,7 @@ var TypeScript; context.walker.options.goChildren = false; }; return DoWhileStatement; - })(Statement); + }(Statement)); TypeScript.DoWhileStatement = DoWhileStatement; var IfStatement = (function (_super) { __extends(IfStatement, _super); @@ -3922,7 +3922,7 @@ var TypeScript; context.walker.options.goChildren = false; }; return IfStatement; - })(Statement); + }(Statement)); TypeScript.IfStatement = IfStatement; var ReturnStatement = (function (_super) { __extends(ReturnStatement, _super); @@ -3953,7 +3953,7 @@ var TypeScript; return typeFlow.typeCheckReturn(this); }; return ReturnStatement; - })(Statement); + }(Statement)); TypeScript.ReturnStatement = ReturnStatement; var EndCode = (function (_super) { __extends(EndCode, _super); @@ -3961,7 +3961,7 @@ var TypeScript; _super.call(this, NodeType.EndCode); } return EndCode; - })(AST); + }(AST)); TypeScript.EndCode = EndCode; var ForInStatement = (function (_super) { __extends(ForInStatement, _super); @@ -4076,7 +4076,7 @@ var TypeScript; context.walker.options.goChildren = false; }; return ForInStatement; - })(Statement); + }(Statement)); TypeScript.ForInStatement = ForInStatement; var ForStatement = (function (_super) { __extends(ForStatement, _super); @@ -4167,7 +4167,7 @@ var TypeScript; context.walker.options.goChildren = false; }; return ForStatement; - })(Statement); + }(Statement)); TypeScript.ForStatement = ForStatement; var WithStatement = (function (_super) { __extends(WithStatement, _super); @@ -4193,7 +4193,7 @@ var TypeScript; return typeFlow.typeCheckWith(this); }; return WithStatement; - })(Statement); + }(Statement)); TypeScript.WithStatement = WithStatement; var SwitchStatement = (function (_super) { __extends(SwitchStatement, _super); @@ -4265,7 +4265,7 @@ var TypeScript; context.walker.options.goChildren = false; }; return SwitchStatement; - })(Statement); + }(Statement)); TypeScript.SwitchStatement = SwitchStatement; var CaseStatement = (function (_super) { __extends(CaseStatement, _super); @@ -4318,7 +4318,7 @@ var TypeScript; context.walker.options.goChildren = false; }; return CaseStatement; - })(Statement); + }(Statement)); TypeScript.CaseStatement = CaseStatement; var TypeReference = (function (_super) { __extends(TypeReference, _super); @@ -4348,7 +4348,7 @@ var TypeScript; return this; }; return TypeReference; - })(AST); + }(AST)); TypeScript.TypeReference = TypeReference; var TryFinally = (function (_super) { __extends(TryFinally, _super); @@ -4393,7 +4393,7 @@ var TypeScript; context.walker.options.goChildren = false; }; return TryFinally; - })(Statement); + }(Statement)); TypeScript.TryFinally = TryFinally; var TryCatch = (function (_super) { __extends(TryCatch, _super); @@ -4443,7 +4443,7 @@ var TypeScript; return this; }; return TryCatch; - })(Statement); + }(Statement)); TypeScript.TryCatch = TryCatch; var Try = (function (_super) { __extends(Try, _super); @@ -4471,7 +4471,7 @@ var TypeScript; context.noContinuation = false; }; return Try; - })(Statement); + }(Statement)); TypeScript.Try = Try; var Catch = (function (_super) { __extends(Catch, _super); @@ -4544,7 +4544,7 @@ var TypeScript; return this; }; return Catch; - })(Statement); + }(Statement)); TypeScript.Catch = Catch; var Finally = (function (_super) { __extends(Finally, _super); @@ -4572,7 +4572,7 @@ var TypeScript; return this; }; return Finally; - })(Statement); + }(Statement)); TypeScript.Finally = Finally; var Comment = (function (_super) { __extends(Comment, _super); @@ -4598,7 +4598,7 @@ var TypeScript; return this.text; }; return Comment; - })(AST); + }(AST)); TypeScript.Comment = Comment; var DebuggerStatement = (function (_super) { __extends(DebuggerStatement, _super); @@ -4613,6 +4613,6 @@ var TypeScript; emitter.emitParensAndCommentsInPlace(this, false); }; return DebuggerStatement; - })(Statement); + }(Statement)); TypeScript.DebuggerStatement = DebuggerStatement; })(TypeScript || (TypeScript = {})); diff --git a/tests/baselines/reference/parserRealSource12.js b/tests/baselines/reference/parserRealSource12.js index 831c121ab08..fccb1fa45e0 100644 --- a/tests/baselines/reference/parserRealSource12.js +++ b/tests/baselines/reference/parserRealSource12.js @@ -548,7 +548,7 @@ var TypeScript; this.goNextSibling = !stop; }; return AstWalkOptions; - })(); + }()); TypeScript.AstWalkOptions = AstWalkOptions; var AstWalker = (function () { function AstWalker(childrenWalkers, pre, post, options, state) { @@ -586,7 +586,7 @@ var TypeScript; } }; return AstWalker; - })(); + }()); var AstWalkerFactory = (function () { function AstWalkerFactory() { this.childrenWalkers = []; @@ -720,7 +720,7 @@ var TypeScript; } }; return AstWalkerFactory; - })(); + }()); TypeScript.AstWalkerFactory = AstWalkerFactory; var globalAstWalkerFactory; function getAstWalkerFactory() { diff --git a/tests/baselines/reference/parserRealSource14.js b/tests/baselines/reference/parserRealSource14.js index 4312cb38517..c31a9dd6c72 100644 --- a/tests/baselines/reference/parserRealSource14.js +++ b/tests/baselines/reference/parserRealSource14.js @@ -940,7 +940,7 @@ var TypeScript; this.asts[this.top - 0].isStatementBlock === false; }; return AstPath; - })(); + }()); TypeScript.AstPath = AstPath; function isValidAstNode(ast) { if (ast === null) @@ -955,7 +955,7 @@ var TypeScript; this.path = new TypeScript.AstPath(); } return AstPathContext; - })(); + }()); TypeScript.AstPathContext = AstPathContext; (function (GetAstPathOptions) { GetAstPathOptions[GetAstPathOptions["Default"] = 0] = "Default"; diff --git a/tests/baselines/reference/parserRealSource4.js b/tests/baselines/reference/parserRealSource4.js index 563e9e92a08..c06bd191fb5 100644 --- a/tests/baselines/reference/parserRealSource4.js +++ b/tests/baselines/reference/parserRealSource4.js @@ -314,7 +314,7 @@ var TypeScript; this["constructor"] = undefined; } return BlockIntrinsics; - })(); + }()); TypeScript.BlockIntrinsics = BlockIntrinsics; var StringHashTable = (function () { function StringHashTable() { @@ -388,7 +388,7 @@ var TypeScript; } }; return StringHashTable; - })(); + }()); TypeScript.StringHashTable = StringHashTable; // The resident table is expected to reference the same table object, whereas the // transientTable may reference different objects over time @@ -441,7 +441,7 @@ var TypeScript; } }; return DualStringHashTable; - })(); + }()); TypeScript.DualStringHashTable = DualStringHashTable; function numberHashFn(key) { var c2 = 0x27d4eb2d; // a prime or an odd constant @@ -463,7 +463,7 @@ var TypeScript; this.data = data; } return HashEntry; - })(); + }()); TypeScript.HashEntry = HashEntry; var HashTable = (function () { function HashTable(size, hashFn, equalsFn) { @@ -526,7 +526,7 @@ var TypeScript; return (null); }; return HashTable; - })(); + }()); TypeScript.HashTable = HashTable; // Simple Hash table with list of keys and values matching each other at the given index var SimpleHashTable = (function () { @@ -559,6 +559,6 @@ var TypeScript; return true; }; return SimpleHashTable; - })(); + }()); TypeScript.SimpleHashTable = SimpleHashTable; })(TypeScript || (TypeScript = {})); diff --git a/tests/baselines/reference/parserRealSource5.js b/tests/baselines/reference/parserRealSource5.js index 9c64899fab7..4f4db59746e 100644 --- a/tests/baselines/reference/parserRealSource5.js +++ b/tests/baselines/reference/parserRealSource5.js @@ -111,7 +111,7 @@ var TypeScript; this.builder = ""; }; return PrintContext; - })(); + }()); TypeScript.PrintContext = PrintContext; function prePrintAST(ast, parent, walker) { var pc = walker.state; diff --git a/tests/baselines/reference/parserRealSource6.js b/tests/baselines/reference/parserRealSource6.js index d65207b8c77..c7dcc5e497b 100644 --- a/tests/baselines/reference/parserRealSource6.js +++ b/tests/baselines/reference/parserRealSource6.js @@ -234,7 +234,7 @@ var TypeScript; this.script = null; } return TypeCollectionContext; - })(); + }()); TypeScript.TypeCollectionContext = TypeCollectionContext; var MemberScopeContext = (function () { function MemberScopeContext(flow, pos, matchFlag) { @@ -246,7 +246,7 @@ var TypeScript; this.options = new AstWalkOptions(); } return MemberScopeContext; - })(); + }()); TypeScript.MemberScopeContext = MemberScopeContext; var EnclosingScopeContext = (function () { function EnclosingScopeContext(logger, script, text, pos, isMemberCompletion) { @@ -293,7 +293,7 @@ var TypeScript; return this.scriptFragment; }; return EnclosingScopeContext; - })(); + }()); TypeScript.EnclosingScopeContext = EnclosingScopeContext; function preFindMemberScope(ast, parent, walker) { var memScope = walker.state; diff --git a/tests/baselines/reference/parserRealSource7.js b/tests/baselines/reference/parserRealSource7.js index 5073c33febd..edc290c35d8 100644 --- a/tests/baselines/reference/parserRealSource7.js +++ b/tests/baselines/reference/parserRealSource7.js @@ -845,7 +845,7 @@ var TypeScript; this.exceptionBlock = -1; } return Continuation; - })(); + }()); TypeScript.Continuation = Continuation; function getBaseTypeLinks(bases, baseTypeLinks) { if (bases) { diff --git a/tests/baselines/reference/parserRealSource8.js b/tests/baselines/reference/parserRealSource8.js index 8a667ad6dbe..d23297954be 100644 --- a/tests/baselines/reference/parserRealSource8.js +++ b/tests/baselines/reference/parserRealSource8.js @@ -479,7 +479,7 @@ var TypeScript; this.modDeclChain = modDeclChain; } return AssignScopeContext; - })(); + }()); TypeScript.AssignScopeContext = AssignScopeContext; function pushAssignScope(scope, context, type, classType, fnc) { var chain = new ScopeChain(null, context.scopeChain, scope); @@ -525,7 +525,7 @@ var TypeScript; } }; return ScopeSearchFilter; - })(); + }()); TypeScript.ScopeSearchFilter = ScopeSearchFilter; TypeScript.instanceFilter = new ScopeSearchFilter(instanceCompare, instanceFilterStop); function preAssignModuleScopes(ast, context) { diff --git a/tests/baselines/reference/parserRealSource9.js b/tests/baselines/reference/parserRealSource9.js index dba28c4f295..e278f88c8e9 100644 --- a/tests/baselines/reference/parserRealSource9.js +++ b/tests/baselines/reference/parserRealSource9.js @@ -396,6 +396,6 @@ var TypeScript; }, this); }; return Binder; - })(); + }()); TypeScript.Binder = Binder; })(TypeScript || (TypeScript = {})); diff --git a/tests/baselines/reference/parserSetAccessorWithTypeAnnotation1.js b/tests/baselines/reference/parserSetAccessorWithTypeAnnotation1.js index 0cbae53aac3..065605fe9d4 100644 --- a/tests/baselines/reference/parserSetAccessorWithTypeAnnotation1.js +++ b/tests/baselines/reference/parserSetAccessorWithTypeAnnotation1.js @@ -15,4 +15,4 @@ var C = (function () { configurable: true }); return C; -})(); +}()); diff --git a/tests/baselines/reference/parserSetAccessorWithTypeParameters1.js b/tests/baselines/reference/parserSetAccessorWithTypeParameters1.js index 651640c6466..ca07292ee54 100644 --- a/tests/baselines/reference/parserSetAccessorWithTypeParameters1.js +++ b/tests/baselines/reference/parserSetAccessorWithTypeParameters1.js @@ -13,4 +13,4 @@ var C = (function () { configurable: true }); return C; -})(); +}()); diff --git a/tests/baselines/reference/parserSuperExpression1.js b/tests/baselines/reference/parserSuperExpression1.js index 0d219afad37..02bd49653fe 100644 --- a/tests/baselines/reference/parserSuperExpression1.js +++ b/tests/baselines/reference/parserSuperExpression1.js @@ -21,7 +21,7 @@ var C = (function () { _super.prototype.foo.call(this); }; return C; -})(); +}()); var M1; (function (M1) { var M2; @@ -33,6 +33,6 @@ var M1; _super.prototype.foo.call(this); }; return C; - })(); + }()); })(M2 = M1.M2 || (M1.M2 = {})); })(M1 || (M1 = {})); diff --git a/tests/baselines/reference/parserSuperExpression2.js b/tests/baselines/reference/parserSuperExpression2.js index eb3c2c697e6..ebd43ad3180 100644 --- a/tests/baselines/reference/parserSuperExpression2.js +++ b/tests/baselines/reference/parserSuperExpression2.js @@ -13,4 +13,4 @@ var C = (function () { _super.prototype..call(this, 0); }; return C; -})(); +}()); diff --git a/tests/baselines/reference/parserSuperExpression3.js b/tests/baselines/reference/parserSuperExpression3.js index b8ae4257c79..f311efcd0f6 100644 --- a/tests/baselines/reference/parserSuperExpression3.js +++ b/tests/baselines/reference/parserSuperExpression3.js @@ -13,4 +13,4 @@ var C = (function () { this.super(0); }; return C; -})(); +}()); diff --git a/tests/baselines/reference/parserSuperExpression4.js b/tests/baselines/reference/parserSuperExpression4.js index 59ba63bb2cf..97f6ad26c4b 100644 --- a/tests/baselines/reference/parserSuperExpression4.js +++ b/tests/baselines/reference/parserSuperExpression4.js @@ -21,7 +21,7 @@ var C = (function () { _super.prototype.foo = 1; }; return C; -})(); +}()); var M1; (function (M1) { var M2; @@ -33,6 +33,6 @@ var M1; _super.prototype.foo = 1; }; return C; - })(); + }()); })(M2 = M1.M2 || (M1.M2 = {})); })(M1 || (M1 = {})); diff --git a/tests/baselines/reference/parserUnicode3.js b/tests/baselines/reference/parserUnicode3.js index 6d4daa539ee..30652e90cfa 100644 --- a/tests/baselines/reference/parserUnicode3.js +++ b/tests/baselines/reference/parserUnicode3.js @@ -7,4 +7,4 @@ var 剩下 = (function () { function 剩下() { } return 剩下; -})(); +}()); diff --git a/tests/baselines/reference/parserharness.js b/tests/baselines/reference/parserharness.js index 296aae05fad..6b38a8c9e4c 100644 --- a/tests/baselines/reference/parserharness.js +++ b/tests/baselines/reference/parserharness.js @@ -2282,7 +2282,7 @@ var Harness; Logger.prototype.comment = function (comment) { }; Logger.prototype.verify = function (test, passed, actual, expected, message) { }; return Logger; - })(); + }()); Harness.Logger = Logger; // Logger-related functions var loggers = []; @@ -2375,7 +2375,7 @@ var Harness; Runnable.currentStack = []; Runnable.errorHandlerStack = []; return Runnable; - })(); + }()); Harness.Runnable = Runnable; var TestCase = (function (_super) { __extends(TestCase, _super); @@ -2409,7 +2409,7 @@ var Harness; } }; return TestCase; - })(Runnable); + }(Runnable)); Harness.TestCase = TestCase; var Scenario = (function (_super) { __extends(Scenario, _super); @@ -2464,7 +2464,7 @@ var Harness; done(); }; return Scenario; - })(Runnable); + }(Runnable)); Harness.Scenario = Scenario; var Run = (function (_super) { __extends(Run, _super); @@ -2495,7 +2495,7 @@ var Harness; emitLog('end'); }; return Run; - })(Runnable); + }(Runnable)); Harness.Run = Run; // Performance test var Perf; @@ -2530,7 +2530,7 @@ var Harness; this.time = (Clock.now() - this.startTime) / Clock.resolution * 1000; }; return Timer; - })(); + }()); Perf.Timer = Timer; var Dataset = (function () { function Dataset() { @@ -2573,7 +2573,7 @@ var Harness; return Math.sqrt(sumOfSquares / this.data.length); }; return Dataset; - })(); + }()); Perf.Dataset = Dataset; // Base benchmark class with some defaults. var Benchmark = (function () { @@ -2592,7 +2592,7 @@ var Harness; this.results[name].add(timing); }; return Benchmark; - })(); + }()); Perf.Benchmark = Benchmark; Perf.benchmarks = []; var timeFunction; @@ -2673,7 +2673,7 @@ var Harness; this.currentLine = ""; }; return WriterAggregator; - })(); + }()); Compiler.WriterAggregator = WriterAggregator; /** Mimics having multiple files, later concatenated to a single file. */ var EmitterIOHost = (function () { @@ -2709,7 +2709,7 @@ var Harness; return result; }; return EmitterIOHost; - })(); + }()); Compiler.EmitterIOHost = EmitterIOHost; var libFolder = global['WScript'] ? TypeScript.filePath(global['WScript'].ScriptFullName) : (__dirname + '/'); Compiler.libText = IO ? IO.readFile(libFolder + "lib.d.ts") : ''; @@ -2873,7 +2873,7 @@ var Harness; }); }; return Type; - })(); + }()); Compiler.Type = Type; var TypeFactory = (function () { function TypeFactory() { @@ -3014,7 +3014,7 @@ var Harness; }); }; return TypeFactory; - })(); + }()); Compiler.TypeFactory = TypeFactory; /** Generates a .d.ts file for the given code * @param verifyNoDeclFile pass true when the given code should generate no decl file, false otherwise @@ -3110,7 +3110,7 @@ var Harness; return false; }; return CompilerResult; - })(); + }()); Compiler.CompilerResult = CompilerResult; // Compiler Error. var CompilerError = (function () { @@ -3124,7 +3124,7 @@ var Harness; return this.file + "(" + this.line + "," + this.column + "): " + this.message; }; return CompilerError; - })(); + }()); Compiler.CompilerError = CompilerError; /** Create a new instance of the compiler with default settings and lib.d.ts, then typecheck */ function recreate() { @@ -3452,7 +3452,7 @@ var Harness; return new TypeScript.ScriptEditRange(minDistFromStart, entries[0].length - minDistFromEnd, aggDelta); }; return ScriptInfo; - })(); + }()); Harness.ScriptInfo = ScriptInfo; var TypeScriptLS = (function () { function TypeScriptLS() { @@ -3654,7 +3654,7 @@ var Harness; return JSON.stringify({ usePullLanguageService: Harness.usePull }); }; return TypeScriptLS; - })(); + }()); Harness.TypeScriptLS = TypeScriptLS; // Describe/it definitions function describe(description, block) { diff --git a/tests/baselines/reference/parserindenter.js b/tests/baselines/reference/parserindenter.js index a60eadc66a1..8beb2393748 100644 --- a/tests/baselines/reference/parserindenter.js +++ b/tests/baselines/reference/parserindenter.js @@ -1340,6 +1340,6 @@ var Formatting; this.snapshot.GetLineNumberFromPosition(token.Span.endPosition()) > this.snapshot.GetLineNumberFromPosition(token.Span.startPosition()); }; return Indenter; - })(); + }()); Formatting.Indenter = Indenter; })(Formatting || (Formatting = {})); diff --git a/tests/baselines/reference/parsingClassRecoversWhenHittingUnexpectedSemicolon.js b/tests/baselines/reference/parsingClassRecoversWhenHittingUnexpectedSemicolon.js index 59129f91b97..de5777feca8 100644 --- a/tests/baselines/reference/parsingClassRecoversWhenHittingUnexpectedSemicolon.js +++ b/tests/baselines/reference/parsingClassRecoversWhenHittingUnexpectedSemicolon.js @@ -12,4 +12,4 @@ var C = (function () { C.prototype.f = function () { }; ; return C; -})(); +}()); diff --git a/tests/baselines/reference/partiallyAmbientClodule.js b/tests/baselines/reference/partiallyAmbientClodule.js index 52077a4b4ad..f721d032f34 100644 --- a/tests/baselines/reference/partiallyAmbientClodule.js +++ b/tests/baselines/reference/partiallyAmbientClodule.js @@ -9,4 +9,4 @@ var foo = (function () { function foo() { } return foo; -})(); // Legal, because module is ambient +}()); // Legal, because module is ambient diff --git a/tests/baselines/reference/pinnedComments1.js b/tests/baselines/reference/pinnedComments1.js index 9ab2a147e6a..18bdcc982b0 100644 --- a/tests/baselines/reference/pinnedComments1.js +++ b/tests/baselines/reference/pinnedComments1.js @@ -18,4 +18,4 @@ var C = (function () { function C() { } return C; -})(); +}()); diff --git a/tests/baselines/reference/plusOperatorWithAnyOtherType.js b/tests/baselines/reference/plusOperatorWithAnyOtherType.js index 0356bad198e..6c24aa68806 100644 --- a/tests/baselines/reference/plusOperatorWithAnyOtherType.js +++ b/tests/baselines/reference/plusOperatorWithAnyOtherType.js @@ -75,7 +75,7 @@ var A = (function () { return a; }; return A; -})(); +}()); var M; (function (M) { })(M || (M = {})); diff --git a/tests/baselines/reference/plusOperatorWithBooleanType.js b/tests/baselines/reference/plusOperatorWithBooleanType.js index d48066707aa..1bd72bb6ea7 100644 --- a/tests/baselines/reference/plusOperatorWithBooleanType.js +++ b/tests/baselines/reference/plusOperatorWithBooleanType.js @@ -44,7 +44,7 @@ var A = (function () { } A.foo = function () { return false; }; return A; -})(); +}()); var M; (function (M) { })(M || (M = {})); diff --git a/tests/baselines/reference/plusOperatorWithNumberType.js b/tests/baselines/reference/plusOperatorWithNumberType.js index 8da631aa7a8..377577194bb 100644 --- a/tests/baselines/reference/plusOperatorWithNumberType.js +++ b/tests/baselines/reference/plusOperatorWithNumberType.js @@ -51,7 +51,7 @@ var A = (function () { } A.foo = function () { return 1; }; return A; -})(); +}()); var M; (function (M) { })(M || (M = {})); diff --git a/tests/baselines/reference/plusOperatorWithStringType.js b/tests/baselines/reference/plusOperatorWithStringType.js index dbe7e23a3d6..19d143eeb8e 100644 --- a/tests/baselines/reference/plusOperatorWithStringType.js +++ b/tests/baselines/reference/plusOperatorWithStringType.js @@ -50,7 +50,7 @@ var A = (function () { } A.foo = function () { return ""; }; return A; -})(); +}()); var M; (function (M) { })(M || (M = {})); diff --git a/tests/baselines/reference/prespecializedGenericMembers1.js b/tests/baselines/reference/prespecializedGenericMembers1.js index c53a6f2ee69..dd6bd2a2dc6 100644 --- a/tests/baselines/reference/prespecializedGenericMembers1.js +++ b/tests/baselines/reference/prespecializedGenericMembers1.js @@ -26,13 +26,13 @@ var Cat = (function () { function Cat() { } return Cat; -})(); +}()); exports.Cat = Cat; var CatBag = (function () { function CatBag(cats) { } return CatBag; -})(); +}()); exports.CatBag = CatBag; var cat = new Cat(); var catThing = { diff --git a/tests/baselines/reference/primitiveConstraints2.js b/tests/baselines/reference/primitiveConstraints2.js index 4ce8480ae0e..c8c49b2a164 100644 --- a/tests/baselines/reference/primitiveConstraints2.js +++ b/tests/baselines/reference/primitiveConstraints2.js @@ -17,7 +17,7 @@ var C = (function () { return null; }; return C; -})(); +}()); var x = new C(); x.bar2(2, ""); // should error x.bar2(2, ""); // should error diff --git a/tests/baselines/reference/primitiveMembers.js b/tests/baselines/reference/primitiveMembers.js index 60ae4b79dec..caf41fe2708 100644 --- a/tests/baselines/reference/primitiveMembers.js +++ b/tests/baselines/reference/primitiveMembers.js @@ -59,7 +59,7 @@ var baz = (function () { baz.prototype.bar = function () { }; ; return baz; -})(); +}()); var foo = (function (_super) { __extends(foo, _super); function foo() { @@ -68,4 +68,4 @@ var foo = (function (_super) { foo.prototype.bar = function () { return undefined; }; ; return foo; -})(baz); +}(baz)); diff --git a/tests/baselines/reference/primitiveTypeAsClassName.js b/tests/baselines/reference/primitiveTypeAsClassName.js index 5890e53d144..f68d64f9444 100644 --- a/tests/baselines/reference/primitiveTypeAsClassName.js +++ b/tests/baselines/reference/primitiveTypeAsClassName.js @@ -6,4 +6,4 @@ var any = (function () { function any() { } return any; -})(); +}()); diff --git a/tests/baselines/reference/privacyAccessorDeclFile.js b/tests/baselines/reference/privacyAccessorDeclFile.js index efd96c4442b..6fed8b8f082 100644 --- a/tests/baselines/reference/privacyAccessorDeclFile.js +++ b/tests/baselines/reference/privacyAccessorDeclFile.js @@ -1065,12 +1065,12 @@ var privateClass = (function () { function privateClass() { } return privateClass; -})(); +}()); var publicClass = (function () { function publicClass() { } return publicClass; -})(); +}()); exports.publicClass = publicClass; var publicClassWithWithPrivateGetAccessorTypes = (function () { function publicClassWithWithPrivateGetAccessorTypes() { @@ -1132,7 +1132,7 @@ var publicClassWithWithPrivateGetAccessorTypes = (function () { configurable: true }); return publicClassWithWithPrivateGetAccessorTypes; -})(); +}()); exports.publicClassWithWithPrivateGetAccessorTypes = publicClassWithWithPrivateGetAccessorTypes; var publicClassWithWithPublicGetAccessorTypes = (function () { function publicClassWithWithPublicGetAccessorTypes() { @@ -1194,7 +1194,7 @@ var publicClassWithWithPublicGetAccessorTypes = (function () { configurable: true }); return publicClassWithWithPublicGetAccessorTypes; -})(); +}()); exports.publicClassWithWithPublicGetAccessorTypes = publicClassWithWithPublicGetAccessorTypes; var privateClassWithWithPrivateGetAccessorTypes = (function () { function privateClassWithWithPrivateGetAccessorTypes() { @@ -1256,7 +1256,7 @@ var privateClassWithWithPrivateGetAccessorTypes = (function () { configurable: true }); return privateClassWithWithPrivateGetAccessorTypes; -})(); +}()); var privateClassWithWithPublicGetAccessorTypes = (function () { function privateClassWithWithPublicGetAccessorTypes() { } @@ -1317,7 +1317,7 @@ var privateClassWithWithPublicGetAccessorTypes = (function () { configurable: true }); return privateClassWithWithPublicGetAccessorTypes; -})(); +}()); var publicClassWithWithPrivateSetAccessorTypes = (function () { function publicClassWithWithPrivateSetAccessorTypes() { } @@ -1346,7 +1346,7 @@ var publicClassWithWithPrivateSetAccessorTypes = (function () { configurable: true }); return publicClassWithWithPrivateSetAccessorTypes; -})(); +}()); exports.publicClassWithWithPrivateSetAccessorTypes = publicClassWithWithPrivateSetAccessorTypes; var publicClassWithWithPublicSetAccessorTypes = (function () { function publicClassWithWithPublicSetAccessorTypes() { @@ -1376,7 +1376,7 @@ var publicClassWithWithPublicSetAccessorTypes = (function () { configurable: true }); return publicClassWithWithPublicSetAccessorTypes; -})(); +}()); exports.publicClassWithWithPublicSetAccessorTypes = publicClassWithWithPublicSetAccessorTypes; var privateClassWithWithPrivateSetAccessorTypes = (function () { function privateClassWithWithPrivateSetAccessorTypes() { @@ -1406,7 +1406,7 @@ var privateClassWithWithPrivateSetAccessorTypes = (function () { configurable: true }); return privateClassWithWithPrivateSetAccessorTypes; -})(); +}()); var privateClassWithWithPublicSetAccessorTypes = (function () { function privateClassWithWithPublicSetAccessorTypes() { } @@ -1435,7 +1435,7 @@ var privateClassWithWithPublicSetAccessorTypes = (function () { configurable: true }); return privateClassWithWithPublicSetAccessorTypes; -})(); +}()); var publicClassWithPrivateModuleGetAccessorTypes = (function () { function publicClassWithPrivateModuleGetAccessorTypes() { } @@ -1468,7 +1468,7 @@ var publicClassWithPrivateModuleGetAccessorTypes = (function () { configurable: true }); return publicClassWithPrivateModuleGetAccessorTypes; -})(); +}()); exports.publicClassWithPrivateModuleGetAccessorTypes = publicClassWithPrivateModuleGetAccessorTypes; var publicClassWithPrivateModuleSetAccessorTypes = (function () { function publicClassWithPrivateModuleSetAccessorTypes() { @@ -1486,7 +1486,7 @@ var publicClassWithPrivateModuleSetAccessorTypes = (function () { configurable: true }); return publicClassWithPrivateModuleSetAccessorTypes; -})(); +}()); exports.publicClassWithPrivateModuleSetAccessorTypes = publicClassWithPrivateModuleSetAccessorTypes; var privateClassWithPrivateModuleGetAccessorTypes = (function () { function privateClassWithPrivateModuleGetAccessorTypes() { @@ -1520,7 +1520,7 @@ var privateClassWithPrivateModuleGetAccessorTypes = (function () { configurable: true }); return privateClassWithPrivateModuleGetAccessorTypes; -})(); +}()); var privateClassWithPrivateModuleSetAccessorTypes = (function () { function privateClassWithPrivateModuleSetAccessorTypes() { } @@ -1537,19 +1537,19 @@ var privateClassWithPrivateModuleSetAccessorTypes = (function () { configurable: true }); return privateClassWithPrivateModuleSetAccessorTypes; -})(); +}()); var publicModule; (function (publicModule) { var privateClass = (function () { function privateClass() { } return privateClass; - })(); + }()); var publicClass = (function () { function publicClass() { } return publicClass; - })(); + }()); publicModule.publicClass = publicClass; var publicClassWithWithPrivateGetAccessorTypes = (function () { function publicClassWithWithPrivateGetAccessorTypes() { @@ -1611,7 +1611,7 @@ var publicModule; configurable: true }); return publicClassWithWithPrivateGetAccessorTypes; - })(); + }()); publicModule.publicClassWithWithPrivateGetAccessorTypes = publicClassWithWithPrivateGetAccessorTypes; var publicClassWithWithPublicGetAccessorTypes = (function () { function publicClassWithWithPublicGetAccessorTypes() { @@ -1673,7 +1673,7 @@ var publicModule; configurable: true }); return publicClassWithWithPublicGetAccessorTypes; - })(); + }()); publicModule.publicClassWithWithPublicGetAccessorTypes = publicClassWithWithPublicGetAccessorTypes; var privateClassWithWithPrivateGetAccessorTypes = (function () { function privateClassWithWithPrivateGetAccessorTypes() { @@ -1735,7 +1735,7 @@ var publicModule; configurable: true }); return privateClassWithWithPrivateGetAccessorTypes; - })(); + }()); var privateClassWithWithPublicGetAccessorTypes = (function () { function privateClassWithWithPublicGetAccessorTypes() { } @@ -1796,7 +1796,7 @@ var publicModule; configurable: true }); return privateClassWithWithPublicGetAccessorTypes; - })(); + }()); var publicClassWithWithPrivateSetAccessorTypes = (function () { function publicClassWithWithPrivateSetAccessorTypes() { } @@ -1825,7 +1825,7 @@ var publicModule; configurable: true }); return publicClassWithWithPrivateSetAccessorTypes; - })(); + }()); publicModule.publicClassWithWithPrivateSetAccessorTypes = publicClassWithWithPrivateSetAccessorTypes; var publicClassWithWithPublicSetAccessorTypes = (function () { function publicClassWithWithPublicSetAccessorTypes() { @@ -1855,7 +1855,7 @@ var publicModule; configurable: true }); return publicClassWithWithPublicSetAccessorTypes; - })(); + }()); publicModule.publicClassWithWithPublicSetAccessorTypes = publicClassWithWithPublicSetAccessorTypes; var privateClassWithWithPrivateSetAccessorTypes = (function () { function privateClassWithWithPrivateSetAccessorTypes() { @@ -1885,7 +1885,7 @@ var publicModule; configurable: true }); return privateClassWithWithPrivateSetAccessorTypes; - })(); + }()); var privateClassWithWithPublicSetAccessorTypes = (function () { function privateClassWithWithPublicSetAccessorTypes() { } @@ -1914,7 +1914,7 @@ var publicModule; configurable: true }); return privateClassWithWithPublicSetAccessorTypes; - })(); + }()); var publicClassWithPrivateModuleGetAccessorTypes = (function () { function publicClassWithPrivateModuleGetAccessorTypes() { } @@ -1947,7 +1947,7 @@ var publicModule; configurable: true }); return publicClassWithPrivateModuleGetAccessorTypes; - })(); + }()); publicModule.publicClassWithPrivateModuleGetAccessorTypes = publicClassWithPrivateModuleGetAccessorTypes; var publicClassWithPrivateModuleSetAccessorTypes = (function () { function publicClassWithPrivateModuleSetAccessorTypes() { @@ -1965,7 +1965,7 @@ var publicModule; configurable: true }); return publicClassWithPrivateModuleSetAccessorTypes; - })(); + }()); publicModule.publicClassWithPrivateModuleSetAccessorTypes = publicClassWithPrivateModuleSetAccessorTypes; var privateClassWithPrivateModuleGetAccessorTypes = (function () { function privateClassWithPrivateModuleGetAccessorTypes() { @@ -1999,7 +1999,7 @@ var publicModule; configurable: true }); return privateClassWithPrivateModuleGetAccessorTypes; - })(); + }()); var privateClassWithPrivateModuleSetAccessorTypes = (function () { function privateClassWithPrivateModuleSetAccessorTypes() { } @@ -2016,7 +2016,7 @@ var publicModule; configurable: true }); return privateClassWithPrivateModuleSetAccessorTypes; - })(); + }()); })(publicModule = exports.publicModule || (exports.publicModule = {})); var privateModule; (function (privateModule) { @@ -2024,12 +2024,12 @@ var privateModule; function privateClass() { } return privateClass; - })(); + }()); var publicClass = (function () { function publicClass() { } return publicClass; - })(); + }()); privateModule.publicClass = publicClass; var publicClassWithWithPrivateGetAccessorTypes = (function () { function publicClassWithWithPrivateGetAccessorTypes() { @@ -2091,7 +2091,7 @@ var privateModule; configurable: true }); return publicClassWithWithPrivateGetAccessorTypes; - })(); + }()); privateModule.publicClassWithWithPrivateGetAccessorTypes = publicClassWithWithPrivateGetAccessorTypes; var publicClassWithWithPublicGetAccessorTypes = (function () { function publicClassWithWithPublicGetAccessorTypes() { @@ -2153,7 +2153,7 @@ var privateModule; configurable: true }); return publicClassWithWithPublicGetAccessorTypes; - })(); + }()); privateModule.publicClassWithWithPublicGetAccessorTypes = publicClassWithWithPublicGetAccessorTypes; var privateClassWithWithPrivateGetAccessorTypes = (function () { function privateClassWithWithPrivateGetAccessorTypes() { @@ -2215,7 +2215,7 @@ var privateModule; configurable: true }); return privateClassWithWithPrivateGetAccessorTypes; - })(); + }()); var privateClassWithWithPublicGetAccessorTypes = (function () { function privateClassWithWithPublicGetAccessorTypes() { } @@ -2276,7 +2276,7 @@ var privateModule; configurable: true }); return privateClassWithWithPublicGetAccessorTypes; - })(); + }()); var publicClassWithWithPrivateSetAccessorTypes = (function () { function publicClassWithWithPrivateSetAccessorTypes() { } @@ -2305,7 +2305,7 @@ var privateModule; configurable: true }); return publicClassWithWithPrivateSetAccessorTypes; - })(); + }()); privateModule.publicClassWithWithPrivateSetAccessorTypes = publicClassWithWithPrivateSetAccessorTypes; var publicClassWithWithPublicSetAccessorTypes = (function () { function publicClassWithWithPublicSetAccessorTypes() { @@ -2335,7 +2335,7 @@ var privateModule; configurable: true }); return publicClassWithWithPublicSetAccessorTypes; - })(); + }()); privateModule.publicClassWithWithPublicSetAccessorTypes = publicClassWithWithPublicSetAccessorTypes; var privateClassWithWithPrivateSetAccessorTypes = (function () { function privateClassWithWithPrivateSetAccessorTypes() { @@ -2365,7 +2365,7 @@ var privateModule; configurable: true }); return privateClassWithWithPrivateSetAccessorTypes; - })(); + }()); var privateClassWithWithPublicSetAccessorTypes = (function () { function privateClassWithWithPublicSetAccessorTypes() { } @@ -2394,7 +2394,7 @@ var privateModule; configurable: true }); return privateClassWithWithPublicSetAccessorTypes; - })(); + }()); var publicClassWithPrivateModuleGetAccessorTypes = (function () { function publicClassWithPrivateModuleGetAccessorTypes() { } @@ -2427,7 +2427,7 @@ var privateModule; configurable: true }); return publicClassWithPrivateModuleGetAccessorTypes; - })(); + }()); privateModule.publicClassWithPrivateModuleGetAccessorTypes = publicClassWithPrivateModuleGetAccessorTypes; var publicClassWithPrivateModuleSetAccessorTypes = (function () { function publicClassWithPrivateModuleSetAccessorTypes() { @@ -2445,7 +2445,7 @@ var privateModule; configurable: true }); return publicClassWithPrivateModuleSetAccessorTypes; - })(); + }()); privateModule.publicClassWithPrivateModuleSetAccessorTypes = publicClassWithPrivateModuleSetAccessorTypes; var privateClassWithPrivateModuleGetAccessorTypes = (function () { function privateClassWithPrivateModuleGetAccessorTypes() { @@ -2479,7 +2479,7 @@ var privateModule; configurable: true }); return privateClassWithPrivateModuleGetAccessorTypes; - })(); + }()); var privateClassWithPrivateModuleSetAccessorTypes = (function () { function privateClassWithPrivateModuleSetAccessorTypes() { } @@ -2496,14 +2496,14 @@ var privateModule; configurable: true }); return privateClassWithPrivateModuleSetAccessorTypes; - })(); + }()); })(privateModule || (privateModule = {})); //// [privacyAccessorDeclFile_GlobalFile.js] var publicClassInGlobal = (function () { function publicClassInGlobal() { } return publicClassInGlobal; -})(); +}()); var publicClassInGlobalWithPublicGetAccessorTypes = (function () { function publicClassInGlobalWithPublicGetAccessorTypes() { } @@ -2564,7 +2564,7 @@ var publicClassInGlobalWithPublicGetAccessorTypes = (function () { configurable: true }); return publicClassInGlobalWithPublicGetAccessorTypes; -})(); +}()); var publicClassInGlobalWithWithPublicSetAccessorTypes = (function () { function publicClassInGlobalWithWithPublicSetAccessorTypes() { } @@ -2593,19 +2593,19 @@ var publicClassInGlobalWithWithPublicSetAccessorTypes = (function () { configurable: true }); return publicClassInGlobalWithWithPublicSetAccessorTypes; -})(); +}()); var publicModuleInGlobal; (function (publicModuleInGlobal) { var privateClass = (function () { function privateClass() { } return privateClass; - })(); + }()); var publicClass = (function () { function publicClass() { } return publicClass; - })(); + }()); publicModuleInGlobal.publicClass = publicClass; var privateModule; (function (privateModule) { @@ -2613,12 +2613,12 @@ var publicModuleInGlobal; function privateClass() { } return privateClass; - })(); + }()); var publicClass = (function () { function publicClass() { } return publicClass; - })(); + }()); privateModule.publicClass = publicClass; var publicClassWithWithPrivateGetAccessorTypes = (function () { function publicClassWithWithPrivateGetAccessorTypes() { @@ -2680,7 +2680,7 @@ var publicModuleInGlobal; configurable: true }); return publicClassWithWithPrivateGetAccessorTypes; - })(); + }()); privateModule.publicClassWithWithPrivateGetAccessorTypes = publicClassWithWithPrivateGetAccessorTypes; var publicClassWithWithPublicGetAccessorTypes = (function () { function publicClassWithWithPublicGetAccessorTypes() { @@ -2742,7 +2742,7 @@ var publicModuleInGlobal; configurable: true }); return publicClassWithWithPublicGetAccessorTypes; - })(); + }()); privateModule.publicClassWithWithPublicGetAccessorTypes = publicClassWithWithPublicGetAccessorTypes; var privateClassWithWithPrivateGetAccessorTypes = (function () { function privateClassWithWithPrivateGetAccessorTypes() { @@ -2804,7 +2804,7 @@ var publicModuleInGlobal; configurable: true }); return privateClassWithWithPrivateGetAccessorTypes; - })(); + }()); var privateClassWithWithPublicGetAccessorTypes = (function () { function privateClassWithWithPublicGetAccessorTypes() { } @@ -2865,7 +2865,7 @@ var publicModuleInGlobal; configurable: true }); return privateClassWithWithPublicGetAccessorTypes; - })(); + }()); var publicClassWithWithPrivateSetAccessorTypes = (function () { function publicClassWithWithPrivateSetAccessorTypes() { } @@ -2894,7 +2894,7 @@ var publicModuleInGlobal; configurable: true }); return publicClassWithWithPrivateSetAccessorTypes; - })(); + }()); privateModule.publicClassWithWithPrivateSetAccessorTypes = publicClassWithWithPrivateSetAccessorTypes; var publicClassWithWithPublicSetAccessorTypes = (function () { function publicClassWithWithPublicSetAccessorTypes() { @@ -2924,7 +2924,7 @@ var publicModuleInGlobal; configurable: true }); return publicClassWithWithPublicSetAccessorTypes; - })(); + }()); privateModule.publicClassWithWithPublicSetAccessorTypes = publicClassWithWithPublicSetAccessorTypes; var privateClassWithWithPrivateSetAccessorTypes = (function () { function privateClassWithWithPrivateSetAccessorTypes() { @@ -2954,7 +2954,7 @@ var publicModuleInGlobal; configurable: true }); return privateClassWithWithPrivateSetAccessorTypes; - })(); + }()); var privateClassWithWithPublicSetAccessorTypes = (function () { function privateClassWithWithPublicSetAccessorTypes() { } @@ -2983,7 +2983,7 @@ var publicModuleInGlobal; configurable: true }); return privateClassWithWithPublicSetAccessorTypes; - })(); + }()); var publicClassWithPrivateModuleGetAccessorTypes = (function () { function publicClassWithPrivateModuleGetAccessorTypes() { } @@ -3016,7 +3016,7 @@ var publicModuleInGlobal; configurable: true }); return publicClassWithPrivateModuleGetAccessorTypes; - })(); + }()); privateModule.publicClassWithPrivateModuleGetAccessorTypes = publicClassWithPrivateModuleGetAccessorTypes; var publicClassWithPrivateModuleSetAccessorTypes = (function () { function publicClassWithPrivateModuleSetAccessorTypes() { @@ -3034,7 +3034,7 @@ var publicModuleInGlobal; configurable: true }); return publicClassWithPrivateModuleSetAccessorTypes; - })(); + }()); privateModule.publicClassWithPrivateModuleSetAccessorTypes = publicClassWithPrivateModuleSetAccessorTypes; var privateClassWithPrivateModuleGetAccessorTypes = (function () { function privateClassWithPrivateModuleGetAccessorTypes() { @@ -3068,7 +3068,7 @@ var publicModuleInGlobal; configurable: true }); return privateClassWithPrivateModuleGetAccessorTypes; - })(); + }()); var privateClassWithPrivateModuleSetAccessorTypes = (function () { function privateClassWithPrivateModuleSetAccessorTypes() { } @@ -3085,7 +3085,7 @@ var publicModuleInGlobal; configurable: true }); return privateClassWithPrivateModuleSetAccessorTypes; - })(); + }()); })(privateModule || (privateModule = {})); var publicClassWithWithPrivateGetAccessorTypes = (function () { function publicClassWithWithPrivateGetAccessorTypes() { @@ -3147,7 +3147,7 @@ var publicModuleInGlobal; configurable: true }); return publicClassWithWithPrivateGetAccessorTypes; - })(); + }()); publicModuleInGlobal.publicClassWithWithPrivateGetAccessorTypes = publicClassWithWithPrivateGetAccessorTypes; var publicClassWithWithPublicGetAccessorTypes = (function () { function publicClassWithWithPublicGetAccessorTypes() { @@ -3209,7 +3209,7 @@ var publicModuleInGlobal; configurable: true }); return publicClassWithWithPublicGetAccessorTypes; - })(); + }()); publicModuleInGlobal.publicClassWithWithPublicGetAccessorTypes = publicClassWithWithPublicGetAccessorTypes; var privateClassWithWithPrivateGetAccessorTypes = (function () { function privateClassWithWithPrivateGetAccessorTypes() { @@ -3271,7 +3271,7 @@ var publicModuleInGlobal; configurable: true }); return privateClassWithWithPrivateGetAccessorTypes; - })(); + }()); var privateClassWithWithPublicGetAccessorTypes = (function () { function privateClassWithWithPublicGetAccessorTypes() { } @@ -3332,7 +3332,7 @@ var publicModuleInGlobal; configurable: true }); return privateClassWithWithPublicGetAccessorTypes; - })(); + }()); var publicClassWithWithPrivateSetAccessorTypes = (function () { function publicClassWithWithPrivateSetAccessorTypes() { } @@ -3361,7 +3361,7 @@ var publicModuleInGlobal; configurable: true }); return publicClassWithWithPrivateSetAccessorTypes; - })(); + }()); publicModuleInGlobal.publicClassWithWithPrivateSetAccessorTypes = publicClassWithWithPrivateSetAccessorTypes; var publicClassWithWithPublicSetAccessorTypes = (function () { function publicClassWithWithPublicSetAccessorTypes() { @@ -3391,7 +3391,7 @@ var publicModuleInGlobal; configurable: true }); return publicClassWithWithPublicSetAccessorTypes; - })(); + }()); publicModuleInGlobal.publicClassWithWithPublicSetAccessorTypes = publicClassWithWithPublicSetAccessorTypes; var privateClassWithWithPrivateSetAccessorTypes = (function () { function privateClassWithWithPrivateSetAccessorTypes() { @@ -3421,7 +3421,7 @@ var publicModuleInGlobal; configurable: true }); return privateClassWithWithPrivateSetAccessorTypes; - })(); + }()); var privateClassWithWithPublicSetAccessorTypes = (function () { function privateClassWithWithPublicSetAccessorTypes() { } @@ -3450,7 +3450,7 @@ var publicModuleInGlobal; configurable: true }); return privateClassWithWithPublicSetAccessorTypes; - })(); + }()); var publicClassWithPrivateModuleGetAccessorTypes = (function () { function publicClassWithPrivateModuleGetAccessorTypes() { } @@ -3483,7 +3483,7 @@ var publicModuleInGlobal; configurable: true }); return publicClassWithPrivateModuleGetAccessorTypes; - })(); + }()); publicModuleInGlobal.publicClassWithPrivateModuleGetAccessorTypes = publicClassWithPrivateModuleGetAccessorTypes; var publicClassWithPrivateModuleSetAccessorTypes = (function () { function publicClassWithPrivateModuleSetAccessorTypes() { @@ -3501,7 +3501,7 @@ var publicModuleInGlobal; configurable: true }); return publicClassWithPrivateModuleSetAccessorTypes; - })(); + }()); publicModuleInGlobal.publicClassWithPrivateModuleSetAccessorTypes = publicClassWithPrivateModuleSetAccessorTypes; var privateClassWithPrivateModuleGetAccessorTypes = (function () { function privateClassWithPrivateModuleGetAccessorTypes() { @@ -3535,7 +3535,7 @@ var publicModuleInGlobal; configurable: true }); return privateClassWithPrivateModuleGetAccessorTypes; - })(); + }()); var privateClassWithPrivateModuleSetAccessorTypes = (function () { function privateClassWithPrivateModuleSetAccessorTypes() { } @@ -3552,5 +3552,5 @@ var publicModuleInGlobal; configurable: true }); return privateClassWithPrivateModuleSetAccessorTypes; - })(); + }()); })(publicModuleInGlobal || (publicModuleInGlobal = {})); diff --git a/tests/baselines/reference/privacyCannotNameAccessorDeclFile.js b/tests/baselines/reference/privacyCannotNameAccessorDeclFile.js index cb6bbc38a7e..4121dbdd51d 100644 --- a/tests/baselines/reference/privacyCannotNameAccessorDeclFile.js +++ b/tests/baselines/reference/privacyCannotNameAccessorDeclFile.js @@ -144,7 +144,7 @@ var Widget1 = (function () { this.name = 'one'; } return Widget1; -})(); +}()); exports.Widget1 = Widget1; function createWidget1() { return new Widget1(); @@ -157,7 +157,7 @@ var SpecializedWidget; this.name = 'one'; } return Widget2; - })(); + }()); SpecializedWidget.Widget2 = Widget2; function createWidget2() { return new Widget2(); @@ -248,7 +248,7 @@ var publicClassWithWithPrivateGetAccessorTypes = (function () { configurable: true }); return publicClassWithWithPrivateGetAccessorTypes; -})(); +}()); exports.publicClassWithWithPrivateGetAccessorTypes = publicClassWithWithPrivateGetAccessorTypes; var privateClassWithWithPrivateGetAccessorTypes = (function () { function privateClassWithWithPrivateGetAccessorTypes() { @@ -310,7 +310,7 @@ var privateClassWithWithPrivateGetAccessorTypes = (function () { configurable: true }); return privateClassWithWithPrivateGetAccessorTypes; -})(); +}()); var publicClassWithPrivateModuleGetAccessorTypes = (function () { function publicClassWithPrivateModuleGetAccessorTypes() { } @@ -343,7 +343,7 @@ var publicClassWithPrivateModuleGetAccessorTypes = (function () { configurable: true }); return publicClassWithPrivateModuleGetAccessorTypes; -})(); +}()); exports.publicClassWithPrivateModuleGetAccessorTypes = publicClassWithPrivateModuleGetAccessorTypes; var privateClassWithPrivateModuleGetAccessorTypes = (function () { function privateClassWithPrivateModuleGetAccessorTypes() { @@ -377,7 +377,7 @@ var privateClassWithPrivateModuleGetAccessorTypes = (function () { configurable: true }); return privateClassWithPrivateModuleGetAccessorTypes; -})(); +}()); //// [privacyCannotNameAccessorDeclFile_GlobalWidgets.d.ts] diff --git a/tests/baselines/reference/privacyCannotNameVarTypeDeclFile.js b/tests/baselines/reference/privacyCannotNameVarTypeDeclFile.js index b64e813f4ee..6c2dcf304cf 100644 --- a/tests/baselines/reference/privacyCannotNameVarTypeDeclFile.js +++ b/tests/baselines/reference/privacyCannotNameVarTypeDeclFile.js @@ -108,7 +108,7 @@ var Widget1 = (function () { this.name = 'one'; } return Widget1; -})(); +}()); exports.Widget1 = Widget1; function createWidget1() { return new Widget1(); @@ -121,7 +121,7 @@ var SpecializedWidget; this.name = 'one'; } return Widget2; - })(); + }()); SpecializedWidget.Widget2 = Widget2; function createWidget2() { return new Widget2(); @@ -164,7 +164,7 @@ var publicClassWithWithPrivatePropertyTypes = (function () { publicClassWithWithPrivatePropertyTypes.myPublicStaticProperty1 = exporter.createExportedWidget3(); // Error publicClassWithWithPrivatePropertyTypes.myPrivateStaticProperty1 = exporter.createExportedWidget3(); return publicClassWithWithPrivatePropertyTypes; -})(); +}()); exports.publicClassWithWithPrivatePropertyTypes = publicClassWithWithPrivatePropertyTypes; var privateClassWithWithPrivatePropertyTypes = (function () { function privateClassWithWithPrivatePropertyTypes() { @@ -178,7 +178,7 @@ var privateClassWithWithPrivatePropertyTypes = (function () { privateClassWithWithPrivatePropertyTypes.myPublicStaticProperty1 = exporter.createExportedWidget3(); privateClassWithWithPrivatePropertyTypes.myPrivateStaticProperty1 = exporter.createExportedWidget3(); return privateClassWithWithPrivatePropertyTypes; -})(); +}()); exports.publicVarWithPrivatePropertyTypes = exporter.createExportedWidget1(); // Error var privateVarWithPrivatePropertyTypes = exporter.createExportedWidget1(); exports.publicVarWithPrivatePropertyTypes1 = exporter.createExportedWidget3(); // Error @@ -191,7 +191,7 @@ var publicClassWithPrivateModulePropertyTypes = (function () { publicClassWithPrivateModulePropertyTypes.myPublicStaticProperty = exporter.createExportedWidget2(); // Error publicClassWithPrivateModulePropertyTypes.myPublicStaticProperty1 = exporter.createExportedWidget4(); // Error return publicClassWithPrivateModulePropertyTypes; -})(); +}()); exports.publicClassWithPrivateModulePropertyTypes = publicClassWithPrivateModulePropertyTypes; exports.publicVarWithPrivateModulePropertyTypes = exporter.createExportedWidget2(); // Error exports.publicVarWithPrivateModulePropertyTypes1 = exporter.createExportedWidget4(); // Error @@ -203,7 +203,7 @@ var privateClassWithPrivateModulePropertyTypes = (function () { privateClassWithPrivateModulePropertyTypes.myPublicStaticProperty = exporter.createExportedWidget2(); privateClassWithPrivateModulePropertyTypes.myPublicStaticProperty1 = exporter.createExportedWidget4(); return privateClassWithPrivateModulePropertyTypes; -})(); +}()); var privateVarWithPrivateModulePropertyTypes = exporter.createExportedWidget2(); var privateVarWithPrivateModulePropertyTypes1 = exporter.createExportedWidget4(); diff --git a/tests/baselines/reference/privacyCheckExternalModuleExportAssignmentOfGenericClass.js b/tests/baselines/reference/privacyCheckExternalModuleExportAssignmentOfGenericClass.js index 94933d322e6..ff241a726bf 100644 --- a/tests/baselines/reference/privacyCheckExternalModuleExportAssignmentOfGenericClass.js +++ b/tests/baselines/reference/privacyCheckExternalModuleExportAssignmentOfGenericClass.js @@ -20,7 +20,7 @@ var Foo = (function () { this.a = a; } return Foo; -})(); +}()); module.exports = Foo; //// [privacyCheckExternalModuleExportAssignmentOfGenericClass_1.js] "use strict"; diff --git a/tests/baselines/reference/privacyCheckOnTypeParameterReferenceInConstructorParameter.js b/tests/baselines/reference/privacyCheckOnTypeParameterReferenceInConstructorParameter.js index 1788435755a..7d4db36ee99 100644 --- a/tests/baselines/reference/privacyCheckOnTypeParameterReferenceInConstructorParameter.js +++ b/tests/baselines/reference/privacyCheckOnTypeParameterReferenceInConstructorParameter.js @@ -18,13 +18,13 @@ define(["require", "exports"], function (require, exports) { var child = new B(this); } return A; - })(); + }()); exports.A = A; var B = (function () { function B(parent) { } return B; - })(); + }()); exports.B = B; }); diff --git a/tests/baselines/reference/privacyClass.js b/tests/baselines/reference/privacyClass.js index 74a4234b474..a149aa26f75 100644 --- a/tests/baselines/reference/privacyClass.js +++ b/tests/baselines/reference/privacyClass.js @@ -142,34 +142,34 @@ var m1; m1_c_public.prototype.f1 = function () { }; return m1_c_public; - })(); + }()); m1.m1_c_public = m1_c_public; var m1_c_private = (function () { function m1_c_private() { } return m1_c_private; - })(); + }()); var m1_C1_private = (function (_super) { __extends(m1_C1_private, _super); function m1_C1_private() { _super.apply(this, arguments); } return m1_C1_private; - })(m1_c_public); + }(m1_c_public)); var m1_C2_private = (function (_super) { __extends(m1_C2_private, _super); function m1_C2_private() { _super.apply(this, arguments); } return m1_C2_private; - })(m1_c_private); + }(m1_c_private)); var m1_C3_public = (function (_super) { __extends(m1_C3_public, _super); function m1_C3_public() { _super.apply(this, arguments); } return m1_C3_public; - })(m1_c_public); + }(m1_c_public)); m1.m1_C3_public = m1_C3_public; var m1_C4_public = (function (_super) { __extends(m1_C4_public, _super); @@ -177,29 +177,29 @@ var m1; _super.apply(this, arguments); } return m1_C4_public; - })(m1_c_private); + }(m1_c_private)); m1.m1_C4_public = m1_C4_public; var m1_C5_private = (function () { function m1_C5_private() { } return m1_C5_private; - })(); + }()); var m1_C6_private = (function () { function m1_C6_private() { } return m1_C6_private; - })(); + }()); var m1_C7_public = (function () { function m1_C7_public() { } return m1_C7_public; - })(); + }()); m1.m1_C7_public = m1_C7_public; var m1_C8_public = (function () { function m1_C8_public() { } return m1_C8_public; - })(); + }()); m1.m1_C8_public = m1_C8_public; var m1_C9_private = (function (_super) { __extends(m1_C9_private, _super); @@ -207,21 +207,21 @@ var m1; _super.apply(this, arguments); } return m1_C9_private; - })(m1_c_public); + }(m1_c_public)); var m1_C10_private = (function (_super) { __extends(m1_C10_private, _super); function m1_C10_private() { _super.apply(this, arguments); } return m1_C10_private; - })(m1_c_private); + }(m1_c_private)); var m1_C11_public = (function (_super) { __extends(m1_C11_public, _super); function m1_C11_public() { _super.apply(this, arguments); } return m1_C11_public; - })(m1_c_public); + }(m1_c_public)); m1.m1_C11_public = m1_C11_public; var m1_C12_public = (function (_super) { __extends(m1_C12_public, _super); @@ -229,7 +229,7 @@ var m1; _super.apply(this, arguments); } return m1_C12_public; - })(m1_c_private); + }(m1_c_private)); m1.m1_C12_public = m1_C12_public; })(m1 = exports.m1 || (exports.m1 = {})); var m2; @@ -240,34 +240,34 @@ var m2; m2_c_public.prototype.f1 = function () { }; return m2_c_public; - })(); + }()); m2.m2_c_public = m2_c_public; var m2_c_private = (function () { function m2_c_private() { } return m2_c_private; - })(); + }()); var m2_C1_private = (function (_super) { __extends(m2_C1_private, _super); function m2_C1_private() { _super.apply(this, arguments); } return m2_C1_private; - })(m2_c_public); + }(m2_c_public)); var m2_C2_private = (function (_super) { __extends(m2_C2_private, _super); function m2_C2_private() { _super.apply(this, arguments); } return m2_C2_private; - })(m2_c_private); + }(m2_c_private)); var m2_C3_public = (function (_super) { __extends(m2_C3_public, _super); function m2_C3_public() { _super.apply(this, arguments); } return m2_C3_public; - })(m2_c_public); + }(m2_c_public)); m2.m2_C3_public = m2_C3_public; var m2_C4_public = (function (_super) { __extends(m2_C4_public, _super); @@ -275,29 +275,29 @@ var m2; _super.apply(this, arguments); } return m2_C4_public; - })(m2_c_private); + }(m2_c_private)); m2.m2_C4_public = m2_C4_public; var m2_C5_private = (function () { function m2_C5_private() { } return m2_C5_private; - })(); + }()); var m2_C6_private = (function () { function m2_C6_private() { } return m2_C6_private; - })(); + }()); var m2_C7_public = (function () { function m2_C7_public() { } return m2_C7_public; - })(); + }()); m2.m2_C7_public = m2_C7_public; var m2_C8_public = (function () { function m2_C8_public() { } return m2_C8_public; - })(); + }()); m2.m2_C8_public = m2_C8_public; var m2_C9_private = (function (_super) { __extends(m2_C9_private, _super); @@ -305,21 +305,21 @@ var m2; _super.apply(this, arguments); } return m2_C9_private; - })(m2_c_public); + }(m2_c_public)); var m2_C10_private = (function (_super) { __extends(m2_C10_private, _super); function m2_C10_private() { _super.apply(this, arguments); } return m2_C10_private; - })(m2_c_private); + }(m2_c_private)); var m2_C11_public = (function (_super) { __extends(m2_C11_public, _super); function m2_C11_public() { _super.apply(this, arguments); } return m2_C11_public; - })(m2_c_public); + }(m2_c_public)); m2.m2_C11_public = m2_C11_public; var m2_C12_public = (function (_super) { __extends(m2_C12_public, _super); @@ -327,7 +327,7 @@ var m2; _super.apply(this, arguments); } return m2_C12_public; - })(m2_c_private); + }(m2_c_private)); m2.m2_C12_public = m2_C12_public; })(m2 || (m2 = {})); var glo_c_public = (function () { @@ -336,34 +336,34 @@ var glo_c_public = (function () { glo_c_public.prototype.f1 = function () { }; return glo_c_public; -})(); +}()); exports.glo_c_public = glo_c_public; var glo_c_private = (function () { function glo_c_private() { } return glo_c_private; -})(); +}()); var glo_C1_private = (function (_super) { __extends(glo_C1_private, _super); function glo_C1_private() { _super.apply(this, arguments); } return glo_C1_private; -})(glo_c_public); +}(glo_c_public)); var glo_C2_private = (function (_super) { __extends(glo_C2_private, _super); function glo_C2_private() { _super.apply(this, arguments); } return glo_C2_private; -})(glo_c_private); +}(glo_c_private)); var glo_C3_public = (function (_super) { __extends(glo_C3_public, _super); function glo_C3_public() { _super.apply(this, arguments); } return glo_C3_public; -})(glo_c_public); +}(glo_c_public)); exports.glo_C3_public = glo_C3_public; var glo_C4_public = (function (_super) { __extends(glo_C4_public, _super); @@ -371,29 +371,29 @@ var glo_C4_public = (function (_super) { _super.apply(this, arguments); } return glo_C4_public; -})(glo_c_private); +}(glo_c_private)); exports.glo_C4_public = glo_C4_public; var glo_C5_private = (function () { function glo_C5_private() { } return glo_C5_private; -})(); +}()); var glo_C6_private = (function () { function glo_C6_private() { } return glo_C6_private; -})(); +}()); var glo_C7_public = (function () { function glo_C7_public() { } return glo_C7_public; -})(); +}()); exports.glo_C7_public = glo_C7_public; var glo_C8_public = (function () { function glo_C8_public() { } return glo_C8_public; -})(); +}()); exports.glo_C8_public = glo_C8_public; var glo_C9_private = (function (_super) { __extends(glo_C9_private, _super); @@ -401,21 +401,21 @@ var glo_C9_private = (function (_super) { _super.apply(this, arguments); } return glo_C9_private; -})(glo_c_public); +}(glo_c_public)); var glo_C10_private = (function (_super) { __extends(glo_C10_private, _super); function glo_C10_private() { _super.apply(this, arguments); } return glo_C10_private; -})(glo_c_private); +}(glo_c_private)); var glo_C11_public = (function (_super) { __extends(glo_C11_public, _super); function glo_C11_public() { _super.apply(this, arguments); } return glo_C11_public; -})(glo_c_public); +}(glo_c_public)); exports.glo_C11_public = glo_C11_public; var glo_C12_public = (function (_super) { __extends(glo_C12_public, _super); @@ -423,5 +423,5 @@ var glo_C12_public = (function (_super) { _super.apply(this, arguments); } return glo_C12_public; -})(glo_c_private); +}(glo_c_private)); exports.glo_C12_public = glo_C12_public; diff --git a/tests/baselines/reference/privacyClassExtendsClauseDeclFile.js b/tests/baselines/reference/privacyClassExtendsClauseDeclFile.js index 4efc6e12b16..e2bb58781de 100644 --- a/tests/baselines/reference/privacyClassExtendsClauseDeclFile.js +++ b/tests/baselines/reference/privacyClassExtendsClauseDeclFile.js @@ -112,34 +112,34 @@ var publicModule; publicClassInPublicModule.prototype.f1 = function () { }; return publicClassInPublicModule; - })(); + }()); publicModule.publicClassInPublicModule = publicClassInPublicModule; var privateClassInPublicModule = (function () { function privateClassInPublicModule() { } return privateClassInPublicModule; - })(); + }()); var privateClassExtendingPublicClassInModule = (function (_super) { __extends(privateClassExtendingPublicClassInModule, _super); function privateClassExtendingPublicClassInModule() { _super.apply(this, arguments); } return privateClassExtendingPublicClassInModule; - })(publicClassInPublicModule); + }(publicClassInPublicModule)); var privateClassExtendingPrivateClassInModule = (function (_super) { __extends(privateClassExtendingPrivateClassInModule, _super); function privateClassExtendingPrivateClassInModule() { _super.apply(this, arguments); } return privateClassExtendingPrivateClassInModule; - })(privateClassInPublicModule); + }(privateClassInPublicModule)); var publicClassExtendingPublicClassInModule = (function (_super) { __extends(publicClassExtendingPublicClassInModule, _super); function publicClassExtendingPublicClassInModule() { _super.apply(this, arguments); } return publicClassExtendingPublicClassInModule; - })(publicClassInPublicModule); + }(publicClassInPublicModule)); publicModule.publicClassExtendingPublicClassInModule = publicClassExtendingPublicClassInModule; var publicClassExtendingPrivateClassInModule = (function (_super) { __extends(publicClassExtendingPrivateClassInModule, _super); @@ -147,7 +147,7 @@ var publicModule; _super.apply(this, arguments); } return publicClassExtendingPrivateClassInModule; - })(privateClassInPublicModule); + }(privateClassInPublicModule)); publicModule.publicClassExtendingPrivateClassInModule = publicClassExtendingPrivateClassInModule; var privateClassExtendingFromPrivateModuleClass = (function (_super) { __extends(privateClassExtendingFromPrivateModuleClass, _super); @@ -155,14 +155,14 @@ var publicModule; _super.apply(this, arguments); } return privateClassExtendingFromPrivateModuleClass; - })(privateModule.publicClassInPrivateModule); + }(privateModule.publicClassInPrivateModule)); var publicClassExtendingFromPrivateModuleClass = (function (_super) { __extends(publicClassExtendingFromPrivateModuleClass, _super); function publicClassExtendingFromPrivateModuleClass() { _super.apply(this, arguments); } return publicClassExtendingFromPrivateModuleClass; - })(privateModule.publicClassInPrivateModule); + }(privateModule.publicClassInPrivateModule)); publicModule.publicClassExtendingFromPrivateModuleClass = publicClassExtendingFromPrivateModuleClass; })(publicModule = exports.publicModule || (exports.publicModule = {})); var privateModule; @@ -173,34 +173,34 @@ var privateModule; publicClassInPrivateModule.prototype.f1 = function () { }; return publicClassInPrivateModule; - })(); + }()); privateModule.publicClassInPrivateModule = publicClassInPrivateModule; var privateClassInPrivateModule = (function () { function privateClassInPrivateModule() { } return privateClassInPrivateModule; - })(); + }()); var privateClassExtendingPublicClassInModule = (function (_super) { __extends(privateClassExtendingPublicClassInModule, _super); function privateClassExtendingPublicClassInModule() { _super.apply(this, arguments); } return privateClassExtendingPublicClassInModule; - })(publicClassInPrivateModule); + }(publicClassInPrivateModule)); var privateClassExtendingPrivateClassInModule = (function (_super) { __extends(privateClassExtendingPrivateClassInModule, _super); function privateClassExtendingPrivateClassInModule() { _super.apply(this, arguments); } return privateClassExtendingPrivateClassInModule; - })(privateClassInPrivateModule); + }(privateClassInPrivateModule)); var publicClassExtendingPublicClassInModule = (function (_super) { __extends(publicClassExtendingPublicClassInModule, _super); function publicClassExtendingPublicClassInModule() { _super.apply(this, arguments); } return publicClassExtendingPublicClassInModule; - })(publicClassInPrivateModule); + }(publicClassInPrivateModule)); privateModule.publicClassExtendingPublicClassInModule = publicClassExtendingPublicClassInModule; var publicClassExtendingPrivateClassInModule = (function (_super) { __extends(publicClassExtendingPrivateClassInModule, _super); @@ -208,7 +208,7 @@ var privateModule; _super.apply(this, arguments); } return publicClassExtendingPrivateClassInModule; - })(privateClassInPrivateModule); + }(privateClassInPrivateModule)); privateModule.publicClassExtendingPrivateClassInModule = publicClassExtendingPrivateClassInModule; var privateClassExtendingFromPrivateModuleClass = (function (_super) { __extends(privateClassExtendingFromPrivateModuleClass, _super); @@ -216,14 +216,14 @@ var privateModule; _super.apply(this, arguments); } return privateClassExtendingFromPrivateModuleClass; - })(privateModule.publicClassInPrivateModule); + }(privateModule.publicClassInPrivateModule)); var publicClassExtendingFromPrivateModuleClass = (function (_super) { __extends(publicClassExtendingFromPrivateModuleClass, _super); function publicClassExtendingFromPrivateModuleClass() { _super.apply(this, arguments); } return publicClassExtendingFromPrivateModuleClass; - })(privateModule.publicClassInPrivateModule); + }(privateModule.publicClassInPrivateModule)); privateModule.publicClassExtendingFromPrivateModuleClass = publicClassExtendingFromPrivateModuleClass; })(privateModule || (privateModule = {})); var publicClass = (function () { @@ -232,34 +232,34 @@ var publicClass = (function () { publicClass.prototype.f1 = function () { }; return publicClass; -})(); +}()); exports.publicClass = publicClass; var privateClass = (function () { function privateClass() { } return privateClass; -})(); +}()); var privateClassExtendingPublicClass = (function (_super) { __extends(privateClassExtendingPublicClass, _super); function privateClassExtendingPublicClass() { _super.apply(this, arguments); } return privateClassExtendingPublicClass; -})(publicClass); +}(publicClass)); var privateClassExtendingPrivateClassInModule = (function (_super) { __extends(privateClassExtendingPrivateClassInModule, _super); function privateClassExtendingPrivateClassInModule() { _super.apply(this, arguments); } return privateClassExtendingPrivateClassInModule; -})(privateClass); +}(privateClass)); var publicClassExtendingPublicClass = (function (_super) { __extends(publicClassExtendingPublicClass, _super); function publicClassExtendingPublicClass() { _super.apply(this, arguments); } return publicClassExtendingPublicClass; -})(publicClass); +}(publicClass)); exports.publicClassExtendingPublicClass = publicClassExtendingPublicClass; var publicClassExtendingPrivateClass = (function (_super) { __extends(publicClassExtendingPrivateClass, _super); @@ -267,7 +267,7 @@ var publicClassExtendingPrivateClass = (function (_super) { _super.apply(this, arguments); } return publicClassExtendingPrivateClass; -})(privateClass); +}(privateClass)); exports.publicClassExtendingPrivateClass = publicClassExtendingPrivateClass; var privateClassExtendingFromPrivateModuleClass = (function (_super) { __extends(privateClassExtendingFromPrivateModuleClass, _super); @@ -275,14 +275,14 @@ var privateClassExtendingFromPrivateModuleClass = (function (_super) { _super.apply(this, arguments); } return privateClassExtendingFromPrivateModuleClass; -})(privateModule.publicClassInPrivateModule); +}(privateModule.publicClassInPrivateModule)); var publicClassExtendingFromPrivateModuleClass = (function (_super) { __extends(publicClassExtendingFromPrivateModuleClass, _super); function publicClassExtendingFromPrivateModuleClass() { _super.apply(this, arguments); } return publicClassExtendingFromPrivateModuleClass; -})(privateModule.publicClassInPrivateModule); +}(privateModule.publicClassInPrivateModule)); exports.publicClassExtendingFromPrivateModuleClass = publicClassExtendingFromPrivateModuleClass; //// [privacyClassExtendsClauseDeclFile_GlobalFile.js] var __extends = (this && this.__extends) || function (d, b) { @@ -298,34 +298,34 @@ var publicModuleInGlobal; publicClassInPublicModule.prototype.f1 = function () { }; return publicClassInPublicModule; - })(); + }()); publicModuleInGlobal.publicClassInPublicModule = publicClassInPublicModule; var privateClassInPublicModule = (function () { function privateClassInPublicModule() { } return privateClassInPublicModule; - })(); + }()); var privateClassExtendingPublicClassInModule = (function (_super) { __extends(privateClassExtendingPublicClassInModule, _super); function privateClassExtendingPublicClassInModule() { _super.apply(this, arguments); } return privateClassExtendingPublicClassInModule; - })(publicClassInPublicModule); + }(publicClassInPublicModule)); var privateClassExtendingPrivateClassInModule = (function (_super) { __extends(privateClassExtendingPrivateClassInModule, _super); function privateClassExtendingPrivateClassInModule() { _super.apply(this, arguments); } return privateClassExtendingPrivateClassInModule; - })(privateClassInPublicModule); + }(privateClassInPublicModule)); var publicClassExtendingPublicClassInModule = (function (_super) { __extends(publicClassExtendingPublicClassInModule, _super); function publicClassExtendingPublicClassInModule() { _super.apply(this, arguments); } return publicClassExtendingPublicClassInModule; - })(publicClassInPublicModule); + }(publicClassInPublicModule)); publicModuleInGlobal.publicClassExtendingPublicClassInModule = publicClassExtendingPublicClassInModule; var publicClassExtendingPrivateClassInModule = (function (_super) { __extends(publicClassExtendingPrivateClassInModule, _super); @@ -333,18 +333,18 @@ var publicModuleInGlobal; _super.apply(this, arguments); } return publicClassExtendingPrivateClassInModule; - })(privateClassInPublicModule); + }(privateClassInPublicModule)); publicModuleInGlobal.publicClassExtendingPrivateClassInModule = publicClassExtendingPrivateClassInModule; })(publicModuleInGlobal || (publicModuleInGlobal = {})); var publicClassInGlobal = (function () { function publicClassInGlobal() { } return publicClassInGlobal; -})(); +}()); var publicClassExtendingPublicClassInGlobal = (function (_super) { __extends(publicClassExtendingPublicClassInGlobal, _super); function publicClassExtendingPublicClassInGlobal() { _super.apply(this, arguments); } return publicClassExtendingPublicClassInGlobal; -})(publicClassInGlobal); +}(publicClassInGlobal)); diff --git a/tests/baselines/reference/privacyClassImplementsClauseDeclFile.js b/tests/baselines/reference/privacyClassImplementsClauseDeclFile.js index 74f1ec1bec6..15de9a16674 100644 --- a/tests/baselines/reference/privacyClassImplementsClauseDeclFile.js +++ b/tests/baselines/reference/privacyClassImplementsClauseDeclFile.js @@ -102,40 +102,40 @@ var publicModule; function privateClassImplementingPublicInterfaceInModule() { } return privateClassImplementingPublicInterfaceInModule; - })(); + }()); var privateClassImplementingPrivateInterfaceInModule = (function () { function privateClassImplementingPrivateInterfaceInModule() { } return privateClassImplementingPrivateInterfaceInModule; - })(); + }()); var publicClassImplementingPublicInterfaceInModule = (function () { function publicClassImplementingPublicInterfaceInModule() { } return publicClassImplementingPublicInterfaceInModule; - })(); + }()); publicModule.publicClassImplementingPublicInterfaceInModule = publicClassImplementingPublicInterfaceInModule; var publicClassImplementingPrivateInterfaceInModule = (function () { function publicClassImplementingPrivateInterfaceInModule() { } return publicClassImplementingPrivateInterfaceInModule; - })(); + }()); publicModule.publicClassImplementingPrivateInterfaceInModule = publicClassImplementingPrivateInterfaceInModule; var privateClassImplementingFromPrivateModuleInterface = (function () { function privateClassImplementingFromPrivateModuleInterface() { } return privateClassImplementingFromPrivateModuleInterface; - })(); + }()); var publicClassImplementingFromPrivateModuleInterface = (function () { function publicClassImplementingFromPrivateModuleInterface() { } return publicClassImplementingFromPrivateModuleInterface; - })(); + }()); publicModule.publicClassImplementingFromPrivateModuleInterface = publicClassImplementingFromPrivateModuleInterface; var publicClassImplementingPrivateAndPublicInterface = (function () { function publicClassImplementingPrivateAndPublicInterface() { } return publicClassImplementingPrivateAndPublicInterface; - })(); + }()); publicModule.publicClassImplementingPrivateAndPublicInterface = publicClassImplementingPrivateAndPublicInterface; })(publicModule = exports.publicModule || (exports.publicModule = {})); var privateModule; @@ -144,68 +144,68 @@ var privateModule; function privateClassImplementingPublicInterfaceInModule() { } return privateClassImplementingPublicInterfaceInModule; - })(); + }()); var privateClassImplementingPrivateInterfaceInModule = (function () { function privateClassImplementingPrivateInterfaceInModule() { } return privateClassImplementingPrivateInterfaceInModule; - })(); + }()); var publicClassImplementingPublicInterfaceInModule = (function () { function publicClassImplementingPublicInterfaceInModule() { } return publicClassImplementingPublicInterfaceInModule; - })(); + }()); privateModule.publicClassImplementingPublicInterfaceInModule = publicClassImplementingPublicInterfaceInModule; var publicClassImplementingPrivateInterfaceInModule = (function () { function publicClassImplementingPrivateInterfaceInModule() { } return publicClassImplementingPrivateInterfaceInModule; - })(); + }()); privateModule.publicClassImplementingPrivateInterfaceInModule = publicClassImplementingPrivateInterfaceInModule; var privateClassImplementingFromPrivateModuleInterface = (function () { function privateClassImplementingFromPrivateModuleInterface() { } return privateClassImplementingFromPrivateModuleInterface; - })(); + }()); var publicClassImplementingFromPrivateModuleInterface = (function () { function publicClassImplementingFromPrivateModuleInterface() { } return publicClassImplementingFromPrivateModuleInterface; - })(); + }()); privateModule.publicClassImplementingFromPrivateModuleInterface = publicClassImplementingFromPrivateModuleInterface; })(privateModule || (privateModule = {})); var privateClassImplementingPublicInterface = (function () { function privateClassImplementingPublicInterface() { } return privateClassImplementingPublicInterface; -})(); +}()); var privateClassImplementingPrivateInterfaceInModule = (function () { function privateClassImplementingPrivateInterfaceInModule() { } return privateClassImplementingPrivateInterfaceInModule; -})(); +}()); var publicClassImplementingPublicInterface = (function () { function publicClassImplementingPublicInterface() { } return publicClassImplementingPublicInterface; -})(); +}()); exports.publicClassImplementingPublicInterface = publicClassImplementingPublicInterface; var publicClassImplementingPrivateInterface = (function () { function publicClassImplementingPrivateInterface() { } return publicClassImplementingPrivateInterface; -})(); +}()); exports.publicClassImplementingPrivateInterface = publicClassImplementingPrivateInterface; var privateClassImplementingFromPrivateModuleInterface = (function () { function privateClassImplementingFromPrivateModuleInterface() { } return privateClassImplementingFromPrivateModuleInterface; -})(); +}()); var publicClassImplementingFromPrivateModuleInterface = (function () { function publicClassImplementingFromPrivateModuleInterface() { } return publicClassImplementingFromPrivateModuleInterface; -})(); +}()); exports.publicClassImplementingFromPrivateModuleInterface = publicClassImplementingFromPrivateModuleInterface; //// [privacyClassImplementsClauseDeclFile_GlobalFile.js] var publicModuleInGlobal; @@ -214,27 +214,27 @@ var publicModuleInGlobal; function privateClassImplementingPublicInterfaceInModule() { } return privateClassImplementingPublicInterfaceInModule; - })(); + }()); var privateClassImplementingPrivateInterfaceInModule = (function () { function privateClassImplementingPrivateInterfaceInModule() { } return privateClassImplementingPrivateInterfaceInModule; - })(); + }()); var publicClassImplementingPublicInterfaceInModule = (function () { function publicClassImplementingPublicInterfaceInModule() { } return publicClassImplementingPublicInterfaceInModule; - })(); + }()); publicModuleInGlobal.publicClassImplementingPublicInterfaceInModule = publicClassImplementingPublicInterfaceInModule; var publicClassImplementingPrivateInterfaceInModule = (function () { function publicClassImplementingPrivateInterfaceInModule() { } return publicClassImplementingPrivateInterfaceInModule; - })(); + }()); publicModuleInGlobal.publicClassImplementingPrivateInterfaceInModule = publicClassImplementingPrivateInterfaceInModule; })(publicModuleInGlobal || (publicModuleInGlobal = {})); var publicClassImplementingPublicInterfaceInGlobal = (function () { function publicClassImplementingPublicInterfaceInGlobal() { } return publicClassImplementingPublicInterfaceInGlobal; -})(); +}()); diff --git a/tests/baselines/reference/privacyFunc.js b/tests/baselines/reference/privacyFunc.js index d822e496946..b9c0e8e13c9 100644 --- a/tests/baselines/reference/privacyFunc.js +++ b/tests/baselines/reference/privacyFunc.js @@ -237,13 +237,13 @@ var m1; C1_public.prototype.f1 = function () { }; return C1_public; - })(); + }()); m1.C1_public = C1_public; var C2_private = (function () { function C2_private() { } return C2_private; - })(); + }()); var C3_public = (function () { function C3_public(m1_c3_c1_2) { } @@ -280,7 +280,7 @@ var m1; return new C2_private(); //error }; return C3_public; - })(); + }()); m1.C3_public = C3_public; var C4_private = (function () { function C4_private(m1_c4_c1_2) { @@ -318,29 +318,29 @@ var m1; return new C2_private(); }; return C4_private; - })(); + }()); var C5_public = (function () { function C5_public(m1_c5_c) { } return C5_public; - })(); + }()); m1.C5_public = C5_public; var C6_private = (function () { function C6_private(m1_c6_c) { } return C6_private; - })(); + }()); var C7_public = (function () { function C7_public(m1_c7_c) { } return C7_public; - })(); + }()); m1.C7_public = C7_public; var C8_private = (function () { function C8_private(m1_c8_c) { } return C8_private; - })(); + }()); function f1_public(m1_f1_arg) { } function f2_public(m1_f2_arg) { @@ -384,7 +384,7 @@ var C6_public = (function () { function C6_public() { } return C6_public; -})(); +}()); var C7_public = (function () { function C7_public(c7_c1_2) { } @@ -405,12 +405,12 @@ var C7_public = (function () { return new C6_public(); }; return C7_public; -})(); +}()); var C9_public = (function () { function C9_public(c9_c) { } return C9_public; -})(); +}()); function f4_public(f4_arg) { } function f6_public() { diff --git a/tests/baselines/reference/privacyFunctionCannotNameParameterTypeDeclFile.js b/tests/baselines/reference/privacyFunctionCannotNameParameterTypeDeclFile.js index 6f567ec3bd0..d8bfef7060e 100644 --- a/tests/baselines/reference/privacyFunctionCannotNameParameterTypeDeclFile.js +++ b/tests/baselines/reference/privacyFunctionCannotNameParameterTypeDeclFile.js @@ -164,7 +164,7 @@ var Widget1 = (function () { this.name = 'one'; } return Widget1; -})(); +}()); exports.Widget1 = Widget1; function createWidget1() { return new Widget1(); @@ -177,7 +177,7 @@ var SpecializedWidget; this.name = 'one'; } return Widget2; - })(); + }()); SpecializedWidget.Widget2 = Widget2; function createWidget2() { return new Widget2(); @@ -229,7 +229,7 @@ var publicClassWithWithPrivateParmeterTypes = (function () { if (param === void 0) { param = exporter.createExportedWidget1(); } }; return publicClassWithWithPrivateParmeterTypes; -})(); +}()); exports.publicClassWithWithPrivateParmeterTypes = publicClassWithWithPrivateParmeterTypes; var publicClassWithWithPrivateParmeterTypes1 = (function () { function publicClassWithWithPrivateParmeterTypes1(param, param1, param2) { @@ -252,7 +252,7 @@ var publicClassWithWithPrivateParmeterTypes1 = (function () { if (param === void 0) { param = exporter.createExportedWidget3(); } }; return publicClassWithWithPrivateParmeterTypes1; -})(); +}()); exports.publicClassWithWithPrivateParmeterTypes1 = publicClassWithWithPrivateParmeterTypes1; var privateClassWithWithPrivateParmeterTypes = (function () { function privateClassWithWithPrivateParmeterTypes(param, param1, param2) { @@ -275,7 +275,7 @@ var privateClassWithWithPrivateParmeterTypes = (function () { if (param === void 0) { param = exporter.createExportedWidget1(); } }; return privateClassWithWithPrivateParmeterTypes; -})(); +}()); var privateClassWithWithPrivateParmeterTypes2 = (function () { function privateClassWithWithPrivateParmeterTypes2(param, param1, param2) { if (param === void 0) { param = exporter.createExportedWidget3(); } @@ -297,7 +297,7 @@ var privateClassWithWithPrivateParmeterTypes2 = (function () { if (param === void 0) { param = exporter.createExportedWidget3(); } }; return privateClassWithWithPrivateParmeterTypes2; -})(); +}()); function publicFunctionWithPrivateParmeterTypes(param) { if (param === void 0) { param = exporter.createExportedWidget1(); } } @@ -327,7 +327,7 @@ var publicClassWithPrivateModuleParameterTypes = (function () { if (param === void 0) { param = exporter.createExportedWidget2(); } }; return publicClassWithPrivateModuleParameterTypes; -})(); +}()); exports.publicClassWithPrivateModuleParameterTypes = publicClassWithPrivateModuleParameterTypes; var publicClassWithPrivateModuleParameterTypes2 = (function () { function publicClassWithPrivateModuleParameterTypes2(param, param1, param2) { @@ -344,7 +344,7 @@ var publicClassWithPrivateModuleParameterTypes2 = (function () { if (param === void 0) { param = exporter.createExportedWidget4(); } }; return publicClassWithPrivateModuleParameterTypes2; -})(); +}()); exports.publicClassWithPrivateModuleParameterTypes2 = publicClassWithPrivateModuleParameterTypes2; function publicFunctionWithPrivateModuleParameterTypes(param) { if (param === void 0) { param = exporter.createExportedWidget2(); } @@ -369,7 +369,7 @@ var privateClassWithPrivateModuleParameterTypes = (function () { if (param === void 0) { param = exporter.createExportedWidget2(); } }; return privateClassWithPrivateModuleParameterTypes; -})(); +}()); var privateClassWithPrivateModuleParameterTypes1 = (function () { function privateClassWithPrivateModuleParameterTypes1(param, param1, param2) { if (param === void 0) { param = exporter.createExportedWidget4(); } @@ -385,7 +385,7 @@ var privateClassWithPrivateModuleParameterTypes1 = (function () { if (param === void 0) { param = exporter.createExportedWidget4(); } }; return privateClassWithPrivateModuleParameterTypes1; -})(); +}()); function privateFunctionWithPrivateModuleParameterTypes(param) { if (param === void 0) { param = exporter.createExportedWidget2(); } } diff --git a/tests/baselines/reference/privacyFunctionCannotNameReturnTypeDeclFile.js b/tests/baselines/reference/privacyFunctionCannotNameReturnTypeDeclFile.js index 1de0f2b6642..3b1ffb487ff 100644 --- a/tests/baselines/reference/privacyFunctionCannotNameReturnTypeDeclFile.js +++ b/tests/baselines/reference/privacyFunctionCannotNameReturnTypeDeclFile.js @@ -171,7 +171,7 @@ var Widget1 = (function () { this.name = 'one'; } return Widget1; -})(); +}()); exports.Widget1 = Widget1; function createWidget1() { return new Widget1(); @@ -184,7 +184,7 @@ var SpecializedWidget; this.name = 'one'; } return Widget2; - })(); + }()); SpecializedWidget.Widget2 = Widget2; function createWidget2() { return new Widget2(); @@ -249,7 +249,7 @@ var publicClassWithWithPrivateParmeterTypes = (function () { ; }; return publicClassWithWithPrivateParmeterTypes; -})(); +}()); exports.publicClassWithWithPrivateParmeterTypes = publicClassWithWithPrivateParmeterTypes; var privateClassWithWithPrivateParmeterTypes = (function () { function privateClassWithWithPrivateParmeterTypes() { @@ -285,7 +285,7 @@ var privateClassWithWithPrivateParmeterTypes = (function () { ; }; return privateClassWithWithPrivateParmeterTypes; -})(); +}()); function publicFunctionWithPrivateParmeterTypes() { return exporter.createExportedWidget1(); } @@ -316,7 +316,7 @@ var publicClassWithPrivateModuleReturnTypes = (function () { return exporter.createExportedWidget4(); }; return publicClassWithPrivateModuleReturnTypes; -})(); +}()); exports.publicClassWithPrivateModuleReturnTypes = publicClassWithPrivateModuleReturnTypes; function publicFunctionWithPrivateModuleReturnTypes() { return exporter.createExportedWidget2(); @@ -342,7 +342,7 @@ var privateClassWithPrivateModuleReturnTypes = (function () { return exporter.createExportedWidget4(); }; return privateClassWithPrivateModuleReturnTypes; -})(); +}()); function privateFunctionWithPrivateModuleReturnTypes() { return exporter.createExportedWidget2(); } diff --git a/tests/baselines/reference/privacyFunctionParameterDeclFile.js b/tests/baselines/reference/privacyFunctionParameterDeclFile.js index e02c221d333..e8fff791a0e 100644 --- a/tests/baselines/reference/privacyFunctionParameterDeclFile.js +++ b/tests/baselines/reference/privacyFunctionParameterDeclFile.js @@ -692,12 +692,12 @@ var privateClass = (function () { function privateClass() { } return privateClass; -})(); +}()); var publicClass = (function () { function publicClass() { } return publicClass; -})(); +}()); exports.publicClass = publicClass; var publicClassWithWithPrivateParmeterTypes = (function () { function publicClassWithWithPrivateParmeterTypes(param, param1, param2) { @@ -713,7 +713,7 @@ var publicClassWithWithPrivateParmeterTypes = (function () { publicClassWithWithPrivateParmeterTypes.prototype.myPrivateMethod = function (param) { }; return publicClassWithWithPrivateParmeterTypes; -})(); +}()); exports.publicClassWithWithPrivateParmeterTypes = publicClassWithWithPrivateParmeterTypes; var publicClassWithWithPublicParmeterTypes = (function () { function publicClassWithWithPublicParmeterTypes(param, param1, param2) { @@ -729,7 +729,7 @@ var publicClassWithWithPublicParmeterTypes = (function () { publicClassWithWithPublicParmeterTypes.prototype.myPrivateMethod = function (param) { }; return publicClassWithWithPublicParmeterTypes; -})(); +}()); exports.publicClassWithWithPublicParmeterTypes = publicClassWithWithPublicParmeterTypes; var privateClassWithWithPrivateParmeterTypes = (function () { function privateClassWithWithPrivateParmeterTypes(param, param1, param2) { @@ -745,7 +745,7 @@ var privateClassWithWithPrivateParmeterTypes = (function () { privateClassWithWithPrivateParmeterTypes.prototype.myPrivateMethod = function (param) { }; return privateClassWithWithPrivateParmeterTypes; -})(); +}()); var privateClassWithWithPublicParmeterTypes = (function () { function privateClassWithWithPublicParmeterTypes(param, param1, param2) { this.param1 = param1; @@ -760,7 +760,7 @@ var privateClassWithWithPublicParmeterTypes = (function () { privateClassWithWithPublicParmeterTypes.prototype.myPrivateMethod = function (param) { }; return privateClassWithWithPublicParmeterTypes; -})(); +}()); function publicFunctionWithPrivateParmeterTypes(param) { } exports.publicFunctionWithPrivateParmeterTypes = publicFunctionWithPrivateParmeterTypes; @@ -781,7 +781,7 @@ var publicClassWithPrivateModuleParameterTypes = (function () { publicClassWithPrivateModuleParameterTypes.prototype.myPublicMethod = function (param) { }; return publicClassWithPrivateModuleParameterTypes; -})(); +}()); exports.publicClassWithPrivateModuleParameterTypes = publicClassWithPrivateModuleParameterTypes; function publicFunctionWithPrivateModuleParameterTypes(param) { } @@ -796,7 +796,7 @@ var privateClassWithPrivateModuleParameterTypes = (function () { privateClassWithPrivateModuleParameterTypes.prototype.myPublicMethod = function (param) { }; return privateClassWithPrivateModuleParameterTypes; -})(); +}()); function privateFunctionWithPrivateModuleParameterTypes(param) { } var publicModule; @@ -805,12 +805,12 @@ var publicModule; function privateClass() { } return privateClass; - })(); + }()); var publicClass = (function () { function publicClass() { } return publicClass; - })(); + }()); publicModule.publicClass = publicClass; var publicClassWithWithPrivateParmeterTypes = (function () { function publicClassWithWithPrivateParmeterTypes(param, param1, param2) { @@ -826,7 +826,7 @@ var publicModule; publicClassWithWithPrivateParmeterTypes.prototype.myPrivateMethod = function (param) { }; return publicClassWithWithPrivateParmeterTypes; - })(); + }()); publicModule.publicClassWithWithPrivateParmeterTypes = publicClassWithWithPrivateParmeterTypes; var publicClassWithWithPublicParmeterTypes = (function () { function publicClassWithWithPublicParmeterTypes(param, param1, param2) { @@ -842,7 +842,7 @@ var publicModule; publicClassWithWithPublicParmeterTypes.prototype.myPrivateMethod = function (param) { }; return publicClassWithWithPublicParmeterTypes; - })(); + }()); publicModule.publicClassWithWithPublicParmeterTypes = publicClassWithWithPublicParmeterTypes; var privateClassWithWithPrivateParmeterTypes = (function () { function privateClassWithWithPrivateParmeterTypes(param, param1, param2) { @@ -858,7 +858,7 @@ var publicModule; privateClassWithWithPrivateParmeterTypes.prototype.myPrivateMethod = function (param) { }; return privateClassWithWithPrivateParmeterTypes; - })(); + }()); var privateClassWithWithPublicParmeterTypes = (function () { function privateClassWithWithPublicParmeterTypes(param, param1, param2) { this.param1 = param1; @@ -873,7 +873,7 @@ var publicModule; privateClassWithWithPublicParmeterTypes.prototype.myPrivateMethod = function (param) { }; return privateClassWithWithPublicParmeterTypes; - })(); + }()); function publicFunctionWithPrivateParmeterTypes(param) { } publicModule.publicFunctionWithPrivateParmeterTypes = publicFunctionWithPrivateParmeterTypes; @@ -894,7 +894,7 @@ var publicModule; publicClassWithPrivateModuleParameterTypes.prototype.myPublicMethod = function (param) { }; return publicClassWithPrivateModuleParameterTypes; - })(); + }()); publicModule.publicClassWithPrivateModuleParameterTypes = publicClassWithPrivateModuleParameterTypes; function publicFunctionWithPrivateModuleParameterTypes(param) { } @@ -909,7 +909,7 @@ var publicModule; privateClassWithPrivateModuleParameterTypes.prototype.myPublicMethod = function (param) { }; return privateClassWithPrivateModuleParameterTypes; - })(); + }()); function privateFunctionWithPrivateModuleParameterTypes(param) { } })(publicModule = exports.publicModule || (exports.publicModule = {})); @@ -919,12 +919,12 @@ var privateModule; function privateClass() { } return privateClass; - })(); + }()); var publicClass = (function () { function publicClass() { } return publicClass; - })(); + }()); privateModule.publicClass = publicClass; var publicClassWithWithPrivateParmeterTypes = (function () { function publicClassWithWithPrivateParmeterTypes(param, param1, param2) { @@ -940,7 +940,7 @@ var privateModule; publicClassWithWithPrivateParmeterTypes.prototype.myPrivateMethod = function (param) { }; return publicClassWithWithPrivateParmeterTypes; - })(); + }()); privateModule.publicClassWithWithPrivateParmeterTypes = publicClassWithWithPrivateParmeterTypes; var publicClassWithWithPublicParmeterTypes = (function () { function publicClassWithWithPublicParmeterTypes(param, param1, param2) { @@ -956,7 +956,7 @@ var privateModule; publicClassWithWithPublicParmeterTypes.prototype.myPrivateMethod = function (param) { }; return publicClassWithWithPublicParmeterTypes; - })(); + }()); privateModule.publicClassWithWithPublicParmeterTypes = publicClassWithWithPublicParmeterTypes; var privateClassWithWithPrivateParmeterTypes = (function () { function privateClassWithWithPrivateParmeterTypes(param, param1, param2) { @@ -972,7 +972,7 @@ var privateModule; privateClassWithWithPrivateParmeterTypes.prototype.myPrivateMethod = function (param) { }; return privateClassWithWithPrivateParmeterTypes; - })(); + }()); var privateClassWithWithPublicParmeterTypes = (function () { function privateClassWithWithPublicParmeterTypes(param, param1, param2) { this.param1 = param1; @@ -987,7 +987,7 @@ var privateModule; privateClassWithWithPublicParmeterTypes.prototype.myPrivateMethod = function (param) { }; return privateClassWithWithPublicParmeterTypes; - })(); + }()); function publicFunctionWithPrivateParmeterTypes(param) { } privateModule.publicFunctionWithPrivateParmeterTypes = publicFunctionWithPrivateParmeterTypes; @@ -1008,7 +1008,7 @@ var privateModule; publicClassWithPrivateModuleParameterTypes.prototype.myPublicMethod = function (param) { }; return publicClassWithPrivateModuleParameterTypes; - })(); + }()); privateModule.publicClassWithPrivateModuleParameterTypes = publicClassWithPrivateModuleParameterTypes; function publicFunctionWithPrivateModuleParameterTypes(param) { } @@ -1023,7 +1023,7 @@ var privateModule; privateClassWithPrivateModuleParameterTypes.prototype.myPublicMethod = function (param) { }; return privateClassWithPrivateModuleParameterTypes; - })(); + }()); function privateFunctionWithPrivateModuleParameterTypes(param) { } })(privateModule || (privateModule = {})); @@ -1032,7 +1032,7 @@ var publicClassInGlobal = (function () { function publicClassInGlobal() { } return publicClassInGlobal; -})(); +}()); var publicClassWithWithPublicParmeterTypesInGlobal = (function () { function publicClassWithWithPublicParmeterTypesInGlobal(param, param1, param2) { this.param1 = param1; @@ -1047,7 +1047,7 @@ var publicClassWithWithPublicParmeterTypesInGlobal = (function () { publicClassWithWithPublicParmeterTypesInGlobal.prototype.myPrivateMethod = function (param) { }; return publicClassWithWithPublicParmeterTypesInGlobal; -})(); +}()); function publicFunctionWithPublicParmeterTypesInGlobal(param) { } var publicModuleInGlobal; @@ -1056,12 +1056,12 @@ var publicModuleInGlobal; function privateClass() { } return privateClass; - })(); + }()); var publicClass = (function () { function publicClass() { } return publicClass; - })(); + }()); publicModuleInGlobal.publicClass = publicClass; var privateModule; (function (privateModule) { @@ -1069,12 +1069,12 @@ var publicModuleInGlobal; function privateClass() { } return privateClass; - })(); + }()); var publicClass = (function () { function publicClass() { } return publicClass; - })(); + }()); privateModule.publicClass = publicClass; var publicClassWithWithPrivateParmeterTypes = (function () { function publicClassWithWithPrivateParmeterTypes(param, param1, param2) { @@ -1090,7 +1090,7 @@ var publicModuleInGlobal; publicClassWithWithPrivateParmeterTypes.prototype.myPrivateMethod = function (param) { }; return publicClassWithWithPrivateParmeterTypes; - })(); + }()); privateModule.publicClassWithWithPrivateParmeterTypes = publicClassWithWithPrivateParmeterTypes; var publicClassWithWithPublicParmeterTypes = (function () { function publicClassWithWithPublicParmeterTypes(param, param1, param2) { @@ -1106,7 +1106,7 @@ var publicModuleInGlobal; publicClassWithWithPublicParmeterTypes.prototype.myPrivateMethod = function (param) { }; return publicClassWithWithPublicParmeterTypes; - })(); + }()); privateModule.publicClassWithWithPublicParmeterTypes = publicClassWithWithPublicParmeterTypes; var privateClassWithWithPrivateParmeterTypes = (function () { function privateClassWithWithPrivateParmeterTypes(param, param1, param2) { @@ -1122,7 +1122,7 @@ var publicModuleInGlobal; privateClassWithWithPrivateParmeterTypes.prototype.myPrivateMethod = function (param) { }; return privateClassWithWithPrivateParmeterTypes; - })(); + }()); var privateClassWithWithPublicParmeterTypes = (function () { function privateClassWithWithPublicParmeterTypes(param, param1, param2) { this.param1 = param1; @@ -1137,7 +1137,7 @@ var publicModuleInGlobal; privateClassWithWithPublicParmeterTypes.prototype.myPrivateMethod = function (param) { }; return privateClassWithWithPublicParmeterTypes; - })(); + }()); function publicFunctionWithPrivateParmeterTypes(param) { } privateModule.publicFunctionWithPrivateParmeterTypes = publicFunctionWithPrivateParmeterTypes; @@ -1158,7 +1158,7 @@ var publicModuleInGlobal; publicClassWithPrivateModuleParameterTypes.prototype.myPublicMethod = function (param) { }; return publicClassWithPrivateModuleParameterTypes; - })(); + }()); privateModule.publicClassWithPrivateModuleParameterTypes = publicClassWithPrivateModuleParameterTypes; function publicFunctionWithPrivateModuleParameterTypes(param) { } @@ -1173,7 +1173,7 @@ var publicModuleInGlobal; privateClassWithPrivateModuleParameterTypes.prototype.myPublicMethod = function (param) { }; return privateClassWithPrivateModuleParameterTypes; - })(); + }()); function privateFunctionWithPrivateModuleParameterTypes(param) { } })(privateModule || (privateModule = {})); @@ -1191,7 +1191,7 @@ var publicModuleInGlobal; publicClassWithWithPrivateParmeterTypes.prototype.myPrivateMethod = function (param) { }; return publicClassWithWithPrivateParmeterTypes; - })(); + }()); publicModuleInGlobal.publicClassWithWithPrivateParmeterTypes = publicClassWithWithPrivateParmeterTypes; var publicClassWithWithPublicParmeterTypes = (function () { function publicClassWithWithPublicParmeterTypes(param, param1, param2) { @@ -1207,7 +1207,7 @@ var publicModuleInGlobal; publicClassWithWithPublicParmeterTypes.prototype.myPrivateMethod = function (param) { }; return publicClassWithWithPublicParmeterTypes; - })(); + }()); publicModuleInGlobal.publicClassWithWithPublicParmeterTypes = publicClassWithWithPublicParmeterTypes; var privateClassWithWithPrivateParmeterTypes = (function () { function privateClassWithWithPrivateParmeterTypes(param, param1, param2) { @@ -1223,7 +1223,7 @@ var publicModuleInGlobal; privateClassWithWithPrivateParmeterTypes.prototype.myPrivateMethod = function (param) { }; return privateClassWithWithPrivateParmeterTypes; - })(); + }()); var privateClassWithWithPublicParmeterTypes = (function () { function privateClassWithWithPublicParmeterTypes(param, param1, param2) { this.param1 = param1; @@ -1238,7 +1238,7 @@ var publicModuleInGlobal; privateClassWithWithPublicParmeterTypes.prototype.myPrivateMethod = function (param) { }; return privateClassWithWithPublicParmeterTypes; - })(); + }()); function publicFunctionWithPrivateParmeterTypes(param) { } publicModuleInGlobal.publicFunctionWithPrivateParmeterTypes = publicFunctionWithPrivateParmeterTypes; @@ -1259,7 +1259,7 @@ var publicModuleInGlobal; publicClassWithPrivateModuleParameterTypes.prototype.myPublicMethod = function (param) { }; return publicClassWithPrivateModuleParameterTypes; - })(); + }()); publicModuleInGlobal.publicClassWithPrivateModuleParameterTypes = publicClassWithPrivateModuleParameterTypes; function publicFunctionWithPrivateModuleParameterTypes(param) { } @@ -1274,7 +1274,7 @@ var publicModuleInGlobal; privateClassWithPrivateModuleParameterTypes.prototype.myPublicMethod = function (param) { }; return privateClassWithPrivateModuleParameterTypes; - })(); + }()); function privateFunctionWithPrivateModuleParameterTypes(param) { } })(publicModuleInGlobal || (publicModuleInGlobal = {})); diff --git a/tests/baselines/reference/privacyFunctionReturnTypeDeclFile.js b/tests/baselines/reference/privacyFunctionReturnTypeDeclFile.js index b312578b7a3..d4265b1c352 100644 --- a/tests/baselines/reference/privacyFunctionReturnTypeDeclFile.js +++ b/tests/baselines/reference/privacyFunctionReturnTypeDeclFile.js @@ -1199,12 +1199,12 @@ var privateClass = (function () { function privateClass() { } return privateClass; -})(); +}()); var publicClass = (function () { function publicClass() { } return publicClass; -})(); +}()); exports.publicClass = publicClass; var publicClassWithWithPrivateParmeterTypes = (function () { function publicClassWithWithPrivateParmeterTypes() { @@ -1234,7 +1234,7 @@ var publicClassWithWithPrivateParmeterTypes = (function () { return new privateClass(); }; return publicClassWithWithPrivateParmeterTypes; -})(); +}()); exports.publicClassWithWithPrivateParmeterTypes = publicClassWithWithPrivateParmeterTypes; var publicClassWithWithPublicParmeterTypes = (function () { function publicClassWithWithPublicParmeterTypes() { @@ -1264,7 +1264,7 @@ var publicClassWithWithPublicParmeterTypes = (function () { return new publicClass(); }; return publicClassWithWithPublicParmeterTypes; -})(); +}()); exports.publicClassWithWithPublicParmeterTypes = publicClassWithWithPublicParmeterTypes; var privateClassWithWithPrivateParmeterTypes = (function () { function privateClassWithWithPrivateParmeterTypes() { @@ -1294,7 +1294,7 @@ var privateClassWithWithPrivateParmeterTypes = (function () { return new privateClass(); }; return privateClassWithWithPrivateParmeterTypes; -})(); +}()); var privateClassWithWithPublicParmeterTypes = (function () { function privateClassWithWithPublicParmeterTypes() { } @@ -1323,7 +1323,7 @@ var privateClassWithWithPublicParmeterTypes = (function () { return new publicClass(); }; return privateClassWithWithPublicParmeterTypes; -})(); +}()); function publicFunctionWithPrivateParmeterTypes() { return null; } @@ -1368,7 +1368,7 @@ var publicClassWithPrivateModuleParameterTypes = (function () { return new privateModule.publicClass(); }; return publicClassWithPrivateModuleParameterTypes; -})(); +}()); exports.publicClassWithPrivateModuleParameterTypes = publicClassWithPrivateModuleParameterTypes; function publicFunctionWithPrivateModuleParameterTypes() { return null; @@ -1394,7 +1394,7 @@ var privateClassWithPrivateModuleParameterTypes = (function () { return new privateModule.publicClass(); }; return privateClassWithPrivateModuleParameterTypes; -})(); +}()); function privateFunctionWithPrivateModuleParameterTypes() { return null; } @@ -1407,12 +1407,12 @@ var publicModule; function privateClass() { } return privateClass; - })(); + }()); var publicClass = (function () { function publicClass() { } return publicClass; - })(); + }()); publicModule.publicClass = publicClass; var publicClassWithWithPrivateParmeterTypes = (function () { function publicClassWithWithPrivateParmeterTypes() { @@ -1442,7 +1442,7 @@ var publicModule; return new privateClass(); }; return publicClassWithWithPrivateParmeterTypes; - })(); + }()); publicModule.publicClassWithWithPrivateParmeterTypes = publicClassWithWithPrivateParmeterTypes; var publicClassWithWithPublicParmeterTypes = (function () { function publicClassWithWithPublicParmeterTypes() { @@ -1472,7 +1472,7 @@ var publicModule; return new publicClass(); }; return publicClassWithWithPublicParmeterTypes; - })(); + }()); publicModule.publicClassWithWithPublicParmeterTypes = publicClassWithWithPublicParmeterTypes; var privateClassWithWithPrivateParmeterTypes = (function () { function privateClassWithWithPrivateParmeterTypes() { @@ -1502,7 +1502,7 @@ var publicModule; return new privateClass(); }; return privateClassWithWithPrivateParmeterTypes; - })(); + }()); var privateClassWithWithPublicParmeterTypes = (function () { function privateClassWithWithPublicParmeterTypes() { } @@ -1531,7 +1531,7 @@ var publicModule; return new publicClass(); }; return privateClassWithWithPublicParmeterTypes; - })(); + }()); function publicFunctionWithPrivateParmeterTypes() { return null; } @@ -1576,7 +1576,7 @@ var publicModule; return new privateModule.publicClass(); }; return publicClassWithPrivateModuleParameterTypes; - })(); + }()); publicModule.publicClassWithPrivateModuleParameterTypes = publicClassWithPrivateModuleParameterTypes; function publicFunctionWithPrivateModuleParameterTypes() { return null; @@ -1602,7 +1602,7 @@ var publicModule; return new privateModule.publicClass(); }; return privateClassWithPrivateModuleParameterTypes; - })(); + }()); function privateFunctionWithPrivateModuleParameterTypes() { return null; } @@ -1616,12 +1616,12 @@ var privateModule; function privateClass() { } return privateClass; - })(); + }()); var publicClass = (function () { function publicClass() { } return publicClass; - })(); + }()); privateModule.publicClass = publicClass; var publicClassWithWithPrivateParmeterTypes = (function () { function publicClassWithWithPrivateParmeterTypes() { @@ -1651,7 +1651,7 @@ var privateModule; return new privateClass(); }; return publicClassWithWithPrivateParmeterTypes; - })(); + }()); privateModule.publicClassWithWithPrivateParmeterTypes = publicClassWithWithPrivateParmeterTypes; var publicClassWithWithPublicParmeterTypes = (function () { function publicClassWithWithPublicParmeterTypes() { @@ -1681,7 +1681,7 @@ var privateModule; return new publicClass(); }; return publicClassWithWithPublicParmeterTypes; - })(); + }()); privateModule.publicClassWithWithPublicParmeterTypes = publicClassWithWithPublicParmeterTypes; var privateClassWithWithPrivateParmeterTypes = (function () { function privateClassWithWithPrivateParmeterTypes() { @@ -1711,7 +1711,7 @@ var privateModule; return new privateClass(); }; return privateClassWithWithPrivateParmeterTypes; - })(); + }()); var privateClassWithWithPublicParmeterTypes = (function () { function privateClassWithWithPublicParmeterTypes() { } @@ -1740,7 +1740,7 @@ var privateModule; return new publicClass(); }; return privateClassWithWithPublicParmeterTypes; - })(); + }()); function publicFunctionWithPrivateParmeterTypes() { return null; } @@ -1785,7 +1785,7 @@ var privateModule; return new privateModule.publicClass(); }; return publicClassWithPrivateModuleParameterTypes; - })(); + }()); privateModule.publicClassWithPrivateModuleParameterTypes = publicClassWithPrivateModuleParameterTypes; function publicFunctionWithPrivateModuleParameterTypes() { return null; @@ -1811,7 +1811,7 @@ var privateModule; return new privateModule.publicClass(); }; return privateClassWithPrivateModuleParameterTypes; - })(); + }()); function privateFunctionWithPrivateModuleParameterTypes() { return null; } @@ -1824,7 +1824,7 @@ var publicClassInGlobal = (function () { function publicClassInGlobal() { } return publicClassInGlobal; -})(); +}()); var publicClassWithWithPublicParmeterTypesInGlobal = (function () { function publicClassWithWithPublicParmeterTypesInGlobal() { } @@ -1853,7 +1853,7 @@ var publicClassWithWithPublicParmeterTypesInGlobal = (function () { return new publicClassInGlobal(); }; return publicClassWithWithPublicParmeterTypesInGlobal; -})(); +}()); function publicFunctionWithPublicParmeterTypesInGlobal() { return null; } @@ -1866,12 +1866,12 @@ var publicModuleInGlobal; function privateClass() { } return privateClass; - })(); + }()); var publicClass = (function () { function publicClass() { } return publicClass; - })(); + }()); publicModuleInGlobal.publicClass = publicClass; var privateModule; (function (privateModule) { @@ -1879,12 +1879,12 @@ var publicModuleInGlobal; function privateClass() { } return privateClass; - })(); + }()); var publicClass = (function () { function publicClass() { } return publicClass; - })(); + }()); privateModule.publicClass = publicClass; var publicClassWithWithPrivateParmeterTypes = (function () { function publicClassWithWithPrivateParmeterTypes() { @@ -1914,7 +1914,7 @@ var publicModuleInGlobal; return new privateClass(); }; return publicClassWithWithPrivateParmeterTypes; - })(); + }()); privateModule.publicClassWithWithPrivateParmeterTypes = publicClassWithWithPrivateParmeterTypes; var publicClassWithWithPublicParmeterTypes = (function () { function publicClassWithWithPublicParmeterTypes() { @@ -1944,7 +1944,7 @@ var publicModuleInGlobal; return new publicClass(); }; return publicClassWithWithPublicParmeterTypes; - })(); + }()); privateModule.publicClassWithWithPublicParmeterTypes = publicClassWithWithPublicParmeterTypes; var privateClassWithWithPrivateParmeterTypes = (function () { function privateClassWithWithPrivateParmeterTypes() { @@ -1974,7 +1974,7 @@ var publicModuleInGlobal; return new privateClass(); }; return privateClassWithWithPrivateParmeterTypes; - })(); + }()); var privateClassWithWithPublicParmeterTypes = (function () { function privateClassWithWithPublicParmeterTypes() { } @@ -2003,7 +2003,7 @@ var publicModuleInGlobal; return new publicClass(); }; return privateClassWithWithPublicParmeterTypes; - })(); + }()); function publicFunctionWithPrivateParmeterTypes() { return null; } @@ -2048,7 +2048,7 @@ var publicModuleInGlobal; return new privateModule.publicClass(); }; return publicClassWithPrivateModuleParameterTypes; - })(); + }()); privateModule.publicClassWithPrivateModuleParameterTypes = publicClassWithPrivateModuleParameterTypes; function publicFunctionWithPrivateModuleParameterTypes() { return null; @@ -2074,7 +2074,7 @@ var publicModuleInGlobal; return new privateModule.publicClass(); }; return privateClassWithPrivateModuleParameterTypes; - })(); + }()); function privateFunctionWithPrivateModuleParameterTypes() { return null; } @@ -2110,7 +2110,7 @@ var publicModuleInGlobal; return new privateClass(); }; return publicClassWithWithPrivateParmeterTypes; - })(); + }()); publicModuleInGlobal.publicClassWithWithPrivateParmeterTypes = publicClassWithWithPrivateParmeterTypes; var publicClassWithWithPublicParmeterTypes = (function () { function publicClassWithWithPublicParmeterTypes() { @@ -2140,7 +2140,7 @@ var publicModuleInGlobal; return new publicClass(); }; return publicClassWithWithPublicParmeterTypes; - })(); + }()); publicModuleInGlobal.publicClassWithWithPublicParmeterTypes = publicClassWithWithPublicParmeterTypes; var privateClassWithWithPrivateParmeterTypes = (function () { function privateClassWithWithPrivateParmeterTypes() { @@ -2170,7 +2170,7 @@ var publicModuleInGlobal; return new privateClass(); }; return privateClassWithWithPrivateParmeterTypes; - })(); + }()); var privateClassWithWithPublicParmeterTypes = (function () { function privateClassWithWithPublicParmeterTypes() { } @@ -2199,7 +2199,7 @@ var publicModuleInGlobal; return new publicClass(); }; return privateClassWithWithPublicParmeterTypes; - })(); + }()); function publicFunctionWithPrivateParmeterTypes() { return null; } @@ -2244,7 +2244,7 @@ var publicModuleInGlobal; return new privateModule.publicClass(); }; return publicClassWithPrivateModuleParameterTypes; - })(); + }()); publicModuleInGlobal.publicClassWithPrivateModuleParameterTypes = publicClassWithPrivateModuleParameterTypes; function publicFunctionWithPrivateModuleParameterTypes() { return null; @@ -2270,7 +2270,7 @@ var publicModuleInGlobal; return new privateModule.publicClass(); }; return privateClassWithPrivateModuleParameterTypes; - })(); + }()); function privateFunctionWithPrivateModuleParameterTypes() { return null; } diff --git a/tests/baselines/reference/privacyGetter.js b/tests/baselines/reference/privacyGetter.js index 95e3dda5643..37d89442e62 100644 --- a/tests/baselines/reference/privacyGetter.js +++ b/tests/baselines/reference/privacyGetter.js @@ -218,13 +218,13 @@ define(["require", "exports"], function (require, exports) { C1_public.prototype.f1 = function () { }; return C1_public; - })(); + }()); m1.C1_public = C1_public; var C2_private = (function () { function C2_private() { } return C2_private; - })(); + }()); var C3_public = (function () { function C3_public() { } @@ -265,7 +265,7 @@ define(["require", "exports"], function (require, exports) { configurable: true }); return C3_public; - })(); + }()); m1.C3_public = C3_public; var C4_private = (function () { function C4_private() { @@ -307,7 +307,7 @@ define(["require", "exports"], function (require, exports) { configurable: true }); return C4_private; - })(); + }()); })(m1 = exports.m1 || (exports.m1 = {})); var m2; (function (m2) { @@ -317,13 +317,13 @@ define(["require", "exports"], function (require, exports) { m2_C1_public.prototype.f1 = function () { }; return m2_C1_public; - })(); + }()); m2.m2_C1_public = m2_C1_public; var m2_C2_private = (function () { function m2_C2_private() { } return m2_C2_private; - })(); + }()); var m2_C3_public = (function () { function m2_C3_public() { } @@ -364,7 +364,7 @@ define(["require", "exports"], function (require, exports) { configurable: true }); return m2_C3_public; - })(); + }()); m2.m2_C3_public = m2_C3_public; var m2_C4_private = (function () { function m2_C4_private() { @@ -406,7 +406,7 @@ define(["require", "exports"], function (require, exports) { configurable: true }); return m2_C4_private; - })(); + }()); })(m2 || (m2 = {})); var C5_private = (function () { function C5_private() { @@ -414,12 +414,12 @@ define(["require", "exports"], function (require, exports) { C5_private.prototype.f = function () { }; return C5_private; - })(); + }()); var C6_public = (function () { function C6_public() { } return C6_public; - })(); + }()); exports.C6_public = C6_public; var C7_public = (function () { function C7_public() { @@ -461,7 +461,7 @@ define(["require", "exports"], function (require, exports) { configurable: true }); return C7_public; - })(); + }()); exports.C7_public = C7_public; var C8_private = (function () { function C8_private() { @@ -503,5 +503,5 @@ define(["require", "exports"], function (require, exports) { configurable: true }); return C8_private; - })(); + }()); }); diff --git a/tests/baselines/reference/privacyGloClass.js b/tests/baselines/reference/privacyGloClass.js index 01eff312739..e8c8c447cf9 100644 --- a/tests/baselines/reference/privacyGloClass.js +++ b/tests/baselines/reference/privacyGloClass.js @@ -74,34 +74,34 @@ var m1; m1_c_public.prototype.f1 = function () { }; return m1_c_public; - })(); + }()); m1.m1_c_public = m1_c_public; var m1_c_private = (function () { function m1_c_private() { } return m1_c_private; - })(); + }()); var m1_C1_private = (function (_super) { __extends(m1_C1_private, _super); function m1_C1_private() { _super.apply(this, arguments); } return m1_C1_private; - })(m1_c_public); + }(m1_c_public)); var m1_C2_private = (function (_super) { __extends(m1_C2_private, _super); function m1_C2_private() { _super.apply(this, arguments); } return m1_C2_private; - })(m1_c_private); + }(m1_c_private)); var m1_C3_public = (function (_super) { __extends(m1_C3_public, _super); function m1_C3_public() { _super.apply(this, arguments); } return m1_C3_public; - })(m1_c_public); + }(m1_c_public)); m1.m1_C3_public = m1_C3_public; var m1_C4_public = (function (_super) { __extends(m1_C4_public, _super); @@ -109,29 +109,29 @@ var m1; _super.apply(this, arguments); } return m1_C4_public; - })(m1_c_private); + }(m1_c_private)); m1.m1_C4_public = m1_C4_public; var m1_C5_private = (function () { function m1_C5_private() { } return m1_C5_private; - })(); + }()); var m1_C6_private = (function () { function m1_C6_private() { } return m1_C6_private; - })(); + }()); var m1_C7_public = (function () { function m1_C7_public() { } return m1_C7_public; - })(); + }()); m1.m1_C7_public = m1_C7_public; var m1_C8_public = (function () { function m1_C8_public() { } return m1_C8_public; - })(); + }()); m1.m1_C8_public = m1_C8_public; var m1_C9_private = (function (_super) { __extends(m1_C9_private, _super); @@ -139,21 +139,21 @@ var m1; _super.apply(this, arguments); } return m1_C9_private; - })(m1_c_public); + }(m1_c_public)); var m1_C10_private = (function (_super) { __extends(m1_C10_private, _super); function m1_C10_private() { _super.apply(this, arguments); } return m1_C10_private; - })(m1_c_private); + }(m1_c_private)); var m1_C11_public = (function (_super) { __extends(m1_C11_public, _super); function m1_C11_public() { _super.apply(this, arguments); } return m1_C11_public; - })(m1_c_public); + }(m1_c_public)); m1.m1_C11_public = m1_C11_public; var m1_C12_public = (function (_super) { __extends(m1_C12_public, _super); @@ -161,7 +161,7 @@ var m1; _super.apply(this, arguments); } return m1_C12_public; - })(m1_c_private); + }(m1_c_private)); m1.m1_C12_public = m1_C12_public; })(m1 || (m1 = {})); var glo_c_public = (function () { @@ -170,23 +170,23 @@ var glo_c_public = (function () { glo_c_public.prototype.f1 = function () { }; return glo_c_public; -})(); +}()); var glo_C3_public = (function (_super) { __extends(glo_C3_public, _super); function glo_C3_public() { _super.apply(this, arguments); } return glo_C3_public; -})(glo_c_public); +}(glo_c_public)); var glo_C7_public = (function () { function glo_C7_public() { } return glo_C7_public; -})(); +}()); var glo_C11_public = (function (_super) { __extends(glo_C11_public, _super); function glo_C11_public() { _super.apply(this, arguments); } return glo_C11_public; -})(glo_c_public); +}(glo_c_public)); diff --git a/tests/baselines/reference/privacyGloFunc.js b/tests/baselines/reference/privacyGloFunc.js index ff801078df5..153fa57e3d3 100644 --- a/tests/baselines/reference/privacyGloFunc.js +++ b/tests/baselines/reference/privacyGloFunc.js @@ -541,13 +541,13 @@ define(["require", "exports"], function (require, exports) { C1_public.prototype.f1 = function () { }; return C1_public; - })(); + }()); m1.C1_public = C1_public; var C2_private = (function () { function C2_private() { } return C2_private; - })(); + }()); var C3_public = (function () { function C3_public(m1_c3_c1_2) { } @@ -584,7 +584,7 @@ define(["require", "exports"], function (require, exports) { return new C2_private(); //error }; return C3_public; - })(); + }()); m1.C3_public = C3_public; var C4_private = (function () { function C4_private(m1_c4_c1_2) { @@ -622,29 +622,29 @@ define(["require", "exports"], function (require, exports) { return new C2_private(); }; return C4_private; - })(); + }()); var C5_public = (function () { function C5_public(m1_c5_c) { } return C5_public; - })(); + }()); m1.C5_public = C5_public; var C6_private = (function () { function C6_private(m1_c6_c) { } return C6_private; - })(); + }()); var C7_public = (function () { function C7_public(m1_c7_c) { } return C7_public; - })(); + }()); m1.C7_public = C7_public; var C8_private = (function () { function C8_private(m1_c8_c) { } return C8_private; - })(); + }()); function f1_public(m1_f1_arg) { } function f2_public(m1_f2_arg) { @@ -692,13 +692,13 @@ define(["require", "exports"], function (require, exports) { m2_C1_public.prototype.f = function () { }; return m2_C1_public; - })(); + }()); m2.m2_C1_public = m2_C1_public; var m2_C2_private = (function () { function m2_C2_private() { } return m2_C2_private; - })(); + }()); var m2_C3_public = (function () { function m2_C3_public(m2_c3_c1_2) { } @@ -735,7 +735,7 @@ define(["require", "exports"], function (require, exports) { return new m2_C2_private(); }; return m2_C3_public; - })(); + }()); m2.m2_C3_public = m2_C3_public; var m2_C4_private = (function () { function m2_C4_private(m2_c4_c1_2) { @@ -773,29 +773,29 @@ define(["require", "exports"], function (require, exports) { return new m2_C2_private(); }; return m2_C4_private; - })(); + }()); var m2_C5_public = (function () { function m2_C5_public(m2_c5_c) { } return m2_C5_public; - })(); + }()); m2.m2_C5_public = m2_C5_public; var m2_C6_private = (function () { function m2_C6_private(m2_c6_c) { } return m2_C6_private; - })(); + }()); var m2_C7_public = (function () { function m2_C7_public(m2_c7_c) { } return m2_C7_public; - })(); + }()); m2.m2_C7_public = m2_C7_public; var m2_C8_private = (function () { function m2_C8_private(m2_c8_c) { } return m2_C8_private; - })(); + }()); function f1_public(m2_f1_arg) { } function f2_public(m2_f2_arg) { @@ -841,12 +841,12 @@ define(["require", "exports"], function (require, exports) { C5_private.prototype.f = function () { }; return C5_private; - })(); + }()); var C6_public = (function () { function C6_public() { } return C6_public; - })(); + }()); exports.C6_public = C6_public; var C7_public = (function () { function C7_public(c7_c1_2) { @@ -884,7 +884,7 @@ define(["require", "exports"], function (require, exports) { return new C5_private(); //error }; return C7_public; - })(); + }()); exports.C7_public = C7_public; var C8_private = (function () { function C8_private(c8_c1_2) { @@ -922,29 +922,29 @@ define(["require", "exports"], function (require, exports) { return new C5_private(); }; return C8_private; - })(); + }()); var C9_public = (function () { function C9_public(c9_c) { } return C9_public; - })(); + }()); exports.C9_public = C9_public; var C10_private = (function () { function C10_private(c10_c) { } return C10_private; - })(); + }()); var C11_public = (function () { function C11_public(c11_c) { } return C11_public; - })(); + }()); exports.C11_public = C11_public; var C12_private = (function () { function C12_private(c12_c) { } return C12_private; - })(); + }()); function f1_private(f1_arg) { } function f2_public(f2_arg) { diff --git a/tests/baselines/reference/privacyGloGetter.js b/tests/baselines/reference/privacyGloGetter.js index 34e4b69d392..2ae94a0d321 100644 --- a/tests/baselines/reference/privacyGloGetter.js +++ b/tests/baselines/reference/privacyGloGetter.js @@ -97,13 +97,13 @@ var m1; C1_public.prototype.f1 = function () { }; return C1_public; - })(); + }()); m1.C1_public = C1_public; var C2_private = (function () { function C2_private() { } return C2_private; - })(); + }()); var C3_public = (function () { function C3_public() { } @@ -144,7 +144,7 @@ var m1; configurable: true }); return C3_public; - })(); + }()); m1.C3_public = C3_public; var C4_private = (function () { function C4_private() { @@ -186,13 +186,13 @@ var m1; configurable: true }); return C4_private; - })(); + }()); })(m1 || (m1 = {})); var C6_public = (function () { function C6_public() { } return C6_public; -})(); +}()); var C7_public = (function () { function C7_public() { } @@ -215,4 +215,4 @@ var C7_public = (function () { configurable: true }); return C7_public; -})(); +}()); diff --git a/tests/baselines/reference/privacyGloImport.js b/tests/baselines/reference/privacyGloImport.js index 7f832ef75fe..407ac5bb8d5 100644 --- a/tests/baselines/reference/privacyGloImport.js +++ b/tests/baselines/reference/privacyGloImport.js @@ -161,7 +161,7 @@ var m1; function c1() { } return c1; - })(); + }()); m1_M1_public.c1 = c1; function f1() { return new c1; @@ -175,7 +175,7 @@ var m1; function c1() { } return c1; - })(); + }()); m1_M2_private.c1 = c1; function f1() { return new c1; @@ -242,7 +242,7 @@ var glo_M1_public; function c1() { } return c1; - })(); + }()); glo_M1_public.c1 = c1; function f1() { return new c1; diff --git a/tests/baselines/reference/privacyGloImportParseErrors.js b/tests/baselines/reference/privacyGloImportParseErrors.js index f99fdaca8cc..21175ff068d 100644 --- a/tests/baselines/reference/privacyGloImportParseErrors.js +++ b/tests/baselines/reference/privacyGloImportParseErrors.js @@ -161,7 +161,7 @@ var m1; function c1() { } return c1; - })(); + }()); m1_M1_public.c1 = c1; function f1() { return new c1; @@ -175,7 +175,7 @@ var m1; function c1() { } return c1; - })(); + }()); m1_M2_private.c1 = c1; function f1() { return new c1; @@ -226,7 +226,7 @@ var glo_M1_public; function c1() { } return c1; - })(); + }()); glo_M1_public.c1 = c1; function f1() { return new c1; diff --git a/tests/baselines/reference/privacyGloInterface.js b/tests/baselines/reference/privacyGloInterface.js index f4469942b54..671977678a3 100644 --- a/tests/baselines/reference/privacyGloInterface.js +++ b/tests/baselines/reference/privacyGloInterface.js @@ -128,13 +128,13 @@ var m1; C1_public.prototype.f1 = function () { }; return C1_public; - })(); + }()); m1.C1_public = C1_public; var C2_private = (function () { function C2_private() { } return C2_private; - })(); + }()); })(m1 || (m1 = {})); var C5_public = (function () { function C5_public() { @@ -142,4 +142,4 @@ var C5_public = (function () { C5_public.prototype.f1 = function () { }; return C5_public; -})(); +}()); diff --git a/tests/baselines/reference/privacyGloVar.js b/tests/baselines/reference/privacyGloVar.js index e4bda49698f..678d6cfdc99 100644 --- a/tests/baselines/reference/privacyGloVar.js +++ b/tests/baselines/reference/privacyGloVar.js @@ -89,13 +89,13 @@ var m1; C1_public.prototype.f1 = function () { }; return C1_public; - })(); + }()); m1.C1_public = C1_public; var C2_private = (function () { function C2_private() { } return C2_private; - })(); + }()); var C3_public = (function () { function C3_public() { this.C3_v11_private = new C1_public(); @@ -108,7 +108,7 @@ var m1; this.C3_v24_public = new C2_private(); // error } return C3_public; - })(); + }()); m1.C3_public = C3_public; var C4_public = (function () { function C4_public() { @@ -122,7 +122,7 @@ var m1; this.C4_v24_public = new C2_private(); } return C4_public; - })(); + }()); var m1_v1_private; var m1_v3_private; var m1_v11_private = new C1_public(); @@ -140,7 +140,7 @@ var glo_C1_public = (function () { glo_C1_public.prototype.f1 = function () { }; return glo_C1_public; -})(); +}()); var glo_C3_public = (function () { function glo_C3_public() { this.glo_C3_v11_private = new glo_C1_public(); @@ -149,7 +149,7 @@ var glo_C3_public = (function () { this.glo_C3_v22_public = new glo_C1_public(); } return glo_C3_public; -})(); +}()); var glo_v2_public; var glo_v12_public = new glo_C1_public(); var glo_v22_public = new glo_C1_public(); diff --git a/tests/baselines/reference/privacyImport.js b/tests/baselines/reference/privacyImport.js index 13a6bc396ea..debb1e3b4bd 100644 --- a/tests/baselines/reference/privacyImport.js +++ b/tests/baselines/reference/privacyImport.js @@ -366,7 +366,7 @@ var m1; function c1() { } return c1; - })(); + }()); m1_M1_public.c1 = c1; function f1() { return new c1; @@ -380,7 +380,7 @@ var m1; function c1() { } return c1; - })(); + }()); m1_M2_private.c1 = c1; function f1() { return new c1; @@ -449,7 +449,7 @@ var m2; function c1() { } return c1; - })(); + }()); m2_M1_public.c1 = c1; function f1() { return new c1; @@ -463,7 +463,7 @@ var m2; function c1() { } return c1; - })(); + }()); m2_M2_private.c1 = c1; function f1() { return new c1; @@ -531,7 +531,7 @@ var glo_M1_public; function c1() { } return c1; - })(); + }()); glo_M1_public.c1 = c1; function f1() { return new c1; @@ -552,7 +552,7 @@ var glo_M3_private; function c1() { } return c1; - })(); + }()); glo_M3_private.c1 = c1; function f1() { return new c1; diff --git a/tests/baselines/reference/privacyImportParseErrors.js b/tests/baselines/reference/privacyImportParseErrors.js index 7a7e7141684..25d96b6156e 100644 --- a/tests/baselines/reference/privacyImportParseErrors.js +++ b/tests/baselines/reference/privacyImportParseErrors.js @@ -366,7 +366,7 @@ var m1; function c1() { } return c1; - })(); + }()); m1_M1_public.c1 = c1; function f1() { return new c1; @@ -380,7 +380,7 @@ var m1; function c1() { } return c1; - })(); + }()); m1_M2_private.c1 = c1; function f1() { return new c1; @@ -433,7 +433,7 @@ var m2; function c1() { } return c1; - })(); + }()); m2_M1_public.c1 = c1; function f1() { return new c1; @@ -447,7 +447,7 @@ var m2; function c1() { } return c1; - })(); + }()); m2_M2_private.c1 = c1; function f1() { return new c1; @@ -499,7 +499,7 @@ var glo_M1_public; function c1() { } return c1; - })(); + }()); glo_M1_public.c1 = c1; function f1() { return new c1; @@ -513,7 +513,7 @@ var glo_M3_private; function c1() { } return c1; - })(); + }()); glo_M3_private.c1 = c1; function f1() { return new c1; diff --git a/tests/baselines/reference/privacyInterface.js b/tests/baselines/reference/privacyInterface.js index 78e87bc22d2..59e10aca7ff 100644 --- a/tests/baselines/reference/privacyInterface.js +++ b/tests/baselines/reference/privacyInterface.js @@ -274,13 +274,13 @@ var m1; C1_public.prototype.f1 = function () { }; return C1_public; - })(); + }()); m1.C1_public = C1_public; var C2_private = (function () { function C2_private() { } return C2_private; - })(); + }()); })(m1 = exports.m1 || (exports.m1 = {})); var m2; (function (m2) { @@ -290,13 +290,13 @@ var m2; C1_public.prototype.f1 = function () { }; return C1_public; - })(); + }()); m2.C1_public = C1_public; var C2_private = (function () { function C2_private() { } return C2_private; - })(); + }()); })(m2 || (m2 = {})); var C5_public = (function () { function C5_public() { @@ -304,10 +304,10 @@ var C5_public = (function () { C5_public.prototype.f1 = function () { }; return C5_public; -})(); +}()); exports.C5_public = C5_public; var C6_private = (function () { function C6_private() { } return C6_private; -})(); +}()); diff --git a/tests/baselines/reference/privacyLocalInternalReferenceImportWithExport.js b/tests/baselines/reference/privacyLocalInternalReferenceImportWithExport.js index e5c127272b7..0ab6d3e531e 100644 --- a/tests/baselines/reference/privacyLocalInternalReferenceImportWithExport.js +++ b/tests/baselines/reference/privacyLocalInternalReferenceImportWithExport.js @@ -161,7 +161,7 @@ var m_private; function c_private() { } return c_private; - })(); + }()); m_private.c_private = c_private; (function (e_private) { e_private[e_private["Happy"] = 0] = "Happy"; @@ -179,7 +179,7 @@ var m_private; function c() { } return c; - })(); + }()); mi_private.c = c; })(mi_private = m_private.mi_private || (m_private.mi_private = {})); })(m_private || (m_private = {})); @@ -190,7 +190,7 @@ var m_public; function c_public() { } return c_public; - })(); + }()); m_public.c_public = c_public; (function (e_public) { e_public[e_public["Happy"] = 0] = "Happy"; @@ -208,7 +208,7 @@ var m_public; function c() { } return c; - })(); + }()); mi_public.c = c; })(mi_public = m_public.mi_public || (m_public.mi_public = {})); })(m_public = exports.m_public || (exports.m_public = {})); diff --git a/tests/baselines/reference/privacyLocalInternalReferenceImportWithoutExport.js b/tests/baselines/reference/privacyLocalInternalReferenceImportWithoutExport.js index 9cc4f6a9160..96f7b74b474 100644 --- a/tests/baselines/reference/privacyLocalInternalReferenceImportWithoutExport.js +++ b/tests/baselines/reference/privacyLocalInternalReferenceImportWithoutExport.js @@ -162,7 +162,7 @@ define(["require", "exports"], function (require, exports) { function c_private() { } return c_private; - })(); + }()); m_private.c_private = c_private; (function (e_private) { e_private[e_private["Happy"] = 0] = "Happy"; @@ -180,7 +180,7 @@ define(["require", "exports"], function (require, exports) { function c() { } return c; - })(); + }()); mi_private.c = c; })(mi_private = m_private.mi_private || (m_private.mi_private = {})); })(m_private || (m_private = {})); @@ -191,7 +191,7 @@ define(["require", "exports"], function (require, exports) { function c_public() { } return c_public; - })(); + }()); m_public.c_public = c_public; (function (e_public) { e_public[e_public["Happy"] = 0] = "Happy"; @@ -209,7 +209,7 @@ define(["require", "exports"], function (require, exports) { function c() { } return c; - })(); + }()); mi_public.c = c; })(mi_public = m_public.mi_public || (m_public.mi_public = {})); })(m_public = exports.m_public || (exports.m_public = {})); diff --git a/tests/baselines/reference/privacyTopLevelAmbientExternalModuleImportWithExport.js b/tests/baselines/reference/privacyTopLevelAmbientExternalModuleImportWithExport.js index 5cb455f47bc..d8bf7c85d12 100644 --- a/tests/baselines/reference/privacyTopLevelAmbientExternalModuleImportWithExport.js +++ b/tests/baselines/reference/privacyTopLevelAmbientExternalModuleImportWithExport.js @@ -57,7 +57,7 @@ var c_public = (function () { function c_public() { } return c_public; -})(); +}()); exports.c_public = c_public; //// [privacyTopLevelAmbientExternalModuleImportWithExport_require1.js] "use strict"; @@ -65,7 +65,7 @@ var c_public = (function () { function c_public() { } return c_public; -})(); +}()); exports.c_public = c_public; //// [privacyTopLevelAmbientExternalModuleImportWithExport_core.js] "use strict"; diff --git a/tests/baselines/reference/privacyTopLevelAmbientExternalModuleImportWithoutExport.js b/tests/baselines/reference/privacyTopLevelAmbientExternalModuleImportWithoutExport.js index a03c7dcef62..7f44dbe6257 100644 --- a/tests/baselines/reference/privacyTopLevelAmbientExternalModuleImportWithoutExport.js +++ b/tests/baselines/reference/privacyTopLevelAmbientExternalModuleImportWithoutExport.js @@ -58,7 +58,7 @@ define(["require", "exports"], function (require, exports) { function c_public() { } return c_public; - })(); + }()); exports.c_public = c_public; }); //// [privacyTopLevelAmbientExternalModuleImportWithoutExport_require1.js] @@ -68,7 +68,7 @@ define(["require", "exports"], function (require, exports) { function c_public() { } return c_public; - })(); + }()); exports.c_public = c_public; }); //// [privacyTopLevelAmbientExternalModuleImportWithoutExport_core.js] diff --git a/tests/baselines/reference/privacyTopLevelInternalReferenceImportWithExport.js b/tests/baselines/reference/privacyTopLevelInternalReferenceImportWithExport.js index 5daa00d5764..852ae4d3f19 100644 --- a/tests/baselines/reference/privacyTopLevelInternalReferenceImportWithExport.js +++ b/tests/baselines/reference/privacyTopLevelInternalReferenceImportWithExport.js @@ -109,7 +109,7 @@ define(["require", "exports"], function (require, exports) { function c_private() { } return c_private; - })(); + }()); m_private.c_private = c_private; (function (e_private) { e_private[e_private["Happy"] = 0] = "Happy"; @@ -127,7 +127,7 @@ define(["require", "exports"], function (require, exports) { function c() { } return c; - })(); + }()); mi_private.c = c; })(mi_private = m_private.mi_private || (m_private.mi_private = {})); })(m_private || (m_private = {})); @@ -138,7 +138,7 @@ define(["require", "exports"], function (require, exports) { function c_public() { } return c_public; - })(); + }()); m_public.c_public = c_public; (function (e_public) { e_public[e_public["Happy"] = 0] = "Happy"; @@ -156,7 +156,7 @@ define(["require", "exports"], function (require, exports) { function c() { } return c; - })(); + }()); mi_public.c = c; })(mi_public = m_public.mi_public || (m_public.mi_public = {})); })(m_public = exports.m_public || (exports.m_public = {})); diff --git a/tests/baselines/reference/privacyTopLevelInternalReferenceImportWithoutExport.js b/tests/baselines/reference/privacyTopLevelInternalReferenceImportWithoutExport.js index 2abc4b11d93..1241165a8dc 100644 --- a/tests/baselines/reference/privacyTopLevelInternalReferenceImportWithoutExport.js +++ b/tests/baselines/reference/privacyTopLevelInternalReferenceImportWithoutExport.js @@ -110,7 +110,7 @@ define(["require", "exports"], function (require, exports) { function c_private() { } return c_private; - })(); + }()); m_private.c_private = c_private; (function (e_private) { e_private[e_private["Happy"] = 0] = "Happy"; @@ -128,7 +128,7 @@ define(["require", "exports"], function (require, exports) { function c() { } return c; - })(); + }()); mi_private.c = c; })(mi_private = m_private.mi_private || (m_private.mi_private = {})); })(m_private || (m_private = {})); @@ -139,7 +139,7 @@ define(["require", "exports"], function (require, exports) { function c_public() { } return c_public; - })(); + }()); m_public.c_public = c_public; (function (e_public) { e_public[e_public["Happy"] = 0] = "Happy"; @@ -157,7 +157,7 @@ define(["require", "exports"], function (require, exports) { function c() { } return c; - })(); + }()); mi_public.c = c; })(mi_public = m_public.mi_public || (m_public.mi_public = {})); })(m_public = exports.m_public || (exports.m_public = {})); diff --git a/tests/baselines/reference/privacyTypeParameterOfFunction.js b/tests/baselines/reference/privacyTypeParameterOfFunction.js index ec447d9ccbb..84034362fac 100644 --- a/tests/baselines/reference/privacyTypeParameterOfFunction.js +++ b/tests/baselines/reference/privacyTypeParameterOfFunction.js @@ -138,12 +138,12 @@ var privateClass = (function () { function privateClass() { } return privateClass; -})(); +}()); var publicClass = (function () { function publicClass() { } return publicClass; -})(); +}()); exports.publicClass = publicClass; var publicClassWithWithPrivateTypeParameters = (function () { function publicClassWithWithPrivateTypeParameters() { @@ -159,7 +159,7 @@ var publicClassWithWithPrivateTypeParameters = (function () { publicClassWithWithPrivateTypeParameters.prototype.myPrivateMethod = function () { }; return publicClassWithWithPrivateTypeParameters; -})(); +}()); exports.publicClassWithWithPrivateTypeParameters = publicClassWithWithPrivateTypeParameters; var publicClassWithWithPublicTypeParameters = (function () { function publicClassWithWithPublicTypeParameters() { @@ -173,7 +173,7 @@ var publicClassWithWithPublicTypeParameters = (function () { publicClassWithWithPublicTypeParameters.prototype.myPrivateMethod = function () { }; return publicClassWithWithPublicTypeParameters; -})(); +}()); exports.publicClassWithWithPublicTypeParameters = publicClassWithWithPublicTypeParameters; var privateClassWithWithPrivateTypeParameters = (function () { function privateClassWithWithPrivateTypeParameters() { @@ -187,7 +187,7 @@ var privateClassWithWithPrivateTypeParameters = (function () { privateClassWithWithPrivateTypeParameters.prototype.myPrivateMethod = function () { }; return privateClassWithWithPrivateTypeParameters; -})(); +}()); var privateClassWithWithPublicTypeParameters = (function () { function privateClassWithWithPublicTypeParameters() { } @@ -200,7 +200,7 @@ var privateClassWithWithPublicTypeParameters = (function () { privateClassWithWithPublicTypeParameters.prototype.myPrivateMethod = function () { }; return privateClassWithWithPublicTypeParameters; -})(); +}()); // TypeParameter_0_of_exported_function_has_or_is_using_private_type_1 function publicFunctionWithPrivateTypeParameters() { } @@ -224,7 +224,7 @@ var publicClassWithWithPublicTypeParametersWithoutExtends = (function () { publicClassWithWithPublicTypeParametersWithoutExtends.prototype.myPrivateMethod = function () { }; return publicClassWithWithPublicTypeParametersWithoutExtends; -})(); +}()); exports.publicClassWithWithPublicTypeParametersWithoutExtends = publicClassWithWithPublicTypeParametersWithoutExtends; var privateClassWithWithPublicTypeParametersWithoutExtends = (function () { function privateClassWithWithPublicTypeParametersWithoutExtends() { @@ -238,7 +238,7 @@ var privateClassWithWithPublicTypeParametersWithoutExtends = (function () { privateClassWithWithPublicTypeParametersWithoutExtends.prototype.myPrivateMethod = function () { }; return privateClassWithWithPublicTypeParametersWithoutExtends; -})(); +}()); function publicFunctionWithPublicTypeParametersWithoutExtends() { } exports.publicFunctionWithPublicTypeParametersWithoutExtends = publicFunctionWithPublicTypeParametersWithoutExtends; diff --git a/tests/baselines/reference/privacyTypeParameterOfFunctionDeclFile.js b/tests/baselines/reference/privacyTypeParameterOfFunctionDeclFile.js index 41dbb84a3ff..3eb6027b050 100644 --- a/tests/baselines/reference/privacyTypeParameterOfFunctionDeclFile.js +++ b/tests/baselines/reference/privacyTypeParameterOfFunctionDeclFile.js @@ -444,12 +444,12 @@ var privateClass = (function () { function privateClass() { } return privateClass; -})(); +}()); var publicClass = (function () { function publicClass() { } return publicClass; -})(); +}()); exports.publicClass = publicClass; var publicClassWithWithPrivateTypeParameters = (function () { function publicClassWithWithPrivateTypeParameters() { @@ -463,7 +463,7 @@ var publicClassWithWithPrivateTypeParameters = (function () { publicClassWithWithPrivateTypeParameters.prototype.myPrivateMethod = function () { }; return publicClassWithWithPrivateTypeParameters; -})(); +}()); exports.publicClassWithWithPrivateTypeParameters = publicClassWithWithPrivateTypeParameters; var publicClassWithWithPublicTypeParameters = (function () { function publicClassWithWithPublicTypeParameters() { @@ -477,7 +477,7 @@ var publicClassWithWithPublicTypeParameters = (function () { publicClassWithWithPublicTypeParameters.prototype.myPrivateMethod = function () { }; return publicClassWithWithPublicTypeParameters; -})(); +}()); exports.publicClassWithWithPublicTypeParameters = publicClassWithWithPublicTypeParameters; var privateClassWithWithPrivateTypeParameters = (function () { function privateClassWithWithPrivateTypeParameters() { @@ -491,7 +491,7 @@ var privateClassWithWithPrivateTypeParameters = (function () { privateClassWithWithPrivateTypeParameters.prototype.myPrivateMethod = function () { }; return privateClassWithWithPrivateTypeParameters; -})(); +}()); var privateClassWithWithPublicTypeParameters = (function () { function privateClassWithWithPublicTypeParameters() { } @@ -504,7 +504,7 @@ var privateClassWithWithPublicTypeParameters = (function () { privateClassWithWithPublicTypeParameters.prototype.myPrivateMethod = function () { }; return privateClassWithWithPublicTypeParameters; -})(); +}()); function publicFunctionWithPrivateTypeParameters() { } exports.publicFunctionWithPrivateTypeParameters = publicFunctionWithPrivateTypeParameters; @@ -527,7 +527,7 @@ var publicClassWithWithPublicTypeParametersWithoutExtends = (function () { publicClassWithWithPublicTypeParametersWithoutExtends.prototype.myPrivateMethod = function () { }; return publicClassWithWithPublicTypeParametersWithoutExtends; -})(); +}()); exports.publicClassWithWithPublicTypeParametersWithoutExtends = publicClassWithWithPublicTypeParametersWithoutExtends; var privateClassWithWithPublicTypeParametersWithoutExtends = (function () { function privateClassWithWithPublicTypeParametersWithoutExtends() { @@ -541,7 +541,7 @@ var privateClassWithWithPublicTypeParametersWithoutExtends = (function () { privateClassWithWithPublicTypeParametersWithoutExtends.prototype.myPrivateMethod = function () { }; return privateClassWithWithPublicTypeParametersWithoutExtends; -})(); +}()); function publicFunctionWithPublicTypeParametersWithoutExtends() { } exports.publicFunctionWithPublicTypeParametersWithoutExtends = publicFunctionWithPublicTypeParametersWithoutExtends; @@ -555,7 +555,7 @@ var publicClassWithWithPrivateModuleTypeParameters = (function () { publicClassWithWithPrivateModuleTypeParameters.prototype.myPublicMethod = function () { }; return publicClassWithWithPrivateModuleTypeParameters; -})(); +}()); exports.publicClassWithWithPrivateModuleTypeParameters = publicClassWithWithPrivateModuleTypeParameters; function publicFunctionWithPrivateMopduleTypeParameters() { } @@ -568,7 +568,7 @@ var privateClassWithWithPrivateModuleTypeParameters = (function () { privateClassWithWithPrivateModuleTypeParameters.prototype.myPublicMethod = function () { }; return privateClassWithWithPrivateModuleTypeParameters; -})(); +}()); function privateFunctionWithPrivateMopduleTypeParameters() { } var publicModule; @@ -577,12 +577,12 @@ var publicModule; function privateClass() { } return privateClass; - })(); + }()); var publicClass = (function () { function publicClass() { } return publicClass; - })(); + }()); publicModule.publicClass = publicClass; var publicClassWithWithPrivateTypeParameters = (function () { function publicClassWithWithPrivateTypeParameters() { @@ -596,7 +596,7 @@ var publicModule; publicClassWithWithPrivateTypeParameters.prototype.myPrivateMethod = function () { }; return publicClassWithWithPrivateTypeParameters; - })(); + }()); publicModule.publicClassWithWithPrivateTypeParameters = publicClassWithWithPrivateTypeParameters; var publicClassWithWithPublicTypeParameters = (function () { function publicClassWithWithPublicTypeParameters() { @@ -610,7 +610,7 @@ var publicModule; publicClassWithWithPublicTypeParameters.prototype.myPrivateMethod = function () { }; return publicClassWithWithPublicTypeParameters; - })(); + }()); publicModule.publicClassWithWithPublicTypeParameters = publicClassWithWithPublicTypeParameters; var privateClassWithWithPrivateTypeParameters = (function () { function privateClassWithWithPrivateTypeParameters() { @@ -624,7 +624,7 @@ var publicModule; privateClassWithWithPrivateTypeParameters.prototype.myPrivateMethod = function () { }; return privateClassWithWithPrivateTypeParameters; - })(); + }()); var privateClassWithWithPublicTypeParameters = (function () { function privateClassWithWithPublicTypeParameters() { } @@ -637,7 +637,7 @@ var publicModule; privateClassWithWithPublicTypeParameters.prototype.myPrivateMethod = function () { }; return privateClassWithWithPublicTypeParameters; - })(); + }()); function publicFunctionWithPrivateTypeParameters() { } publicModule.publicFunctionWithPrivateTypeParameters = publicFunctionWithPrivateTypeParameters; @@ -660,7 +660,7 @@ var publicModule; publicClassWithWithPublicTypeParametersWithoutExtends.prototype.myPrivateMethod = function () { }; return publicClassWithWithPublicTypeParametersWithoutExtends; - })(); + }()); publicModule.publicClassWithWithPublicTypeParametersWithoutExtends = publicClassWithWithPublicTypeParametersWithoutExtends; var privateClassWithWithPublicTypeParametersWithoutExtends = (function () { function privateClassWithWithPublicTypeParametersWithoutExtends() { @@ -674,7 +674,7 @@ var publicModule; privateClassWithWithPublicTypeParametersWithoutExtends.prototype.myPrivateMethod = function () { }; return privateClassWithWithPublicTypeParametersWithoutExtends; - })(); + }()); function publicFunctionWithPublicTypeParametersWithoutExtends() { } publicModule.publicFunctionWithPublicTypeParametersWithoutExtends = publicFunctionWithPublicTypeParametersWithoutExtends; @@ -688,7 +688,7 @@ var publicModule; publicClassWithWithPrivateModuleTypeParameters.prototype.myPublicMethod = function () { }; return publicClassWithWithPrivateModuleTypeParameters; - })(); + }()); publicModule.publicClassWithWithPrivateModuleTypeParameters = publicClassWithWithPrivateModuleTypeParameters; function publicFunctionWithPrivateMopduleTypeParameters() { } @@ -701,7 +701,7 @@ var publicModule; privateClassWithWithPrivateModuleTypeParameters.prototype.myPublicMethod = function () { }; return privateClassWithWithPrivateModuleTypeParameters; - })(); + }()); function privateFunctionWithPrivateMopduleTypeParameters() { } })(publicModule = exports.publicModule || (exports.publicModule = {})); @@ -711,12 +711,12 @@ var privateModule; function privateClass() { } return privateClass; - })(); + }()); var publicClass = (function () { function publicClass() { } return publicClass; - })(); + }()); privateModule.publicClass = publicClass; var publicClassWithWithPrivateTypeParameters = (function () { function publicClassWithWithPrivateTypeParameters() { @@ -730,7 +730,7 @@ var privateModule; publicClassWithWithPrivateTypeParameters.prototype.myPrivateMethod = function () { }; return publicClassWithWithPrivateTypeParameters; - })(); + }()); privateModule.publicClassWithWithPrivateTypeParameters = publicClassWithWithPrivateTypeParameters; var publicClassWithWithPublicTypeParameters = (function () { function publicClassWithWithPublicTypeParameters() { @@ -744,7 +744,7 @@ var privateModule; publicClassWithWithPublicTypeParameters.prototype.myPrivateMethod = function () { }; return publicClassWithWithPublicTypeParameters; - })(); + }()); privateModule.publicClassWithWithPublicTypeParameters = publicClassWithWithPublicTypeParameters; var privateClassWithWithPrivateTypeParameters = (function () { function privateClassWithWithPrivateTypeParameters() { @@ -758,7 +758,7 @@ var privateModule; privateClassWithWithPrivateTypeParameters.prototype.myPrivateMethod = function () { }; return privateClassWithWithPrivateTypeParameters; - })(); + }()); var privateClassWithWithPublicTypeParameters = (function () { function privateClassWithWithPublicTypeParameters() { } @@ -771,7 +771,7 @@ var privateModule; privateClassWithWithPublicTypeParameters.prototype.myPrivateMethod = function () { }; return privateClassWithWithPublicTypeParameters; - })(); + }()); function publicFunctionWithPrivateTypeParameters() { } privateModule.publicFunctionWithPrivateTypeParameters = publicFunctionWithPrivateTypeParameters; @@ -794,7 +794,7 @@ var privateModule; publicClassWithWithPublicTypeParametersWithoutExtends.prototype.myPrivateMethod = function () { }; return publicClassWithWithPublicTypeParametersWithoutExtends; - })(); + }()); privateModule.publicClassWithWithPublicTypeParametersWithoutExtends = publicClassWithWithPublicTypeParametersWithoutExtends; var privateClassWithWithPublicTypeParametersWithoutExtends = (function () { function privateClassWithWithPublicTypeParametersWithoutExtends() { @@ -808,7 +808,7 @@ var privateModule; privateClassWithWithPublicTypeParametersWithoutExtends.prototype.myPrivateMethod = function () { }; return privateClassWithWithPublicTypeParametersWithoutExtends; - })(); + }()); function publicFunctionWithPublicTypeParametersWithoutExtends() { } privateModule.publicFunctionWithPublicTypeParametersWithoutExtends = publicFunctionWithPublicTypeParametersWithoutExtends; diff --git a/tests/baselines/reference/privacyTypeParametersOfClass.js b/tests/baselines/reference/privacyTypeParametersOfClass.js index 8118d94ab7d..3d28e145b32 100644 --- a/tests/baselines/reference/privacyTypeParametersOfClass.js +++ b/tests/baselines/reference/privacyTypeParametersOfClass.js @@ -49,12 +49,12 @@ var privateClass = (function () { function privateClass() { } return privateClass; -})(); +}()); var publicClass = (function () { function publicClass() { } return publicClass; -})(); +}()); exports.publicClass = publicClass; // TypeParameter_0_of_exported_class_1_has_or_is_using_private_type_2 var publicClassWithPrivateTypeParameters = (function () { @@ -64,7 +64,7 @@ var publicClassWithPrivateTypeParameters = (function () { return val; }; return publicClassWithPrivateTypeParameters; -})(); +}()); exports.publicClassWithPrivateTypeParameters = publicClassWithPrivateTypeParameters; var publicClassWithPublicTypeParameters = (function () { function publicClassWithPublicTypeParameters() { @@ -73,7 +73,7 @@ var publicClassWithPublicTypeParameters = (function () { return val; }; return publicClassWithPublicTypeParameters; -})(); +}()); exports.publicClassWithPublicTypeParameters = publicClassWithPublicTypeParameters; var privateClassWithPrivateTypeParameters = (function () { function privateClassWithPrivateTypeParameters() { @@ -82,7 +82,7 @@ var privateClassWithPrivateTypeParameters = (function () { return val; }; return privateClassWithPrivateTypeParameters; -})(); +}()); var privateClassWithPublicTypeParameters = (function () { function privateClassWithPublicTypeParameters() { } @@ -90,7 +90,7 @@ var privateClassWithPublicTypeParameters = (function () { return val; }; return privateClassWithPublicTypeParameters; -})(); +}()); var publicClassWithPublicTypeParametersWithoutExtends = (function () { function publicClassWithPublicTypeParametersWithoutExtends() { } @@ -98,7 +98,7 @@ var publicClassWithPublicTypeParametersWithoutExtends = (function () { return val; }; return publicClassWithPublicTypeParametersWithoutExtends; -})(); +}()); exports.publicClassWithPublicTypeParametersWithoutExtends = publicClassWithPublicTypeParametersWithoutExtends; var privateClassWithPublicTypeParametersWithoutExtends = (function () { function privateClassWithPublicTypeParametersWithoutExtends() { @@ -107,4 +107,4 @@ var privateClassWithPublicTypeParametersWithoutExtends = (function () { return val; }; return privateClassWithPublicTypeParametersWithoutExtends; -})(); +}()); diff --git a/tests/baselines/reference/privacyTypeParametersOfClassDeclFile.js b/tests/baselines/reference/privacyTypeParametersOfClassDeclFile.js index e9e1ad218bd..3ccdec46d7c 100644 --- a/tests/baselines/reference/privacyTypeParametersOfClassDeclFile.js +++ b/tests/baselines/reference/privacyTypeParametersOfClassDeclFile.js @@ -160,12 +160,12 @@ var privateClass = (function () { function privateClass() { } return privateClass; -})(); +}()); var publicClass = (function () { function publicClass() { } return publicClass; -})(); +}()); exports.publicClass = publicClass; var publicClassWithPrivateTypeParameters = (function () { function publicClassWithPrivateTypeParameters() { @@ -174,7 +174,7 @@ var publicClassWithPrivateTypeParameters = (function () { return val; }; return publicClassWithPrivateTypeParameters; -})(); +}()); exports.publicClassWithPrivateTypeParameters = publicClassWithPrivateTypeParameters; var publicClassWithPublicTypeParameters = (function () { function publicClassWithPublicTypeParameters() { @@ -183,7 +183,7 @@ var publicClassWithPublicTypeParameters = (function () { return val; }; return publicClassWithPublicTypeParameters; -})(); +}()); exports.publicClassWithPublicTypeParameters = publicClassWithPublicTypeParameters; var privateClassWithPrivateTypeParameters = (function () { function privateClassWithPrivateTypeParameters() { @@ -192,7 +192,7 @@ var privateClassWithPrivateTypeParameters = (function () { return val; }; return privateClassWithPrivateTypeParameters; -})(); +}()); var privateClassWithPublicTypeParameters = (function () { function privateClassWithPublicTypeParameters() { } @@ -200,7 +200,7 @@ var privateClassWithPublicTypeParameters = (function () { return val; }; return privateClassWithPublicTypeParameters; -})(); +}()); var publicClassWithPublicTypeParametersWithoutExtends = (function () { function publicClassWithPublicTypeParametersWithoutExtends() { } @@ -208,7 +208,7 @@ var publicClassWithPublicTypeParametersWithoutExtends = (function () { return val; }; return publicClassWithPublicTypeParametersWithoutExtends; -})(); +}()); exports.publicClassWithPublicTypeParametersWithoutExtends = publicClassWithPublicTypeParametersWithoutExtends; var privateClassWithPublicTypeParametersWithoutExtends = (function () { function privateClassWithPublicTypeParametersWithoutExtends() { @@ -217,7 +217,7 @@ var privateClassWithPublicTypeParametersWithoutExtends = (function () { return val; }; return privateClassWithPublicTypeParametersWithoutExtends; -})(); +}()); var publicClassWithTypeParametersFromPrivateModule = (function () { function publicClassWithTypeParametersFromPrivateModule() { } @@ -225,7 +225,7 @@ var publicClassWithTypeParametersFromPrivateModule = (function () { return val; }; return publicClassWithTypeParametersFromPrivateModule; -})(); +}()); exports.publicClassWithTypeParametersFromPrivateModule = publicClassWithTypeParametersFromPrivateModule; var privateClassWithTypeParametersFromPrivateModule = (function () { function privateClassWithTypeParametersFromPrivateModule() { @@ -234,19 +234,19 @@ var privateClassWithTypeParametersFromPrivateModule = (function () { return val; }; return privateClassWithTypeParametersFromPrivateModule; -})(); +}()); var publicModule; (function (publicModule) { var privateClassInPublicModule = (function () { function privateClassInPublicModule() { } return privateClassInPublicModule; - })(); + }()); var publicClassInPublicModule = (function () { function publicClassInPublicModule() { } return publicClassInPublicModule; - })(); + }()); publicModule.publicClassInPublicModule = publicClassInPublicModule; var publicClassWithPrivateTypeParameters = (function () { function publicClassWithPrivateTypeParameters() { @@ -255,7 +255,7 @@ var publicModule; return val; }; return publicClassWithPrivateTypeParameters; - })(); + }()); publicModule.publicClassWithPrivateTypeParameters = publicClassWithPrivateTypeParameters; var publicClassWithPublicTypeParameters = (function () { function publicClassWithPublicTypeParameters() { @@ -264,7 +264,7 @@ var publicModule; return val; }; return publicClassWithPublicTypeParameters; - })(); + }()); publicModule.publicClassWithPublicTypeParameters = publicClassWithPublicTypeParameters; var privateClassWithPrivateTypeParameters = (function () { function privateClassWithPrivateTypeParameters() { @@ -273,7 +273,7 @@ var publicModule; return val; }; return privateClassWithPrivateTypeParameters; - })(); + }()); var privateClassWithPublicTypeParameters = (function () { function privateClassWithPublicTypeParameters() { } @@ -281,7 +281,7 @@ var publicModule; return val; }; return privateClassWithPublicTypeParameters; - })(); + }()); var publicClassWithPublicTypeParametersWithoutExtends = (function () { function publicClassWithPublicTypeParametersWithoutExtends() { } @@ -289,7 +289,7 @@ var publicModule; return val; }; return publicClassWithPublicTypeParametersWithoutExtends; - })(); + }()); publicModule.publicClassWithPublicTypeParametersWithoutExtends = publicClassWithPublicTypeParametersWithoutExtends; var privateClassWithPublicTypeParametersWithoutExtends = (function () { function privateClassWithPublicTypeParametersWithoutExtends() { @@ -298,7 +298,7 @@ var publicModule; return val; }; return privateClassWithPublicTypeParametersWithoutExtends; - })(); + }()); var publicClassWithTypeParametersFromPrivateModule = (function () { function publicClassWithTypeParametersFromPrivateModule() { } @@ -306,7 +306,7 @@ var publicModule; return val; }; return publicClassWithTypeParametersFromPrivateModule; - })(); + }()); publicModule.publicClassWithTypeParametersFromPrivateModule = publicClassWithTypeParametersFromPrivateModule; var privateClassWithTypeParametersFromPrivateModule = (function () { function privateClassWithTypeParametersFromPrivateModule() { @@ -315,7 +315,7 @@ var publicModule; return val; }; return privateClassWithTypeParametersFromPrivateModule; - })(); + }()); })(publicModule = exports.publicModule || (exports.publicModule = {})); var privateModule; (function (privateModule) { @@ -323,12 +323,12 @@ var privateModule; function privateClassInPrivateModule() { } return privateClassInPrivateModule; - })(); + }()); var publicClassInPrivateModule = (function () { function publicClassInPrivateModule() { } return publicClassInPrivateModule; - })(); + }()); privateModule.publicClassInPrivateModule = publicClassInPrivateModule; var publicClassWithPrivateTypeParameters = (function () { function publicClassWithPrivateTypeParameters() { @@ -337,7 +337,7 @@ var privateModule; return val; }; return publicClassWithPrivateTypeParameters; - })(); + }()); privateModule.publicClassWithPrivateTypeParameters = publicClassWithPrivateTypeParameters; var publicClassWithPublicTypeParameters = (function () { function publicClassWithPublicTypeParameters() { @@ -346,7 +346,7 @@ var privateModule; return val; }; return publicClassWithPublicTypeParameters; - })(); + }()); privateModule.publicClassWithPublicTypeParameters = publicClassWithPublicTypeParameters; var privateClassWithPrivateTypeParameters = (function () { function privateClassWithPrivateTypeParameters() { @@ -355,7 +355,7 @@ var privateModule; return val; }; return privateClassWithPrivateTypeParameters; - })(); + }()); var privateClassWithPublicTypeParameters = (function () { function privateClassWithPublicTypeParameters() { } @@ -363,7 +363,7 @@ var privateModule; return val; }; return privateClassWithPublicTypeParameters; - })(); + }()); var publicClassWithPublicTypeParametersWithoutExtends = (function () { function publicClassWithPublicTypeParametersWithoutExtends() { } @@ -371,7 +371,7 @@ var privateModule; return val; }; return publicClassWithPublicTypeParametersWithoutExtends; - })(); + }()); privateModule.publicClassWithPublicTypeParametersWithoutExtends = publicClassWithPublicTypeParametersWithoutExtends; var privateClassWithPublicTypeParametersWithoutExtends = (function () { function privateClassWithPublicTypeParametersWithoutExtends() { @@ -380,5 +380,5 @@ var privateModule; return val; }; return privateClassWithPublicTypeParametersWithoutExtends; - })(); + }()); })(privateModule || (privateModule = {})); diff --git a/tests/baselines/reference/privacyTypeParametersOfInterface.js b/tests/baselines/reference/privacyTypeParametersOfInterface.js index c77da126cb6..a330ea76e13 100644 --- a/tests/baselines/reference/privacyTypeParametersOfInterface.js +++ b/tests/baselines/reference/privacyTypeParametersOfInterface.js @@ -64,21 +64,21 @@ var privateClass = (function () { function privateClass() { } return privateClass; -})(); +}()); var publicClass = (function () { function publicClass() { } return publicClass; -})(); +}()); exports.publicClass = publicClass; var privateClassT = (function () { function privateClassT() { } return privateClassT; -})(); +}()); var publicClassT = (function () { function publicClassT() { } return publicClassT; -})(); +}()); exports.publicClassT = publicClassT; diff --git a/tests/baselines/reference/privacyTypeParametersOfInterfaceDeclFile.js b/tests/baselines/reference/privacyTypeParametersOfInterfaceDeclFile.js index ae8ee2d43f3..7c92ed701d9 100644 --- a/tests/baselines/reference/privacyTypeParametersOfInterfaceDeclFile.js +++ b/tests/baselines/reference/privacyTypeParametersOfInterfaceDeclFile.js @@ -196,23 +196,23 @@ var privateClass = (function () { function privateClass() { } return privateClass; -})(); +}()); var publicClass = (function () { function publicClass() { } return publicClass; -})(); +}()); exports.publicClass = publicClass; var privateClassT = (function () { function privateClassT() { } return privateClassT; -})(); +}()); var publicClassT = (function () { function publicClassT() { } return publicClassT; -})(); +}()); exports.publicClassT = publicClassT; var publicModule; (function (publicModule) { @@ -220,23 +220,23 @@ var publicModule; function privateClassInPublicModule() { } return privateClassInPublicModule; - })(); + }()); var publicClassInPublicModule = (function () { function publicClassInPublicModule() { } return publicClassInPublicModule; - })(); + }()); publicModule.publicClassInPublicModule = publicClassInPublicModule; var privateClassInPublicModuleT = (function () { function privateClassInPublicModuleT() { } return privateClassInPublicModuleT; - })(); + }()); var publicClassInPublicModuleT = (function () { function publicClassInPublicModuleT() { } return publicClassInPublicModuleT; - })(); + }()); publicModule.publicClassInPublicModuleT = publicClassInPublicModuleT; })(publicModule = exports.publicModule || (exports.publicModule = {})); var privateModule; @@ -245,22 +245,22 @@ var privateModule; function privateClassInPrivateModule() { } return privateClassInPrivateModule; - })(); + }()); var publicClassInPrivateModule = (function () { function publicClassInPrivateModule() { } return publicClassInPrivateModule; - })(); + }()); privateModule.publicClassInPrivateModule = publicClassInPrivateModule; var privateClassInPrivateModuleT = (function () { function privateClassInPrivateModuleT() { } return privateClassInPrivateModuleT; - })(); + }()); var publicClassInPrivateModuleT = (function () { function publicClassInPrivateModuleT() { } return publicClassInPrivateModuleT; - })(); + }()); privateModule.publicClassInPrivateModuleT = publicClassInPrivateModuleT; })(privateModule || (privateModule = {})); diff --git a/tests/baselines/reference/privacyVar.js b/tests/baselines/reference/privacyVar.js index b5a68268074..0d133743709 100644 --- a/tests/baselines/reference/privacyVar.js +++ b/tests/baselines/reference/privacyVar.js @@ -184,13 +184,13 @@ var m1; C1_public.prototype.f1 = function () { }; return C1_public; - })(); + }()); m1.C1_public = C1_public; var C2_private = (function () { function C2_private() { } return C2_private; - })(); + }()); var C3_public = (function () { function C3_public() { this.C3_v11_private = new C1_public(); @@ -203,7 +203,7 @@ var m1; this.C3_v24_public = new C2_private(); // error } return C3_public; - })(); + }()); m1.C3_public = C3_public; var C4_public = (function () { function C4_public() { @@ -217,7 +217,7 @@ var m1; this.C4_v24_public = new C2_private(); } return C4_public; - })(); + }()); var m1_v1_private; var m1_v3_private; var m1_v11_private = new C1_public(); @@ -237,13 +237,13 @@ var m2; m2_C1_public.prototype.f1 = function () { }; return m2_C1_public; - })(); + }()); m2.m2_C1_public = m2_C1_public; var m2_C2_private = (function () { function m2_C2_private() { } return m2_C2_private; - })(); + }()); var m2_C3_public = (function () { function m2_C3_public() { this.m2_C3_v11_private = new m2_C1_public(); @@ -256,7 +256,7 @@ var m2; this.m2_C3_v24_public = new m2_C2_private(); } return m2_C3_public; - })(); + }()); m2.m2_C3_public = m2_C3_public; var m2_C4_public = (function () { function m2_C4_public() { @@ -270,7 +270,7 @@ var m2; this.m2_C4_v24_public = new m2_C2_private(); } return m2_C4_public; - })(); + }()); var m2_v1_private; var m2_v3_private; var m2_v11_private = new m2_C1_public(); @@ -288,13 +288,13 @@ var glo_C1_public = (function () { glo_C1_public.prototype.f1 = function () { }; return glo_C1_public; -})(); +}()); exports.glo_C1_public = glo_C1_public; var glo_C2_private = (function () { function glo_C2_private() { } return glo_C2_private; -})(); +}()); var glo_C3_public = (function () { function glo_C3_public() { this.glo_C3_v11_private = new glo_C1_public(); @@ -307,7 +307,7 @@ var glo_C3_public = (function () { this.glo_C3_v24_public = new glo_C2_private(); //error } return glo_C3_public; -})(); +}()); exports.glo_C3_public = glo_C3_public; var glo_C4_public = (function () { function glo_C4_public() { @@ -321,7 +321,7 @@ var glo_C4_public = (function () { this.glo_C4_v24_public = new glo_C2_private(); } return glo_C4_public; -})(); +}()); var glo_v1_private; var glo_v3_private; var glo_v11_private = new glo_C1_public(); diff --git a/tests/baselines/reference/privacyVarDeclFile.js b/tests/baselines/reference/privacyVarDeclFile.js index 5dd2e611ffb..102aeea58a4 100644 --- a/tests/baselines/reference/privacyVarDeclFile.js +++ b/tests/baselines/reference/privacyVarDeclFile.js @@ -431,48 +431,48 @@ var privateClass = (function () { function privateClass() { } return privateClass; -})(); +}()); var publicClass = (function () { function publicClass() { } return publicClass; -})(); +}()); exports.publicClass = publicClass; var publicClassWithWithPrivatePropertyTypes = (function () { function publicClassWithWithPrivatePropertyTypes() { } return publicClassWithWithPrivatePropertyTypes; -})(); +}()); exports.publicClassWithWithPrivatePropertyTypes = publicClassWithWithPrivatePropertyTypes; var publicClassWithWithPublicPropertyTypes = (function () { function publicClassWithWithPublicPropertyTypes() { } return publicClassWithWithPublicPropertyTypes; -})(); +}()); exports.publicClassWithWithPublicPropertyTypes = publicClassWithWithPublicPropertyTypes; var privateClassWithWithPrivatePropertyTypes = (function () { function privateClassWithWithPrivatePropertyTypes() { } return privateClassWithWithPrivatePropertyTypes; -})(); +}()); var privateClassWithWithPublicPropertyTypes = (function () { function privateClassWithWithPublicPropertyTypes() { } return privateClassWithWithPublicPropertyTypes; -})(); +}()); var privateVarWithPrivatePropertyTypes; var privateVarWithPublicPropertyTypes; var publicClassWithPrivateModulePropertyTypes = (function () { function publicClassWithPrivateModulePropertyTypes() { } return publicClassWithPrivateModulePropertyTypes; -})(); +}()); exports.publicClassWithPrivateModulePropertyTypes = publicClassWithPrivateModulePropertyTypes; var privateClassWithPrivateModulePropertyTypes = (function () { function privateClassWithPrivateModulePropertyTypes() { } return privateClassWithPrivateModulePropertyTypes; -})(); +}()); var privateVarWithPrivateModulePropertyTypes; var publicModule; (function (publicModule) { @@ -480,48 +480,48 @@ var publicModule; function privateClass() { } return privateClass; - })(); + }()); var publicClass = (function () { function publicClass() { } return publicClass; - })(); + }()); publicModule.publicClass = publicClass; var publicClassWithWithPrivatePropertyTypes = (function () { function publicClassWithWithPrivatePropertyTypes() { } return publicClassWithWithPrivatePropertyTypes; - })(); + }()); publicModule.publicClassWithWithPrivatePropertyTypes = publicClassWithWithPrivatePropertyTypes; var publicClassWithWithPublicPropertyTypes = (function () { function publicClassWithWithPublicPropertyTypes() { } return publicClassWithWithPublicPropertyTypes; - })(); + }()); publicModule.publicClassWithWithPublicPropertyTypes = publicClassWithWithPublicPropertyTypes; var privateClassWithWithPrivatePropertyTypes = (function () { function privateClassWithWithPrivatePropertyTypes() { } return privateClassWithWithPrivatePropertyTypes; - })(); + }()); var privateClassWithWithPublicPropertyTypes = (function () { function privateClassWithWithPublicPropertyTypes() { } return privateClassWithWithPublicPropertyTypes; - })(); + }()); var privateVarWithPrivatePropertyTypes; var privateVarWithPublicPropertyTypes; var publicClassWithPrivateModulePropertyTypes = (function () { function publicClassWithPrivateModulePropertyTypes() { } return publicClassWithPrivateModulePropertyTypes; - })(); + }()); publicModule.publicClassWithPrivateModulePropertyTypes = publicClassWithPrivateModulePropertyTypes; var privateClassWithPrivateModulePropertyTypes = (function () { function privateClassWithPrivateModulePropertyTypes() { } return privateClassWithPrivateModulePropertyTypes; - })(); + }()); var privateVarWithPrivateModulePropertyTypes; })(publicModule = exports.publicModule || (exports.publicModule = {})); var privateModule; @@ -530,48 +530,48 @@ var privateModule; function privateClass() { } return privateClass; - })(); + }()); var publicClass = (function () { function publicClass() { } return publicClass; - })(); + }()); privateModule.publicClass = publicClass; var publicClassWithWithPrivatePropertyTypes = (function () { function publicClassWithWithPrivatePropertyTypes() { } return publicClassWithWithPrivatePropertyTypes; - })(); + }()); privateModule.publicClassWithWithPrivatePropertyTypes = publicClassWithWithPrivatePropertyTypes; var publicClassWithWithPublicPropertyTypes = (function () { function publicClassWithWithPublicPropertyTypes() { } return publicClassWithWithPublicPropertyTypes; - })(); + }()); privateModule.publicClassWithWithPublicPropertyTypes = publicClassWithWithPublicPropertyTypes; var privateClassWithWithPrivatePropertyTypes = (function () { function privateClassWithWithPrivatePropertyTypes() { } return privateClassWithWithPrivatePropertyTypes; - })(); + }()); var privateClassWithWithPublicPropertyTypes = (function () { function privateClassWithWithPublicPropertyTypes() { } return privateClassWithWithPublicPropertyTypes; - })(); + }()); var privateVarWithPrivatePropertyTypes; var privateVarWithPublicPropertyTypes; var publicClassWithPrivateModulePropertyTypes = (function () { function publicClassWithPrivateModulePropertyTypes() { } return publicClassWithPrivateModulePropertyTypes; - })(); + }()); privateModule.publicClassWithPrivateModulePropertyTypes = publicClassWithPrivateModulePropertyTypes; var privateClassWithPrivateModulePropertyTypes = (function () { function privateClassWithPrivateModulePropertyTypes() { } return privateClassWithPrivateModulePropertyTypes; - })(); + }()); var privateVarWithPrivateModulePropertyTypes; })(privateModule || (privateModule = {})); //// [privacyVarDeclFile_GlobalFile.js] @@ -579,12 +579,12 @@ var publicClassInGlobal = (function () { function publicClassInGlobal() { } return publicClassInGlobal; -})(); +}()); var publicClassWithWithPublicPropertyTypesInGlobal = (function () { function publicClassWithWithPublicPropertyTypesInGlobal() { } return publicClassWithWithPublicPropertyTypesInGlobal; -})(); +}()); var publicVarWithPublicPropertyTypesInGlobal; var publicModuleInGlobal; (function (publicModuleInGlobal) { @@ -592,12 +592,12 @@ var publicModuleInGlobal; function privateClass() { } return privateClass; - })(); + }()); var publicClass = (function () { function publicClass() { } return publicClass; - })(); + }()); publicModuleInGlobal.publicClass = publicClass; var privateModule; (function (privateModule) { @@ -605,84 +605,84 @@ var publicModuleInGlobal; function privateClass() { } return privateClass; - })(); + }()); var publicClass = (function () { function publicClass() { } return publicClass; - })(); + }()); privateModule.publicClass = publicClass; var publicClassWithWithPrivatePropertyTypes = (function () { function publicClassWithWithPrivatePropertyTypes() { } return publicClassWithWithPrivatePropertyTypes; - })(); + }()); privateModule.publicClassWithWithPrivatePropertyTypes = publicClassWithWithPrivatePropertyTypes; var publicClassWithWithPublicPropertyTypes = (function () { function publicClassWithWithPublicPropertyTypes() { } return publicClassWithWithPublicPropertyTypes; - })(); + }()); privateModule.publicClassWithWithPublicPropertyTypes = publicClassWithWithPublicPropertyTypes; var privateClassWithWithPrivatePropertyTypes = (function () { function privateClassWithWithPrivatePropertyTypes() { } return privateClassWithWithPrivatePropertyTypes; - })(); + }()); var privateClassWithWithPublicPropertyTypes = (function () { function privateClassWithWithPublicPropertyTypes() { } return privateClassWithWithPublicPropertyTypes; - })(); + }()); var privateVarWithPrivatePropertyTypes; var privateVarWithPublicPropertyTypes; var publicClassWithPrivateModulePropertyTypes = (function () { function publicClassWithPrivateModulePropertyTypes() { } return publicClassWithPrivateModulePropertyTypes; - })(); + }()); privateModule.publicClassWithPrivateModulePropertyTypes = publicClassWithPrivateModulePropertyTypes; var privateClassWithPrivateModulePropertyTypes = (function () { function privateClassWithPrivateModulePropertyTypes() { } return privateClassWithPrivateModulePropertyTypes; - })(); + }()); var privateVarWithPrivateModulePropertyTypes; })(privateModule || (privateModule = {})); var publicClassWithWithPrivatePropertyTypes = (function () { function publicClassWithWithPrivatePropertyTypes() { } return publicClassWithWithPrivatePropertyTypes; - })(); + }()); publicModuleInGlobal.publicClassWithWithPrivatePropertyTypes = publicClassWithWithPrivatePropertyTypes; var publicClassWithWithPublicPropertyTypes = (function () { function publicClassWithWithPublicPropertyTypes() { } return publicClassWithWithPublicPropertyTypes; - })(); + }()); publicModuleInGlobal.publicClassWithWithPublicPropertyTypes = publicClassWithWithPublicPropertyTypes; var privateClassWithWithPrivatePropertyTypes = (function () { function privateClassWithWithPrivatePropertyTypes() { } return privateClassWithWithPrivatePropertyTypes; - })(); + }()); var privateClassWithWithPublicPropertyTypes = (function () { function privateClassWithWithPublicPropertyTypes() { } return privateClassWithWithPublicPropertyTypes; - })(); + }()); var privateVarWithPrivatePropertyTypes; var privateVarWithPublicPropertyTypes; var publicClassWithPrivateModulePropertyTypes = (function () { function publicClassWithPrivateModulePropertyTypes() { } return publicClassWithPrivateModulePropertyTypes; - })(); + }()); publicModuleInGlobal.publicClassWithPrivateModulePropertyTypes = publicClassWithPrivateModulePropertyTypes; var privateClassWithPrivateModulePropertyTypes = (function () { function privateClassWithPrivateModulePropertyTypes() { } return privateClassWithPrivateModulePropertyTypes; - })(); + }()); var privateVarWithPrivateModulePropertyTypes; })(publicModuleInGlobal || (publicModuleInGlobal = {})); diff --git a/tests/baselines/reference/privateAccessInSubclass1.js b/tests/baselines/reference/privateAccessInSubclass1.js index b22af20af37..188c3149fd0 100644 --- a/tests/baselines/reference/privateAccessInSubclass1.js +++ b/tests/baselines/reference/privateAccessInSubclass1.js @@ -19,7 +19,7 @@ var Base = (function () { function Base() { } return Base; -})(); +}()); var D = (function (_super) { __extends(D, _super); function D() { @@ -29,4 +29,4 @@ var D = (function (_super) { this.options; }; return D; -})(Base); +}(Base)); diff --git a/tests/baselines/reference/privateClassPropertyAccessibleWithinClass.js b/tests/baselines/reference/privateClassPropertyAccessibleWithinClass.js index 116b255a921..1a4ac4b1679 100644 --- a/tests/baselines/reference/privateClassPropertyAccessibleWithinClass.js +++ b/tests/baselines/reference/privateClassPropertyAccessibleWithinClass.js @@ -52,7 +52,7 @@ var C = (function () { C.foo = function () { return this.foo; }; C.bar = function () { this.foo(); }; return C; -})(); +}()); // added level of function nesting var C2 = (function () { function C2() { @@ -96,4 +96,4 @@ var C2 = (function () { (function () { return _this.foo(); }); }; return C2; -})(); +}()); diff --git a/tests/baselines/reference/privateIndexer.js b/tests/baselines/reference/privateIndexer.js index 09f0c85ea5b..8e6fefdbc09 100644 --- a/tests/baselines/reference/privateIndexer.js +++ b/tests/baselines/reference/privateIndexer.js @@ -19,14 +19,14 @@ var C = (function () { function C() { } return C; -})(); +}()); var D = (function () { function D() { } return D; -})(); +}()); var E = (function () { function E() { } return E; -})(); +}()); diff --git a/tests/baselines/reference/privateInstanceMemberAccessibility.js b/tests/baselines/reference/privateInstanceMemberAccessibility.js index 0ba2093a5c7..8fbe5121136 100644 --- a/tests/baselines/reference/privateInstanceMemberAccessibility.js +++ b/tests/baselines/reference/privateInstanceMemberAccessibility.js @@ -23,7 +23,7 @@ var Base = (function () { function Base() { } return Base; -})(); +}()); var Derived = (function (_super) { __extends(Derived, _super); function Derived() { @@ -35,4 +35,4 @@ var Derived = (function (_super) { return _super.prototype.foo; // error }; return Derived; -})(Base); +}(Base)); diff --git a/tests/baselines/reference/privateInstanceVisibility.js b/tests/baselines/reference/privateInstanceVisibility.js index b730a763e1e..86d9d426236 100644 --- a/tests/baselines/reference/privateInstanceVisibility.js +++ b/tests/baselines/reference/privateInstanceVisibility.js @@ -51,7 +51,7 @@ var Test; } }; return Example; - })(); + }()); Test.Example = Example; })(Test || (Test = {})); var C = (function () { @@ -62,4 +62,4 @@ var C = (function () { this.x = other.x; }; return C; -})(); +}()); diff --git a/tests/baselines/reference/privateInterfaceProperties.js b/tests/baselines/reference/privateInterfaceProperties.js index 244f61a98c4..8e1a1ebf5ef 100644 --- a/tests/baselines/reference/privateInterfaceProperties.js +++ b/tests/baselines/reference/privateInterfaceProperties.js @@ -15,10 +15,10 @@ var c1 = (function () { function c1() { } return c1; -})(); +}()); // should be ok var c2 = (function () { function c2() { } return c2; -})(); +}()); diff --git a/tests/baselines/reference/privatePropertyUsingObjectType.js b/tests/baselines/reference/privatePropertyUsingObjectType.js index d3a0c1c8764..0c16d8bafff 100644 --- a/tests/baselines/reference/privatePropertyUsingObjectType.js +++ b/tests/baselines/reference/privatePropertyUsingObjectType.js @@ -16,6 +16,6 @@ define(["require", "exports"], function (require, exports) { function FilterManager() { } return FilterManager; - })(); + }()); exports.FilterManager = FilterManager; }); diff --git a/tests/baselines/reference/privateStaticMemberAccessibility.js b/tests/baselines/reference/privateStaticMemberAccessibility.js index 0b9be3b69ff..2074e5aa864 100644 --- a/tests/baselines/reference/privateStaticMemberAccessibility.js +++ b/tests/baselines/reference/privateStaticMemberAccessibility.js @@ -18,7 +18,7 @@ var Base = (function () { function Base() { } return Base; -})(); +}()); var Derived = (function (_super) { __extends(Derived, _super); function Derived() { @@ -27,4 +27,4 @@ var Derived = (function (_super) { } Derived.bar = Base.foo; // error return Derived; -})(Base); +}(Base)); diff --git a/tests/baselines/reference/privateStaticNotAccessibleInClodule.js b/tests/baselines/reference/privateStaticNotAccessibleInClodule.js index 47aa08dc71f..cb67a15fb24 100644 --- a/tests/baselines/reference/privateStaticNotAccessibleInClodule.js +++ b/tests/baselines/reference/privateStaticNotAccessibleInClodule.js @@ -16,7 +16,7 @@ var C = (function () { function C() { } return C; -})(); +}()); var C; (function (C) { C.y = C.bar; // error diff --git a/tests/baselines/reference/privateStaticNotAccessibleInClodule2.js b/tests/baselines/reference/privateStaticNotAccessibleInClodule2.js index b67ca77dc26..7ed6f3d6792 100644 --- a/tests/baselines/reference/privateStaticNotAccessibleInClodule2.js +++ b/tests/baselines/reference/privateStaticNotAccessibleInClodule2.js @@ -25,14 +25,14 @@ var C = (function () { function C() { } return C; -})(); +}()); var D = (function (_super) { __extends(D, _super); function D() { _super.apply(this, arguments); } return D; -})(C); +}(C)); var D; (function (D) { D.y = D.bar; // error diff --git a/tests/baselines/reference/privateVisibility.js b/tests/baselines/reference/privateVisibility.js index d70d7b4756f..71227b9e09b 100644 --- a/tests/baselines/reference/privateVisibility.js +++ b/tests/baselines/reference/privateVisibility.js @@ -35,7 +35,7 @@ var Foo = (function () { Foo.prototype.pubMeth = function () { this.privMeth(); }; Foo.prototype.privMeth = function () { }; return Foo; -})(); +}()); var f = new Foo(); f.privMeth(); // should not work f.privProp; // should not work @@ -49,7 +49,7 @@ var M; this.priv = 1; } return C; - })(); + }()); M.C = C; M.V = 0; })(M || (M = {})); diff --git a/tests/baselines/reference/privateVisibles.js b/tests/baselines/reference/privateVisibles.js index b2cb673c681..4c3736449f1 100644 --- a/tests/baselines/reference/privateVisibles.js +++ b/tests/baselines/reference/privateVisibles.js @@ -17,4 +17,4 @@ var Foo = (function () { } Foo.prototype.meth = function () { var q = this.pvar; }; return Foo; -})(); +}()); diff --git a/tests/baselines/reference/promiseChaining.js b/tests/baselines/reference/promiseChaining.js index ce15e2d44c1..3f0900f7748 100644 --- a/tests/baselines/reference/promiseChaining.js +++ b/tests/baselines/reference/promiseChaining.js @@ -23,4 +23,4 @@ var Chain = (function () { return new Chain(result); }; return Chain; -})(); +}()); diff --git a/tests/baselines/reference/promiseChaining1.js b/tests/baselines/reference/promiseChaining1.js index 001f1ffc1a6..b396261a59e 100644 --- a/tests/baselines/reference/promiseChaining1.js +++ b/tests/baselines/reference/promiseChaining1.js @@ -23,4 +23,4 @@ var Chain2 = (function () { return new Chain2(result); }; return Chain2; -})(); +}()); diff --git a/tests/baselines/reference/promiseChaining2.js b/tests/baselines/reference/promiseChaining2.js index ed03ab2c97a..d9ae5e8099c 100644 --- a/tests/baselines/reference/promiseChaining2.js +++ b/tests/baselines/reference/promiseChaining2.js @@ -23,4 +23,4 @@ var Chain2 = (function () { return new Chain2(result); }; return Chain2; -})(); +}()); diff --git a/tests/baselines/reference/properties.js b/tests/baselines/reference/properties.js index 67bfc0d9903..fc103423529 100644 --- a/tests/baselines/reference/properties.js +++ b/tests/baselines/reference/properties.js @@ -28,7 +28,7 @@ var MyClass = (function () { configurable: true }); return MyClass; -})(); +}()); //# sourceMappingURL=properties.js.map //// [properties.d.ts] diff --git a/tests/baselines/reference/properties.sourcemap.txt b/tests/baselines/reference/properties.sourcemap.txt index 40245a8976d..8c99154125a 100644 --- a/tests/baselines/reference/properties.sourcemap.txt +++ b/tests/baselines/reference/properties.sourcemap.txt @@ -142,7 +142,7 @@ sourceFile:properties.ts 1->Emitted(14, 5) Source(13, 1) + SourceIndex(0) 2 >Emitted(14, 19) Source(13, 2) + SourceIndex(0) --- ->>>})(); +>>>}()); 1 > 2 >^ 3 > diff --git a/tests/baselines/reference/propertiesAndIndexers.js b/tests/baselines/reference/propertiesAndIndexers.js index b7a39ae2330..591c4760e58 100644 --- a/tests/baselines/reference/propertiesAndIndexers.js +++ b/tests/baselines/reference/propertiesAndIndexers.js @@ -61,12 +61,12 @@ var P = (function () { function P() { } return P; -})(); +}()); var Q = (function (_super) { __extends(Q, _super); function Q() { _super.apply(this, arguments); } return Q; -})(P); +}(P)); var c; diff --git a/tests/baselines/reference/propertiesAndIndexersForNumericNames.js b/tests/baselines/reference/propertiesAndIndexersForNumericNames.js index 975abdc00ec..409107960b3 100644 --- a/tests/baselines/reference/propertiesAndIndexersForNumericNames.js +++ b/tests/baselines/reference/propertiesAndIndexersForNumericNames.js @@ -81,4 +81,4 @@ var C = (function () { this["0.000000000000000000012"] = "should've been in exponential form"; // No error } return C; -})(); +}()); diff --git a/tests/baselines/reference/propertyAccess.js b/tests/baselines/reference/propertyAccess.js index ed004b332cb..2dbb316d848 100644 --- a/tests/baselines/reference/propertyAccess.js +++ b/tests/baselines/reference/propertyAccess.js @@ -160,14 +160,14 @@ var A = (function () { function A() { } return A; -})(); +}()); var B = (function (_super) { __extends(B, _super); function B() { _super.apply(this, arguments); } return B; -})(A); +}(A)); var Compass; (function (Compass) { Compass[Compass["North"] = 0] = "North"; diff --git a/tests/baselines/reference/propertyAccessOnTypeParameterWithConstraints.js b/tests/baselines/reference/propertyAccessOnTypeParameterWithConstraints.js index c76ad3a1165..63f91ae4f44 100644 --- a/tests/baselines/reference/propertyAccessOnTypeParameterWithConstraints.js +++ b/tests/baselines/reference/propertyAccessOnTypeParameterWithConstraints.js @@ -46,7 +46,7 @@ var C = (function () { return a + x.getDate(); }; return C; -})(); +}()); var r = (new C()).f(); var i; var r2 = i.foo.getDate(); diff --git a/tests/baselines/reference/propertyAccessOnTypeParameterWithConstraints2.js b/tests/baselines/reference/propertyAccessOnTypeParameterWithConstraints2.js index 35c279ba0ed..bbd2def2206 100644 --- a/tests/baselines/reference/propertyAccessOnTypeParameterWithConstraints2.js +++ b/tests/baselines/reference/propertyAccessOnTypeParameterWithConstraints2.js @@ -93,7 +93,7 @@ var A = (function () { } A.prototype.foo = function () { return ''; }; return A; -})(); +}()); var B = (function (_super) { __extends(B, _super); function B() { @@ -103,7 +103,7 @@ var B = (function (_super) { return ''; }; return B; -})(A); +}(A)); var C = (function () { function C() { } @@ -117,7 +117,7 @@ var C = (function () { return a + x.foo(); }; return C; -})(); +}()); //class C { // f() { // var x: U; diff --git a/tests/baselines/reference/propertyAccessOnTypeParameterWithConstraints3.js b/tests/baselines/reference/propertyAccessOnTypeParameterWithConstraints3.js index 24c3fc50501..76da06166d4 100644 --- a/tests/baselines/reference/propertyAccessOnTypeParameterWithConstraints3.js +++ b/tests/baselines/reference/propertyAccessOnTypeParameterWithConstraints3.js @@ -68,7 +68,7 @@ var A = (function () { } A.prototype.foo = function () { return ''; }; return A; -})(); +}()); var B = (function (_super) { __extends(B, _super); function B() { @@ -78,7 +78,7 @@ var B = (function (_super) { return ''; }; return B; -})(A); +}(A)); var C = (function () { function C() { } @@ -94,7 +94,7 @@ var C = (function () { return a + x.foo(); }; return C; -})(); +}()); var r1a = (new C()).f(); var r1b = (new C()).g(new B()); var i; diff --git a/tests/baselines/reference/propertyAccessOnTypeParameterWithConstraints4.js b/tests/baselines/reference/propertyAccessOnTypeParameterWithConstraints4.js index e1209fbfe84..3c5a87e4d06 100644 --- a/tests/baselines/reference/propertyAccessOnTypeParameterWithConstraints4.js +++ b/tests/baselines/reference/propertyAccessOnTypeParameterWithConstraints4.js @@ -42,7 +42,7 @@ var C = (function () { return a + x.notHere(); }; return C; -})(); +}()); var r = (new C()).f(); var i; var r2 = i.foo.notHere(); diff --git a/tests/baselines/reference/propertyAccessOnTypeParameterWithConstraints5.js b/tests/baselines/reference/propertyAccessOnTypeParameterWithConstraints5.js index 37b8240b9ac..c49153c59b0 100644 --- a/tests/baselines/reference/propertyAccessOnTypeParameterWithConstraints5.js +++ b/tests/baselines/reference/propertyAccessOnTypeParameterWithConstraints5.js @@ -55,7 +55,7 @@ var A = (function () { } A.prototype.foo = function () { return ''; }; return A; -})(); +}()); var B = (function (_super) { __extends(B, _super); function B() { @@ -65,7 +65,7 @@ var B = (function (_super) { return ''; }; return B; -})(A); +}(A)); var C = (function () { function C() { } @@ -75,7 +75,7 @@ var C = (function () { return a + x.foo() + x.notHere(); }; return C; -})(); +}()); var r = (new C()).f(); var i; var r2 = i.foo.notHere(); diff --git a/tests/baselines/reference/propertyAccessOnTypeParameterWithoutConstraints.js b/tests/baselines/reference/propertyAccessOnTypeParameterWithoutConstraints.js index bed3e685dcf..0e5a1ee7bae 100644 --- a/tests/baselines/reference/propertyAccessOnTypeParameterWithoutConstraints.js +++ b/tests/baselines/reference/propertyAccessOnTypeParameterWithoutConstraints.js @@ -41,7 +41,7 @@ var C = (function () { return a + x.toString(); }; return C; -})(); +}()); var r = (new C()).f(); var i; var r2 = i.foo.toString(); diff --git a/tests/baselines/reference/propertyAccessibility1.js b/tests/baselines/reference/propertyAccessibility1.js index 9c4d0eb0582..3ba7b297ced 100644 --- a/tests/baselines/reference/propertyAccessibility1.js +++ b/tests/baselines/reference/propertyAccessibility1.js @@ -12,6 +12,6 @@ var Foo = (function () { this.privProp = 0; } return Foo; -})(); +}()); var f = new Foo(); f.privProp; diff --git a/tests/baselines/reference/propertyAccessibility2.js b/tests/baselines/reference/propertyAccessibility2.js index 3009a984186..afce6c4c24a 100644 --- a/tests/baselines/reference/propertyAccessibility2.js +++ b/tests/baselines/reference/propertyAccessibility2.js @@ -11,5 +11,5 @@ var C = (function () { } C.x = 1; return C; -})(); +}()); var c = C.x; diff --git a/tests/baselines/reference/propertyAndAccessorWithSameName.js b/tests/baselines/reference/propertyAndAccessorWithSameName.js index f8978ac4d18..ece999fac54 100644 --- a/tests/baselines/reference/propertyAndAccessorWithSameName.js +++ b/tests/baselines/reference/propertyAndAccessorWithSameName.js @@ -31,7 +31,7 @@ var C = (function () { configurable: true }); return C; -})(); +}()); var D = (function () { function D() { } @@ -42,7 +42,7 @@ var D = (function () { configurable: true }); return D; -})(); +}()); var E = (function () { function E() { } @@ -55,4 +55,4 @@ var E = (function () { configurable: true }); return E; -})(); +}()); diff --git a/tests/baselines/reference/propertyAndFunctionWithSameName.js b/tests/baselines/reference/propertyAndFunctionWithSameName.js index eb0b437fd5c..bb979735172 100644 --- a/tests/baselines/reference/propertyAndFunctionWithSameName.js +++ b/tests/baselines/reference/propertyAndFunctionWithSameName.js @@ -19,10 +19,10 @@ var C = (function () { return 1; }; return C; -})(); +}()); var D = (function () { function D() { } D.prototype.x = function (v) { }; // error return D; -})(); +}()); diff --git a/tests/baselines/reference/propertyIdentityWithPrivacyMismatch.js b/tests/baselines/reference/propertyIdentityWithPrivacyMismatch.js index b87147d11ce..f62acb89dfd 100644 --- a/tests/baselines/reference/propertyIdentityWithPrivacyMismatch.js +++ b/tests/baselines/reference/propertyIdentityWithPrivacyMismatch.js @@ -37,12 +37,12 @@ define(["require", "exports"], function (require, exports) { function Foo1() { } return Foo1; - })(); + }()); var Foo2 = (function () { function Foo2() { } return Foo2; - })(); + }()); var y; var y; }); diff --git a/tests/baselines/reference/propertyNameWithoutTypeAnnotation.js b/tests/baselines/reference/propertyNameWithoutTypeAnnotation.js index ffbc946a368..f9e106a3786 100644 --- a/tests/baselines/reference/propertyNameWithoutTypeAnnotation.js +++ b/tests/baselines/reference/propertyNameWithoutTypeAnnotation.js @@ -26,7 +26,7 @@ var C = (function () { function C() { } return C; -})(); +}()); var a; var b = { foo: null diff --git a/tests/baselines/reference/propertyNamedPrototype.js b/tests/baselines/reference/propertyNamedPrototype.js index 2af5e01de19..34a967a0c91 100644 --- a/tests/baselines/reference/propertyNamedPrototype.js +++ b/tests/baselines/reference/propertyNamedPrototype.js @@ -9,4 +9,4 @@ var C = (function () { function C() { } return C; -})(); +}()); diff --git a/tests/baselines/reference/propertyNamesOfReservedWords.js b/tests/baselines/reference/propertyNamesOfReservedWords.js index b2332345712..4c333f48cbb 100644 --- a/tests/baselines/reference/propertyNamesOfReservedWords.js +++ b/tests/baselines/reference/propertyNamesOfReservedWords.js @@ -281,7 +281,7 @@ var C = (function () { function C() { } return C; -})(); +}()); var c; var r1 = c.abstract; var r2 = c.as; diff --git a/tests/baselines/reference/propertyNamesWithStringLiteral.js b/tests/baselines/reference/propertyNamesWithStringLiteral.js index 1474847723f..f17ddb84dc3 100644 --- a/tests/baselines/reference/propertyNamesWithStringLiteral.js +++ b/tests/baselines/reference/propertyNamesWithStringLiteral.js @@ -21,7 +21,7 @@ var _Color = (function () { function _Color() { } return _Color; -})(); +}()); var Color; (function (Color) { })(Color || (Color = {})); diff --git a/tests/baselines/reference/propertyOrdering.js b/tests/baselines/reference/propertyOrdering.js index f0f4644a983..190117b66f4 100644 --- a/tests/baselines/reference/propertyOrdering.js +++ b/tests/baselines/reference/propertyOrdering.js @@ -33,7 +33,7 @@ var Foo = (function () { }; Foo.prototype.bar = function () { return this.store; }; // should be an error return Foo; -})(); +}()); var Bar = (function () { function Bar(store) { this._store = store; @@ -42,4 +42,4 @@ var Bar = (function () { return this._store.length; // shouldn't be an error }; return Bar; -})(); +}()); diff --git a/tests/baselines/reference/propertyOrdering2.js b/tests/baselines/reference/propertyOrdering2.js index 4c1cfc63d5c..783e7c8d000 100644 --- a/tests/baselines/reference/propertyOrdering2.js +++ b/tests/baselines/reference/propertyOrdering2.js @@ -18,4 +18,4 @@ var Foo = (function () { return this.y; }; return Foo; -})(); +}()); diff --git a/tests/baselines/reference/propertyParameterWithQuestionMark.js b/tests/baselines/reference/propertyParameterWithQuestionMark.js index e3b6bd153c2..511062663e8 100644 --- a/tests/baselines/reference/propertyParameterWithQuestionMark.js +++ b/tests/baselines/reference/propertyParameterWithQuestionMark.js @@ -15,7 +15,7 @@ var C = (function () { this.x = x; } return C; -})(); +}()); // x should not be an optional property var v = {}; // Should fail var v2; diff --git a/tests/baselines/reference/propertyWrappedInTry.js b/tests/baselines/reference/propertyWrappedInTry.js index e7f8a28d688..96684f2b453 100644 --- a/tests/baselines/reference/propertyWrappedInTry.js +++ b/tests/baselines/reference/propertyWrappedInTry.js @@ -24,7 +24,7 @@ var Foo = (function () { function Foo() { } return Foo; -})(); +}()); try { bar = someInitThatMightFail(); } diff --git a/tests/baselines/reference/protectedClassPropertyAccessibleWithinClass.js b/tests/baselines/reference/protectedClassPropertyAccessibleWithinClass.js index 19ec9f50d27..85f63e11c68 100644 --- a/tests/baselines/reference/protectedClassPropertyAccessibleWithinClass.js +++ b/tests/baselines/reference/protectedClassPropertyAccessibleWithinClass.js @@ -52,7 +52,7 @@ var C = (function () { C.foo = function () { return this.foo; }; C.bar = function () { this.foo(); }; return C; -})(); +}()); // added level of function nesting var C2 = (function () { function C2() { @@ -96,4 +96,4 @@ var C2 = (function () { (function () { return _this.foo(); }); }; return C2; -})(); +}()); diff --git a/tests/baselines/reference/protectedClassPropertyAccessibleWithinSubclass.js b/tests/baselines/reference/protectedClassPropertyAccessibleWithinSubclass.js index ce7bc5d0b40..a87f67e15f2 100644 --- a/tests/baselines/reference/protectedClassPropertyAccessibleWithinSubclass.js +++ b/tests/baselines/reference/protectedClassPropertyAccessibleWithinSubclass.js @@ -30,7 +30,7 @@ var B = (function () { function B() { } return B; -})(); +}()); var C = (function (_super) { __extends(C, _super); function C() { @@ -53,4 +53,4 @@ var C = (function (_super) { C.foo = function () { return this.x; }; C.bar = function () { this.foo(); }; return C; -})(B); +}(B)); diff --git a/tests/baselines/reference/protectedClassPropertyAccessibleWithinSubclass2.js b/tests/baselines/reference/protectedClassPropertyAccessibleWithinSubclass2.js index e47e7e5a7d5..05dc85e251e 100644 --- a/tests/baselines/reference/protectedClassPropertyAccessibleWithinSubclass2.js +++ b/tests/baselines/reference/protectedClassPropertyAccessibleWithinSubclass2.js @@ -116,7 +116,7 @@ var Base = (function () { d4.x; // OK, accessed within their declaring class }; return Base; -})(); +}()); var Derived1 = (function (_super) { __extends(Derived1, _super); function Derived1() { @@ -135,7 +135,7 @@ var Derived1 = (function (_super) { d4.x; // Error, isn't accessed through an instance of the enclosing class }; return Derived1; -})(Base); +}(Base)); var Derived2 = (function (_super) { __extends(Derived2, _super); function Derived2() { @@ -154,7 +154,7 @@ var Derived2 = (function (_super) { d4.x; // OK, accessed within a class derived from their declaring class, and through an instance of the enclosing class or one of its subclasses }; return Derived2; -})(Base); +}(Base)); var Derived3 = (function (_super) { __extends(Derived3, _super); function Derived3() { @@ -173,7 +173,7 @@ var Derived3 = (function (_super) { d4.x; // Error, isn't accessed through an instance of the enclosing class }; return Derived3; -})(Derived1); +}(Derived1)); var Derived4 = (function (_super) { __extends(Derived4, _super); function Derived4() { @@ -192,7 +192,7 @@ var Derived4 = (function (_super) { d4.x; // OK, accessed within a class derived from their declaring class, and through an instance of the enclosing class }; return Derived4; -})(Derived2); +}(Derived2)); var b; var d1; var d2; diff --git a/tests/baselines/reference/protectedClassPropertyAccessibleWithinSubclass3.js b/tests/baselines/reference/protectedClassPropertyAccessibleWithinSubclass3.js index 0140e61406c..6675589226e 100644 --- a/tests/baselines/reference/protectedClassPropertyAccessibleWithinSubclass3.js +++ b/tests/baselines/reference/protectedClassPropertyAccessibleWithinSubclass3.js @@ -26,7 +26,7 @@ var Base = (function () { this.x; // OK, accessed within their declaring class }; return Base; -})(); +}()); var Derived = (function (_super) { __extends(Derived, _super); function Derived() { @@ -37,4 +37,4 @@ var Derived = (function (_super) { _super.prototype.x; // Error, x is not public }; return Derived; -})(Base); +}(Base)); diff --git a/tests/baselines/reference/protectedInstanceMemberAccessibility.js b/tests/baselines/reference/protectedInstanceMemberAccessibility.js index ff4ae952249..eba89aac28e 100644 --- a/tests/baselines/reference/protectedInstanceMemberAccessibility.js +++ b/tests/baselines/reference/protectedInstanceMemberAccessibility.js @@ -57,7 +57,7 @@ var A = (function () { return "hello"; }; return A; -})(); +}()); var B = (function (_super) { __extends(B, _super); function B() { @@ -89,11 +89,11 @@ var B = (function (_super) { var c4 = c.z; // error }; return B; -})(A); +}(A)); var C = (function (_super) { __extends(C, _super); function C() { _super.apply(this, arguments); } return C; -})(A); +}(A)); diff --git a/tests/baselines/reference/protectedMembers.js b/tests/baselines/reference/protectedMembers.js index f86818b6e65..e541f697f44 100644 --- a/tests/baselines/reference/protectedMembers.js +++ b/tests/baselines/reference/protectedMembers.js @@ -133,7 +133,7 @@ var C1 = (function () { return this.sx; }; return C1; -})(); +}()); // Derived class accessing protected members var C2 = (function (_super) { __extends(C2, _super); @@ -147,7 +147,7 @@ var C2 = (function (_super) { return _super.sf.call(this) + this.sx; }; return C2; -})(C1); +}(C1)); // Derived class making protected members public var C3 = (function (_super) { __extends(C3, _super); @@ -161,7 +161,7 @@ var C3 = (function (_super) { return _super.sf.call(this); }; return C3; -})(C2); +}(C2)); var c1; var c2; var c3; @@ -184,14 +184,14 @@ var A = (function () { function A() { } return A; -})(); +}()); var B = (function (_super) { __extends(B, _super); function B() { _super.apply(this, arguments); } return B; -})(A); +}(A)); var C = (function (_super) { __extends(C, _super); function C() { @@ -205,30 +205,30 @@ var C = (function (_super) { e.x = 1; }; return C; -})(A); +}(A)); var D = (function (_super) { __extends(D, _super); function D() { _super.apply(this, arguments); } return D; -})(C); +}(C)); var CC = (function () { // Error, constructor cannot be protected function CC() { } return CC; -})(); +}()); var A1 = (function () { function A1() { } return A1; -})(); +}()); var B1 = (function () { function B1() { } return B1; -})(); +}()); var a1; var b1; a1 = b1; // Error, B1 doesn't derive from A1 @@ -237,19 +237,19 @@ var A2 = (function () { function A2() { } return A2; -})(); +}()); var B2 = (function (_super) { __extends(B2, _super); function B2() { _super.apply(this, arguments); } return B2; -})(A2); +}(A2)); var A3 = (function () { function A3() { } return A3; -})(); +}()); // Error x is protected in B3 but public in A3 var B3 = (function (_super) { __extends(B3, _super); @@ -257,4 +257,4 @@ var B3 = (function (_super) { _super.apply(this, arguments); } return B3; -})(A3); +}(A3)); diff --git a/tests/baselines/reference/protectedStaticClassPropertyAccessibleWithinSubclass.js b/tests/baselines/reference/protectedStaticClassPropertyAccessibleWithinSubclass.js index 9edd43ad52e..323a5a2f2b6 100644 --- a/tests/baselines/reference/protectedStaticClassPropertyAccessibleWithinSubclass.js +++ b/tests/baselines/reference/protectedStaticClassPropertyAccessibleWithinSubclass.js @@ -59,7 +59,7 @@ var Base = (function () { Derived3.x; // Error, redefined in a subclass, can only be accessed in the declaring class or one of its subclasses }; return Base; -})(); +}()); var Derived1 = (function (_super) { __extends(Derived1, _super); function Derived1() { @@ -72,7 +72,7 @@ var Derived1 = (function (_super) { Derived3.x; // Error, redefined in a subclass, can only be accessed in the declaring class or one of its subclasses }; return Derived1; -})(Base); +}(Base)); var Derived2 = (function (_super) { __extends(Derived2, _super); function Derived2() { @@ -85,7 +85,7 @@ var Derived2 = (function (_super) { Derived3.x; // Error, redefined in a subclass, can only be accessed in the declaring class or one of its subclasses }; return Derived2; -})(Base); +}(Base)); var Derived3 = (function (_super) { __extends(Derived3, _super); function Derived3() { @@ -98,7 +98,7 @@ var Derived3 = (function (_super) { Derived3.x; // OK, accessed within their declaring class }; return Derived3; -})(Derived1); +}(Derived1)); Base.x; // Error, neither within their declaring class nor classes derived from their declaring class Derived1.x; // Error, neither within their declaring class nor classes derived from their declaring class Derived2.x; // Error, neither within their declaring class nor classes derived from their declaring class diff --git a/tests/baselines/reference/protectedStaticClassPropertyAccessibleWithinSubclass2.js b/tests/baselines/reference/protectedStaticClassPropertyAccessibleWithinSubclass2.js index 5a8b07df371..1295dc7448e 100644 --- a/tests/baselines/reference/protectedStaticClassPropertyAccessibleWithinSubclass2.js +++ b/tests/baselines/reference/protectedStaticClassPropertyAccessibleWithinSubclass2.js @@ -34,7 +34,7 @@ var Base = (function () { this.x; // OK, accessed within their declaring class }; return Base; -})(); +}()); var Derived1 = (function (_super) { __extends(Derived1, _super); function Derived1() { @@ -45,7 +45,7 @@ var Derived1 = (function (_super) { _super.x; // Error, x is not public }; return Derived1; -})(Base); +}(Base)); var Derived2 = (function (_super) { __extends(Derived2, _super); function Derived2() { @@ -56,4 +56,4 @@ var Derived2 = (function (_super) { _super.x; // Error, x is not public }; return Derived2; -})(Derived1); +}(Derived1)); diff --git a/tests/baselines/reference/protectedStaticNotAccessibleInClodule.js b/tests/baselines/reference/protectedStaticNotAccessibleInClodule.js index 7534850b34f..91776654692 100644 --- a/tests/baselines/reference/protectedStaticNotAccessibleInClodule.js +++ b/tests/baselines/reference/protectedStaticNotAccessibleInClodule.js @@ -17,7 +17,7 @@ var C = (function () { function C() { } return C; -})(); +}()); var C; (function (C) { C.f = C.foo; // OK diff --git a/tests/baselines/reference/protoAsIndexInIndexExpression.js b/tests/baselines/reference/protoAsIndexInIndexExpression.js index 715ac2c1007..2c9b0f7a7c7 100644 --- a/tests/baselines/reference/protoAsIndexInIndexExpression.js +++ b/tests/baselines/reference/protoAsIndexInIndexExpression.js @@ -37,4 +37,4 @@ var C = (function () { this["__proto__"] = 0; } return C; -})(); +}()); diff --git a/tests/baselines/reference/protoInIndexer.js b/tests/baselines/reference/protoInIndexer.js index 08e1fbc931c..d1d47681e0c 100644 --- a/tests/baselines/reference/protoInIndexer.js +++ b/tests/baselines/reference/protoInIndexer.js @@ -11,4 +11,4 @@ var X = (function () { this['__proto__'] = null; // used to cause ICE } return X; -})(); +}()); diff --git a/tests/baselines/reference/prototypeInstantiatedWithBaseConstraint.js b/tests/baselines/reference/prototypeInstantiatedWithBaseConstraint.js index 7267d2dad29..3dd3a503213 100644 --- a/tests/baselines/reference/prototypeInstantiatedWithBaseConstraint.js +++ b/tests/baselines/reference/prototypeInstantiatedWithBaseConstraint.js @@ -10,5 +10,5 @@ var C = (function () { function C() { } return C; -})(); +}()); C.prototype.x.boo; // No error, prototype is instantiated to any diff --git a/tests/baselines/reference/publicIndexer.js b/tests/baselines/reference/publicIndexer.js index 6fc5d81b62f..e55a6ace2c4 100644 --- a/tests/baselines/reference/publicIndexer.js +++ b/tests/baselines/reference/publicIndexer.js @@ -19,14 +19,14 @@ var C = (function () { function C() { } return C; -})(); +}()); var D = (function () { function D() { } return D; -})(); +}()); var E = (function () { function E() { } return E; -})(); +}()); diff --git a/tests/baselines/reference/publicMemberImplementedAsPrivateInDerivedClass.js b/tests/baselines/reference/publicMemberImplementedAsPrivateInDerivedClass.js index 7c6202eec30..fc8b07a52bd 100644 --- a/tests/baselines/reference/publicMemberImplementedAsPrivateInDerivedClass.js +++ b/tests/baselines/reference/publicMemberImplementedAsPrivateInDerivedClass.js @@ -12,4 +12,4 @@ var Foo = (function () { function Foo() { } return Foo; -})(); +}()); diff --git a/tests/baselines/reference/qualifiedName_entity-name-resolution-does-not-affect-class-heritage.js b/tests/baselines/reference/qualifiedName_entity-name-resolution-does-not-affect-class-heritage.js index b0079c2f45b..f396c2483e8 100644 --- a/tests/baselines/reference/qualifiedName_entity-name-resolution-does-not-affect-class-heritage.js +++ b/tests/baselines/reference/qualifiedName_entity-name-resolution-does-not-affect-class-heritage.js @@ -22,4 +22,4 @@ var Beta = (function (_super) { _super.apply(this, arguments); } return Beta; -})(Alpha.x); +}(Alpha.x)); diff --git a/tests/baselines/reference/quotedAccessorName1.js b/tests/baselines/reference/quotedAccessorName1.js index 69e0fdb2c8e..fbc47ae18d2 100644 --- a/tests/baselines/reference/quotedAccessorName1.js +++ b/tests/baselines/reference/quotedAccessorName1.js @@ -13,4 +13,4 @@ var C = (function () { configurable: true }); return C; -})(); +}()); diff --git a/tests/baselines/reference/quotedAccessorName2.js b/tests/baselines/reference/quotedAccessorName2.js index 5d2d4861550..a5a3cb3f598 100644 --- a/tests/baselines/reference/quotedAccessorName2.js +++ b/tests/baselines/reference/quotedAccessorName2.js @@ -13,4 +13,4 @@ var C = (function () { configurable: true }); return C; -})(); +}()); diff --git a/tests/baselines/reference/quotedFunctionName1.js b/tests/baselines/reference/quotedFunctionName1.js index 69f4f2cfaa3..f58d154bc7f 100644 --- a/tests/baselines/reference/quotedFunctionName1.js +++ b/tests/baselines/reference/quotedFunctionName1.js @@ -9,4 +9,4 @@ var Test1 = (function () { } Test1.prototype["prop1"] = function () { }; return Test1; -})(); +}()); diff --git a/tests/baselines/reference/quotedFunctionName2.js b/tests/baselines/reference/quotedFunctionName2.js index 3173ec29f13..1508305c969 100644 --- a/tests/baselines/reference/quotedFunctionName2.js +++ b/tests/baselines/reference/quotedFunctionName2.js @@ -9,4 +9,4 @@ var Test1 = (function () { } Test1["prop1"] = function () { }; return Test1; -})(); +}()); diff --git a/tests/baselines/reference/quotedPropertyName1.js b/tests/baselines/reference/quotedPropertyName1.js index 2b4176fc492..91c0c2256e2 100644 --- a/tests/baselines/reference/quotedPropertyName1.js +++ b/tests/baselines/reference/quotedPropertyName1.js @@ -9,4 +9,4 @@ var Test1 = (function () { this["prop1"] = 0; } return Test1; -})(); +}()); diff --git a/tests/baselines/reference/quotedPropertyName2.js b/tests/baselines/reference/quotedPropertyName2.js index ebff9f5fca0..1c4d85076ea 100644 --- a/tests/baselines/reference/quotedPropertyName2.js +++ b/tests/baselines/reference/quotedPropertyName2.js @@ -9,4 +9,4 @@ var Test1 = (function () { } Test1["prop1"] = 0; return Test1; -})(); +}()); diff --git a/tests/baselines/reference/quotedPropertyName3.js b/tests/baselines/reference/quotedPropertyName3.js index 4191418e42a..0b837addf25 100644 --- a/tests/baselines/reference/quotedPropertyName3.js +++ b/tests/baselines/reference/quotedPropertyName3.js @@ -17,4 +17,4 @@ var Test = (function () { var y = x(); }; return Test; -})(); +}()); diff --git a/tests/baselines/reference/raiseErrorOnParameterProperty.js b/tests/baselines/reference/raiseErrorOnParameterProperty.js index 600e1916231..437da6c948f 100644 --- a/tests/baselines/reference/raiseErrorOnParameterProperty.js +++ b/tests/baselines/reference/raiseErrorOnParameterProperty.js @@ -13,5 +13,5 @@ var C1 = (function () { this.x = x; } return C1; -})(); +}()); var c1 = new C1(0); diff --git a/tests/baselines/reference/reachabilityChecks1.js b/tests/baselines/reference/reachabilityChecks1.js index dcbfbe89de4..97b914fc104 100644 --- a/tests/baselines/reference/reachabilityChecks1.js +++ b/tests/baselines/reference/reachabilityChecks1.js @@ -130,7 +130,7 @@ function f2() { function A() { } return A; - })(); + }()); } var B; (function (B) { diff --git a/tests/baselines/reference/reassignStaticProp.js b/tests/baselines/reference/reassignStaticProp.js index 4c8d1178855..2bf2bafa128 100644 --- a/tests/baselines/reference/reassignStaticProp.js +++ b/tests/baselines/reference/reassignStaticProp.js @@ -17,4 +17,4 @@ var foo = (function () { } foo.bar = 1; return foo; -})(); +}()); diff --git a/tests/baselines/reference/recursiveBaseCheck3.js b/tests/baselines/reference/recursiveBaseCheck3.js index aeb0d70240f..b032ce6774d 100644 --- a/tests/baselines/reference/recursiveBaseCheck3.js +++ b/tests/baselines/reference/recursiveBaseCheck3.js @@ -16,12 +16,12 @@ var A = (function (_super) { _super.apply(this, arguments); } return A; -})(C); +}(C)); var C = (function (_super) { __extends(C, _super); function C() { _super.apply(this, arguments); } return C; -})(A); +}(A)); (new C).blah; diff --git a/tests/baselines/reference/recursiveBaseCheck4.js b/tests/baselines/reference/recursiveBaseCheck4.js index 2e4a745a703..07ba40c68b1 100644 --- a/tests/baselines/reference/recursiveBaseCheck4.js +++ b/tests/baselines/reference/recursiveBaseCheck4.js @@ -14,5 +14,5 @@ var M = (function (_super) { _super.apply(this, arguments); } return M; -})(M); +}(M)); (new M).blah; diff --git a/tests/baselines/reference/recursiveBaseCheck5.js b/tests/baselines/reference/recursiveBaseCheck5.js index a27e8403e2a..ac07ae9df4d 100644 --- a/tests/baselines/reference/recursiveBaseCheck5.js +++ b/tests/baselines/reference/recursiveBaseCheck5.js @@ -9,5 +9,5 @@ var X = (function () { function X() { } return X; -})(); +}()); (new X).blah; diff --git a/tests/baselines/reference/recursiveBaseCheck6.js b/tests/baselines/reference/recursiveBaseCheck6.js index 13b4944e96f..5b880c294b7 100644 --- a/tests/baselines/reference/recursiveBaseCheck6.js +++ b/tests/baselines/reference/recursiveBaseCheck6.js @@ -14,5 +14,5 @@ var S18 = (function (_super) { _super.apply(this, arguments); } return S18; -})(S18); +}(S18)); (new S18()).blah; diff --git a/tests/baselines/reference/recursiveBaseConstructorCreation1.js b/tests/baselines/reference/recursiveBaseConstructorCreation1.js index d14a78ed908..dd79ba068bb 100644 --- a/tests/baselines/reference/recursiveBaseConstructorCreation1.js +++ b/tests/baselines/reference/recursiveBaseConstructorCreation1.js @@ -17,12 +17,12 @@ var C1 = (function () { } C1.prototype.func = function (param) { }; return C1; -})(); +}()); var C2 = (function (_super) { __extends(C2, _super); function C2() { _super.apply(this, arguments); } return C2; -})(C1); +}(C1)); var x = new C2(); // Valid diff --git a/tests/baselines/reference/recursiveClassInstantiationsWithDefaultConstructors.js b/tests/baselines/reference/recursiveClassInstantiationsWithDefaultConstructors.js index 224c13e7765..62e5958715e 100644 --- a/tests/baselines/reference/recursiveClassInstantiationsWithDefaultConstructors.js +++ b/tests/baselines/reference/recursiveClassInstantiationsWithDefaultConstructors.js @@ -23,7 +23,7 @@ var TypeScript2; this.prefix = ""; } return MemberName; - })(); + }()); TypeScript2.MemberName = MemberName; var MemberNameArray = (function (_super) { __extends(MemberNameArray, _super); @@ -31,6 +31,6 @@ var TypeScript2; _super.apply(this, arguments); } return MemberNameArray; - })(MemberName); + }(MemberName)); TypeScript2.MemberNameArray = MemberNameArray; })(TypeScript2 || (TypeScript2 = {})); diff --git a/tests/baselines/reference/recursiveClassReferenceTest.js b/tests/baselines/reference/recursiveClassReferenceTest.js index 0e884b94e8e..3aa066d158d 100644 --- a/tests/baselines/reference/recursiveClassReferenceTest.js +++ b/tests/baselines/reference/recursiveClassReferenceTest.js @@ -126,7 +126,7 @@ var Sample; return true; }; return StartFindAction; - })(); + }()); Find.StartFindAction = StartFindAction; })(Find = Thing_1.Find || (Thing_1.Find = {})); })(Thing = Actions.Thing || (Actions.Thing = {})); @@ -154,7 +154,7 @@ var Sample; FindWidget.prototype.destroy = function () { }; return FindWidget; - })(); + }()); Widgets.FindWidget = FindWidget; })(Widgets = Thing.Widgets || (Thing.Widgets = {})); })(Thing = Sample.Thing || (Sample.Thing = {})); @@ -164,7 +164,7 @@ var AbstractMode = (function () { } AbstractMode.prototype.getInitialState = function () { return null; }; return AbstractMode; -})(); +}()); var Sample; (function (Sample) { var Thing; @@ -185,7 +185,7 @@ var Sample; }; State.prototype.getMode = function () { return mode; }; return State; - })(); + }()); PlainText.State = State; var Mode = (function (_super) { __extends(Mode, _super); @@ -197,7 +197,7 @@ var Sample; return new State(self); }; return Mode; - })(AbstractMode); + }(AbstractMode)); PlainText.Mode = Mode; })(PlainText = Languages.PlainText || (Languages.PlainText = {})); })(Languages = Thing.Languages || (Thing.Languages = {})); diff --git a/tests/baselines/reference/recursiveClassReferenceTest.js.map b/tests/baselines/reference/recursiveClassReferenceTest.js.map index 60c5c552d83..40f720effce 100644 --- a/tests/baselines/reference/recursiveClassReferenceTest.js.map +++ b/tests/baselines/reference/recursiveClassReferenceTest.js.map @@ -1,2 +1,2 @@ //// [recursiveClassReferenceTest.js.map] -{"version":3,"file":"recursiveClassReferenceTest.js","sourceRoot":"","sources":["recursiveClassReferenceTest.ts"],"names":[],"mappings":"AAAA,iEAAiE;AACjE,0EAA0E;;;;;;AA8B1E,IAAO,MAAM,CAUZ;AAVD,WAAO,MAAM;IAAC,IAAA,OAAO,CAUpB;IAVa,WAAA,OAAO;QAAC,IAAA,KAAK,CAU1B;QAVqB,WAAA,OAAK;YAAC,IAAA,IAAI,CAU/B;YAV2B,WAAA,IAAI,EAAC,CAAC;gBACjC;oBAAA;oBAQA,CAAC;oBANO,+BAAK,GAAZ,cAAiB,MAAM,CAAC,IAAI,CAAC,CAAC,CAAC;oBAExB,6BAAG,GAAV,UAAW,KAA6B;wBAEvC,MAAM,CAAC,IAAI,CAAC;oBACb,CAAC;oBACF,sBAAC;gBAAD,CAAC,AARD,IAQC;gBARY,oBAAe,kBAQ3B,CAAA;YACF,CAAC,EAV2B,IAAI,GAAJ,YAAI,KAAJ,YAAI,QAU/B;QAAD,CAAC,EAVqB,KAAK,GAAL,aAAK,KAAL,aAAK,QAU1B;IAAD,CAAC,EAVa,OAAO,GAAP,cAAO,KAAP,cAAO,QAUpB;AAAD,CAAC,EAVM,MAAM,KAAN,MAAM,QAUZ;AAED,IAAO,MAAM,CAoBZ;AApBD,WAAO,MAAM;IAAC,IAAA,KAAK,CAoBlB;IApBa,WAAA,KAAK;QAAC,IAAA,OAAO,CAoB1B;QApBmB,WAAA,OAAO,EAAC,CAAC;YAC5B;gBAKC,oBAAoB,SAAkC;oBAAlC,cAAS,GAAT,SAAS,CAAyB;oBAD9C,YAAO,GAAO,IAAI,CAAC;oBAEvB,aAAa;oBACb,SAAS,CAAC,SAAS,CAAC,WAAW,EAAE,IAAI,CAAC,CAAC;gBAC3C,CAAC;gBANM,wBAAG,GAAV,UAAW,MAAyC,IAAI,EAAE,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC;oBAAA,MAAM,CAAC,MAAM,CAAC,IAAI,CAAC,CAAC;gBAAA,CAAC,CAAA,CAAC;gBAQlF,+BAAU,GAAjB;oBACC,MAAM,CAAC,OAAO,CAAC;gBAChB,CAAC;gBAEM,4BAAO,GAAd;gBAEA,CAAC;gBAEF,iBAAC;YAAD,CAAC,AAlBD,IAkBC;YAlBY,kBAAU,aAkBtB,CAAA;QACF,CAAC,EApBmB,OAAO,GAAP,aAAO,KAAP,aAAO,QAoB1B;IAAD,CAAC,EApBa,KAAK,GAAL,YAAK,KAAL,YAAK,QAoBlB;AAAD,CAAC,EApBM,MAAM,KAAN,MAAM,QAoBZ;AAGD;IAAA;IAAuF,CAAC;IAA3C,sCAAe,GAAtB,cAAmC,MAAM,CAAC,IAAI,CAAC,CAAA,CAAC;IAAC,mBAAC;AAAD,CAAC,AAAxF,IAAwF;AASxF,IAAO,MAAM,CAwBZ;AAxBD,WAAO,MAAM;IAAC,IAAA,KAAK,CAwBlB;IAxBa,WAAA,KAAK;QAAC,IAAA,SAAS,CAwB5B;QAxBmB,WAAA,SAAS;YAAC,IAAA,SAAS,CAwBtC;YAxB6B,WAAA,SAAS,EAAC,CAAC;gBAExC;oBACO,eAAoB,IAAW;wBAAX,SAAI,GAAJ,IAAI,CAAO;oBAAI,CAAC;oBACnC,qBAAK,GAAZ;wBACC,MAAM,CAAC,IAAI,CAAC;oBACb,CAAC;oBAEM,sBAAM,GAAb,UAAc,KAAY;wBACzB,MAAM,CAAC,IAAI,KAAK,KAAK,CAAC;oBACvB,CAAC;oBAEM,uBAAO,GAAd,cAA0B,MAAM,CAAC,IAAI,CAAC,CAAC,CAAC;oBACzC,YAAC;gBAAD,CAAC,AAXD,IAWC;gBAXY,eAAK,QAWjB,CAAA;gBAED;oBAA0B,wBAAY;oBAAtC;wBAA0B,8BAAY;oBAQtC,CAAC;oBANA,aAAa;oBACN,8BAAe,GAAtB;wBACC,MAAM,CAAC,IAAI,KAAK,CAAC,IAAI,CAAC,CAAC;oBACxB,CAAC;oBAGF,WAAC;gBAAD,CAAC,AARD,EAA0B,YAAY,EAQrC;gBARY,cAAI,OAQhB,CAAA;YACF,CAAC,EAxB6B,SAAS,GAAT,mBAAS,KAAT,mBAAS,QAwBtC;QAAD,CAAC,EAxBmB,SAAS,GAAT,eAAS,KAAT,eAAS,QAwB5B;IAAD,CAAC,EAxBa,KAAK,GAAL,YAAK,KAAL,YAAK,QAwBlB;AAAD,CAAC,EAxBM,MAAM,KAAN,MAAM,QAwBZ"} \ No newline at end of file +{"version":3,"file":"recursiveClassReferenceTest.js","sourceRoot":"","sources":["recursiveClassReferenceTest.ts"],"names":[],"mappings":"AAAA,iEAAiE;AACjE,0EAA0E;;;;;;AA8B1E,IAAO,MAAM,CAUZ;AAVD,WAAO,MAAM;IAAC,IAAA,OAAO,CAUpB;IAVa,WAAA,OAAO;QAAC,IAAA,KAAK,CAU1B;QAVqB,WAAA,OAAK;YAAC,IAAA,IAAI,CAU/B;YAV2B,WAAA,IAAI,EAAC,CAAC;gBACjC;oBAAA;oBAQA,CAAC;oBANO,+BAAK,GAAZ,cAAiB,MAAM,CAAC,IAAI,CAAC,CAAC,CAAC;oBAExB,6BAAG,GAAV,UAAW,KAA6B;wBAEvC,MAAM,CAAC,IAAI,CAAC;oBACb,CAAC;oBACF,sBAAC;gBAAD,CAAC,AARD,IAQC;gBARY,oBAAe,kBAQ3B,CAAA;YACF,CAAC,EAV2B,IAAI,GAAJ,YAAI,KAAJ,YAAI,QAU/B;QAAD,CAAC,EAVqB,KAAK,GAAL,aAAK,KAAL,aAAK,QAU1B;IAAD,CAAC,EAVa,OAAO,GAAP,cAAO,KAAP,cAAO,QAUpB;AAAD,CAAC,EAVM,MAAM,KAAN,MAAM,QAUZ;AAED,IAAO,MAAM,CAoBZ;AApBD,WAAO,MAAM;IAAC,IAAA,KAAK,CAoBlB;IApBa,WAAA,KAAK;QAAC,IAAA,OAAO,CAoB1B;QApBmB,WAAA,OAAO,EAAC,CAAC;YAC5B;gBAKC,oBAAoB,SAAkC;oBAAlC,cAAS,GAAT,SAAS,CAAyB;oBAD9C,YAAO,GAAO,IAAI,CAAC;oBAEvB,aAAa;oBACb,SAAS,CAAC,SAAS,CAAC,WAAW,EAAE,IAAI,CAAC,CAAC;gBAC3C,CAAC;gBANM,wBAAG,GAAV,UAAW,MAAyC,IAAI,EAAE,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC;oBAAA,MAAM,CAAC,MAAM,CAAC,IAAI,CAAC,CAAC;gBAAA,CAAC,CAAA,CAAC;gBAQlF,+BAAU,GAAjB;oBACC,MAAM,CAAC,OAAO,CAAC;gBAChB,CAAC;gBAEM,4BAAO,GAAd;gBAEA,CAAC;gBAEF,iBAAC;YAAD,CAAC,AAlBD,IAkBC;YAlBY,kBAAU,aAkBtB,CAAA;QACF,CAAC,EApBmB,OAAO,GAAP,aAAO,KAAP,aAAO,QAoB1B;IAAD,CAAC,EApBa,KAAK,GAAL,YAAK,KAAL,YAAK,QAoBlB;AAAD,CAAC,EApBM,MAAM,KAAN,MAAM,QAoBZ;AAGD;IAAA;IAAuF,CAAC;IAA3C,sCAAe,GAAtB,cAAmC,MAAM,CAAC,IAAI,CAAC,CAAA,CAAC;IAAC,mBAAC;AAAD,CAAC,AAAxF,IAAwF;AASxF,IAAO,MAAM,CAwBZ;AAxBD,WAAO,MAAM;IAAC,IAAA,KAAK,CAwBlB;IAxBa,WAAA,KAAK;QAAC,IAAA,SAAS,CAwB5B;QAxBmB,WAAA,SAAS;YAAC,IAAA,SAAS,CAwBtC;YAxB6B,WAAA,SAAS,EAAC,CAAC;gBAExC;oBACO,eAAoB,IAAW;wBAAX,SAAI,GAAJ,IAAI,CAAO;oBAAI,CAAC;oBACnC,qBAAK,GAAZ;wBACC,MAAM,CAAC,IAAI,CAAC;oBACb,CAAC;oBAEM,sBAAM,GAAb,UAAc,KAAY;wBACzB,MAAM,CAAC,IAAI,KAAK,KAAK,CAAC;oBACvB,CAAC;oBAEM,uBAAO,GAAd,cAA0B,MAAM,CAAC,IAAI,CAAC,CAAC,CAAC;oBACzC,YAAC;gBAAD,CAAC,AAXD,IAWC;gBAXY,eAAK,QAWjB,CAAA;gBAED;oBAA0B,wBAAY;oBAAtC;wBAA0B,8BAAY;oBAQtC,CAAC;oBANA,aAAa;oBACN,8BAAe,GAAtB;wBACC,MAAM,CAAC,IAAI,KAAK,CAAC,IAAI,CAAC,CAAC;oBACxB,CAAC;oBAGF,WAAC;gBAAD,CAAC,AARD,CAA0B,YAAY,GAQrC;gBARY,cAAI,OAQhB,CAAA;YACF,CAAC,EAxB6B,SAAS,GAAT,mBAAS,KAAT,mBAAS,QAwBtC;QAAD,CAAC,EAxBmB,SAAS,GAAT,eAAS,KAAT,eAAS,QAwB5B;IAAD,CAAC,EAxBa,KAAK,GAAL,YAAK,KAAL,YAAK,QAwBlB;AAAD,CAAC,EAxBM,MAAM,KAAN,MAAM,QAwBZ"} \ No newline at end of file diff --git a/tests/baselines/reference/recursiveClassReferenceTest.sourcemap.txt b/tests/baselines/reference/recursiveClassReferenceTest.sourcemap.txt index 0036b8234d8..25dc6a1900d 100644 --- a/tests/baselines/reference/recursiveClassReferenceTest.sourcemap.txt +++ b/tests/baselines/reference/recursiveClassReferenceTest.sourcemap.txt @@ -331,7 +331,7 @@ sourceFile:recursiveClassReferenceTest.ts 1->Emitted(23, 21) Source(41, 2) + SourceIndex(0) 2 >Emitted(23, 43) Source(41, 3) + SourceIndex(0) --- ->>> })(); +>>> }()); 1 >^^^^^^^^^^^^^^^^ 2 > ^ 3 > @@ -952,7 +952,7 @@ sourceFile:recursiveClassReferenceTest.ts 1->Emitted(51, 17) Source(63, 2) + SourceIndex(0) 2 >Emitted(51, 34) Source(63, 3) + SourceIndex(0) --- ->>> })(); +>>> }()); 1 >^^^^^^^^^^^^ 2 > ^ 3 > @@ -1225,7 +1225,7 @@ sourceFile:recursiveClassReferenceTest.ts 1 >Emitted(61, 5) Source(67, 88) + SourceIndex(0) 2 >Emitted(61, 24) Source(67, 89) + SourceIndex(0) --- ->>>})(); +>>>}()); 1 > 2 >^ 3 > @@ -1640,7 +1640,7 @@ sourceFile:recursiveClassReferenceTest.ts 1 >Emitted(82, 21) Source(89, 2) + SourceIndex(0) 2 >Emitted(82, 33) Source(89, 3) + SourceIndex(0) --- ->>> })(); +>>> }()); 1 >^^^^^^^^^^^^^^^^ 2 > ^ 3 > @@ -1812,33 +1812,33 @@ sourceFile:recursiveClassReferenceTest.ts 1->Emitted(94, 21) Source(99, 2) + SourceIndex(0) 2 >Emitted(94, 32) Source(99, 3) + SourceIndex(0) --- ->>> })(AbstractMode); +>>> }(AbstractMode)); 1->^^^^^^^^^^^^^^^^ 2 > ^ 3 > -4 > ^^ -5 > ^^^^^^^^^^^^ -6 > ^^ +4 > ^ +5 > ^^^^^^^^^^^^ +6 > ^^^ 7 > ^^^^^^-> 1-> 2 > } 3 > 4 > export class Mode extends -5 > AbstractMode -6 > { - > - > // scenario 2 - > public getInitialState(): IState { - > return new State(self); - > } - > - > - > } +5 > AbstractMode +6 > { + > + > // scenario 2 + > public getInitialState(): IState { + > return new State(self); + > } + > + > + > } 1->Emitted(95, 17) Source(99, 2) + SourceIndex(0) 2 >Emitted(95, 18) Source(99, 3) + SourceIndex(0) 3 >Emitted(95, 18) Source(91, 2) + SourceIndex(0) -4 >Emitted(95, 20) Source(91, 28) + SourceIndex(0) -5 >Emitted(95, 32) Source(91, 40) + SourceIndex(0) +4 >Emitted(95, 19) Source(91, 28) + SourceIndex(0) +5 >Emitted(95, 31) Source(91, 40) + SourceIndex(0) 6 >Emitted(95, 34) Source(99, 3) + SourceIndex(0) --- >>> PlainText.Mode = Mode; diff --git a/tests/baselines/reference/recursiveCloduleReference.js b/tests/baselines/reference/recursiveCloduleReference.js index 74072e653ef..07d80e6011a 100644 --- a/tests/baselines/reference/recursiveCloduleReference.js +++ b/tests/baselines/reference/recursiveCloduleReference.js @@ -17,7 +17,7 @@ var M; function C() { } return C; - })(); + }()); M.C = C; var C; (function (C_1) { diff --git a/tests/baselines/reference/recursiveComplicatedClasses.js b/tests/baselines/reference/recursiveComplicatedClasses.js index e35931008b2..a5756024458 100644 --- a/tests/baselines/reference/recursiveComplicatedClasses.js +++ b/tests/baselines/reference/recursiveComplicatedClasses.js @@ -35,7 +35,7 @@ var Signature = (function () { this.parameters = null; } return Signature; -})(); +}()); function aEnclosesB(a) { return true; } @@ -47,25 +47,25 @@ var Symbol = (function () { return aEnclosesB(b); }; return Symbol; -})(); +}()); var InferenceSymbol = (function (_super) { __extends(InferenceSymbol, _super); function InferenceSymbol() { _super.apply(this, arguments); } return InferenceSymbol; -})(Symbol); +}(Symbol)); var ParameterSymbol = (function (_super) { __extends(ParameterSymbol, _super); function ParameterSymbol() { _super.apply(this, arguments); } return ParameterSymbol; -})(InferenceSymbol); +}(InferenceSymbol)); var TypeSymbol = (function (_super) { __extends(TypeSymbol, _super); function TypeSymbol() { _super.apply(this, arguments); } return TypeSymbol; -})(InferenceSymbol); +}(InferenceSymbol)); diff --git a/tests/baselines/reference/recursiveExportAssignmentAndFindAliasedType1.js b/tests/baselines/reference/recursiveExportAssignmentAndFindAliasedType1.js index 2cc10db27c0..d759bc2f296 100644 --- a/tests/baselines/reference/recursiveExportAssignmentAndFindAliasedType1.js +++ b/tests/baselines/reference/recursiveExportAssignmentAndFindAliasedType1.js @@ -23,7 +23,7 @@ define(["require", "exports"], function (require, exports) { function ClassB() { } return ClassB; - })(); + }()); return ClassB; }); //// [recursiveExportAssignmentAndFindAliasedType1_moduleA.js] diff --git a/tests/baselines/reference/recursiveExportAssignmentAndFindAliasedType2.js b/tests/baselines/reference/recursiveExportAssignmentAndFindAliasedType2.js index f1e5753360f..7704b38f68d 100644 --- a/tests/baselines/reference/recursiveExportAssignmentAndFindAliasedType2.js +++ b/tests/baselines/reference/recursiveExportAssignmentAndFindAliasedType2.js @@ -27,7 +27,7 @@ define(["require", "exports"], function (require, exports) { function ClassB() { } return ClassB; - })(); + }()); return ClassB; }); //// [recursiveExportAssignmentAndFindAliasedType2_moduleA.js] diff --git a/tests/baselines/reference/recursiveExportAssignmentAndFindAliasedType3.js b/tests/baselines/reference/recursiveExportAssignmentAndFindAliasedType3.js index c195f13a5ed..a46be3bdafc 100644 --- a/tests/baselines/reference/recursiveExportAssignmentAndFindAliasedType3.js +++ b/tests/baselines/reference/recursiveExportAssignmentAndFindAliasedType3.js @@ -31,7 +31,7 @@ define(["require", "exports"], function (require, exports) { function ClassB() { } return ClassB; - })(); + }()); return ClassB; }); //// [recursiveExportAssignmentAndFindAliasedType3_moduleA.js] diff --git a/tests/baselines/reference/recursiveExportAssignmentAndFindAliasedType4.js b/tests/baselines/reference/recursiveExportAssignmentAndFindAliasedType4.js index 59726c68c25..55f89491bf8 100644 --- a/tests/baselines/reference/recursiveExportAssignmentAndFindAliasedType4.js +++ b/tests/baselines/reference/recursiveExportAssignmentAndFindAliasedType4.js @@ -24,7 +24,7 @@ define(["require", "exports"], function (require, exports) { function ClassB() { } return ClassB; - })(); + }()); return ClassB; }); //// [recursiveExportAssignmentAndFindAliasedType4_moduleA.js] diff --git a/tests/baselines/reference/recursiveExportAssignmentAndFindAliasedType5.js b/tests/baselines/reference/recursiveExportAssignmentAndFindAliasedType5.js index 7bd4b7dce4a..44464fd300e 100644 --- a/tests/baselines/reference/recursiveExportAssignmentAndFindAliasedType5.js +++ b/tests/baselines/reference/recursiveExportAssignmentAndFindAliasedType5.js @@ -32,7 +32,7 @@ define(["require", "exports"], function (require, exports) { function ClassB() { } return ClassB; - })(); + }()); return ClassB; }); //// [recursiveExportAssignmentAndFindAliasedType5_moduleA.js] diff --git a/tests/baselines/reference/recursiveExportAssignmentAndFindAliasedType6.js b/tests/baselines/reference/recursiveExportAssignmentAndFindAliasedType6.js index 268352c001a..a457802041b 100644 --- a/tests/baselines/reference/recursiveExportAssignmentAndFindAliasedType6.js +++ b/tests/baselines/reference/recursiveExportAssignmentAndFindAliasedType6.js @@ -40,7 +40,7 @@ define(["require", "exports"], function (require, exports) { function ClassB() { } return ClassB; - })(); + }()); return ClassB; }); //// [recursiveExportAssignmentAndFindAliasedType6_moduleA.js] diff --git a/tests/baselines/reference/recursiveExportAssignmentAndFindAliasedType7.js b/tests/baselines/reference/recursiveExportAssignmentAndFindAliasedType7.js index be43b42e75f..9a29c2bf949 100644 --- a/tests/baselines/reference/recursiveExportAssignmentAndFindAliasedType7.js +++ b/tests/baselines/reference/recursiveExportAssignmentAndFindAliasedType7.js @@ -45,7 +45,7 @@ define(["require", "exports"], function (require, exports) { function ClassB() { } return ClassB; - })(); + }()); return ClassB; }); //// [recursiveExportAssignmentAndFindAliasedType7_moduleA.js] diff --git a/tests/baselines/reference/recursiveFunctionTypes.js b/tests/baselines/reference/recursiveFunctionTypes.js index 040c323066d..6ff9e4eb997 100644 --- a/tests/baselines/reference/recursiveFunctionTypes.js +++ b/tests/baselines/reference/recursiveFunctionTypes.js @@ -60,7 +60,7 @@ var C = (function () { } C.g = function (t) { }; return C; -})(); +}()); C.g(3); // error var f4; f4 = 3; // error diff --git a/tests/baselines/reference/recursiveFunctionTypes1.js b/tests/baselines/reference/recursiveFunctionTypes1.js index c4c255d5e44..d219c741625 100644 --- a/tests/baselines/reference/recursiveFunctionTypes1.js +++ b/tests/baselines/reference/recursiveFunctionTypes1.js @@ -9,4 +9,4 @@ var C = (function () { } C.g = function (t) { }; return C; -})(); +}()); diff --git a/tests/baselines/reference/recursiveGetterAccess.js b/tests/baselines/reference/recursiveGetterAccess.js index 1dea2e02d3a..efb9dda3b31 100644 --- a/tests/baselines/reference/recursiveGetterAccess.js +++ b/tests/baselines/reference/recursiveGetterAccess.js @@ -15,4 +15,4 @@ var MyClass = (function () { configurable: true }); return MyClass; -})(); +}()); diff --git a/tests/baselines/reference/recursiveInheritance3.js b/tests/baselines/reference/recursiveInheritance3.js index bc9fb6cb4f9..564d4fe6f3c 100644 --- a/tests/baselines/reference/recursiveInheritance3.js +++ b/tests/baselines/reference/recursiveInheritance3.js @@ -15,4 +15,4 @@ var C = (function () { } C.prototype.foo = function (x) { return x; }; return C; -})(); +}()); diff --git a/tests/baselines/reference/recursiveMods.js b/tests/baselines/reference/recursiveMods.js index b25daa169ca..86b3d47a48e 100644 --- a/tests/baselines/reference/recursiveMods.js +++ b/tests/baselines/reference/recursiveMods.js @@ -32,7 +32,7 @@ var Foo; function C() { } return C; - })(); + }()); Foo.C = C; })(Foo = exports.Foo || (exports.Foo = {})); var Foo; diff --git a/tests/baselines/reference/recursiveProperties.js b/tests/baselines/reference/recursiveProperties.js index 84d9ebcd27c..35a284dac89 100644 --- a/tests/baselines/reference/recursiveProperties.js +++ b/tests/baselines/reference/recursiveProperties.js @@ -17,7 +17,7 @@ var A = (function () { configurable: true }); return A; -})(); +}()); var B = (function () { function B() { } @@ -27,4 +27,4 @@ var B = (function () { configurable: true }); return B; -})(); +}()); diff --git a/tests/baselines/reference/recursiveSpecializationOfSignatures.js b/tests/baselines/reference/recursiveSpecializationOfSignatures.js index 7542e85616a..496a74f8983 100644 --- a/tests/baselines/reference/recursiveSpecializationOfSignatures.js +++ b/tests/baselines/reference/recursiveSpecializationOfSignatures.js @@ -18,4 +18,4 @@ var S0 = (function () { configurable: true }); return S0; -})(); +}()); diff --git a/tests/baselines/reference/recursiveTypeInGenericConstraint.js b/tests/baselines/reference/recursiveTypeInGenericConstraint.js index 16ebdd2f6d9..2fb45e1b9e3 100644 --- a/tests/baselines/reference/recursiveTypeInGenericConstraint.js +++ b/tests/baselines/reference/recursiveTypeInGenericConstraint.js @@ -18,15 +18,15 @@ var G = (function () { function G() { } return G; -})(); +}()); var Foo = (function () { function Foo() { } return Foo; -})(); +}()); var D = (function () { function D() { } return D; -})(); +}()); var c1 = new Foo(); // ok, circularity in assignment compat check causes success diff --git a/tests/baselines/reference/recursiveTypeParameterConstraintReferenceLacksTypeArgs.js b/tests/baselines/reference/recursiveTypeParameterConstraintReferenceLacksTypeArgs.js index 45761b9bc28..7a889a8a62a 100644 --- a/tests/baselines/reference/recursiveTypeParameterConstraintReferenceLacksTypeArgs.js +++ b/tests/baselines/reference/recursiveTypeParameterConstraintReferenceLacksTypeArgs.js @@ -6,4 +6,4 @@ var A = (function () { function A() { } return A; -})(); +}()); diff --git a/tests/baselines/reference/recursiveTypeParameterReferenceError1.js b/tests/baselines/reference/recursiveTypeParameterReferenceError1.js index 4bc466bc6cf..a866b4fc78c 100644 --- a/tests/baselines/reference/recursiveTypeParameterReferenceError1.js +++ b/tests/baselines/reference/recursiveTypeParameterReferenceError1.js @@ -22,13 +22,13 @@ var X = (function () { function X() { } return X; -})(); +}()); var f; var r = f.z; var C2 = (function () { function C2() { } return C2; -})(); +}()); var f2; var r2 = f2.ofC4; diff --git a/tests/baselines/reference/recursiveTypesUsedAsFunctionParameters.js b/tests/baselines/reference/recursiveTypesUsedAsFunctionParameters.js index 0cef9be47ab..c2286901a29 100644 --- a/tests/baselines/reference/recursiveTypesUsedAsFunctionParameters.js +++ b/tests/baselines/reference/recursiveTypesUsedAsFunctionParameters.js @@ -48,12 +48,12 @@ var List = (function () { function List() { } return List; -})(); +}()); var MyList = (function () { function MyList() { } return MyList; -})(); +}()); function foo(x) { } function foo2(x) { diff --git a/tests/baselines/reference/recursivelySpecializedConstructorDeclaration.js b/tests/baselines/reference/recursivelySpecializedConstructorDeclaration.js index 48e8b1c4eba..92cc2f72cac 100644 --- a/tests/baselines/reference/recursivelySpecializedConstructorDeclaration.js +++ b/tests/baselines/reference/recursivelySpecializedConstructorDeclaration.js @@ -47,7 +47,7 @@ var MsPortal; function ItemValue(value) { } return ItemValue; - })(); + }()); ItemList.ItemValue = ItemValue; var ViewModel = (function (_super) { __extends(ViewModel, _super); @@ -55,7 +55,7 @@ var MsPortal; _super.apply(this, arguments); } return ViewModel; - })(ItemValue); + }(ItemValue)); ItemList.ViewModel = ViewModel; })(ItemList = Base.ItemList || (Base.ItemList = {})); })(Base = Controls.Base || (Controls.Base = {})); diff --git a/tests/baselines/reference/reexportClassDefinition.js b/tests/baselines/reference/reexportClassDefinition.js index 7c836e056e4..ab5279d1d47 100644 --- a/tests/baselines/reference/reexportClassDefinition.js +++ b/tests/baselines/reference/reexportClassDefinition.js @@ -23,7 +23,7 @@ var x = (function () { function x() { } return x; -})(); +}()); module.exports = x; //// [foo2.js] "use strict"; @@ -45,4 +45,4 @@ var x = (function (_super) { _super.apply(this, arguments); } return x; -})(foo2.x); +}(foo2.x)); diff --git a/tests/baselines/reference/requireEmitSemicolon.js b/tests/baselines/reference/requireEmitSemicolon.js index ea0b4243ff4..7ac73b6f3df 100644 --- a/tests/baselines/reference/requireEmitSemicolon.js +++ b/tests/baselines/reference/requireEmitSemicolon.js @@ -28,7 +28,7 @@ define(["require", "exports"], function (require, exports) { function Person(name) { } return Person; - })(); + }()); Models.Person = Person; })(Models = exports.Models || (exports.Models = {})); }); @@ -44,7 +44,7 @@ define(["require", "exports", "requireEmitSemicolon_0"], function (require, expo return new P.Models.Person("Rock"); }; return DB; - })(); + }()); Database.DB = DB; })(Database = exports.Database || (exports.Database = {})); }); diff --git a/tests/baselines/reference/requiredInitializedParameter2.js b/tests/baselines/reference/requiredInitializedParameter2.js index 3c69d54e1d9..b46a6edfeb0 100644 --- a/tests/baselines/reference/requiredInitializedParameter2.js +++ b/tests/baselines/reference/requiredInitializedParameter2.js @@ -15,4 +15,4 @@ var C1 = (function () { if (a === void 0) { a = 0; } }; return C1; -})(); +}()); diff --git a/tests/baselines/reference/requiredInitializedParameter3.js b/tests/baselines/reference/requiredInitializedParameter3.js index 68e1aa696ea..983955b79e8 100644 --- a/tests/baselines/reference/requiredInitializedParameter3.js +++ b/tests/baselines/reference/requiredInitializedParameter3.js @@ -15,7 +15,7 @@ var C1 = (function () { if (a === void 0) { a = 0; } }; return C1; -})(); +}()); //// [requiredInitializedParameter3.d.ts] diff --git a/tests/baselines/reference/requiredInitializedParameter4.js b/tests/baselines/reference/requiredInitializedParameter4.js index 3b23f119391..11abdc20f41 100644 --- a/tests/baselines/reference/requiredInitializedParameter4.js +++ b/tests/baselines/reference/requiredInitializedParameter4.js @@ -11,7 +11,7 @@ var C1 = (function () { if (a === void 0) { a = 0; } }; return C1; -})(); +}()); //// [requiredInitializedParameter4.d.ts] diff --git a/tests/baselines/reference/resolveTypeAliasWithSameLetDeclarationName1.js b/tests/baselines/reference/resolveTypeAliasWithSameLetDeclarationName1.js index ac73145ee50..7793fc6c650 100644 --- a/tests/baselines/reference/resolveTypeAliasWithSameLetDeclarationName1.js +++ b/tests/baselines/reference/resolveTypeAliasWithSameLetDeclarationName1.js @@ -9,5 +9,5 @@ var C = (function () { function C() { } return C; -})(); +}()); var baz; diff --git a/tests/baselines/reference/resolvingClassDeclarationWhenInBaseTypeResolution.js b/tests/baselines/reference/resolvingClassDeclarationWhenInBaseTypeResolution.js index 3ba03a1e03c..6e621a18805 100644 --- a/tests/baselines/reference/resolvingClassDeclarationWhenInBaseTypeResolution.js +++ b/tests/baselines/reference/resolvingClassDeclarationWhenInBaseTypeResolution.js @@ -1063,7 +1063,7 @@ var rionegrensis; return x; }; return caniventer; - })(Lanthanum.nitidus); + }(Lanthanum.nitidus)); rionegrensis.caniventer = caniventer; var veraecrucis = (function (_super) { __extends(veraecrucis, _super); @@ -1101,7 +1101,7 @@ var rionegrensis; return x; }; return veraecrucis; - })(trivirgatus.mixtus); + }(trivirgatus.mixtus)); rionegrensis.veraecrucis = veraecrucis; })(rionegrensis || (rionegrensis = {})); var julianae; @@ -1110,7 +1110,7 @@ var julianae; function steerii() { } return steerii; - })(); + }()); julianae.steerii = steerii; var nudicaudus = (function () { function nudicaudus() { @@ -1146,7 +1146,7 @@ var julianae; return x; }; return nudicaudus; - })(); + }()); julianae.nudicaudus = nudicaudus; var galapagoensis = (function () { function galapagoensis() { @@ -1194,7 +1194,7 @@ var julianae; return x; }; return galapagoensis; - })(); + }()); julianae.galapagoensis = galapagoensis; var albidens = (function () { function albidens() { @@ -1242,7 +1242,7 @@ var julianae; return x; }; return albidens; - })(); + }()); julianae.albidens = albidens; var oralis = (function (_super) { __extends(oralis, _super); @@ -1328,7 +1328,7 @@ var julianae; return x; }; return oralis; - })(caurinus.psilurus); + }(caurinus.psilurus)); julianae.oralis = oralis; var sumatrana = (function (_super) { __extends(sumatrana, _super); @@ -1378,7 +1378,7 @@ var julianae; return x; }; return sumatrana; - })(Lanthanum.jugularis); + }(Lanthanum.jugularis)); julianae.sumatrana = sumatrana; var gerbillus = (function () { function gerbillus() { @@ -1450,7 +1450,7 @@ var julianae; return x; }; return gerbillus; - })(); + }()); julianae.gerbillus = gerbillus; var acariensis = (function () { function acariensis() { @@ -1528,7 +1528,7 @@ var julianae; return x; }; return acariensis; - })(); + }()); julianae.acariensis = acariensis; var durangae = (function (_super) { __extends(durangae, _super); @@ -1554,7 +1554,7 @@ var julianae; return x; }; return durangae; - })(dogramacii.aurata); + }(dogramacii.aurata)); julianae.durangae = durangae; })(julianae || (julianae = {})); var ruatanica; @@ -1575,7 +1575,7 @@ var ruatanica; return x; }; return hector; - })(); + }()); ruatanica.hector = hector; })(ruatanica || (ruatanica = {})); var Lanthanum; @@ -1602,7 +1602,7 @@ var Lanthanum; return x; }; return suillus; - })(); + }()); Lanthanum.suillus = suillus; var nitidus = (function (_super) { __extends(nitidus, _super); @@ -1670,7 +1670,7 @@ var Lanthanum; return x; }; return nitidus; - })(argurus.gilbertii); + }(argurus.gilbertii)); Lanthanum.nitidus = nitidus; var megalonyx = (function (_super) { __extends(megalonyx, _super); @@ -1726,7 +1726,7 @@ var Lanthanum; return x; }; return megalonyx; - })(caurinus.johorensis); + }(caurinus.johorensis)); Lanthanum.megalonyx = megalonyx; var jugularis = (function () { function jugularis() { @@ -1816,7 +1816,7 @@ var Lanthanum; return x; }; return jugularis; - })(); + }()); Lanthanum.jugularis = jugularis; })(Lanthanum || (Lanthanum = {})); var rendalli; @@ -1911,7 +1911,7 @@ var rendalli; return x; }; return zuluensis; - })(julianae.steerii); + }(julianae.steerii)); rendalli.zuluensis = zuluensis; var moojeni = (function () { function moojeni() { @@ -1977,7 +1977,7 @@ var rendalli; return x; }; return moojeni; - })(); + }()); rendalli.moojeni = moojeni; var crenulata = (function (_super) { __extends(crenulata, _super); @@ -2003,7 +2003,7 @@ var rendalli; return x; }; return crenulata; - })(trivirgatus.falconeri); + }(trivirgatus.falconeri)); rendalli.crenulata = crenulata; })(rendalli || (rendalli = {})); var trivirgatus; @@ -2060,7 +2060,7 @@ var trivirgatus; return x; }; return tumidifrons; - })(); + }()); trivirgatus.tumidifrons = tumidifrons; var mixtus = (function (_super) { __extends(mixtus, _super); @@ -2110,7 +2110,7 @@ var trivirgatus; return x; }; return mixtus; - })(argurus.pygmaea); + }(argurus.pygmaea)); trivirgatus.mixtus = mixtus; var lotor = (function () { function lotor() { @@ -2128,7 +2128,7 @@ var trivirgatus; return x; }; return lotor; - })(); + }()); trivirgatus.lotor = lotor; var falconeri = (function () { function falconeri() { @@ -2176,7 +2176,7 @@ var trivirgatus; return x; }; return falconeri; - })(); + }()); trivirgatus.falconeri = falconeri; var oconnelli = (function () { function oconnelli() { @@ -2266,7 +2266,7 @@ var trivirgatus; return x; }; return oconnelli; - })(); + }()); trivirgatus.oconnelli = oconnelli; })(trivirgatus || (trivirgatus = {})); var quasiater; @@ -2299,7 +2299,7 @@ var quasiater; return x; }; return bobrinskoi; - })(); + }()); quasiater.bobrinskoi = bobrinskoi; })(quasiater || (quasiater = {})); var ruatanica; @@ -2334,7 +2334,7 @@ var ruatanica; return x; }; return americanus; - })(imperfecta.ciliolabrum); + }(imperfecta.ciliolabrum)); ruatanica.americanus = americanus; })(ruatanica || (ruatanica = {})); var lavali; @@ -2423,13 +2423,13 @@ var lavali; return x; }; return wilsoni; - })(Lanthanum.nitidus); + }(Lanthanum.nitidus)); lavali.wilsoni = wilsoni; var beisa = (function () { function beisa() { } return beisa; - })(); + }()); lavali.beisa = beisa; var otion = (function (_super) { __extends(otion, _super); @@ -2515,7 +2515,7 @@ var lavali; return x; }; return otion; - })(howi.coludo); + }(howi.coludo)); lavali.otion = otion; var xanthognathus = (function () { function xanthognathus() { @@ -2593,7 +2593,7 @@ var lavali; return x; }; return xanthognathus; - })(); + }()); lavali.xanthognathus = xanthognathus; var thaeleri = (function (_super) { __extends(thaeleri, _super); @@ -2649,7 +2649,7 @@ var lavali; return x; }; return thaeleri; - })(argurus.oreas); + }(argurus.oreas)); lavali.thaeleri = thaeleri; var lepturus = (function (_super) { __extends(lepturus, _super); @@ -2669,7 +2669,7 @@ var lavali; return x; }; return lepturus; - })(Lanthanum.suillus); + }(Lanthanum.suillus)); lavali.lepturus = lepturus; })(lavali || (lavali = {})); var dogramacii; @@ -2734,7 +2734,7 @@ var dogramacii; return x; }; return robustulus; - })(lavali.wilsoni); + }(lavali.wilsoni)); dogramacii.robustulus = robustulus; var koepckeae = (function () { function koepckeae() { @@ -2746,7 +2746,7 @@ var dogramacii; return x; }; return koepckeae; - })(); + }()); dogramacii.koepckeae = koepckeae; var kaiseri = (function () { function kaiseri() { @@ -2830,7 +2830,7 @@ var dogramacii; return x; }; return kaiseri; - })(); + }()); dogramacii.kaiseri = kaiseri; var aurata = (function () { function aurata() { @@ -2884,7 +2884,7 @@ var dogramacii; return x; }; return aurata; - })(); + }()); dogramacii.aurata = aurata; })(dogramacii || (dogramacii = {})); var lutreolus; @@ -2979,7 +2979,7 @@ var lutreolus; return x; }; return schlegeli; - })(lavali.beisa); + }(lavali.beisa)); lutreolus.schlegeli = schlegeli; })(lutreolus || (lutreolus = {})); var argurus; @@ -3054,7 +3054,7 @@ var argurus; return x; }; return dauricus; - })(); + }()); argurus.dauricus = dauricus; })(argurus || (argurus = {})); var nigra; @@ -3111,7 +3111,7 @@ var nigra; return x; }; return dolichurus; - })(); + }()); nigra.dolichurus = dolichurus; })(nigra || (nigra = {})); var panglima; @@ -3158,7 +3158,7 @@ var panglima; return x; }; return amphibius; - })(caurinus.johorensis); + }(caurinus.johorensis)); panglima.amphibius = amphibius; var fundatus = (function (_super) { __extends(fundatus, _super); @@ -3184,7 +3184,7 @@ var panglima; return x; }; return fundatus; - })(lutreolus.schlegeli); + }(lutreolus.schlegeli)); panglima.fundatus = fundatus; var abidi = (function (_super) { __extends(abidi, _super); @@ -3222,7 +3222,7 @@ var panglima; return x; }; return abidi; - })(argurus.dauricus); + }(argurus.dauricus)); panglima.abidi = abidi; })(panglima || (panglima = {})); var quasiater; @@ -3273,7 +3273,7 @@ var quasiater; return x; }; return carolinensis; - })(); + }()); quasiater.carolinensis = carolinensis; })(quasiater || (quasiater = {})); var minutus; @@ -3356,7 +3356,7 @@ var minutus; return x; }; return himalayana; - })(lutreolus.punicus); + }(lutreolus.punicus)); minutus.himalayana = himalayana; })(minutus || (minutus = {})); var caurinus; @@ -3415,7 +3415,7 @@ var caurinus; return x; }; return mahaganus; - })(panglima.fundatus); + }(panglima.fundatus)); caurinus.mahaganus = mahaganus; })(caurinus || (caurinus = {})); var macrorhinos; @@ -3430,7 +3430,7 @@ var macrorhinos; return x; }; return marmosurus; - })(); + }()); macrorhinos.marmosurus = marmosurus; })(macrorhinos || (macrorhinos = {})); var howi; @@ -3447,7 +3447,7 @@ var howi; return x; }; return angulatus; - })(sagitta.stolzmanni); + }(sagitta.stolzmanni)); howi.angulatus = angulatus; })(howi || (howi = {})); var daubentonii; @@ -3456,7 +3456,7 @@ var daubentonii; function nesiotes() { } return nesiotes; - })(); + }()); daubentonii.nesiotes = nesiotes; })(daubentonii || (daubentonii = {})); var nigra; @@ -3513,7 +3513,7 @@ var nigra; return x; }; return thalia; - })(); + }()); nigra.thalia = thalia; })(nigra || (nigra = {})); var sagitta; @@ -3530,7 +3530,7 @@ var sagitta; return x; }; return walkeri; - })(minutus.portoricensis); + }(minutus.portoricensis)); sagitta.walkeri = walkeri; })(sagitta || (sagitta = {})); var minutus; @@ -3547,7 +3547,7 @@ var minutus; return x; }; return inez; - })(samarensis.pelurus); + }(samarensis.pelurus)); minutus.inez = inez; })(minutus || (minutus = {})); var macrorhinos; @@ -3558,7 +3558,7 @@ var macrorhinos; _super.apply(this, arguments); } return konganensis; - })(imperfecta.lasiurus); + }(imperfecta.lasiurus)); macrorhinos.konganensis = konganensis; })(macrorhinos || (macrorhinos = {})); var panamensis; @@ -3623,7 +3623,7 @@ var panamensis; return x; }; return linulus; - })(ruatanica.hector); + }(ruatanica.hector)); panamensis.linulus = linulus; })(panamensis || (panamensis = {})); var nigra; @@ -3710,7 +3710,7 @@ var nigra; return x; }; return gracilis; - })(); + }()); nigra.gracilis = gracilis; })(nigra || (nigra = {})); var samarensis; @@ -3799,7 +3799,7 @@ var samarensis; return x; }; return pelurus; - })(sagitta.stolzmanni); + }(sagitta.stolzmanni)); samarensis.pelurus = pelurus; var fuscus = (function (_super) { __extends(fuscus, _super); @@ -3891,7 +3891,7 @@ var samarensis; return x; }; return fuscus; - })(macrorhinos.daphaenodon); + }(macrorhinos.daphaenodon)); samarensis.fuscus = fuscus; var pallidus = (function () { function pallidus() { @@ -3921,7 +3921,7 @@ var samarensis; return x; }; return pallidus; - })(); + }()); samarensis.pallidus = pallidus; var cahirinus = (function () { function cahirinus() { @@ -3957,7 +3957,7 @@ var samarensis; return x; }; return cahirinus; - })(); + }()); samarensis.cahirinus = cahirinus; })(samarensis || (samarensis = {})); var sagitta; @@ -3998,7 +3998,7 @@ var sagitta; return x; }; return leptoceros; - })(caurinus.johorensis); + }(caurinus.johorensis)); sagitta.leptoceros = leptoceros; })(sagitta || (sagitta = {})); var daubentonii; @@ -4015,7 +4015,7 @@ var daubentonii; return x; }; return nigricans; - })(sagitta.stolzmanni); + }(sagitta.stolzmanni)); daubentonii.nigricans = nigricans; })(daubentonii || (daubentonii = {})); var dammermani; @@ -4024,7 +4024,7 @@ var dammermani; function siberu() { } return siberu; - })(); + }()); dammermani.siberu = siberu; })(dammermani || (dammermani = {})); var argurus; @@ -4053,7 +4053,7 @@ var argurus; return x; }; return pygmaea; - })(rendalli.moojeni); + }(rendalli.moojeni)); argurus.pygmaea = pygmaea; })(argurus || (argurus = {})); var chrysaeolus; @@ -4106,7 +4106,7 @@ var chrysaeolus; return x; }; return sarasinorum; - })(caurinus.psilurus); + }(caurinus.psilurus)); chrysaeolus.sarasinorum = sarasinorum; })(chrysaeolus || (chrysaeolus = {})); var argurus; @@ -4157,7 +4157,7 @@ var argurus; return x; }; return wetmorei; - })(); + }()); argurus.wetmorei = wetmorei; })(argurus || (argurus = {})); var argurus; @@ -4216,7 +4216,7 @@ var argurus; return x; }; return oreas; - })(lavali.wilsoni); + }(lavali.wilsoni)); argurus.oreas = oreas; })(argurus || (argurus = {})); var daubentonii; @@ -4297,7 +4297,7 @@ var daubentonii; return x; }; return arboreus; - })(); + }()); daubentonii.arboreus = arboreus; })(daubentonii || (daubentonii = {})); var patas; @@ -4384,7 +4384,7 @@ var patas; return x; }; return uralensis; - })(); + }()); patas.uralensis = uralensis; })(patas || (patas = {})); var provocax; @@ -4407,7 +4407,7 @@ var provocax; return x; }; return melanoleuca; - })(lavali.wilsoni); + }(lavali.wilsoni)); provocax.melanoleuca = melanoleuca; })(provocax || (provocax = {})); var sagitta; @@ -4428,7 +4428,7 @@ var sagitta; return x; }; return sicarius; - })(); + }()); sagitta.sicarius = sicarius; })(sagitta || (sagitta = {})); var howi; @@ -4523,7 +4523,7 @@ var howi; return x; }; return marcanoi; - })(Lanthanum.megalonyx); + }(Lanthanum.megalonyx)); howi.marcanoi = marcanoi; })(howi || (howi = {})); var argurus; @@ -4604,7 +4604,7 @@ var argurus; return x; }; return gilbertii; - })(); + }()); argurus.gilbertii = gilbertii; })(argurus || (argurus = {})); var petrophilus; @@ -4613,7 +4613,7 @@ var petrophilus; function minutilla() { } return minutilla; - })(); + }()); petrophilus.minutilla = minutilla; })(petrophilus || (petrophilus = {})); var lutreolus; @@ -4700,7 +4700,7 @@ var lutreolus; return x; }; return punicus; - })(); + }()); lutreolus.punicus = punicus; })(lutreolus || (lutreolus = {})); var macrorhinos; @@ -4745,7 +4745,7 @@ var macrorhinos; return x; }; return daphaenodon; - })(); + }()); macrorhinos.daphaenodon = daphaenodon; })(macrorhinos || (macrorhinos = {})); var sagitta; @@ -4826,7 +4826,7 @@ var sagitta; return x; }; return cinereus; - })(); + }()); sagitta.cinereus = cinereus; })(sagitta || (sagitta = {})); var nigra; @@ -4835,7 +4835,7 @@ var nigra; function caucasica() { } return caucasica; - })(); + }()); nigra.caucasica = caucasica; })(nigra || (nigra = {})); var gabriellae; @@ -4846,7 +4846,7 @@ var gabriellae; _super.apply(this, arguments); } return klossii; - })(imperfecta.lasiurus); + }(imperfecta.lasiurus)); gabriellae.klossii = klossii; var amicus = (function () { function amicus() { @@ -4912,7 +4912,7 @@ var gabriellae; return x; }; return amicus; - })(); + }()); gabriellae.amicus = amicus; var echinatus = (function () { function echinatus() { @@ -4924,7 +4924,7 @@ var gabriellae; return x; }; return echinatus; - })(); + }()); gabriellae.echinatus = echinatus; })(gabriellae || (gabriellae = {})); var imperfecta; @@ -4969,7 +4969,7 @@ var imperfecta; return x; }; return lasiurus; - })(); + }()); imperfecta.lasiurus = lasiurus; var subspinosus = (function () { function subspinosus() { @@ -5041,7 +5041,7 @@ var imperfecta; return x; }; return subspinosus; - })(); + }()); imperfecta.subspinosus = subspinosus; var ciliolabrum = (function (_super) { __extends(ciliolabrum, _super); @@ -5067,7 +5067,7 @@ var imperfecta; return x; }; return ciliolabrum; - })(dogramacii.robustulus); + }(dogramacii.robustulus)); imperfecta.ciliolabrum = ciliolabrum; })(imperfecta || (imperfecta = {})); var quasiater; @@ -5100,7 +5100,7 @@ var quasiater; return x; }; return wattsi; - })(); + }()); quasiater.wattsi = wattsi; })(quasiater || (quasiater = {})); var petrophilus; @@ -5165,7 +5165,7 @@ var petrophilus; return x; }; return sodyi; - })(quasiater.bobrinskoi); + }(quasiater.bobrinskoi)); petrophilus.sodyi = sodyi; })(petrophilus || (petrophilus = {})); var caurinus; @@ -5224,7 +5224,7 @@ var caurinus; return x; }; return megaphyllus; - })(imperfecta.lasiurus); + }(imperfecta.lasiurus)); caurinus.megaphyllus = megaphyllus; })(caurinus || (caurinus = {})); var minutus; @@ -5251,7 +5251,7 @@ var minutus; return x; }; return portoricensis; - })(); + }()); minutus.portoricensis = portoricensis; })(minutus || (minutus = {})); var lutreolus; @@ -5338,7 +5338,7 @@ var lutreolus; return x; }; return foina; - })(); + }()); lutreolus.foina = foina; })(lutreolus || (lutreolus = {})); var lutreolus; @@ -5409,7 +5409,7 @@ var lutreolus; return x; }; return cor; - })(panglima.fundatus); + }(panglima.fundatus)); lutreolus.cor = cor; })(lutreolus || (lutreolus = {})); var howi; @@ -5430,7 +5430,7 @@ var howi; return x; }; return coludo; - })(); + }()); howi.coludo = coludo; })(howi || (howi = {})); var argurus; @@ -5453,7 +5453,7 @@ var argurus; return x; }; return germaini; - })(gabriellae.amicus); + }(gabriellae.amicus)); argurus.germaini = germaini; })(argurus || (argurus = {})); var sagitta; @@ -5528,7 +5528,7 @@ var sagitta; return x; }; return stolzmanni; - })(); + }()); sagitta.stolzmanni = stolzmanni; })(sagitta || (sagitta = {})); var dammermani; @@ -5617,7 +5617,7 @@ var dammermani; return x; }; return melanops; - })(minutus.inez); + }(minutus.inez)); dammermani.melanops = melanops; })(dammermani || (dammermani = {})); var argurus; @@ -5676,7 +5676,7 @@ var argurus; return x; }; return peninsulae; - })(patas.uralensis); + }(patas.uralensis)); argurus.peninsulae = peninsulae; })(argurus || (argurus = {})); var argurus; @@ -5763,7 +5763,7 @@ var argurus; return x; }; return netscheri; - })(); + }()); argurus.netscheri = netscheri; })(argurus || (argurus = {})); var ruatanica; @@ -5852,7 +5852,7 @@ var ruatanica; return x; }; return Praseodymium; - })(ruatanica.hector); + }(ruatanica.hector)); ruatanica.Praseodymium = Praseodymium; })(ruatanica || (ruatanica = {})); var caurinus; @@ -5869,7 +5869,7 @@ var caurinus; return x; }; return johorensis; - })(lutreolus.punicus); + }(lutreolus.punicus)); caurinus.johorensis = johorensis; })(caurinus || (caurinus = {})); var argurus; @@ -5884,7 +5884,7 @@ var argurus; return x; }; return luctuosa; - })(); + }()); argurus.luctuosa = luctuosa; })(argurus || (argurus = {})); var panamensis; @@ -5941,7 +5941,7 @@ var panamensis; return x; }; return setulosus; - })(); + }()); panamensis.setulosus = setulosus; })(panamensis || (panamensis = {})); var petrophilus; @@ -5980,7 +5980,7 @@ var petrophilus; return x; }; return rosalia; - })(); + }()); petrophilus.rosalia = rosalia; })(petrophilus || (petrophilus = {})); var caurinus; @@ -6027,7 +6027,7 @@ var caurinus; return x; }; return psilurus; - })(lutreolus.punicus); + }(lutreolus.punicus)); caurinus.psilurus = psilurus; })(caurinus || (caurinus = {})); diff --git a/tests/baselines/reference/restParamModifier.js b/tests/baselines/reference/restParamModifier.js index 9a780321dc9..3e0f7f7878a 100644 --- a/tests/baselines/reference/restParamModifier.js +++ b/tests/baselines/reference/restParamModifier.js @@ -9,4 +9,4 @@ var C = (function () { if (string === void 0) { string = []; } } return C; -})(); +}()); diff --git a/tests/baselines/reference/restParamModifier2.js b/tests/baselines/reference/restParamModifier2.js index c588c945ce4..ac8376319b3 100644 --- a/tests/baselines/reference/restParamModifier2.js +++ b/tests/baselines/reference/restParamModifier2.js @@ -12,4 +12,4 @@ var C = (function () { } } return C; -})(); +}()); diff --git a/tests/baselines/reference/restParameterAssignmentCompatibility.js b/tests/baselines/reference/restParameterAssignmentCompatibility.js index 62c0204c749..0821cf18277 100644 --- a/tests/baselines/reference/restParameterAssignmentCompatibility.js +++ b/tests/baselines/reference/restParameterAssignmentCompatibility.js @@ -37,14 +37,14 @@ var T = (function () { } }; return T; -})(); +}()); var S = (function () { function S() { } S.prototype.m = function (p1, p2) { }; return S; -})(); +}()); var t; var s; // M is a non - specialized call or construct signature and S' contains a call or construct signature N where, @@ -56,7 +56,7 @@ var T1 = (function () { T1.prototype.m = function (p1, p2) { }; return T1; -})(); +}()); var t1; // When comparing call or construct signatures, parameter names are ignored and rest parameters correspond to an unbounded expansion of optional parameters of the rest parameter element type. t1 = s; // Similar to above, but optionality does not matter here. diff --git a/tests/baselines/reference/restParameterWithoutAnnotationIsAnyArray.js b/tests/baselines/reference/restParameterWithoutAnnotationIsAnyArray.js index c800c628c9c..26774b6c2f2 100644 --- a/tests/baselines/reference/restParameterWithoutAnnotationIsAnyArray.js +++ b/tests/baselines/reference/restParameterWithoutAnnotationIsAnyArray.js @@ -56,7 +56,7 @@ var C = (function () { } }; return C; -})(); +}()); var a; var b = { foo: function () { diff --git a/tests/baselines/reference/restParametersOfNonArrayTypes.js b/tests/baselines/reference/restParametersOfNonArrayTypes.js index f6f6a8af44d..d6235194b30 100644 --- a/tests/baselines/reference/restParametersOfNonArrayTypes.js +++ b/tests/baselines/reference/restParametersOfNonArrayTypes.js @@ -55,7 +55,7 @@ var C = (function () { } }; return C; -})(); +}()); var a; var b = { foo: function () { diff --git a/tests/baselines/reference/restParametersOfNonArrayTypes2.js b/tests/baselines/reference/restParametersOfNonArrayTypes2.js index 73d0ddaeef2..598c8f2fe3d 100644 --- a/tests/baselines/reference/restParametersOfNonArrayTypes2.js +++ b/tests/baselines/reference/restParametersOfNonArrayTypes2.js @@ -87,7 +87,7 @@ var C = (function () { } }; return C; -})(); +}()); var a; var b = { foo: function () { @@ -137,7 +137,7 @@ var C2 = (function () { } }; return C2; -})(); +}()); var a2; var b2 = { foo: function () { diff --git a/tests/baselines/reference/restParametersWithArrayTypeAnnotations.js b/tests/baselines/reference/restParametersWithArrayTypeAnnotations.js index c7d1dee9295..11208f1fb83 100644 --- a/tests/baselines/reference/restParametersWithArrayTypeAnnotations.js +++ b/tests/baselines/reference/restParametersWithArrayTypeAnnotations.js @@ -82,7 +82,7 @@ var C = (function () { } }; return C; -})(); +}()); var a; var b = { foo: function () { @@ -132,7 +132,7 @@ var C2 = (function () { } }; return C2; -})(); +}()); var a2; var b2 = { foo: function () { diff --git a/tests/baselines/reference/returnInConstructor1.js b/tests/baselines/reference/returnInConstructor1.js index e8781f06d24..fab0fe8fe09 100644 --- a/tests/baselines/reference/returnInConstructor1.js +++ b/tests/baselines/reference/returnInConstructor1.js @@ -78,40 +78,40 @@ var A = (function () { } A.prototype.foo = function () { }; return A; -})(); +}()); var B = (function () { function B() { return 1; // error } B.prototype.foo = function () { }; return B; -})(); +}()); var C = (function () { function C() { return this; } C.prototype.foo = function () { }; return C; -})(); +}()); var D = (function () { function D() { return "test"; // error } D.prototype.foo = function () { }; return D; -})(); +}()); var E = (function () { function E() { return { foo: 1 }; } return E; -})(); +}()); var F = (function () { function F() { return { foo: 1 }; //error } return F; -})(); +}()); var G = (function () { function G() { this.test = 2; @@ -119,7 +119,7 @@ var G = (function () { G.prototype.test1 = function () { }; G.prototype.foo = function () { }; return G; -})(); +}()); var H = (function (_super) { __extends(H, _super); function H() { @@ -127,7 +127,7 @@ var H = (function (_super) { return new G(); //error } return H; -})(F); +}(F)); var I = (function (_super) { __extends(I, _super); function I() { @@ -135,4 +135,4 @@ var I = (function (_super) { return new G(); } return I; -})(G); +}(G)); diff --git a/tests/baselines/reference/returnStatements.js b/tests/baselines/reference/returnStatements.js index 956efc5f077..a543ad3bdda 100644 --- a/tests/baselines/reference/returnStatements.js +++ b/tests/baselines/reference/returnStatements.js @@ -44,14 +44,14 @@ var C = (function () { } C.prototype.dispose = function () { }; return C; -})(); +}()); var D = (function (_super) { __extends(D, _super); function D() { _super.apply(this, arguments); } return D; -})(C); +}(C)); function fn10() { return { id: 12 }; } function fn11() { return new C(); } function fn12() { return new D(); } diff --git a/tests/baselines/reference/returnTypeTypeArguments.js b/tests/baselines/reference/returnTypeTypeArguments.js index b374cb1c581..ade97159091 100644 --- a/tests/baselines/reference/returnTypeTypeArguments.js +++ b/tests/baselines/reference/returnTypeTypeArguments.js @@ -81,17 +81,17 @@ var One = (function () { function One() { } return One; -})(); +}()); var Two = (function () { function Two() { } return Two; -})(); +}()); var Three = (function () { function Three() { } return Three; -})(); +}()); function A1() { return null; } function A2() { return null; } function A3() { return null; } @@ -108,7 +108,7 @@ var C = (function () { C.prototype.B2 = function () { return null; }; C.prototype.B3 = function () { return null; }; return C; -})(); +}()); var D = (function () { function D() { } @@ -118,14 +118,14 @@ var D = (function () { D.prototype.B2 = function () { return null; }; D.prototype.B3 = function () { return null; }; return D; -})(); +}()); var Y = (function () { function Y() { } return Y; -})(); +}()); var X = (function () { function X() { } return X; -})(); +}()); diff --git a/tests/baselines/reference/returnValueInSetter.js b/tests/baselines/reference/returnValueInSetter.js index 6774bab6c4e..86a52670ac5 100644 --- a/tests/baselines/reference/returnValueInSetter.js +++ b/tests/baselines/reference/returnValueInSetter.js @@ -19,4 +19,4 @@ var f = (function () { configurable: true }); return f; -})(); +}()); diff --git a/tests/baselines/reference/scannerClass2.js b/tests/baselines/reference/scannerClass2.js index 0838df4d19f..640f0952bb9 100644 --- a/tests/baselines/reference/scannerClass2.js +++ b/tests/baselines/reference/scannerClass2.js @@ -15,5 +15,5 @@ var LoggerAdapter = (function () { this._information = this.logger.information(); } return LoggerAdapter; -})(); +}()); exports.LoggerAdapter = LoggerAdapter; diff --git a/tests/baselines/reference/scannertest1.js b/tests/baselines/reference/scannertest1.js index b96c965a79e..2eb71157476 100644 --- a/tests/baselines/reference/scannertest1.js +++ b/tests/baselines/reference/scannertest1.js @@ -46,4 +46,4 @@ var CharacterInfo = (function () { : c - CharacterCodes.a + 10; }; return CharacterInfo; -})(); +}()); diff --git a/tests/baselines/reference/scopeCheckExtendedClassInsidePublicMethod2.js b/tests/baselines/reference/scopeCheckExtendedClassInsidePublicMethod2.js index 1a5fc7d9b3e..3833a5caf7a 100644 --- a/tests/baselines/reference/scopeCheckExtendedClassInsidePublicMethod2.js +++ b/tests/baselines/reference/scopeCheckExtendedClassInsidePublicMethod2.js @@ -18,7 +18,7 @@ var C = (function () { function C() { } return C; -})(); +}()); var D = (function (_super) { __extends(D, _super); function D() { @@ -30,4 +30,4 @@ var D = (function (_super) { s = 1; }; return D; -})(C); +}(C)); diff --git a/tests/baselines/reference/scopeCheckExtendedClassInsideStaticMethod1.js b/tests/baselines/reference/scopeCheckExtendedClassInsideStaticMethod1.js index 2844897bdd9..d5de584e779 100644 --- a/tests/baselines/reference/scopeCheckExtendedClassInsideStaticMethod1.js +++ b/tests/baselines/reference/scopeCheckExtendedClassInsideStaticMethod1.js @@ -18,7 +18,7 @@ var C = (function () { function C() { } return C; -})(); +}()); var D = (function (_super) { __extends(D, _super); function D() { @@ -30,4 +30,4 @@ var D = (function (_super) { s = 1; }; return D; -})(C); +}(C)); diff --git a/tests/baselines/reference/scopeCheckInsidePublicMethod1.js b/tests/baselines/reference/scopeCheckInsidePublicMethod1.js index b554cb1a0de..46ee1fc719d 100644 --- a/tests/baselines/reference/scopeCheckInsidePublicMethod1.js +++ b/tests/baselines/reference/scopeCheckInsidePublicMethod1.js @@ -14,4 +14,4 @@ var C = (function () { s = 1; // ERR }; return C; -})(); +}()); diff --git a/tests/baselines/reference/scopeCheckInsideStaticMethod1.js b/tests/baselines/reference/scopeCheckInsideStaticMethod1.js index 0eb8349c740..138c9daa483 100644 --- a/tests/baselines/reference/scopeCheckInsideStaticMethod1.js +++ b/tests/baselines/reference/scopeCheckInsideStaticMethod1.js @@ -20,4 +20,4 @@ var C = (function () { this.p = 1; // ERR }; return C; -})(); +}()); diff --git a/tests/baselines/reference/scopeResolutionIdentifiers.js b/tests/baselines/reference/scopeResolutionIdentifiers.js index 42a1e684015..ca45a95239e 100644 --- a/tests/baselines/reference/scopeResolutionIdentifiers.js +++ b/tests/baselines/reference/scopeResolutionIdentifiers.js @@ -66,7 +66,7 @@ var C = (function () { var p; }; return C; -})(); +}()); var M3; (function (M3) { var s; diff --git a/tests/baselines/reference/scopeTests.js b/tests/baselines/reference/scopeTests.js index b104f63f74c..833e84ee5f3 100644 --- a/tests/baselines/reference/scopeTests.js +++ b/tests/baselines/reference/scopeTests.js @@ -21,7 +21,7 @@ var C = (function () { function C() { } return C; -})(); +}()); var D = (function (_super) { __extends(D, _super); function D() { @@ -31,4 +31,4 @@ var D = (function (_super) { C.s = 1; } return D; -})(C); +}(C)); diff --git a/tests/baselines/reference/selfInCallback.js b/tests/baselines/reference/selfInCallback.js index 25228b03187..a0b363ae081 100644 --- a/tests/baselines/reference/selfInCallback.js +++ b/tests/baselines/reference/selfInCallback.js @@ -18,4 +18,4 @@ var C = (function () { this.callback(function () { _this.p1 + 1; }); }; return C; -})(); +}()); diff --git a/tests/baselines/reference/selfInLambdas.js b/tests/baselines/reference/selfInLambdas.js index 6b09cf2e227..b143c0c9e4e 100644 --- a/tests/baselines/reference/selfInLambdas.js +++ b/tests/baselines/reference/selfInLambdas.js @@ -73,4 +73,4 @@ var X = (function () { outer(); }; return X; -})(); +}()); diff --git a/tests/baselines/reference/selfRef.js b/tests/baselines/reference/selfRef.js index 171b1efa977..7f13e04cef1 100644 --- a/tests/baselines/reference/selfRef.js +++ b/tests/baselines/reference/selfRef.js @@ -34,6 +34,6 @@ var M; }; } return Test; - })(); + }()); M.Test = Test; })(M || (M = {})); diff --git a/tests/baselines/reference/selfReferencesInFunctionParameters.js b/tests/baselines/reference/selfReferencesInFunctionParameters.js index c707fc0116b..5dd662cf169 100644 --- a/tests/baselines/reference/selfReferencesInFunctionParameters.js +++ b/tests/baselines/reference/selfReferencesInFunctionParameters.js @@ -31,4 +31,4 @@ var C = (function () { if (b === void 0) { b = b.toString(); } }; return C; -})(); +}()); diff --git a/tests/baselines/reference/selfReferencingFile.js b/tests/baselines/reference/selfReferencingFile.js index c77a6b88429..82b706c55e6 100644 --- a/tests/baselines/reference/selfReferencingFile.js +++ b/tests/baselines/reference/selfReferencingFile.js @@ -11,4 +11,4 @@ var selfReferencingFile = (function () { function selfReferencingFile() { } return selfReferencingFile; -})(); +}()); diff --git a/tests/baselines/reference/selfReferencingFile2.js b/tests/baselines/reference/selfReferencingFile2.js index 57e67e2c51a..a14f9e1e870 100644 --- a/tests/baselines/reference/selfReferencingFile2.js +++ b/tests/baselines/reference/selfReferencingFile2.js @@ -11,4 +11,4 @@ var selfReferencingFile2 = (function () { function selfReferencingFile2() { } return selfReferencingFile2; -})(); +}()); diff --git a/tests/baselines/reference/selfReferencingFile3.js b/tests/baselines/reference/selfReferencingFile3.js index 5dfee00e6b6..08db051ec18 100644 --- a/tests/baselines/reference/selfReferencingFile3.js +++ b/tests/baselines/reference/selfReferencingFile3.js @@ -11,4 +11,4 @@ var selfReferencingFile3 = (function () { function selfReferencingFile3() { } return selfReferencingFile3; -})(); +}()); diff --git a/tests/baselines/reference/setterBeforeGetter.js b/tests/baselines/reference/setterBeforeGetter.js index c897198c2dd..d5200a4eb4d 100644 --- a/tests/baselines/reference/setterBeforeGetter.js +++ b/tests/baselines/reference/setterBeforeGetter.js @@ -28,4 +28,4 @@ var Foo = (function () { configurable: true }); return Foo; -})(); +}()); diff --git a/tests/baselines/reference/setterWithReturn.js b/tests/baselines/reference/setterWithReturn.js index 995cde87509..b7fa5c67f8e 100644 --- a/tests/baselines/reference/setterWithReturn.js +++ b/tests/baselines/reference/setterWithReturn.js @@ -27,4 +27,4 @@ var C234 = (function () { configurable: true }); return C234; -})(); +}()); diff --git a/tests/baselines/reference/shadowPrivateMembers.js b/tests/baselines/reference/shadowPrivateMembers.js index e2ac679e7eb..a1474a24777 100644 --- a/tests/baselines/reference/shadowPrivateMembers.js +++ b/tests/baselines/reference/shadowPrivateMembers.js @@ -14,7 +14,7 @@ var base = (function () { } base.prototype.n = function () { }; return base; -})(); +}()); var derived = (function (_super) { __extends(derived, _super); function derived() { @@ -22,4 +22,4 @@ var derived = (function (_super) { } derived.prototype.n = function () { }; return derived; -})(base); +}(base)); diff --git a/tests/baselines/reference/shadowedInternalModule.js b/tests/baselines/reference/shadowedInternalModule.js index 3a7c6d4d61a..d2566976092 100644 --- a/tests/baselines/reference/shadowedInternalModule.js +++ b/tests/baselines/reference/shadowedInternalModule.js @@ -49,7 +49,7 @@ var X; function Y() { } return Y; - })(); + }()); X.Y = Y; })(X || (X = {})); var Z; diff --git a/tests/baselines/reference/sigantureIsSubTypeIfTheyAreIdentical.js b/tests/baselines/reference/sigantureIsSubTypeIfTheyAreIdentical.js index 3d718e84e95..39b67f9026d 100644 --- a/tests/baselines/reference/sigantureIsSubTypeIfTheyAreIdentical.js +++ b/tests/baselines/reference/sigantureIsSubTypeIfTheyAreIdentical.js @@ -16,4 +16,4 @@ var CacheService = (function () { return undefined; }; return CacheService; -})(); +}()); diff --git a/tests/baselines/reference/sourceMap-Comments.js b/tests/baselines/reference/sourceMap-Comments.js index 12a4e5010dd..e8177d5752c 100644 --- a/tests/baselines/reference/sourceMap-Comments.js +++ b/tests/baselines/reference/sourceMap-Comments.js @@ -43,7 +43,7 @@ var sas; } }; return Test; - })(); + }()); tools.Test = Test; })(tools = sas.tools || (sas.tools = {})); })(sas || (sas = {})); diff --git a/tests/baselines/reference/sourceMap-Comments.sourcemap.txt b/tests/baselines/reference/sourceMap-Comments.sourcemap.txt index ed6b510ac94..29726c68d9a 100644 --- a/tests/baselines/reference/sourceMap-Comments.sourcemap.txt +++ b/tests/baselines/reference/sourceMap-Comments.sourcemap.txt @@ -332,7 +332,7 @@ sourceFile:sourceMap-Comments.ts 1->Emitted(22, 13) Source(17, 5) + SourceIndex(0) 2 >Emitted(22, 24) Source(17, 6) + SourceIndex(0) --- ->>> })(); +>>> }()); 1 >^^^^^^^^ 2 > ^ 3 > diff --git a/tests/baselines/reference/sourceMap-FileWithComments.js b/tests/baselines/reference/sourceMap-FileWithComments.js index e9755f6c048..9bb18dba33d 100644 --- a/tests/baselines/reference/sourceMap-FileWithComments.js +++ b/tests/baselines/reference/sourceMap-FileWithComments.js @@ -52,7 +52,7 @@ var Shapes; // Static member Point.origin = new Point(0, 0); return Point; - })(); + }()); Shapes.Point = Point; // Variable comment after class var a = 10; diff --git a/tests/baselines/reference/sourceMap-FileWithComments.sourcemap.txt b/tests/baselines/reference/sourceMap-FileWithComments.sourcemap.txt index c3909571fdd..3bcf2634507 100644 --- a/tests/baselines/reference/sourceMap-FileWithComments.sourcemap.txt +++ b/tests/baselines/reference/sourceMap-FileWithComments.sourcemap.txt @@ -327,7 +327,7 @@ sourceFile:sourceMap-FileWithComments.ts 1 >Emitted(15, 9) Source(20, 5) + SourceIndex(0) 2 >Emitted(15, 21) Source(20, 6) + SourceIndex(0) --- ->>> })(); +>>> }()); 1 >^^^^ 2 > ^ 3 > diff --git a/tests/baselines/reference/sourceMapSample.js b/tests/baselines/reference/sourceMapSample.js index 96c78c94c0c..4b710b89234 100644 --- a/tests/baselines/reference/sourceMapSample.js +++ b/tests/baselines/reference/sourceMapSample.js @@ -49,7 +49,7 @@ var Foo; return "

" + this.greeting + "

"; }; return Greeter; - })(); + }()); function foo(greeting) { return new Greeter(greeting); } diff --git a/tests/baselines/reference/sourceMapSample.sourcemap.txt b/tests/baselines/reference/sourceMapSample.sourcemap.txt index 8ea198b3129..0fb03dacf48 100644 --- a/tests/baselines/reference/sourceMapSample.sourcemap.txt +++ b/tests/baselines/reference/sourceMapSample.sourcemap.txt @@ -265,7 +265,7 @@ sourceFile:sourceMapSample.ts 1->Emitted(13, 13) Source(11, 5) + SourceIndex(0) 2 >Emitted(13, 27) Source(11, 6) + SourceIndex(0) --- ->>> })(); +>>> }()); 1 >^^^^^^^^ 2 > ^ 3 > diff --git a/tests/baselines/reference/sourceMapValidationClass.js b/tests/baselines/reference/sourceMapValidationClass.js index eef5a723ebf..f0ddca123f9 100644 --- a/tests/baselines/reference/sourceMapValidationClass.js +++ b/tests/baselines/reference/sourceMapValidationClass.js @@ -45,5 +45,5 @@ var Greeter = (function () { configurable: true }); return Greeter; -})(); +}()); //# sourceMappingURL=sourceMapValidationClass.js.map \ No newline at end of file diff --git a/tests/baselines/reference/sourceMapValidationClass.sourcemap.txt b/tests/baselines/reference/sourceMapValidationClass.sourcemap.txt index 3b726492c8f..4173ae0ff0d 100644 --- a/tests/baselines/reference/sourceMapValidationClass.sourcemap.txt +++ b/tests/baselines/reference/sourceMapValidationClass.sourcemap.txt @@ -340,7 +340,7 @@ sourceFile:sourceMapValidationClass.ts 1->Emitted(26, 5) Source(18, 1) + SourceIndex(0) 2 >Emitted(26, 19) Source(18, 2) + SourceIndex(0) --- ->>>})(); +>>>}()); 1 > 2 >^ 3 > diff --git a/tests/baselines/reference/sourceMapValidationClassWithDefaultConstructor.js b/tests/baselines/reference/sourceMapValidationClassWithDefaultConstructor.js index 149780baf08..f76b44fdcd8 100644 --- a/tests/baselines/reference/sourceMapValidationClassWithDefaultConstructor.js +++ b/tests/baselines/reference/sourceMapValidationClassWithDefaultConstructor.js @@ -11,5 +11,5 @@ var Greeter = (function () { this.nameA = "Ten"; } return Greeter; -})(); +}()); //# sourceMappingURL=sourceMapValidationClassWithDefaultConstructor.js.map \ No newline at end of file diff --git a/tests/baselines/reference/sourceMapValidationClassWithDefaultConstructor.sourcemap.txt b/tests/baselines/reference/sourceMapValidationClassWithDefaultConstructor.sourcemap.txt index f07dbf92120..ad4b2800796 100644 --- a/tests/baselines/reference/sourceMapValidationClassWithDefaultConstructor.sourcemap.txt +++ b/tests/baselines/reference/sourceMapValidationClassWithDefaultConstructor.sourcemap.txt @@ -75,7 +75,7 @@ sourceFile:sourceMapValidationClassWithDefaultConstructor.ts 1->Emitted(6, 5) Source(4, 1) + SourceIndex(0) 2 >Emitted(6, 19) Source(4, 2) + SourceIndex(0) --- ->>>})(); +>>>}()); 1 > 2 >^ 3 > diff --git a/tests/baselines/reference/sourceMapValidationClassWithDefaultConstructorAndCapturedThisStatement.js b/tests/baselines/reference/sourceMapValidationClassWithDefaultConstructorAndCapturedThisStatement.js index 486cdd39637..ad92aa18eae 100644 --- a/tests/baselines/reference/sourceMapValidationClassWithDefaultConstructorAndCapturedThisStatement.js +++ b/tests/baselines/reference/sourceMapValidationClassWithDefaultConstructorAndCapturedThisStatement.js @@ -12,5 +12,5 @@ var Greeter = (function () { this.returnA = function () { return _this.a; }; } return Greeter; -})(); +}()); //# sourceMappingURL=sourceMapValidationClassWithDefaultConstructorAndCapturedThisStatement.js.map \ No newline at end of file diff --git a/tests/baselines/reference/sourceMapValidationClassWithDefaultConstructorAndCapturedThisStatement.sourcemap.txt b/tests/baselines/reference/sourceMapValidationClassWithDefaultConstructorAndCapturedThisStatement.sourcemap.txt index fb58003ddcf..d5cb74636e7 100644 --- a/tests/baselines/reference/sourceMapValidationClassWithDefaultConstructorAndCapturedThisStatement.sourcemap.txt +++ b/tests/baselines/reference/sourceMapValidationClassWithDefaultConstructorAndCapturedThisStatement.sourcemap.txt @@ -103,7 +103,7 @@ sourceFile:sourceMapValidationClassWithDefaultConstructorAndCapturedThisStatemen 1->Emitted(7, 5) Source(4, 1) + SourceIndex(0) 2 >Emitted(7, 19) Source(4, 2) + SourceIndex(0) --- ->>>})(); +>>>}()); 1 > 2 >^ 3 > diff --git a/tests/baselines/reference/sourceMapValidationClassWithDefaultConstructorAndExtendsClause.js b/tests/baselines/reference/sourceMapValidationClassWithDefaultConstructorAndExtendsClause.js index f210e65d4d2..1d852127963 100644 --- a/tests/baselines/reference/sourceMapValidationClassWithDefaultConstructorAndExtendsClause.js +++ b/tests/baselines/reference/sourceMapValidationClassWithDefaultConstructorAndExtendsClause.js @@ -17,7 +17,7 @@ var AbstractGreeter = (function () { function AbstractGreeter() { } return AbstractGreeter; -})(); +}()); var Greeter = (function (_super) { __extends(Greeter, _super); function Greeter() { @@ -26,5 +26,5 @@ var Greeter = (function (_super) { this.nameA = "Ten"; } return Greeter; -})(AbstractGreeter); +}(AbstractGreeter)); //# sourceMappingURL=sourceMapValidationClassWithDefaultConstructorAndExtendsClause.js.map \ No newline at end of file diff --git a/tests/baselines/reference/sourceMapValidationClassWithDefaultConstructorAndExtendsClause.js.map b/tests/baselines/reference/sourceMapValidationClassWithDefaultConstructorAndExtendsClause.js.map index cf0a189bef3..7dd53ed4b62 100644 --- a/tests/baselines/reference/sourceMapValidationClassWithDefaultConstructorAndExtendsClause.js.map +++ b/tests/baselines/reference/sourceMapValidationClassWithDefaultConstructorAndExtendsClause.js.map @@ -1,2 +1,2 @@ //// [sourceMapValidationClassWithDefaultConstructorAndExtendsClause.js.map] -{"version":3,"file":"sourceMapValidationClassWithDefaultConstructorAndExtendsClause.js","sourceRoot":"","sources":["sourceMapValidationClassWithDefaultConstructorAndExtendsClause.ts"],"names":[],"mappings":";;;;;AAAA;IAAA;IACA,CAAC;IAAD,sBAAC;AAAD,CAAC,AADD,IACC;AAED;IAAsB,2BAAe;IAArC;QAAsB,8BAAe;QAC1B,MAAC,GAAG,EAAE,CAAC;QACP,UAAK,GAAG,KAAK,CAAC;IACzB,CAAC;IAAD,cAAC;AAAD,CAAC,AAHD,EAAsB,eAAe,EAGpC"} \ No newline at end of file +{"version":3,"file":"sourceMapValidationClassWithDefaultConstructorAndExtendsClause.js","sourceRoot":"","sources":["sourceMapValidationClassWithDefaultConstructorAndExtendsClause.ts"],"names":[],"mappings":";;;;;AAAA;IAAA;IACA,CAAC;IAAD,sBAAC;AAAD,CAAC,AADD,IACC;AAED;IAAsB,2BAAe;IAArC;QAAsB,8BAAe;QAC1B,MAAC,GAAG,EAAE,CAAC;QACP,UAAK,GAAG,KAAK,CAAC;IACzB,CAAC;IAAD,cAAC;AAAD,CAAC,AAHD,CAAsB,eAAe,GAGpC"} \ No newline at end of file diff --git a/tests/baselines/reference/sourceMapValidationClassWithDefaultConstructorAndExtendsClause.sourcemap.txt b/tests/baselines/reference/sourceMapValidationClassWithDefaultConstructorAndExtendsClause.sourcemap.txt index 86bbba306ff..5a3b2f86be9 100644 --- a/tests/baselines/reference/sourceMapValidationClassWithDefaultConstructorAndExtendsClause.sourcemap.txt +++ b/tests/baselines/reference/sourceMapValidationClassWithDefaultConstructorAndExtendsClause.sourcemap.txt @@ -43,7 +43,7 @@ sourceFile:sourceMapValidationClassWithDefaultConstructorAndExtendsClause.ts 1->Emitted(9, 5) Source(2, 1) + SourceIndex(0) 2 >Emitted(9, 27) Source(2, 2) + SourceIndex(0) --- ->>>})(); +>>>}()); 1 > 2 >^ 3 > @@ -145,28 +145,28 @@ sourceFile:sourceMapValidationClassWithDefaultConstructorAndExtendsClause.ts 1->Emitted(18, 5) Source(7, 1) + SourceIndex(0) 2 >Emitted(18, 19) Source(7, 2) + SourceIndex(0) --- ->>>})(AbstractGreeter); +>>>}(AbstractGreeter)); 1-> 2 >^ 3 > -4 > ^^ -5 > ^^^^^^^^^^^^^^^ -6 > ^^ +4 > ^ +5 > ^^^^^^^^^^^^^^^ +6 > ^^^ 7 > ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^-> 1-> 2 >} 3 > 4 > class Greeter extends -5 > AbstractGreeter -6 > { - > public a = 10; - > public nameA = "Ten"; - > } +5 > AbstractGreeter +6 > { + > public a = 10; + > public nameA = "Ten"; + > } 1->Emitted(19, 1) Source(7, 1) + SourceIndex(0) 2 >Emitted(19, 2) Source(7, 2) + SourceIndex(0) 3 >Emitted(19, 2) Source(4, 1) + SourceIndex(0) -4 >Emitted(19, 4) Source(4, 23) + SourceIndex(0) -5 >Emitted(19, 19) Source(4, 38) + SourceIndex(0) +4 >Emitted(19, 3) Source(4, 23) + SourceIndex(0) +5 >Emitted(19, 18) Source(4, 38) + SourceIndex(0) 6 >Emitted(19, 21) Source(7, 2) + SourceIndex(0) --- >>>//# sourceMappingURL=sourceMapValidationClassWithDefaultConstructorAndExtendsClause.js.map \ No newline at end of file diff --git a/tests/baselines/reference/sourceMapValidationClasses.js b/tests/baselines/reference/sourceMapValidationClasses.js index e3b705bc4b0..661892bc748 100644 --- a/tests/baselines/reference/sourceMapValidationClasses.js +++ b/tests/baselines/reference/sourceMapValidationClasses.js @@ -50,7 +50,7 @@ var Foo; return "

" + this.greeting + "

"; }; return Greeter; - })(); + }()); function foo(greeting) { return new Greeter(greeting); } diff --git a/tests/baselines/reference/sourceMapValidationClasses.sourcemap.txt b/tests/baselines/reference/sourceMapValidationClasses.sourcemap.txt index bbf9aa3eb2e..4501ec5d872 100644 --- a/tests/baselines/reference/sourceMapValidationClasses.sourcemap.txt +++ b/tests/baselines/reference/sourceMapValidationClasses.sourcemap.txt @@ -267,7 +267,7 @@ sourceFile:sourceMapValidationClasses.ts 1->Emitted(13, 13) Source(11, 5) + SourceIndex(0) 2 >Emitted(13, 27) Source(11, 6) + SourceIndex(0) --- ->>> })(); +>>> }()); 1 >^^^^^^^^ 2 > ^ 3 > diff --git a/tests/baselines/reference/sourceMapValidationDecorators.js b/tests/baselines/reference/sourceMapValidationDecorators.js index 04eb1d71078..c3bb5cd7225 100644 --- a/tests/baselines/reference/sourceMapValidationDecorators.js +++ b/tests/baselines/reference/sourceMapValidationDecorators.js @@ -120,5 +120,5 @@ var Greeter = (function () { __param(1, ParameterDecorator2(30)) ], Greeter); return Greeter; -})(); +}()); //# sourceMappingURL=sourceMapValidationDecorators.js.map \ No newline at end of file diff --git a/tests/baselines/reference/sourceMapValidationDecorators.sourcemap.txt b/tests/baselines/reference/sourceMapValidationDecorators.sourcemap.txt index 418fee1f87f..16820428856 100644 --- a/tests/baselines/reference/sourceMapValidationDecorators.sourcemap.txt +++ b/tests/baselines/reference/sourceMapValidationDecorators.sourcemap.txt @@ -776,7 +776,7 @@ sourceFile:sourceMapValidationDecorators.ts 1->Emitted(65, 5) Source(54, 1) + SourceIndex(0) 2 >Emitted(65, 19) Source(54, 2) + SourceIndex(0) --- ->>>})(); +>>>}()); 1 > 2 >^ 3 > diff --git a/tests/baselines/reference/sourceMapValidationExportAssignment.js b/tests/baselines/reference/sourceMapValidationExportAssignment.js index 635692ef81a..f556ec0cb81 100644 --- a/tests/baselines/reference/sourceMapValidationExportAssignment.js +++ b/tests/baselines/reference/sourceMapValidationExportAssignment.js @@ -11,7 +11,7 @@ define(["require", "exports"], function (require, exports) { function a() { } return a; - })(); + }()); return a; }); //# sourceMappingURL=sourceMapValidationExportAssignment.js.map \ No newline at end of file diff --git a/tests/baselines/reference/sourceMapValidationExportAssignment.sourcemap.txt b/tests/baselines/reference/sourceMapValidationExportAssignment.sourcemap.txt index 2f30a6d1e10..cdb318d1e15 100644 --- a/tests/baselines/reference/sourceMapValidationExportAssignment.sourcemap.txt +++ b/tests/baselines/reference/sourceMapValidationExportAssignment.sourcemap.txt @@ -41,7 +41,7 @@ sourceFile:sourceMapValidationExportAssignment.ts 1->Emitted(6, 9) Source(3, 1) + SourceIndex(0) 2 >Emitted(6, 17) Source(3, 2) + SourceIndex(0) --- ->>> })(); +>>> }()); 1 >^^^^ 2 > ^ 3 > diff --git a/tests/baselines/reference/sourceMapValidationExportAssignmentCommonjs.js b/tests/baselines/reference/sourceMapValidationExportAssignmentCommonjs.js index daa9391533f..b524a09107b 100644 --- a/tests/baselines/reference/sourceMapValidationExportAssignmentCommonjs.js +++ b/tests/baselines/reference/sourceMapValidationExportAssignmentCommonjs.js @@ -10,6 +10,6 @@ var a = (function () { function a() { } return a; -})(); +}()); module.exports = a; //# sourceMappingURL=sourceMapValidationExportAssignmentCommonjs.js.map \ No newline at end of file diff --git a/tests/baselines/reference/sourceMapValidationExportAssignmentCommonjs.sourcemap.txt b/tests/baselines/reference/sourceMapValidationExportAssignmentCommonjs.sourcemap.txt index a25277da7b1..ed6cf368d96 100644 --- a/tests/baselines/reference/sourceMapValidationExportAssignmentCommonjs.sourcemap.txt +++ b/tests/baselines/reference/sourceMapValidationExportAssignmentCommonjs.sourcemap.txt @@ -40,7 +40,7 @@ sourceFile:sourceMapValidationExportAssignmentCommonjs.ts 1->Emitted(5, 5) Source(3, 1) + SourceIndex(0) 2 >Emitted(5, 13) Source(3, 2) + SourceIndex(0) --- ->>>})(); +>>>}()); 1 > 2 >^ 3 > diff --git a/tests/baselines/reference/sourceMapValidationImport.js b/tests/baselines/reference/sourceMapValidationImport.js index 5f829c4ba13..d9a75d96848 100644 --- a/tests/baselines/reference/sourceMapValidationImport.js +++ b/tests/baselines/reference/sourceMapValidationImport.js @@ -16,7 +16,7 @@ var m; function c() { } return c; - })(); + }()); m.c = c; })(m = exports.m || (exports.m = {})); var a = m.c; diff --git a/tests/baselines/reference/sourceMapValidationImport.sourcemap.txt b/tests/baselines/reference/sourceMapValidationImport.sourcemap.txt index 43eb1963a91..ca0ae80c5fc 100644 --- a/tests/baselines/reference/sourceMapValidationImport.sourcemap.txt +++ b/tests/baselines/reference/sourceMapValidationImport.sourcemap.txt @@ -76,7 +76,7 @@ sourceFile:sourceMapValidationImport.ts 1->Emitted(7, 9) Source(3, 5) + SourceIndex(0) 2 >Emitted(7, 17) Source(3, 6) + SourceIndex(0) --- ->>> })(); +>>> }()); 1 >^^^^ 2 > ^ 3 > diff --git a/tests/baselines/reference/sourceMapValidationWithComments.js b/tests/baselines/reference/sourceMapValidationWithComments.js index 53577271b77..653dcf3c90c 100644 --- a/tests/baselines/reference/sourceMapValidationWithComments.js +++ b/tests/baselines/reference/sourceMapValidationWithComments.js @@ -41,5 +41,5 @@ var DebugClass = (function () { return true; }; return DebugClass; -})(); +}()); //# sourceMappingURL=sourceMapValidationWithComments.js.map \ No newline at end of file diff --git a/tests/baselines/reference/sourceMapValidationWithComments.sourcemap.txt b/tests/baselines/reference/sourceMapValidationWithComments.sourcemap.txt index 77a63842cc4..89d60b87c7d 100644 --- a/tests/baselines/reference/sourceMapValidationWithComments.sourcemap.txt +++ b/tests/baselines/reference/sourceMapValidationWithComments.sourcemap.txt @@ -284,7 +284,7 @@ sourceFile:sourceMapValidationWithComments.ts 1->Emitted(19, 5) Source(21, 1) + SourceIndex(0) 2 >Emitted(19, 22) Source(21, 2) + SourceIndex(0) --- ->>>})(); +>>>}()); 1 > 2 >^ 3 > diff --git a/tests/baselines/reference/sourceMapWithCaseSensitiveFileNames.js b/tests/baselines/reference/sourceMapWithCaseSensitiveFileNames.js index 37ef08d97fb..a41eea9cb28 100644 --- a/tests/baselines/reference/sourceMapWithCaseSensitiveFileNames.js +++ b/tests/baselines/reference/sourceMapWithCaseSensitiveFileNames.js @@ -17,10 +17,10 @@ var c = (function () { function c() { } return c; -})(); +}()); var d = (function () { function d() { } return d; -})(); +}()); //# sourceMappingURL=fooResult.js.map \ No newline at end of file diff --git a/tests/baselines/reference/sourceMapWithCaseSensitiveFileNames.sourcemap.txt b/tests/baselines/reference/sourceMapWithCaseSensitiveFileNames.sourcemap.txt index a83b5f4bb9c..fa1ae2e7221 100644 --- a/tests/baselines/reference/sourceMapWithCaseSensitiveFileNames.sourcemap.txt +++ b/tests/baselines/reference/sourceMapWithCaseSensitiveFileNames.sourcemap.txt @@ -57,7 +57,7 @@ sourceFile:../testFiles/app.ts 1->Emitted(6, 5) Source(4, 1) + SourceIndex(0) 2 >Emitted(6, 13) Source(4, 2) + SourceIndex(0) --- ->>>})(); +>>>}()); 1 > 2 >^ 3 > @@ -107,7 +107,7 @@ sourceFile:../testFiles/app2.ts 1->Emitted(11, 5) Source(2, 1) + SourceIndex(1) 2 >Emitted(11, 13) Source(2, 2) + SourceIndex(1) --- ->>>})(); +>>>}()); 1 > 2 >^ 3 > diff --git a/tests/baselines/reference/sourceMapWithCaseSensitiveFileNamesAndOutDir.js b/tests/baselines/reference/sourceMapWithCaseSensitiveFileNamesAndOutDir.js index 148a66f15db..3872068e7c2 100644 --- a/tests/baselines/reference/sourceMapWithCaseSensitiveFileNamesAndOutDir.js +++ b/tests/baselines/reference/sourceMapWithCaseSensitiveFileNamesAndOutDir.js @@ -17,11 +17,11 @@ var c = (function () { function c() { } return c; -})(); +}()); //# sourceMappingURL=app.js.map//// [app2.js] var d = (function () { function d() { } return d; -})(); +}()); //# sourceMappingURL=app2.js.map \ No newline at end of file diff --git a/tests/baselines/reference/sourceMapWithCaseSensitiveFileNamesAndOutDir.sourcemap.txt b/tests/baselines/reference/sourceMapWithCaseSensitiveFileNamesAndOutDir.sourcemap.txt index e02fb678ae2..bea8c2c6a9d 100644 --- a/tests/baselines/reference/sourceMapWithCaseSensitiveFileNamesAndOutDir.sourcemap.txt +++ b/tests/baselines/reference/sourceMapWithCaseSensitiveFileNamesAndOutDir.sourcemap.txt @@ -57,7 +57,7 @@ sourceFile:../testFiles/app.ts 1->Emitted(6, 5) Source(4, 1) + SourceIndex(0) 2 >Emitted(6, 13) Source(4, 2) + SourceIndex(0) --- ->>>})(); +>>>}()); 1 > 2 >^ 3 > @@ -113,7 +113,7 @@ sourceFile:../testFiles/app2.ts 1->Emitted(4, 5) Source(2, 1) + SourceIndex(0) 2 >Emitted(4, 13) Source(2, 2) + SourceIndex(0) --- ->>>})(); +>>>}()); 1 > 2 >^ 3 > diff --git a/tests/baselines/reference/sourceMapWithMultipleFilesWithFileEndingWithInterface.js b/tests/baselines/reference/sourceMapWithMultipleFilesWithFileEndingWithInterface.js index 81f627ebedc..7e891c57656 100644 --- a/tests/baselines/reference/sourceMapWithMultipleFilesWithFileEndingWithInterface.js +++ b/tests/baselines/reference/sourceMapWithMultipleFilesWithFileEndingWithInterface.js @@ -28,7 +28,7 @@ var m1; function c1() { } return c1; - })(); + }()); m1.c1 = c1; })(m1 || (m1 = {})); //# sourceMappingURL=fooResult.js.map \ No newline at end of file diff --git a/tests/baselines/reference/sourceMapWithMultipleFilesWithFileEndingWithInterface.sourcemap.txt b/tests/baselines/reference/sourceMapWithMultipleFilesWithFileEndingWithInterface.sourcemap.txt index 7ad34d29761..e0f2a3cbbba 100644 --- a/tests/baselines/reference/sourceMapWithMultipleFilesWithFileEndingWithInterface.sourcemap.txt +++ b/tests/baselines/reference/sourceMapWithMultipleFilesWithFileEndingWithInterface.sourcemap.txt @@ -158,7 +158,7 @@ sourceFile:tests/cases/compiler/b.ts 1->Emitted(10, 9) Source(3, 5) + SourceIndex(1) 2 >Emitted(10, 18) Source(3, 6) + SourceIndex(1) --- ->>> })(); +>>> }()); 1 >^^^^ 2 > ^ 3 > diff --git a/tests/baselines/reference/sourceMapWithNonCaseSensitiveFileNames.js b/tests/baselines/reference/sourceMapWithNonCaseSensitiveFileNames.js index 50a3a2f3bc8..b1da77bdb67 100644 --- a/tests/baselines/reference/sourceMapWithNonCaseSensitiveFileNames.js +++ b/tests/baselines/reference/sourceMapWithNonCaseSensitiveFileNames.js @@ -17,10 +17,10 @@ var c = (function () { function c() { } return c; -})(); +}()); var d = (function () { function d() { } return d; -})(); +}()); //# sourceMappingURL=fooResult.js.map \ No newline at end of file diff --git a/tests/baselines/reference/sourceMapWithNonCaseSensitiveFileNames.sourcemap.txt b/tests/baselines/reference/sourceMapWithNonCaseSensitiveFileNames.sourcemap.txt index 28b2e240b8b..25b3d6cfeaf 100644 --- a/tests/baselines/reference/sourceMapWithNonCaseSensitiveFileNames.sourcemap.txt +++ b/tests/baselines/reference/sourceMapWithNonCaseSensitiveFileNames.sourcemap.txt @@ -57,7 +57,7 @@ sourceFile:app.ts 1->Emitted(6, 5) Source(4, 1) + SourceIndex(0) 2 >Emitted(6, 13) Source(4, 2) + SourceIndex(0) --- ->>>})(); +>>>}()); 1 > 2 >^ 3 > @@ -107,7 +107,7 @@ sourceFile:app2.ts 1->Emitted(11, 5) Source(2, 1) + SourceIndex(1) 2 >Emitted(11, 13) Source(2, 2) + SourceIndex(1) --- ->>>})(); +>>>}()); 1 > 2 >^ 3 > diff --git a/tests/baselines/reference/sourceMapWithNonCaseSensitiveFileNamesAndOutDir.js b/tests/baselines/reference/sourceMapWithNonCaseSensitiveFileNamesAndOutDir.js index 4dc043e0ce7..0abd131f0f9 100644 --- a/tests/baselines/reference/sourceMapWithNonCaseSensitiveFileNamesAndOutDir.js +++ b/tests/baselines/reference/sourceMapWithNonCaseSensitiveFileNamesAndOutDir.js @@ -17,11 +17,11 @@ var c = (function () { function c() { } return c; -})(); +}()); //# sourceMappingURL=app.js.map//// [app2.js] var d = (function () { function d() { } return d; -})(); +}()); //# sourceMappingURL=app2.js.map \ No newline at end of file diff --git a/tests/baselines/reference/sourceMapWithNonCaseSensitiveFileNamesAndOutDir.sourcemap.txt b/tests/baselines/reference/sourceMapWithNonCaseSensitiveFileNamesAndOutDir.sourcemap.txt index af6ed80a85b..7b4b590fad6 100644 --- a/tests/baselines/reference/sourceMapWithNonCaseSensitiveFileNamesAndOutDir.sourcemap.txt +++ b/tests/baselines/reference/sourceMapWithNonCaseSensitiveFileNamesAndOutDir.sourcemap.txt @@ -57,7 +57,7 @@ sourceFile:app.ts 1->Emitted(6, 5) Source(4, 1) + SourceIndex(0) 2 >Emitted(6, 13) Source(4, 2) + SourceIndex(0) --- ->>>})(); +>>>}()); 1 > 2 >^ 3 > @@ -113,7 +113,7 @@ sourceFile:app2.ts 1->Emitted(4, 5) Source(2, 1) + SourceIndex(0) 2 >Emitted(4, 13) Source(2, 2) + SourceIndex(0) --- ->>>})(); +>>>}()); 1 > 2 >^ 3 > diff --git a/tests/baselines/reference/sourcemapValidationDuplicateNames.js b/tests/baselines/reference/sourcemapValidationDuplicateNames.js index 5fe519acc5b..360635fe74d 100644 --- a/tests/baselines/reference/sourcemapValidationDuplicateNames.js +++ b/tests/baselines/reference/sourcemapValidationDuplicateNames.js @@ -16,7 +16,7 @@ var m1; function c() { } return c; - })(); + }()); m1.c = c; })(m1 || (m1 = {})); var m1; diff --git a/tests/baselines/reference/sourcemapValidationDuplicateNames.sourcemap.txt b/tests/baselines/reference/sourcemapValidationDuplicateNames.sourcemap.txt index 50302c30a22..5e67d69a517 100644 --- a/tests/baselines/reference/sourcemapValidationDuplicateNames.sourcemap.txt +++ b/tests/baselines/reference/sourcemapValidationDuplicateNames.sourcemap.txt @@ -97,7 +97,7 @@ sourceFile:sourcemapValidationDuplicateNames.ts 1->Emitted(7, 9) Source(4, 5) + SourceIndex(0) 2 >Emitted(7, 17) Source(4, 6) + SourceIndex(0) --- ->>> })(); +>>> }()); 1 >^^^^ 2 > ^ 3 > diff --git a/tests/baselines/reference/specializationOfExportedClass.js b/tests/baselines/reference/specializationOfExportedClass.js index 75ec00b7304..da39b6eca19 100644 --- a/tests/baselines/reference/specializationOfExportedClass.js +++ b/tests/baselines/reference/specializationOfExportedClass.js @@ -15,7 +15,7 @@ var M; function C() { } return C; - })(); + }()); M.C = C; })(M || (M = {})); var x = new M.C(); diff --git a/tests/baselines/reference/specializedInheritedConstructors1.js b/tests/baselines/reference/specializedInheritedConstructors1.js index 20ef13c3f09..f521ba14838 100644 --- a/tests/baselines/reference/specializedInheritedConstructors1.js +++ b/tests/baselines/reference/specializedInheritedConstructors1.js @@ -27,19 +27,19 @@ var View = (function () { function View(options) { } return View; -})(); +}()); var Model = (function () { function Model() { } return Model; -})(); +}()); var MyView = (function (_super) { __extends(MyView, _super); function MyView() { _super.apply(this, arguments); } return MyView; -})(View); +}(View)); var m = { model: new Model() }; var aView = new View({ model: new Model() }); var aView2 = new View(m); diff --git a/tests/baselines/reference/specializedLambdaTypeArguments.js b/tests/baselines/reference/specializedLambdaTypeArguments.js index 393b4f9e8c3..9e5e6778659 100644 --- a/tests/baselines/reference/specializedLambdaTypeArguments.js +++ b/tests/baselines/reference/specializedLambdaTypeArguments.js @@ -11,5 +11,5 @@ var X = (function () { function X() { } return X; -})(); +}()); var a; diff --git a/tests/baselines/reference/specializedOverloadWithRestParameters.js b/tests/baselines/reference/specializedOverloadWithRestParameters.js index 31cb4a69594..62688f7cb7e 100644 --- a/tests/baselines/reference/specializedOverloadWithRestParameters.js +++ b/tests/baselines/reference/specializedOverloadWithRestParameters.js @@ -23,7 +23,7 @@ var Base = (function () { } Base.prototype.foo = function () { }; return Base; -})(); +}()); var Derived1 = (function (_super) { __extends(Derived1, _super); function Derived1() { @@ -31,7 +31,7 @@ var Derived1 = (function (_super) { } Derived1.prototype.bar = function () { }; return Derived1; -})(Base); +}(Base)); function f(tagName) { return null; } diff --git a/tests/baselines/reference/specializedSignatureIsNotSubtypeOfNonSpecializedSignature.js b/tests/baselines/reference/specializedSignatureIsNotSubtypeOfNonSpecializedSignature.js index e5e06d48a8d..f2946cbeab8 100644 --- a/tests/baselines/reference/specializedSignatureIsNotSubtypeOfNonSpecializedSignature.js +++ b/tests/baselines/reference/specializedSignatureIsNotSubtypeOfNonSpecializedSignature.js @@ -75,19 +75,19 @@ var C = (function () { } C.prototype.foo = function (x) { }; return C; -})(); +}()); var C2 = (function () { function C2() { } C2.prototype.foo = function (x) { }; return C2; -})(); +}()); var C3 = (function () { function C3() { } C3.prototype.foo = function (x) { }; return C3; -})(); +}()); var a; var a2; var a3; diff --git a/tests/baselines/reference/specializedSignatureIsSubtypeOfNonSpecializedSignature.js b/tests/baselines/reference/specializedSignatureIsSubtypeOfNonSpecializedSignature.js index 17a886a0784..f4e7961226a 100644 --- a/tests/baselines/reference/specializedSignatureIsSubtypeOfNonSpecializedSignature.js +++ b/tests/baselines/reference/specializedSignatureIsSubtypeOfNonSpecializedSignature.js @@ -90,19 +90,19 @@ var C = (function () { } C.prototype.foo = function (x) { }; return C; -})(); +}()); var C2 = (function () { function C2() { } C2.prototype.foo = function (x) { }; return C2; -})(); +}()); var C3 = (function () { function C3() { } C3.prototype.foo = function (x) { }; return C3; -})(); +}()); var a; var a2; var a3; diff --git a/tests/baselines/reference/staticAndMemberFunctions.js b/tests/baselines/reference/staticAndMemberFunctions.js index 71f146b72f7..ddf47b941d4 100644 --- a/tests/baselines/reference/staticAndMemberFunctions.js +++ b/tests/baselines/reference/staticAndMemberFunctions.js @@ -11,4 +11,4 @@ var T = (function () { T.x = function () { }; T.prototype.y = function () { }; return T; -})(); +}()); diff --git a/tests/baselines/reference/staticAndNonStaticPropertiesSameName.js b/tests/baselines/reference/staticAndNonStaticPropertiesSameName.js index be667ae1f3b..a5c7c5245e9 100644 --- a/tests/baselines/reference/staticAndNonStaticPropertiesSameName.js +++ b/tests/baselines/reference/staticAndNonStaticPropertiesSameName.js @@ -14,4 +14,4 @@ var C = (function () { C.prototype.f = function () { }; C.f = function () { }; return C; -})(); +}()); diff --git a/tests/baselines/reference/staticAsIdentifier.js b/tests/baselines/reference/staticAsIdentifier.js index 36e317b2875..e7751dfca96 100644 --- a/tests/baselines/reference/staticAsIdentifier.js +++ b/tests/baselines/reference/staticAsIdentifier.js @@ -9,4 +9,4 @@ var C = (function () { function C() { } return C; -})(); +}()); diff --git a/tests/baselines/reference/staticClassMemberError.js b/tests/baselines/reference/staticClassMemberError.js index e33cf2f2704..62166aef833 100644 --- a/tests/baselines/reference/staticClassMemberError.js +++ b/tests/baselines/reference/staticClassMemberError.js @@ -20,9 +20,9 @@ var C = (function () { s = 1; }; return C; -})(); +}()); var Foo = (function () { function Foo() { } return Foo; -})(); +}()); diff --git a/tests/baselines/reference/staticClassProps.js b/tests/baselines/reference/staticClassProps.js index aad40e29b76..c808e4eb7fd 100644 --- a/tests/baselines/reference/staticClassProps.js +++ b/tests/baselines/reference/staticClassProps.js @@ -15,4 +15,4 @@ var C = (function () { C.prototype.foo = function () { }; C.z = 1; return C; -})(); +}()); diff --git a/tests/baselines/reference/staticFactory1.js b/tests/baselines/reference/staticFactory1.js index 03092a16de9..6ccd30e37d1 100644 --- a/tests/baselines/reference/staticFactory1.js +++ b/tests/baselines/reference/staticFactory1.js @@ -27,7 +27,7 @@ var Base = (function () { return new this(); }; return Base; -})(); +}()); var Derived = (function (_super) { __extends(Derived, _super); function Derived() { @@ -35,6 +35,6 @@ var Derived = (function (_super) { } Derived.prototype.foo = function () { return 2; }; return Derived; -})(Base); +}(Base)); var d = Derived.create(); d.foo(); diff --git a/tests/baselines/reference/staticGetter1.js b/tests/baselines/reference/staticGetter1.js index 3772364804a..bffc1e03da0 100644 --- a/tests/baselines/reference/staticGetter1.js +++ b/tests/baselines/reference/staticGetter1.js @@ -20,4 +20,4 @@ var C = (function () { configurable: true }); return C; -})(); +}()); diff --git a/tests/baselines/reference/staticGetter2.js b/tests/baselines/reference/staticGetter2.js index 419ea7bbedf..0f59f434be6 100644 --- a/tests/baselines/reference/staticGetter2.js +++ b/tests/baselines/reference/staticGetter2.js @@ -17,4 +17,4 @@ var C = (function () { return this; }; return C; -})(); +}()); diff --git a/tests/baselines/reference/staticGetterAndSetter.js b/tests/baselines/reference/staticGetterAndSetter.js index 5c61af0b7cc..3ae3dfc7d1e 100644 --- a/tests/baselines/reference/staticGetterAndSetter.js +++ b/tests/baselines/reference/staticGetterAndSetter.js @@ -16,4 +16,4 @@ var Foo = (function () { configurable: true }); return Foo; -})(); +}()); diff --git a/tests/baselines/reference/staticIndexer.js b/tests/baselines/reference/staticIndexer.js index f945cf686b0..1be0be2c8da 100644 --- a/tests/baselines/reference/staticIndexer.js +++ b/tests/baselines/reference/staticIndexer.js @@ -8,4 +8,4 @@ var C = (function () { function C() { } return C; -})(); +}()); diff --git a/tests/baselines/reference/staticIndexers.js b/tests/baselines/reference/staticIndexers.js index 4c8a0bc1ec8..610e805a3c1 100644 --- a/tests/baselines/reference/staticIndexers.js +++ b/tests/baselines/reference/staticIndexers.js @@ -19,14 +19,14 @@ var C = (function () { function C() { } return C; -})(); +}()); var D = (function () { function D() { } return D; -})(); +}()); var E = (function () { function E() { } return E; -})(); +}()); diff --git a/tests/baselines/reference/staticInheritance.js b/tests/baselines/reference/staticInheritance.js index d3e14d482cc..52868930792 100644 --- a/tests/baselines/reference/staticInheritance.js +++ b/tests/baselines/reference/staticInheritance.js @@ -23,7 +23,7 @@ var A = (function () { this.p = doThing(A); // OK } return A; -})(); +}()); var B = (function (_super) { __extends(B, _super); function B() { @@ -32,5 +32,5 @@ var B = (function (_super) { this.p2 = doThing(B); // OK } return B; -})(A); +}(A)); doThing(B); //OK diff --git a/tests/baselines/reference/staticInstanceResolution.js b/tests/baselines/reference/staticInstanceResolution.js index de4e9bc9f0a..788a8634c2e 100644 --- a/tests/baselines/reference/staticInstanceResolution.js +++ b/tests/baselines/reference/staticInstanceResolution.js @@ -26,4 +26,4 @@ var Comment = (function () { c.getDocCommentText(); }; return Comment; -})(); +}()); diff --git a/tests/baselines/reference/staticInstanceResolution2.js b/tests/baselines/reference/staticInstanceResolution2.js index 07d5dd376df..3bfb52c6b65 100644 --- a/tests/baselines/reference/staticInstanceResolution2.js +++ b/tests/baselines/reference/staticInstanceResolution2.js @@ -16,11 +16,11 @@ var A = (function () { function A() { } return A; -})(); +}()); A.hasOwnProperty('foo'); var B = (function () { function B() { } return B; -})(); +}()); B.hasOwnProperty('foo'); diff --git a/tests/baselines/reference/staticInstanceResolution3.js b/tests/baselines/reference/staticInstanceResolution3.js index 265d3e5b3e6..238d1bdad13 100644 --- a/tests/baselines/reference/staticInstanceResolution3.js +++ b/tests/baselines/reference/staticInstanceResolution3.js @@ -21,7 +21,7 @@ var Promise = (function () { return null; }; return Promise; -})(); +}()); exports.Promise = Promise; //// [staticInstanceResolution3_1.js] "use strict"; diff --git a/tests/baselines/reference/staticInstanceResolution4.js b/tests/baselines/reference/staticInstanceResolution4.js index c74030d047e..ab98d9deb8e 100644 --- a/tests/baselines/reference/staticInstanceResolution4.js +++ b/tests/baselines/reference/staticInstanceResolution4.js @@ -11,5 +11,5 @@ var A = (function () { } A.prototype.foo = function () { }; return A; -})(); +}()); A.foo(); diff --git a/tests/baselines/reference/staticInterfaceAssignmentCompat.js b/tests/baselines/reference/staticInterfaceAssignmentCompat.js index b955474eb57..1368ffc2f73 100644 --- a/tests/baselines/reference/staticInterfaceAssignmentCompat.js +++ b/tests/baselines/reference/staticInterfaceAssignmentCompat.js @@ -20,5 +20,5 @@ var Shape = (function () { return new Shape(); }; return Shape; -})(); +}()); var x = Shape; diff --git a/tests/baselines/reference/staticMemberAccessOffDerivedType1.js b/tests/baselines/reference/staticMemberAccessOffDerivedType1.js index 8f9849af057..a05ece1dbbb 100644 --- a/tests/baselines/reference/staticMemberAccessOffDerivedType1.js +++ b/tests/baselines/reference/staticMemberAccessOffDerivedType1.js @@ -22,7 +22,7 @@ var SomeBase = (function () { return 2; }; return SomeBase; -})(); +}()); var P = (function (_super) { __extends(P, _super); function P() { @@ -30,4 +30,4 @@ var P = (function (_super) { } P.SomeNumber = P.GetNumber(); return P; -})(SomeBase); +}(SomeBase)); diff --git a/tests/baselines/reference/staticMemberAssignsToConstructorFunctionMembers.js b/tests/baselines/reference/staticMemberAssignsToConstructorFunctionMembers.js index edd657d7da1..9f34914460c 100644 --- a/tests/baselines/reference/staticMemberAssignsToConstructorFunctionMembers.js +++ b/tests/baselines/reference/staticMemberAssignsToConstructorFunctionMembers.js @@ -26,4 +26,4 @@ var C = (function () { return 1; }; return C; -})(); +}()); diff --git a/tests/baselines/reference/staticMemberExportAccess.js b/tests/baselines/reference/staticMemberExportAccess.js index 37799356708..58fddf445ee 100644 --- a/tests/baselines/reference/staticMemberExportAccess.js +++ b/tests/baselines/reference/staticMemberExportAccess.js @@ -29,7 +29,7 @@ var Sammy = (function () { return -1; }; return Sammy; -})(); +}()); var Sammy; (function (Sammy) { Sammy.x = 1; diff --git a/tests/baselines/reference/staticMemberInitialization.js b/tests/baselines/reference/staticMemberInitialization.js index 1e919b4f993..c21c29ed4f8 100644 --- a/tests/baselines/reference/staticMemberInitialization.js +++ b/tests/baselines/reference/staticMemberInitialization.js @@ -12,6 +12,6 @@ var C = (function () { } C.x = 1; return C; -})(); +}()); var c = new C(); var r = C.x; diff --git a/tests/baselines/reference/staticMemberOfClassAndPublicMemberOfAnotherClassAssignment.js b/tests/baselines/reference/staticMemberOfClassAndPublicMemberOfAnotherClassAssignment.js index 7b24a29b326..1b98daa226d 100644 --- a/tests/baselines/reference/staticMemberOfClassAndPublicMemberOfAnotherClassAssignment.js +++ b/tests/baselines/reference/staticMemberOfClassAndPublicMemberOfAnotherClassAssignment.js @@ -31,13 +31,13 @@ var B = (function () { } B.prototype.name = function () { }; return B; -})(); +}()); var C = (function () { function C() { } C.name = function () { }; return C; -})(); +}()); var a = new B(); a = new C(); // error name is missing a = B; // error name is missing diff --git a/tests/baselines/reference/staticMemberWithStringAndNumberNames.js b/tests/baselines/reference/staticMemberWithStringAndNumberNames.js index 2f48aba4f95..2fdd64ea04b 100644 --- a/tests/baselines/reference/staticMemberWithStringAndNumberNames.js +++ b/tests/baselines/reference/staticMemberWithStringAndNumberNames.js @@ -25,4 +25,4 @@ var C = (function () { C.s2 = C['0']; C.s3 = C[0]; return C; -})(); +}()); diff --git a/tests/baselines/reference/staticMembersUsingClassTypeParameter.js b/tests/baselines/reference/staticMembersUsingClassTypeParameter.js index 0c728cdbab6..c7355c01270 100644 --- a/tests/baselines/reference/staticMembersUsingClassTypeParameter.js +++ b/tests/baselines/reference/staticMembersUsingClassTypeParameter.js @@ -22,16 +22,16 @@ var C = (function () { } C.f = function (x) { }; return C; -})(); +}()); var C2 = (function () { function C2() { } C2.f = function (x) { }; return C2; -})(); +}()); var C3 = (function () { function C3() { } C3.f = function (x) { }; return C3; -})(); +}()); diff --git a/tests/baselines/reference/staticMethodReferencingTypeArgument1.js b/tests/baselines/reference/staticMethodReferencingTypeArgument1.js index 00ba0f14002..d4815aee2b6 100644 --- a/tests/baselines/reference/staticMethodReferencingTypeArgument1.js +++ b/tests/baselines/reference/staticMethodReferencingTypeArgument1.js @@ -31,6 +31,6 @@ var Editor; return entry; }; return List; - })(); + }()); Editor.List = List; })(Editor || (Editor = {})); diff --git a/tests/baselines/reference/staticMethodWithTypeParameterExtendsClauseDeclFile.js b/tests/baselines/reference/staticMethodWithTypeParameterExtendsClauseDeclFile.js index 3a14dde6447..9b8987659c5 100644 --- a/tests/baselines/reference/staticMethodWithTypeParameterExtendsClauseDeclFile.js +++ b/tests/baselines/reference/staticMethodWithTypeParameterExtendsClauseDeclFile.js @@ -27,12 +27,12 @@ var privateClass = (function () { function privateClass() { } return privateClass; -})(); +}()); var publicClass = (function () { function publicClass() { } return publicClass; -})(); +}()); exports.publicClass = publicClass; var publicClassWithWithPrivateTypeParameters = (function () { function publicClassWithWithPrivateTypeParameters() { @@ -50,7 +50,7 @@ var publicClassWithWithPrivateTypeParameters = (function () { publicClassWithWithPrivateTypeParameters.prototype.myPublicMethod = function () { }; return publicClassWithWithPrivateTypeParameters; -})(); +}()); exports.publicClassWithWithPrivateTypeParameters = publicClassWithWithPrivateTypeParameters; diff --git a/tests/baselines/reference/staticMethodsReferencingClassTypeParameters.js b/tests/baselines/reference/staticMethodsReferencingClassTypeParameters.js index 76fa7d6249e..43c9ac9da03 100644 --- a/tests/baselines/reference/staticMethodsReferencingClassTypeParameters.js +++ b/tests/baselines/reference/staticMethodsReferencingClassTypeParameters.js @@ -9,4 +9,4 @@ var C = (function () { } C.s = function (p) { return p; }; return C; -})(); +}()); diff --git a/tests/baselines/reference/staticModifierAlreadySeen.js b/tests/baselines/reference/staticModifierAlreadySeen.js index d767a9b51d1..76f8b050d6f 100644 --- a/tests/baselines/reference/staticModifierAlreadySeen.js +++ b/tests/baselines/reference/staticModifierAlreadySeen.js @@ -11,4 +11,4 @@ var C = (function () { C.bar = function () { }; C.foo = 1; return C; -})(); +}()); diff --git a/tests/baselines/reference/staticMustPrecedePublic.js b/tests/baselines/reference/staticMustPrecedePublic.js index 45882488e72..c01a06ff27c 100644 --- a/tests/baselines/reference/staticMustPrecedePublic.js +++ b/tests/baselines/reference/staticMustPrecedePublic.js @@ -10,4 +10,4 @@ var Outer = (function () { function Outer() { } return Outer; -})(); +}()); diff --git a/tests/baselines/reference/staticOffOfInstance1.js b/tests/baselines/reference/staticOffOfInstance1.js index 58cf24d0529..fa9f99f71fb 100644 --- a/tests/baselines/reference/staticOffOfInstance1.js +++ b/tests/baselines/reference/staticOffOfInstance1.js @@ -15,4 +15,4 @@ var List = (function () { }; List.Foo = function () { }; return List; -})(); +}()); diff --git a/tests/baselines/reference/staticOffOfInstance2.js b/tests/baselines/reference/staticOffOfInstance2.js index ceac77419a4..e23416e29dd 100644 --- a/tests/baselines/reference/staticOffOfInstance2.js +++ b/tests/baselines/reference/staticOffOfInstance2.js @@ -18,4 +18,4 @@ var List = (function () { }; List.Foo = function () { }; return List; -})(); +}()); diff --git a/tests/baselines/reference/staticPropSuper.js b/tests/baselines/reference/staticPropSuper.js index 3f75dc8e26b..f4bc5ece8d1 100644 --- a/tests/baselines/reference/staticPropSuper.js +++ b/tests/baselines/reference/staticPropSuper.js @@ -45,7 +45,7 @@ var A = (function () { function A() { } return A; -})(); +}()); var B = (function (_super) { __extends(B, _super); function B() { @@ -54,7 +54,7 @@ var B = (function (_super) { } B.s = 9; return B; -})(A); +}(A)); var C = (function (_super) { __extends(C, _super); function C() { @@ -62,7 +62,7 @@ var C = (function (_super) { var x = 1; // should error } return C; -})(A); +}(A)); var D = (function (_super) { __extends(D, _super); function D() { @@ -70,7 +70,7 @@ var D = (function (_super) { var x = 1; // should error } return D; -})(A); +}(A)); var E = (function (_super) { __extends(E, _super); function E() { @@ -78,4 +78,4 @@ var E = (function (_super) { var x = 1; // should error } return E; -})(A); +}(A)); diff --git a/tests/baselines/reference/staticPropertyAndFunctionWithSameName.js b/tests/baselines/reference/staticPropertyAndFunctionWithSameName.js index 50252c606f4..71db1ca8ef1 100644 --- a/tests/baselines/reference/staticPropertyAndFunctionWithSameName.js +++ b/tests/baselines/reference/staticPropertyAndFunctionWithSameName.js @@ -14,10 +14,10 @@ var C = (function () { function C() { } return C; -})(); +}()); var D = (function () { function D() { } D.prototype.f = function () { }; return D; -})(); +}()); diff --git a/tests/baselines/reference/staticPropertyNotInClassType.js b/tests/baselines/reference/staticPropertyNotInClassType.js index e9df2b2158d..60fd3b808ca 100644 --- a/tests/baselines/reference/staticPropertyNotInClassType.js +++ b/tests/baselines/reference/staticPropertyNotInClassType.js @@ -55,7 +55,7 @@ var NonGeneric; configurable: true }); return C; - })(); + }()); var C; (function (C) { C.bar = ''; // not reflected in class type @@ -81,7 +81,7 @@ var Generic; configurable: true }); return C; - })(); + }()); var C; (function (C) { C.bar = ''; // not reflected in class type diff --git a/tests/baselines/reference/staticPrototypeProperty.js b/tests/baselines/reference/staticPrototypeProperty.js index 471ec743b59..65e53b5522b 100644 --- a/tests/baselines/reference/staticPrototypeProperty.js +++ b/tests/baselines/reference/staticPrototypeProperty.js @@ -13,9 +13,9 @@ var C = (function () { } C.prototype = function () { }; return C; -})(); +}()); var C2 = (function () { function C2() { } return C2; -})(); +}()); diff --git a/tests/baselines/reference/staticPrototypePropertyOnClass.js b/tests/baselines/reference/staticPrototypePropertyOnClass.js index 0782c47ee28..dff9a58073e 100644 --- a/tests/baselines/reference/staticPrototypePropertyOnClass.js +++ b/tests/baselines/reference/staticPrototypePropertyOnClass.js @@ -23,22 +23,22 @@ var c1 = (function () { function c1() { } return c1; -})(); +}()); var c2 = (function () { function c2() { } return c2; -})(); +}()); var c3 = (function () { function c3() { } return c3; -})(); +}()); var c4 = (function () { function c4(param) { } return c4; -})(); +}()); var a = c1; var b = c2; var c = c3; diff --git a/tests/baselines/reference/staticVisibility.js b/tests/baselines/reference/staticVisibility.js index 7dbf49a2baa..fd0a3ba52b0 100644 --- a/tests/baselines/reference/staticVisibility.js +++ b/tests/baselines/reference/staticVisibility.js @@ -52,7 +52,7 @@ var C1 = (function () { C1.s = 1; // should be ok }; return C1; -})(); +}()); var C2 = (function () { function C2() { this.barback = ""; @@ -66,4 +66,4 @@ var C2 = (function () { configurable: true }); return C2; -})(); +}()); diff --git a/tests/baselines/reference/statics.js b/tests/baselines/reference/statics.js index c69fa0aabd7..3776c09c8ce 100644 --- a/tests/baselines/reference/statics.js +++ b/tests/baselines/reference/statics.js @@ -49,7 +49,7 @@ var M; C.pub = 3; C.y = C.priv; return C; - })(); + }()); M.C = C; var c = C.y; function f() { diff --git a/tests/baselines/reference/staticsInConstructorBodies.js b/tests/baselines/reference/staticsInConstructorBodies.js index bb91b52a18a..9bc3ed29325 100644 --- a/tests/baselines/reference/staticsInConstructorBodies.js +++ b/tests/baselines/reference/staticsInConstructorBodies.js @@ -13,4 +13,4 @@ var C = (function () { C.m1 = function () { }; // ERROR C.p1 = 0; // ERROR return C; -})(); +}()); diff --git a/tests/baselines/reference/staticsNotInScopeInClodule.js b/tests/baselines/reference/staticsNotInScopeInClodule.js index 9274a04f8b7..150ae8aca5b 100644 --- a/tests/baselines/reference/staticsNotInScopeInClodule.js +++ b/tests/baselines/reference/staticsNotInScopeInClodule.js @@ -13,7 +13,7 @@ var Clod = (function () { } Clod.x = 10; return Clod; -})(); +}()); var Clod; (function (Clod) { var p = x; // x isn't in scope here diff --git a/tests/baselines/reference/strictModeInConstructor.js b/tests/baselines/reference/strictModeInConstructor.js index 7d1adc48fa0..3b315861548 100644 --- a/tests/baselines/reference/strictModeInConstructor.js +++ b/tests/baselines/reference/strictModeInConstructor.js @@ -70,7 +70,7 @@ var A = (function () { function A() { } return A; -})(); +}()); var B = (function (_super) { __extends(B, _super); function B() { @@ -79,7 +79,7 @@ var B = (function (_super) { _super.call(this); } return B; -})(A); +}(A)); var C = (function (_super) { __extends(C, _super); function C() { @@ -88,7 +88,7 @@ var C = (function (_super) { "use strict"; } return C; -})(A); +}(A)); var D = (function (_super) { __extends(D, _super); function D() { @@ -98,7 +98,7 @@ var D = (function (_super) { "use strict"; } return D; -})(A); +}(A)); var Bs = (function (_super) { __extends(Bs, _super); function Bs() { @@ -107,7 +107,7 @@ var Bs = (function (_super) { } Bs.s = 9; return Bs; -})(A); +}(A)); var Cs = (function (_super) { __extends(Cs, _super); function Cs() { @@ -116,7 +116,7 @@ var Cs = (function (_super) { } Cs.s = 9; return Cs; -})(A); +}(A)); var Ds = (function (_super) { __extends(Ds, _super); function Ds() { @@ -126,4 +126,4 @@ var Ds = (function (_super) { } Ds.s = 9; return Ds; -})(A); +}(A)); diff --git a/tests/baselines/reference/strictModeReservedWord.js b/tests/baselines/reference/strictModeReservedWord.js index bec159dee6f..210d9ec75be 100644 --- a/tests/baselines/reference/strictModeReservedWord.js +++ b/tests/baselines/reference/strictModeReservedWord.js @@ -51,7 +51,7 @@ function foo() { _super.apply(this, arguments); } return package; - })(public); + }(public)); var b; function foo(x) { } function foo1(x) { } diff --git a/tests/baselines/reference/strictModeReservedWordInClassDeclaration.js b/tests/baselines/reference/strictModeReservedWordInClassDeclaration.js index e4bef791374..281b4ade5d6 100644 --- a/tests/baselines/reference/strictModeReservedWordInClassDeclaration.js +++ b/tests/baselines/reference/strictModeReservedWordInClassDeclaration.js @@ -40,7 +40,7 @@ var Foo = (function () { } Foo.prototype.banana = function (x) { }; return Foo; -})(); +}()); var C = (function () { function C(public, let) { this.public = public; @@ -51,38 +51,38 @@ var C = (function () { }; C.prototype.pulbic = function () { }; // No Error; return C; -})(); +}()); var D = (function () { function D() { } return D; -})(); +}()); var E = (function () { function E() { } return E; -})(); +}()); var F = (function () { function F() { } return F; -})(); +}()); var F1 = (function () { function F1() { } return F1; -})(); +}()); var G = (function (_super) { __extends(G, _super); function G() { _super.apply(this, arguments); } return G; -})(package); +}(package)); var H = (function (_super) { __extends(H, _super); function H() { _super.apply(this, arguments); } return H; -})(package.A); +}(package.A)); diff --git a/tests/baselines/reference/strictModeUseContextualKeyword.js b/tests/baselines/reference/strictModeUseContextualKeyword.js index 33ceae36031..d21463f3b39 100644 --- a/tests/baselines/reference/strictModeUseContextualKeyword.js +++ b/tests/baselines/reference/strictModeUseContextualKeyword.js @@ -22,7 +22,7 @@ var C = (function () { } C.prototype.as = function () { }; return C; -})(); +}()); function F() { function as() { } } diff --git a/tests/baselines/reference/stringIndexerAndConstructor.js b/tests/baselines/reference/stringIndexerAndConstructor.js index db3b9b8770b..7e38cff7555 100644 --- a/tests/baselines/reference/stringIndexerAndConstructor.js +++ b/tests/baselines/reference/stringIndexerAndConstructor.js @@ -19,4 +19,4 @@ var C = (function () { } C.v = function () { }; return C; -})(); +}()); diff --git a/tests/baselines/reference/stringIndexerAssignments2.js b/tests/baselines/reference/stringIndexerAssignments2.js index 8f909cc7206..94ce262aadc 100644 --- a/tests/baselines/reference/stringIndexerAssignments2.js +++ b/tests/baselines/reference/stringIndexerAssignments2.js @@ -25,17 +25,17 @@ var C1 = (function () { function C1() { } return C1; -})(); +}()); var C2 = (function () { function C2() { } return C2; -})(); +}()); var C3 = (function () { function C3() { } return C3; -})(); +}()); var x; var a; var b; diff --git a/tests/baselines/reference/stringIndexerConstrainsPropertyDeclarations.js b/tests/baselines/reference/stringIndexerConstrainsPropertyDeclarations.js index 9d70b66887c..57df8ce2883 100644 --- a/tests/baselines/reference/stringIndexerConstrainsPropertyDeclarations.js +++ b/tests/baselines/reference/stringIndexerConstrainsPropertyDeclarations.js @@ -123,7 +123,7 @@ var C = (function () { configurable: true }); return C; -})(); +}()); var a; // error var b = { diff --git a/tests/baselines/reference/stringIndexerConstrainsPropertyDeclarations2.js b/tests/baselines/reference/stringIndexerConstrainsPropertyDeclarations2.js index 97e3e9b0f5b..08a26230f37 100644 --- a/tests/baselines/reference/stringIndexerConstrainsPropertyDeclarations2.js +++ b/tests/baselines/reference/stringIndexerConstrainsPropertyDeclarations2.js @@ -51,7 +51,7 @@ var A = (function () { } A.prototype.foo = function () { return ''; }; return A; -})(); +}()); var B = (function (_super) { __extends(B, _super); function B() { @@ -59,12 +59,12 @@ var B = (function (_super) { } B.prototype.bar = function () { return ''; }; return B; -})(A); +}(A)); var Foo = (function () { function Foo() { } return Foo; -})(); +}()); var a; // error var b = { diff --git a/tests/baselines/reference/stringIndexingResults.js b/tests/baselines/reference/stringIndexingResults.js index a6e00d92ec2..53f82340353 100644 --- a/tests/baselines/reference/stringIndexingResults.js +++ b/tests/baselines/reference/stringIndexingResults.js @@ -41,7 +41,7 @@ var C = (function () { this.y = ''; } return C; -})(); +}()); var c; var r1 = c['y']; var r2 = c['a']; diff --git a/tests/baselines/reference/stringLiteralTypeIsSubtypeOfString.js b/tests/baselines/reference/stringLiteralTypeIsSubtypeOfString.js index 01b5dc814a7..78417b9a082 100644 --- a/tests/baselines/reference/stringLiteralTypeIsSubtypeOfString.js +++ b/tests/baselines/reference/stringLiteralTypeIsSubtypeOfString.js @@ -141,7 +141,7 @@ var C = (function () { C.prototype.substr = function (from, length) { return null; }; C.prototype.valueOf = function () { return null; }; return C; -})(); +}()); function f10(x) { } function f11(x) { } function f12(x) { } diff --git a/tests/baselines/reference/stringLiteralTypesInImplementationSignatures.js b/tests/baselines/reference/stringLiteralTypesInImplementationSignatures.js index 724c20c6309..e9bdc90ecf3 100644 --- a/tests/baselines/reference/stringLiteralTypesInImplementationSignatures.js +++ b/tests/baselines/reference/stringLiteralTypesInImplementationSignatures.js @@ -36,7 +36,7 @@ var C = (function () { } C.prototype.foo = function (x) { }; return C; -})(); +}()); var a; var b = { foo: function (x) { }, diff --git a/tests/baselines/reference/stringLiteralTypesInImplementationSignatures2.js b/tests/baselines/reference/stringLiteralTypesInImplementationSignatures2.js index 5050709c213..a33c6424eda 100644 --- a/tests/baselines/reference/stringLiteralTypesInImplementationSignatures2.js +++ b/tests/baselines/reference/stringLiteralTypesInImplementationSignatures2.js @@ -37,7 +37,7 @@ var C = (function () { } C.prototype.foo = function (x) { }; return C; -})(); +}()); var a; var b = { foo: function (x) { }, diff --git a/tests/baselines/reference/stringNamedPropertyAccess.js b/tests/baselines/reference/stringNamedPropertyAccess.js index cdc8603a0e7..01b634faf5f 100644 --- a/tests/baselines/reference/stringNamedPropertyAccess.js +++ b/tests/baselines/reference/stringNamedPropertyAccess.js @@ -28,7 +28,7 @@ var C = (function () { function C() { } return C; -})(); +}()); var c; var r1 = c["a b"]; var r1b = C['c d']; diff --git a/tests/baselines/reference/stringNamedPropertyDuplicates.js b/tests/baselines/reference/stringNamedPropertyDuplicates.js index 214bb9921e9..a1b4822b5da 100644 --- a/tests/baselines/reference/stringNamedPropertyDuplicates.js +++ b/tests/baselines/reference/stringNamedPropertyDuplicates.js @@ -26,7 +26,7 @@ var C = (function () { function C() { } return C; -})(); +}()); var a; var b = { "a b": 1, diff --git a/tests/baselines/reference/stripInternal1.js b/tests/baselines/reference/stripInternal1.js index c5d350bcd86..e5fbe40df7a 100644 --- a/tests/baselines/reference/stripInternal1.js +++ b/tests/baselines/reference/stripInternal1.js @@ -14,7 +14,7 @@ var C = (function () { // @internal C.prototype.bar = function () { }; return C; -})(); +}()); //// [stripInternal1.d.ts] diff --git a/tests/baselines/reference/subtypesOfAny.js b/tests/baselines/reference/subtypesOfAny.js index e73a120ed63..0b2965cb820 100644 --- a/tests/baselines/reference/subtypesOfAny.js +++ b/tests/baselines/reference/subtypesOfAny.js @@ -139,12 +139,12 @@ var A = (function () { function A() { } return A; -})(); +}()); var A2 = (function () { function A2() { } return A2; -})(); +}()); var E; (function (E) { E[E["A"] = 0] = "A"; @@ -158,7 +158,7 @@ var c = (function () { function c() { } return c; -})(); +}()); var c; (function (c) { c.bar = 1; diff --git a/tests/baselines/reference/subtypesOfTypeParameter.js b/tests/baselines/reference/subtypesOfTypeParameter.js index c7b14a4129c..10d9e3e42ec 100644 --- a/tests/baselines/reference/subtypesOfTypeParameter.js +++ b/tests/baselines/reference/subtypesOfTypeParameter.js @@ -116,14 +116,14 @@ var C3 = (function () { function C3() { } return C3; -})(); +}()); var D1 = (function (_super) { __extends(D1, _super); function D1() { _super.apply(this, arguments); } return D1; -})(C3); +}(C3)); function f1(x, y) { var r = true ? x : y; // error var r = true ? y : x; // error @@ -132,12 +132,12 @@ var C1 = (function () { function C1() { } return C1; -})(); +}()); var C2 = (function () { function C2() { } return C2; -})(); +}()); var E; (function (E) { E[E["A"] = 0] = "A"; @@ -151,7 +151,7 @@ var c = (function () { function c() { } return c; -})(); +}()); var c; (function (c) { c.bar = 1; diff --git a/tests/baselines/reference/subtypesOfTypeParameterWithConstraints.js b/tests/baselines/reference/subtypesOfTypeParameterWithConstraints.js index 194c1835147..0753c52dc9e 100644 --- a/tests/baselines/reference/subtypesOfTypeParameterWithConstraints.js +++ b/tests/baselines/reference/subtypesOfTypeParameterWithConstraints.js @@ -178,35 +178,35 @@ var C3 = (function () { function C3() { } return C3; -})(); +}()); var D1 = (function (_super) { __extends(D1, _super); function D1() { _super.apply(this, arguments); } return D1; -})(C3); +}(C3)); var D2 = (function (_super) { __extends(D2, _super); function D2() { _super.apply(this, arguments); } return D2; -})(C3); +}(C3)); var D3 = (function (_super) { __extends(D3, _super); function D3() { _super.apply(this, arguments); } return D3; -})(C3); +}(C3)); var D4 = (function (_super) { __extends(D4, _super); function D4() { _super.apply(this, arguments); } return D4; -})(C3); +}(C3)); // V > U > T // test if T is subtype of T, U, V // should all work @@ -216,21 +216,21 @@ var D5 = (function (_super) { _super.apply(this, arguments); } return D5; -})(C3); +}(C3)); var D6 = (function (_super) { __extends(D6, _super); function D6() { _super.apply(this, arguments); } return D6; -})(C3); +}(C3)); var D7 = (function (_super) { __extends(D7, _super); function D7() { _super.apply(this, arguments); } return D7; -})(C3); +}(C3)); // test if U is a subtype of T, U, V // only a subtype of V and itself var D8 = (function (_super) { @@ -239,21 +239,21 @@ var D8 = (function (_super) { _super.apply(this, arguments); } return D8; -})(C3); +}(C3)); var D9 = (function (_super) { __extends(D9, _super); function D9() { _super.apply(this, arguments); } return D9; -})(C3); +}(C3)); var D10 = (function (_super) { __extends(D10, _super); function D10() { _super.apply(this, arguments); } return D10; -})(C3); +}(C3)); // test if V is a subtype of T, U, V // only a subtype of itself var D11 = (function (_super) { @@ -262,21 +262,21 @@ var D11 = (function (_super) { _super.apply(this, arguments); } return D11; -})(C3); +}(C3)); var D12 = (function (_super) { __extends(D12, _super); function D12() { _super.apply(this, arguments); } return D12; -})(C3); +}(C3)); var D13 = (function (_super) { __extends(D13, _super); function D13() { _super.apply(this, arguments); } return D13; -})(C3); +}(C3)); // Date > V > U > T // test if T is subtype of T, U, V, Date // should all work @@ -286,28 +286,28 @@ var D14 = (function (_super) { _super.apply(this, arguments); } return D14; -})(C3); +}(C3)); var D15 = (function (_super) { __extends(D15, _super); function D15() { _super.apply(this, arguments); } return D15; -})(C3); +}(C3)); var D16 = (function (_super) { __extends(D16, _super); function D16() { _super.apply(this, arguments); } return D16; -})(C3); +}(C3)); var D17 = (function (_super) { __extends(D17, _super); function D17() { _super.apply(this, arguments); } return D17; -})(C3); +}(C3)); // test if U is a subtype of T, U, V, Date // only a subtype of V, Date and itself var D18 = (function (_super) { @@ -316,28 +316,28 @@ var D18 = (function (_super) { _super.apply(this, arguments); } return D18; -})(C3); +}(C3)); var D19 = (function (_super) { __extends(D19, _super); function D19() { _super.apply(this, arguments); } return D19; -})(C3); +}(C3)); var D20 = (function (_super) { __extends(D20, _super); function D20() { _super.apply(this, arguments); } return D20; -})(C3); +}(C3)); var D21 = (function (_super) { __extends(D21, _super); function D21() { _super.apply(this, arguments); } return D21; -})(C3); +}(C3)); // test if V is a subtype of T, U, V, Date // only a subtype of itself and Date var D22 = (function (_super) { @@ -346,28 +346,28 @@ var D22 = (function (_super) { _super.apply(this, arguments); } return D22; -})(C3); +}(C3)); var D23 = (function (_super) { __extends(D23, _super); function D23() { _super.apply(this, arguments); } return D23; -})(C3); +}(C3)); var D24 = (function (_super) { __extends(D24, _super); function D24() { _super.apply(this, arguments); } return D24; -})(C3); +}(C3)); var D25 = (function (_super) { __extends(D25, _super); function D25() { _super.apply(this, arguments); } return D25; -})(C3); +}(C3)); // test if Date is a subtype of T, U, V, Date // only a subtype of itself var D26 = (function (_super) { @@ -376,25 +376,25 @@ var D26 = (function (_super) { _super.apply(this, arguments); } return D26; -})(C3); +}(C3)); var D27 = (function (_super) { __extends(D27, _super); function D27() { _super.apply(this, arguments); } return D27; -})(C3); +}(C3)); var D28 = (function (_super) { __extends(D28, _super); function D28() { _super.apply(this, arguments); } return D28; -})(C3); +}(C3)); var D29 = (function (_super) { __extends(D29, _super); function D29() { _super.apply(this, arguments); } return D29; -})(C3); +}(C3)); diff --git a/tests/baselines/reference/subtypesOfTypeParameterWithConstraints2.js b/tests/baselines/reference/subtypesOfTypeParameterWithConstraints2.js index e1c137f77e4..771c2ef74f5 100644 --- a/tests/baselines/reference/subtypesOfTypeParameterWithConstraints2.js +++ b/tests/baselines/reference/subtypesOfTypeParameterWithConstraints2.js @@ -189,12 +189,12 @@ var C1 = (function () { function C1() { } return C1; -})(); +}()); var C2 = (function () { function C2() { } return C2; -})(); +}()); var E; (function (E) { E[E["A"] = 0] = "A"; @@ -208,7 +208,7 @@ var c = (function () { function c() { } return c; -})(); +}()); var c; (function (c) { c.bar = 1; diff --git a/tests/baselines/reference/subtypesOfTypeParameterWithConstraints4.js b/tests/baselines/reference/subtypesOfTypeParameterWithConstraints4.js index 370bbf2b8ff..f388bd4e047 100644 --- a/tests/baselines/reference/subtypesOfTypeParameterWithConstraints4.js +++ b/tests/baselines/reference/subtypesOfTypeParameterWithConstraints4.js @@ -89,7 +89,7 @@ var Foo = (function () { function Foo() { } return Foo; -})(); +}()); function f(t, u, v) { // ok var r = true ? t : u; @@ -114,67 +114,67 @@ var B1 = (function () { function B1() { } return B1; -})(); +}()); var D1 = (function (_super) { __extends(D1, _super); function D1() { _super.apply(this, arguments); } return D1; -})(B1); +}(B1)); var D2 = (function (_super) { __extends(D2, _super); function D2() { _super.apply(this, arguments); } return D2; -})(B1); +}(B1)); var D3 = (function (_super) { __extends(D3, _super); function D3() { _super.apply(this, arguments); } return D3; -})(B1); +}(B1)); var D4 = (function (_super) { __extends(D4, _super); function D4() { _super.apply(this, arguments); } return D4; -})(B1); +}(B1)); var D5 = (function (_super) { __extends(D5, _super); function D5() { _super.apply(this, arguments); } return D5; -})(B1); +}(B1)); var D6 = (function (_super) { __extends(D6, _super); function D6() { _super.apply(this, arguments); } return D6; -})(B1); +}(B1)); var D7 = (function (_super) { __extends(D7, _super); function D7() { _super.apply(this, arguments); } return D7; -})(B1); +}(B1)); var D8 = (function (_super) { __extends(D8, _super); function D8() { _super.apply(this, arguments); } return D8; -})(B1); +}(B1)); var D9 = (function (_super) { __extends(D9, _super); function D9() { _super.apply(this, arguments); } return D9; -})(B1); +}(B1)); diff --git a/tests/baselines/reference/subtypesOfTypeParameterWithRecursiveConstraints.js b/tests/baselines/reference/subtypesOfTypeParameterWithRecursiveConstraints.js index c5d4e68b516..cffda7d7f55 100644 --- a/tests/baselines/reference/subtypesOfTypeParameterWithRecursiveConstraints.js +++ b/tests/baselines/reference/subtypesOfTypeParameterWithRecursiveConstraints.js @@ -168,7 +168,7 @@ var Foo = (function () { function Foo() { } return Foo; -})(); +}()); function f(t, u, v) { // ok var r1 = true ? t : u; @@ -213,70 +213,70 @@ var M1; function Base() { } return Base; - })(); + }()); var D1 = (function (_super) { __extends(D1, _super); function D1() { _super.apply(this, arguments); } return D1; - })(Base); + }(Base)); var D2 = (function (_super) { __extends(D2, _super); function D2() { _super.apply(this, arguments); } return D2; - })(Base); + }(Base)); var D3 = (function (_super) { __extends(D3, _super); function D3() { _super.apply(this, arguments); } return D3; - })(Base); + }(Base)); var D4 = (function (_super) { __extends(D4, _super); function D4() { _super.apply(this, arguments); } return D4; - })(Base); + }(Base)); var D5 = (function (_super) { __extends(D5, _super); function D5() { _super.apply(this, arguments); } return D5; - })(Base); + }(Base)); var D6 = (function (_super) { __extends(D6, _super); function D6() { _super.apply(this, arguments); } return D6; - })(Base); + }(Base)); var D7 = (function (_super) { __extends(D7, _super); function D7() { _super.apply(this, arguments); } return D7; - })(Base); + }(Base)); var D8 = (function (_super) { __extends(D8, _super); function D8() { _super.apply(this, arguments); } return D8; - })(Base); + }(Base)); var D9 = (function (_super) { __extends(D9, _super); function D9() { _super.apply(this, arguments); } return D9; - })(Base); + }(Base)); })(M1 || (M1 = {})); var M2; (function (M2) { @@ -284,68 +284,68 @@ var M2; function Base2() { } return Base2; - })(); + }()); var D1 = (function (_super) { __extends(D1, _super); function D1() { _super.apply(this, arguments); } return D1; - })(Base2); + }(Base2)); var D2 = (function (_super) { __extends(D2, _super); function D2() { _super.apply(this, arguments); } return D2; - })(Base2); + }(Base2)); var D3 = (function (_super) { __extends(D3, _super); function D3() { _super.apply(this, arguments); } return D3; - })(Base2); + }(Base2)); var D4 = (function (_super) { __extends(D4, _super); function D4() { _super.apply(this, arguments); } return D4; - })(Base2); + }(Base2)); var D5 = (function (_super) { __extends(D5, _super); function D5() { _super.apply(this, arguments); } return D5; - })(Base2); + }(Base2)); var D6 = (function (_super) { __extends(D6, _super); function D6() { _super.apply(this, arguments); } return D6; - })(Base2); + }(Base2)); var D7 = (function (_super) { __extends(D7, _super); function D7() { _super.apply(this, arguments); } return D7; - })(Base2); + }(Base2)); var D8 = (function (_super) { __extends(D8, _super); function D8() { _super.apply(this, arguments); } return D8; - })(Base2); + }(Base2)); var D9 = (function (_super) { __extends(D9, _super); function D9() { _super.apply(this, arguments); } return D9; - })(Base2); + }(Base2)); })(M2 || (M2 = {})); diff --git a/tests/baselines/reference/subtypesOfUnion.js b/tests/baselines/reference/subtypesOfUnion.js index 926efc3e921..cc0fdea7346 100644 --- a/tests/baselines/reference/subtypesOfUnion.js +++ b/tests/baselines/reference/subtypesOfUnion.js @@ -62,12 +62,12 @@ var A = (function () { function A() { } return A; -})(); +}()); var A2 = (function () { function A2() { } return A2; -})(); +}()); function f() { } var f; (function (f) { @@ -77,7 +77,7 @@ var c = (function () { function c() { } return c; -})(); +}()); var c; (function (c) { c.bar = 1; diff --git a/tests/baselines/reference/subtypingTransitivity.js b/tests/baselines/reference/subtypingTransitivity.js index 9bc5cd93209..9d3df207a0c 100644 --- a/tests/baselines/reference/subtypingTransitivity.js +++ b/tests/baselines/reference/subtypingTransitivity.js @@ -29,21 +29,21 @@ var B = (function () { function B() { } return B; -})(); +}()); var D = (function (_super) { __extends(D, _super); function D() { _super.apply(this, arguments); } return D; -})(B); +}(B)); var D2 = (function (_super) { __extends(D2, _super); function D2() { _super.apply(this, arguments); } return D2; -})(B); +}(B)); var b; var d; var d2; diff --git a/tests/baselines/reference/subtypingWithCallSignatures2.js b/tests/baselines/reference/subtypingWithCallSignatures2.js index f11b83c4da6..014ce4a3003 100644 --- a/tests/baselines/reference/subtypingWithCallSignatures2.js +++ b/tests/baselines/reference/subtypingWithCallSignatures2.js @@ -183,28 +183,28 @@ var Base = (function () { function Base() { } return Base; -})(); +}()); var Derived = (function (_super) { __extends(Derived, _super); function Derived() { _super.apply(this, arguments); } return Derived; -})(Base); +}(Base)); var Derived2 = (function (_super) { __extends(Derived2, _super); function Derived2() { _super.apply(this, arguments); } return Derived2; -})(Derived); +}(Derived)); var OtherDerived = (function (_super) { __extends(OtherDerived, _super); function OtherDerived() { _super.apply(this, arguments); } return OtherDerived; -})(Base); +}(Base)); var r1arg1 = function (x) { return [x]; }; var r1arg2 = function (x) { return [1]; }; var r1 = foo1(r1arg1); // any, return types are not subtype of first overload diff --git a/tests/baselines/reference/subtypingWithCallSignatures3.js b/tests/baselines/reference/subtypingWithCallSignatures3.js index 2b45b75b95f..55f5fa60e71 100644 --- a/tests/baselines/reference/subtypingWithCallSignatures3.js +++ b/tests/baselines/reference/subtypingWithCallSignatures3.js @@ -132,28 +132,28 @@ var Errors; function Base() { } return Base; - })(); + }()); var Derived = (function (_super) { __extends(Derived, _super); function Derived() { _super.apply(this, arguments); } return Derived; - })(Base); + }(Base)); var Derived2 = (function (_super) { __extends(Derived2, _super); function Derived2() { _super.apply(this, arguments); } return Derived2; - })(Derived); + }(Derived)); var OtherDerived = (function (_super) { __extends(OtherDerived, _super); function OtherDerived() { _super.apply(this, arguments); } return OtherDerived; - })(Base); + }(Base)); var r1 = foo2(function (x) { return null; }); // any var r1a = [function (x) { return ['']; }, function (x) { return null; }]; var r1b = [function (x) { return null; }, function (x) { return ['']; }]; diff --git a/tests/baselines/reference/subtypingWithCallSignatures4.js b/tests/baselines/reference/subtypingWithCallSignatures4.js index d1d30437cd6..b8839316e86 100644 --- a/tests/baselines/reference/subtypingWithCallSignatures4.js +++ b/tests/baselines/reference/subtypingWithCallSignatures4.js @@ -122,28 +122,28 @@ var Base = (function () { function Base() { } return Base; -})(); +}()); var Derived = (function (_super) { __extends(Derived, _super); function Derived() { _super.apply(this, arguments); } return Derived; -})(Base); +}(Base)); var Derived2 = (function (_super) { __extends(Derived2, _super); function Derived2() { _super.apply(this, arguments); } return Derived2; -})(Derived); +}(Derived)); var OtherDerived = (function (_super) { __extends(OtherDerived, _super); function OtherDerived() { _super.apply(this, arguments); } return OtherDerived; -})(Base); +}(Base)); var r1arg = function (x) { return null; }; var r1arg2 = function (x) { return null; }; var r1 = foo1(r1arg); diff --git a/tests/baselines/reference/subtypingWithConstructSignatures2.js b/tests/baselines/reference/subtypingWithConstructSignatures2.js index df050ffd6e9..c4168febf4e 100644 --- a/tests/baselines/reference/subtypingWithConstructSignatures2.js +++ b/tests/baselines/reference/subtypingWithConstructSignatures2.js @@ -183,28 +183,28 @@ var Base = (function () { function Base() { } return Base; -})(); +}()); var Derived = (function (_super) { __extends(Derived, _super); function Derived() { _super.apply(this, arguments); } return Derived; -})(Base); +}(Base)); var Derived2 = (function (_super) { __extends(Derived2, _super); function Derived2() { _super.apply(this, arguments); } return Derived2; -})(Derived); +}(Derived)); var OtherDerived = (function (_super) { __extends(OtherDerived, _super); function OtherDerived() { _super.apply(this, arguments); } return OtherDerived; -})(Base); +}(Base)); var r1arg1; var r1arg2; var r1 = foo1(r1arg1); // any, return types are not subtype of first overload diff --git a/tests/baselines/reference/subtypingWithConstructSignatures3.js b/tests/baselines/reference/subtypingWithConstructSignatures3.js index ccc6fb872c5..171e52505e0 100644 --- a/tests/baselines/reference/subtypingWithConstructSignatures3.js +++ b/tests/baselines/reference/subtypingWithConstructSignatures3.js @@ -134,28 +134,28 @@ var Errors; function Base() { } return Base; - })(); + }()); var Derived = (function (_super) { __extends(Derived, _super); function Derived() { _super.apply(this, arguments); } return Derived; - })(Base); + }(Base)); var Derived2 = (function (_super) { __extends(Derived2, _super); function Derived2() { _super.apply(this, arguments); } return Derived2; - })(Derived); + }(Derived)); var OtherDerived = (function (_super) { __extends(OtherDerived, _super); function OtherDerived() { _super.apply(this, arguments); } return OtherDerived; - })(Base); + }(Base)); var r1arg1; var r1arg2; var r1 = foo2(r1arg1); // any diff --git a/tests/baselines/reference/subtypingWithConstructSignatures4.js b/tests/baselines/reference/subtypingWithConstructSignatures4.js index 67b83aa94c9..1152dde04dd 100644 --- a/tests/baselines/reference/subtypingWithConstructSignatures4.js +++ b/tests/baselines/reference/subtypingWithConstructSignatures4.js @@ -122,28 +122,28 @@ var Base = (function () { function Base() { } return Base; -})(); +}()); var Derived = (function (_super) { __extends(Derived, _super); function Derived() { _super.apply(this, arguments); } return Derived; -})(Base); +}(Base)); var Derived2 = (function (_super) { __extends(Derived2, _super); function Derived2() { _super.apply(this, arguments); } return Derived2; -})(Derived); +}(Derived)); var OtherDerived = (function (_super) { __extends(OtherDerived, _super); function OtherDerived() { _super.apply(this, arguments); } return OtherDerived; -})(Base); +}(Base)); var r1arg; var r1arg2; var r1 = foo1(r1arg); diff --git a/tests/baselines/reference/subtypingWithConstructSignatures5.js b/tests/baselines/reference/subtypingWithConstructSignatures5.js index ec3bad2c1f3..24a5ce77dd0 100644 --- a/tests/baselines/reference/subtypingWithConstructSignatures5.js +++ b/tests/baselines/reference/subtypingWithConstructSignatures5.js @@ -60,25 +60,25 @@ var Base = (function () { function Base() { } return Base; -})(); +}()); var Derived = (function (_super) { __extends(Derived, _super); function Derived() { _super.apply(this, arguments); } return Derived; -})(Base); +}(Base)); var Derived2 = (function (_super) { __extends(Derived2, _super); function Derived2() { _super.apply(this, arguments); } return Derived2; -})(Derived); +}(Derived)); var OtherDerived = (function (_super) { __extends(OtherDerived, _super); function OtherDerived() { _super.apply(this, arguments); } return OtherDerived; -})(Base); +}(Base)); diff --git a/tests/baselines/reference/subtypingWithConstructSignatures6.js b/tests/baselines/reference/subtypingWithConstructSignatures6.js index 1c7a2d883c3..8778255dbd5 100644 --- a/tests/baselines/reference/subtypingWithConstructSignatures6.js +++ b/tests/baselines/reference/subtypingWithConstructSignatures6.js @@ -63,25 +63,25 @@ var Base = (function () { function Base() { } return Base; -})(); +}()); var Derived = (function (_super) { __extends(Derived, _super); function Derived() { _super.apply(this, arguments); } return Derived; -})(Base); +}(Base)); var Derived2 = (function (_super) { __extends(Derived2, _super); function Derived2() { _super.apply(this, arguments); } return Derived2; -})(Derived); +}(Derived)); var OtherDerived = (function (_super) { __extends(OtherDerived, _super); function OtherDerived() { _super.apply(this, arguments); } return OtherDerived; -})(Base); +}(Base)); diff --git a/tests/baselines/reference/subtypingWithNumericIndexer.js b/tests/baselines/reference/subtypingWithNumericIndexer.js index 2ad6a2ebedc..cd447c116da 100644 --- a/tests/baselines/reference/subtypingWithNumericIndexer.js +++ b/tests/baselines/reference/subtypingWithNumericIndexer.js @@ -50,54 +50,54 @@ var A = (function () { function A() { } return A; -})(); +}()); var B = (function (_super) { __extends(B, _super); function B() { _super.apply(this, arguments); } return B; -})(A); +}(A)); var B2 = (function (_super) { __extends(B2, _super); function B2() { _super.apply(this, arguments); } return B2; -})(A); +}(A)); var Generics; (function (Generics) { var A = (function () { function A() { } return A; - })(); + }()); var B = (function (_super) { __extends(B, _super); function B() { _super.apply(this, arguments); } return B; - })(A); + }(A)); var B2 = (function (_super) { __extends(B2, _super); function B2() { _super.apply(this, arguments); } return B2; - })(A); + }(A)); var B3 = (function (_super) { __extends(B3, _super); function B3() { _super.apply(this, arguments); } return B3; - })(A); + }(A)); var B4 = (function (_super) { __extends(B4, _super); function B4() { _super.apply(this, arguments); } return B4; - })(A); + }(A)); })(Generics || (Generics = {})); diff --git a/tests/baselines/reference/subtypingWithNumericIndexer3.js b/tests/baselines/reference/subtypingWithNumericIndexer3.js index f4c2d1d9da9..104141b761d 100644 --- a/tests/baselines/reference/subtypingWithNumericIndexer3.js +++ b/tests/baselines/reference/subtypingWithNumericIndexer3.js @@ -54,61 +54,61 @@ var A = (function () { function A() { } return A; -})(); +}()); var B = (function (_super) { __extends(B, _super); function B() { _super.apply(this, arguments); } return B; -})(A); +}(A)); var B2 = (function (_super) { __extends(B2, _super); function B2() { _super.apply(this, arguments); } return B2; -})(A); +}(A)); var Generics; (function (Generics) { var A = (function () { function A() { } return A; - })(); + }()); var B = (function (_super) { __extends(B, _super); function B() { _super.apply(this, arguments); } return B; - })(A); + }(A)); var B2 = (function (_super) { __extends(B2, _super); function B2() { _super.apply(this, arguments); } return B2; - })(A); + }(A)); var B3 = (function (_super) { __extends(B3, _super); function B3() { _super.apply(this, arguments); } return B3; - })(A); + }(A)); var B4 = (function (_super) { __extends(B4, _super); function B4() { _super.apply(this, arguments); } return B4; - })(A); + }(A)); var B5 = (function (_super) { __extends(B5, _super); function B5() { _super.apply(this, arguments); } return B5; - })(A); + }(A)); })(Generics || (Generics = {})); diff --git a/tests/baselines/reference/subtypingWithNumericIndexer4.js b/tests/baselines/reference/subtypingWithNumericIndexer4.js index 7956464d172..59f8cd95ad0 100644 --- a/tests/baselines/reference/subtypingWithNumericIndexer4.js +++ b/tests/baselines/reference/subtypingWithNumericIndexer4.js @@ -38,33 +38,33 @@ var A = (function () { function A() { } return A; -})(); +}()); var B = (function (_super) { __extends(B, _super); function B() { _super.apply(this, arguments); } return B; -})(A); +}(A)); var Generics; (function (Generics) { var A = (function () { function A() { } return A; - })(); + }()); var B = (function (_super) { __extends(B, _super); function B() { _super.apply(this, arguments); } return B; - })(A); + }(A)); var B3 = (function (_super) { __extends(B3, _super); function B3() { _super.apply(this, arguments); } return B3; - })(A); + }(A)); })(Generics || (Generics = {})); diff --git a/tests/baselines/reference/subtypingWithNumericIndexer5.js b/tests/baselines/reference/subtypingWithNumericIndexer5.js index 4c6f785e1a9..50e54d888e7 100644 --- a/tests/baselines/reference/subtypingWithNumericIndexer5.js +++ b/tests/baselines/reference/subtypingWithNumericIndexer5.js @@ -49,37 +49,37 @@ var B = (function () { function B() { } return B; -})(); +}()); var B2 = (function () { function B2() { } return B2; -})(); +}()); var Generics; (function (Generics) { var B = (function () { function B() { } return B; - })(); + }()); var B2 = (function () { function B2() { } return B2; - })(); + }()); var B3 = (function () { function B3() { } return B3; - })(); + }()); var B4 = (function () { function B4() { } return B4; - })(); + }()); var B5 = (function () { function B5() { } return B5; - })(); + }()); })(Generics || (Generics = {})); diff --git a/tests/baselines/reference/subtypingWithObjectMembers.js b/tests/baselines/reference/subtypingWithObjectMembers.js index fc452ba8cf4..c3cef6601e6 100644 --- a/tests/baselines/reference/subtypingWithObjectMembers.js +++ b/tests/baselines/reference/subtypingWithObjectMembers.js @@ -77,95 +77,95 @@ var Base = (function () { function Base() { } return Base; -})(); +}()); var Derived = (function (_super) { __extends(Derived, _super); function Derived() { _super.apply(this, arguments); } return Derived; -})(Base); +}(Base)); var Derived2 = (function (_super) { __extends(Derived2, _super); function Derived2() { _super.apply(this, arguments); } return Derived2; -})(Derived); +}(Derived)); // N and M have the same name, same accessibility, same optionality, and N is a subtype of M // foo properties are valid, bar properties cause errors in the derived class declarations var A = (function () { function A() { } return A; -})(); +}()); var B = (function (_super) { __extends(B, _super); function B() { _super.apply(this, arguments); } return B; -})(A); +}(A)); var A2 = (function () { function A2() { } return A2; -})(); +}()); var B2 = (function (_super) { __extends(B2, _super); function B2() { _super.apply(this, arguments); } return B2; -})(A2); +}(A2)); var A3 = (function () { function A3() { } return A3; -})(); +}()); var B3 = (function (_super) { __extends(B3, _super); function B3() { _super.apply(this, arguments); } return B3; -})(A3); +}(A3)); var TwoLevels; (function (TwoLevels) { var A = (function () { function A() { } return A; - })(); + }()); var B = (function (_super) { __extends(B, _super); function B() { _super.apply(this, arguments); } return B; - })(A); + }(A)); var A2 = (function () { function A2() { } return A2; - })(); + }()); var B2 = (function (_super) { __extends(B2, _super); function B2() { _super.apply(this, arguments); } return B2; - })(A2); + }(A2)); var A3 = (function () { function A3() { } return A3; - })(); + }()); var B3 = (function (_super) { __extends(B3, _super); function B3() { _super.apply(this, arguments); } return B3; - })(A3); + }(A3)); })(TwoLevels || (TwoLevels = {})); diff --git a/tests/baselines/reference/subtypingWithObjectMembers4.js b/tests/baselines/reference/subtypingWithObjectMembers4.js index 487a5969f71..d5c1107e45d 100644 --- a/tests/baselines/reference/subtypingWithObjectMembers4.js +++ b/tests/baselines/reference/subtypingWithObjectMembers4.js @@ -44,47 +44,47 @@ var Base = (function () { function Base() { } return Base; -})(); +}()); var Derived = (function (_super) { __extends(Derived, _super); function Derived() { _super.apply(this, arguments); } return Derived; -})(Base); +}(Base)); var A = (function () { function A() { } return A; -})(); +}()); var B = (function (_super) { __extends(B, _super); function B() { _super.apply(this, arguments); } return B; -})(A); +}(A)); var A2 = (function () { function A2() { } return A2; -})(); +}()); var B2 = (function (_super) { __extends(B2, _super); function B2() { _super.apply(this, arguments); } return B2; -})(A2); +}(A2)); var A3 = (function () { function A3() { } return A3; -})(); +}()); var B3 = (function (_super) { __extends(B3, _super); function B3() { _super.apply(this, arguments); } return B3; -})(A3); +}(A3)); diff --git a/tests/baselines/reference/subtypingWithObjectMembers5.js b/tests/baselines/reference/subtypingWithObjectMembers5.js index 55ea5ade0da..f01a603f563 100644 --- a/tests/baselines/reference/subtypingWithObjectMembers5.js +++ b/tests/baselines/reference/subtypingWithObjectMembers5.js @@ -71,17 +71,17 @@ var NotOptional; function B() { } return B; - })(); + }()); var B2 = (function () { function B2() { } return B2; - })(); + }()); var B3 = (function () { function B3() { } return B3; - })(); + }()); })(NotOptional || (NotOptional = {})); // same cases as above but with optional var Optional; @@ -90,15 +90,15 @@ var Optional; function B() { } return B; - })(); + }()); var B2 = (function () { function B2() { } return B2; - })(); + }()); var B3 = (function () { function B3() { } return B3; - })(); + }()); })(Optional || (Optional = {})); diff --git a/tests/baselines/reference/subtypingWithObjectMembersAccessibility.js b/tests/baselines/reference/subtypingWithObjectMembersAccessibility.js index f08f2367d2c..25faacad88e 100644 --- a/tests/baselines/reference/subtypingWithObjectMembersAccessibility.js +++ b/tests/baselines/reference/subtypingWithObjectMembersAccessibility.js @@ -44,47 +44,47 @@ var Base = (function () { function Base() { } return Base; -})(); +}()); var Derived = (function (_super) { __extends(Derived, _super); function Derived() { _super.apply(this, arguments); } return Derived; -})(Base); +}(Base)); var A = (function () { function A() { } return A; -})(); +}()); var B = (function (_super) { __extends(B, _super); function B() { _super.apply(this, arguments); } return B; -})(A); +}(A)); var A2 = (function () { function A2() { } return A2; -})(); +}()); var B2 = (function (_super) { __extends(B2, _super); function B2() { _super.apply(this, arguments); } return B2; -})(A2); +}(A2)); var A3 = (function () { function A3() { } return A3; -})(); +}()); var B3 = (function (_super) { __extends(B3, _super); function B3() { _super.apply(this, arguments); } return B3; -})(A3); +}(A3)); diff --git a/tests/baselines/reference/subtypingWithObjectMembersAccessibility2.js b/tests/baselines/reference/subtypingWithObjectMembersAccessibility2.js index c23405cd50c..7b0398143a2 100644 --- a/tests/baselines/reference/subtypingWithObjectMembersAccessibility2.js +++ b/tests/baselines/reference/subtypingWithObjectMembersAccessibility2.js @@ -72,52 +72,52 @@ var Base = (function () { function Base() { } return Base; -})(); +}()); var Derived = (function (_super) { __extends(Derived, _super); function Derived() { _super.apply(this, arguments); } return Derived; -})(Base); +}(Base)); var ExplicitPublic; (function (ExplicitPublic) { var A = (function () { function A() { } return A; - })(); + }()); var B = (function (_super) { __extends(B, _super); function B() { _super.apply(this, arguments); } return B; - })(A); + }(A)); var A2 = (function () { function A2() { } return A2; - })(); + }()); var B2 = (function (_super) { __extends(B2, _super); function B2() { _super.apply(this, arguments); } return B2; - })(A2); + }(A2)); var A3 = (function () { function A3() { } return A3; - })(); + }()); var B3 = (function (_super) { __extends(B3, _super); function B3() { _super.apply(this, arguments); } return B3; - })(A3); + }(A3)); })(ExplicitPublic || (ExplicitPublic = {})); var ImplicitPublic; (function (ImplicitPublic) { @@ -125,36 +125,36 @@ var ImplicitPublic; function A() { } return A; - })(); + }()); var B = (function (_super) { __extends(B, _super); function B() { _super.apply(this, arguments); } return B; - })(A); + }(A)); var A2 = (function () { function A2() { } return A2; - })(); + }()); var B2 = (function (_super) { __extends(B2, _super); function B2() { _super.apply(this, arguments); } return B2; - })(A2); + }(A2)); var A3 = (function () { function A3() { } return A3; - })(); + }()); var B3 = (function (_super) { __extends(B3, _super); function B3() { _super.apply(this, arguments); } return B3; - })(A3); + }(A3)); })(ImplicitPublic || (ImplicitPublic = {})); diff --git a/tests/baselines/reference/subtypingWithStringIndexer.js b/tests/baselines/reference/subtypingWithStringIndexer.js index 5f606520a65..0740743a5d9 100644 --- a/tests/baselines/reference/subtypingWithStringIndexer.js +++ b/tests/baselines/reference/subtypingWithStringIndexer.js @@ -51,54 +51,54 @@ var A = (function () { function A() { } return A; -})(); +}()); var B = (function (_super) { __extends(B, _super); function B() { _super.apply(this, arguments); } return B; -})(A); +}(A)); var B2 = (function (_super) { __extends(B2, _super); function B2() { _super.apply(this, arguments); } return B2; -})(A); +}(A)); var Generics; (function (Generics) { var A = (function () { function A() { } return A; - })(); + }()); var B = (function (_super) { __extends(B, _super); function B() { _super.apply(this, arguments); } return B; - })(A); + }(A)); var B2 = (function (_super) { __extends(B2, _super); function B2() { _super.apply(this, arguments); } return B2; - })(A); + }(A)); var B3 = (function (_super) { __extends(B3, _super); function B3() { _super.apply(this, arguments); } return B3; - })(A); + }(A)); var B4 = (function (_super) { __extends(B4, _super); function B4() { _super.apply(this, arguments); } return B4; - })(A); + }(A)); })(Generics || (Generics = {})); diff --git a/tests/baselines/reference/subtypingWithStringIndexer3.js b/tests/baselines/reference/subtypingWithStringIndexer3.js index 6ce66c4e723..5ed44177d52 100644 --- a/tests/baselines/reference/subtypingWithStringIndexer3.js +++ b/tests/baselines/reference/subtypingWithStringIndexer3.js @@ -54,61 +54,61 @@ var A = (function () { function A() { } return A; -})(); +}()); var B = (function (_super) { __extends(B, _super); function B() { _super.apply(this, arguments); } return B; -})(A); +}(A)); var B2 = (function (_super) { __extends(B2, _super); function B2() { _super.apply(this, arguments); } return B2; -})(A); +}(A)); var Generics; (function (Generics) { var A = (function () { function A() { } return A; - })(); + }()); var B = (function (_super) { __extends(B, _super); function B() { _super.apply(this, arguments); } return B; - })(A); + }(A)); var B2 = (function (_super) { __extends(B2, _super); function B2() { _super.apply(this, arguments); } return B2; - })(A); + }(A)); var B3 = (function (_super) { __extends(B3, _super); function B3() { _super.apply(this, arguments); } return B3; - })(A); + }(A)); var B4 = (function (_super) { __extends(B4, _super); function B4() { _super.apply(this, arguments); } return B4; - })(A); + }(A)); var B5 = (function (_super) { __extends(B5, _super); function B5() { _super.apply(this, arguments); } return B5; - })(A); + }(A)); })(Generics || (Generics = {})); diff --git a/tests/baselines/reference/subtypingWithStringIndexer4.js b/tests/baselines/reference/subtypingWithStringIndexer4.js index 19d36e475c2..d6fb874c090 100644 --- a/tests/baselines/reference/subtypingWithStringIndexer4.js +++ b/tests/baselines/reference/subtypingWithStringIndexer4.js @@ -38,33 +38,33 @@ var A = (function () { function A() { } return A; -})(); +}()); var B = (function (_super) { __extends(B, _super); function B() { _super.apply(this, arguments); } return B; -})(A); +}(A)); var Generics; (function (Generics) { var A = (function () { function A() { } return A; - })(); + }()); var B = (function (_super) { __extends(B, _super); function B() { _super.apply(this, arguments); } return B; - })(A); + }(A)); var B3 = (function (_super) { __extends(B3, _super); function B3() { _super.apply(this, arguments); } return B3; - })(A); + }(A)); })(Generics || (Generics = {})); diff --git a/tests/baselines/reference/super.js b/tests/baselines/reference/super.js index 1d060672ceb..81d76aec62b 100644 --- a/tests/baselines/reference/super.js +++ b/tests/baselines/reference/super.js @@ -54,7 +54,7 @@ var Base = (function () { return "basebar"; }; return Base; -})(); +}()); var Sub1 = (function (_super) { __extends(Sub1, _super); function Sub1() { @@ -64,7 +64,7 @@ var Sub1 = (function (_super) { return "sub1" + _super.prototype.foo.call(this) + _super.prototype.bar.call(this); }; return Sub1; -})(Base); +}(Base)); var SubSub1 = (function (_super) { __extends(SubSub1, _super); function SubSub1() { @@ -74,7 +74,7 @@ var SubSub1 = (function (_super) { return "subsub1" + _super.prototype.foo.call(this); }; return SubSub1; -})(Sub1); +}(Sub1)); var Base2 = (function () { function Base2() { } @@ -82,7 +82,7 @@ var Base2 = (function () { _super.prototype.foo.call(this); }; return Base2; -})(); +}()); var s = new Sub1(); var ss = new SubSub1(); s.foo() + ss.foo(); diff --git a/tests/baselines/reference/super1.js b/tests/baselines/reference/super1.js index 5c2182d8afb..4179843b79a 100644 --- a/tests/baselines/reference/super1.js +++ b/tests/baselines/reference/super1.js @@ -80,7 +80,7 @@ var Base1 = (function () { return "base"; }; return Base1; -})(); +}()); var Sub1 = (function (_super) { __extends(Sub1, _super); function Sub1() { @@ -90,7 +90,7 @@ var Sub1 = (function (_super) { return "base"; }; return Sub1; -})(Base1); +}(Base1)); var SubSub1 = (function (_super) { __extends(SubSub1, _super); function SubSub1() { @@ -100,7 +100,7 @@ var SubSub1 = (function (_super) { return _super.prototype.super.foo; }; return SubSub1; -})(Sub1); +}(Sub1)); // Case 2 var Base2 = (function () { function Base2() { @@ -109,7 +109,7 @@ var Base2 = (function () { return "base"; }; return Base2; -})(); +}()); var SubE2 = (function (_super) { __extends(SubE2, _super); function SubE2() { @@ -119,7 +119,7 @@ var SubE2 = (function (_super) { return _super.prototype.prototype.foo = null; }; return SubE2; -})(Base2); +}(Base2)); // Case 3 var Base3 = (function () { function Base3() { @@ -128,7 +128,7 @@ var Base3 = (function () { return "base"; }; return Base3; -})(); +}()); var SubE3 = (function (_super) { __extends(SubE3, _super); function SubE3() { @@ -138,7 +138,7 @@ var SubE3 = (function (_super) { return _super.prototype.bar.call(this); }; return SubE3; -})(Base3); +}(Base3)); // Case 4 var Base4; (function (Base4) { @@ -149,7 +149,7 @@ var Base4; return "hello"; }; return Sub4; - })(); + }()); var SubSub4 = (function (_super) { __extends(SubSub4, _super); function SubSub4() { @@ -159,7 +159,7 @@ var Base4; return _super.prototype.x.call(this); }; return SubSub4; - })(Sub4); + }(Sub4)); Base4.SubSub4 = SubSub4; var Sub4E = (function () { function Sub4E() { @@ -168,6 +168,6 @@ var Base4; return _super.prototype.x.call(this); }; return Sub4E; - })(); + }()); Base4.Sub4E = Sub4E; })(Base4 || (Base4 = {})); diff --git a/tests/baselines/reference/super2.js b/tests/baselines/reference/super2.js index 9d865194a2a..979bdba84e4 100644 --- a/tests/baselines/reference/super2.js +++ b/tests/baselines/reference/super2.js @@ -67,7 +67,7 @@ var Base5 = (function () { return "BaseY"; }; return Base5; -})(); +}()); var Sub5 = (function (_super) { __extends(Sub5, _super); function Sub5() { @@ -77,7 +77,7 @@ var Sub5 = (function (_super) { return "SubX"; }; return Sub5; -})(Base5); +}(Base5)); var SubSub5 = (function (_super) { __extends(SubSub5, _super); function SubSub5() { @@ -90,7 +90,7 @@ var SubSub5 = (function (_super) { return _super.prototype.y.call(this); }; return SubSub5; -})(Sub5); +}(Sub5)); // Case 6 var Base6 = (function () { function Base6() { @@ -99,7 +99,7 @@ var Base6 = (function () { return "BaseX"; }; return Base6; -})(); +}()); var Sub6 = (function (_super) { __extends(Sub6, _super); function Sub6() { @@ -109,7 +109,7 @@ var Sub6 = (function (_super) { return "SubY"; }; return Sub6; -})(Base6); +}(Base6)); var SubSub6 = (function (_super) { __extends(SubSub6, _super); function SubSub6() { @@ -119,7 +119,7 @@ var SubSub6 = (function (_super) { return _super.prototype.y.call(this); }; return SubSub6; -})(Sub6); +}(Sub6)); var results1 = new SubSub5(); var results2 = new SubSub6(); results1.x() + results1.y() + results2.y(); diff --git a/tests/baselines/reference/superAccess.js b/tests/baselines/reference/superAccess.js index bb5a71a0b8f..37c6a9816a6 100644 --- a/tests/baselines/reference/superAccess.js +++ b/tests/baselines/reference/superAccess.js @@ -26,7 +26,7 @@ var MyBase = (function () { } MyBase.S1 = 5; return MyBase; -})(); +}()); var MyDerived = (function (_super) { __extends(MyDerived, _super); function MyDerived() { @@ -38,4 +38,4 @@ var MyDerived = (function (_super) { var l5 = _super.prototype.f.call(this); // Expected => Error: Only public instance methods of the base class are accessible via the 'super' keyword }; return MyDerived; -})(MyBase); +}(MyBase)); diff --git a/tests/baselines/reference/superAccess2.js b/tests/baselines/reference/superAccess2.js index fd20f424ba3..b27d695cb31 100644 --- a/tests/baselines/reference/superAccess2.js +++ b/tests/baselines/reference/superAccess2.js @@ -36,7 +36,7 @@ var P = (function () { P.prototype.x = function () { }; P.y = function () { }; return P; -})(); +}()); var Q = (function (_super) { __extends(Q, _super); // Super is not allowed in constructor args @@ -61,4 +61,4 @@ var Q = (function (_super) { }; Q.yy = _super.; // error for static initializer accessing super return Q; -})(P); +}(P)); diff --git a/tests/baselines/reference/superAccessInFatArrow1.js b/tests/baselines/reference/superAccessInFatArrow1.js index 0dc69179c92..3cd4e199c62 100644 --- a/tests/baselines/reference/superAccessInFatArrow1.js +++ b/tests/baselines/reference/superAccessInFatArrow1.js @@ -29,7 +29,7 @@ var test; A.prototype.foo = function () { }; return A; - })(); + }()); test.A = A; var B = (function (_super) { __extends(B, _super); @@ -45,6 +45,6 @@ var test; }); }; return B; - })(A); + }(A)); test.B = B; })(test || (test = {})); diff --git a/tests/baselines/reference/superCallArgsMustMatch.js b/tests/baselines/reference/superCallArgsMustMatch.js index 3369cf7e8df..9dcdbda8e31 100644 --- a/tests/baselines/reference/superCallArgsMustMatch.js +++ b/tests/baselines/reference/superCallArgsMustMatch.js @@ -36,7 +36,7 @@ var T5 = (function () { this.bar = bar; } return T5; -})(); +}()); var T6 = (function (_super) { __extends(T6, _super); function T6() { @@ -46,4 +46,4 @@ var T6 = (function (_super) { var x = this.foo; } return T6; -})(T5); +}(T5)); diff --git a/tests/baselines/reference/superCallAssignResult.js b/tests/baselines/reference/superCallAssignResult.js index 24a198e3420..7002f94eb7d 100644 --- a/tests/baselines/reference/superCallAssignResult.js +++ b/tests/baselines/reference/superCallAssignResult.js @@ -20,7 +20,7 @@ var E = (function () { function E(arg) { } return E; -})(); +}()); var H = (function (_super) { __extends(H, _super); function H() { @@ -28,4 +28,4 @@ var H = (function (_super) { x = 5; } return H; -})(E); +}(E)); diff --git a/tests/baselines/reference/superCallFromClassThatDerivesFromGenericType1.js b/tests/baselines/reference/superCallFromClassThatDerivesFromGenericType1.js index d59f6f5a578..50830480b1a 100644 --- a/tests/baselines/reference/superCallFromClassThatDerivesFromGenericType1.js +++ b/tests/baselines/reference/superCallFromClassThatDerivesFromGenericType1.js @@ -23,4 +23,4 @@ var D = (function (_super) { _super.call(this); } return D; -})(B); +}(B)); diff --git a/tests/baselines/reference/superCallFromClassThatDerivesFromGenericType2.js b/tests/baselines/reference/superCallFromClassThatDerivesFromGenericType2.js index a3d5d42c822..ef770985888 100644 --- a/tests/baselines/reference/superCallFromClassThatDerivesFromGenericType2.js +++ b/tests/baselines/reference/superCallFromClassThatDerivesFromGenericType2.js @@ -22,4 +22,4 @@ var D = (function (_super) { _super.call(this); } return D; -})(B); +}(B)); diff --git a/tests/baselines/reference/superCallFromClassThatDerivesFromGenericTypeButWithIncorrectNumberOfTypeArguments1.js b/tests/baselines/reference/superCallFromClassThatDerivesFromGenericTypeButWithIncorrectNumberOfTypeArguments1.js index 155258861bf..ebb70023b53 100644 --- a/tests/baselines/reference/superCallFromClassThatDerivesFromGenericTypeButWithIncorrectNumberOfTypeArguments1.js +++ b/tests/baselines/reference/superCallFromClassThatDerivesFromGenericTypeButWithIncorrectNumberOfTypeArguments1.js @@ -21,11 +21,11 @@ var A = (function () { this.map = map; } return A; -})(); +}()); var B = (function (_super) { __extends(B, _super); function B() { _super.call(this, function (value) { return String(value); }); } return B; -})(A); +}(A)); diff --git a/tests/baselines/reference/superCallFromClassThatDerivesFromGenericTypeButWithNoTypeArguments1.js b/tests/baselines/reference/superCallFromClassThatDerivesFromGenericTypeButWithNoTypeArguments1.js index 37883b9921a..d619343ba14 100644 --- a/tests/baselines/reference/superCallFromClassThatDerivesFromGenericTypeButWithNoTypeArguments1.js +++ b/tests/baselines/reference/superCallFromClassThatDerivesFromGenericTypeButWithNoTypeArguments1.js @@ -21,11 +21,11 @@ var A = (function () { this.map = map; } return A; -})(); +}()); var B = (function (_super) { __extends(B, _super); function B() { _super.call(this, function (value) { return String(value); }); } return B; -})(A); +}(A)); diff --git a/tests/baselines/reference/superCallFromClassThatDerivesNonGenericTypeButWithTypeArguments1.js b/tests/baselines/reference/superCallFromClassThatDerivesNonGenericTypeButWithTypeArguments1.js index dbd4528c39f..e9ee84be152 100644 --- a/tests/baselines/reference/superCallFromClassThatDerivesNonGenericTypeButWithTypeArguments1.js +++ b/tests/baselines/reference/superCallFromClassThatDerivesNonGenericTypeButWithTypeArguments1.js @@ -21,11 +21,11 @@ var A = (function () { this.map = map; } return A; -})(); +}()); var B = (function (_super) { __extends(B, _super); function B() { _super.call(this, function (value) { return String(value); }); } return B; -})(A); +}(A)); diff --git a/tests/baselines/reference/superCallFromClassThatHasNoBaseType1.js b/tests/baselines/reference/superCallFromClassThatHasNoBaseType1.js index 7818aed7ff8..d793e9bb2ae 100644 --- a/tests/baselines/reference/superCallFromClassThatHasNoBaseType1.js +++ b/tests/baselines/reference/superCallFromClassThatHasNoBaseType1.js @@ -16,10 +16,10 @@ var A = (function () { this.map = map; } return A; -})(); +}()); var B = (function () { function B() { _super.call(this, function (value) { return String(value); }); } return B; -})(); +}()); diff --git a/tests/baselines/reference/superCallInConstructorWithNoBaseType.js b/tests/baselines/reference/superCallInConstructorWithNoBaseType.js index 8d24fc45c29..9b0f63ed871 100644 --- a/tests/baselines/reference/superCallInConstructorWithNoBaseType.js +++ b/tests/baselines/reference/superCallInConstructorWithNoBaseType.js @@ -17,11 +17,11 @@ var C = (function () { _super.call(this); // error } return C; -})(); +}()); var D = (function () { function D(x) { this.x = x; _super.call(this); // error } return D; -})(); +}()); diff --git a/tests/baselines/reference/superCallInNonStaticMethod.js b/tests/baselines/reference/superCallInNonStaticMethod.js index 7de6a100451..3ff07edf4c9 100644 --- a/tests/baselines/reference/superCallInNonStaticMethod.js +++ b/tests/baselines/reference/superCallInNonStaticMethod.js @@ -62,7 +62,7 @@ var Doing = (function () { Doing.prototype.instanceMethod = function () { }; return Doing; -})(); +}()); var Other = (function (_super) { __extends(Other, _super); function Other() { @@ -107,4 +107,4 @@ var Other = (function (_super) { configurable: true }); return Other; -})(Doing); +}(Doing)); diff --git a/tests/baselines/reference/superCallInStaticMethod.js b/tests/baselines/reference/superCallInStaticMethod.js index 9978773739f..91558e47d3f 100644 --- a/tests/baselines/reference/superCallInStaticMethod.js +++ b/tests/baselines/reference/superCallInStaticMethod.js @@ -58,7 +58,7 @@ var Doing = (function () { Doing.staticMethod = function () { }; return Doing; -})(); +}()); var Other = (function (_super) { __extends(Other, _super); function Other() { @@ -104,4 +104,4 @@ var Other = (function (_super) { _super.staticMethod.call(this); }; return Other; -})(Doing); +}(Doing)); diff --git a/tests/baselines/reference/superCallInsideClassDeclaration.js b/tests/baselines/reference/superCallInsideClassDeclaration.js index 6d16aceb247..e677c426e02 100644 --- a/tests/baselines/reference/superCallInsideClassDeclaration.js +++ b/tests/baselines/reference/superCallInsideClassDeclaration.js @@ -26,12 +26,12 @@ var A = (function () { function A() { } return A; -})(); +}()); var C = (function () { function C() { } return C; -})(); +}()); var B = (function (_super) { __extends(B, _super); function B() { @@ -41,7 +41,7 @@ var B = (function (_super) { _super.call(this); } return D; - })(C); + }(C)); } return B; -})(A); +}(A)); diff --git a/tests/baselines/reference/superCallInsideClassExpression.js b/tests/baselines/reference/superCallInsideClassExpression.js index ea24003d9b7..ee373f69f46 100644 --- a/tests/baselines/reference/superCallInsideClassExpression.js +++ b/tests/baselines/reference/superCallInsideClassExpression.js @@ -26,12 +26,12 @@ var A = (function () { function A() { } return A; -})(); +}()); var C = (function () { function C() { } return C; -})(); +}()); var B = (function (_super) { __extends(B, _super); function B() { @@ -41,7 +41,7 @@ var B = (function (_super) { _super.call(this); } return class_1; - })(C); + }(C)); } return B; -})(A); +}(A)); diff --git a/tests/baselines/reference/superCallInsideObjectLiteralExpression.js b/tests/baselines/reference/superCallInsideObjectLiteralExpression.js index 60513cf43ee..3f9a0a9ce9c 100644 --- a/tests/baselines/reference/superCallInsideObjectLiteralExpression.js +++ b/tests/baselines/reference/superCallInsideObjectLiteralExpression.js @@ -24,7 +24,7 @@ var A = (function () { A.prototype.foo = function () { }; return A; -})(); +}()); var B = (function (_super) { __extends(B, _super); function B() { @@ -33,4 +33,4 @@ var B = (function (_super) { }; } return B; -})(A); +}(A)); diff --git a/tests/baselines/reference/superCallOutsideConstructor.js b/tests/baselines/reference/superCallOutsideConstructor.js index c2152e13db0..202ed531a10 100644 --- a/tests/baselines/reference/superCallOutsideConstructor.js +++ b/tests/baselines/reference/superCallOutsideConstructor.js @@ -33,7 +33,7 @@ var C = (function () { } C.prototype.foo = function () { }; return C; -})(); +}()); var D = (function (_super) { __extends(D, _super); function D() { @@ -47,5 +47,5 @@ var D = (function (_super) { }; } return D; -})(C); +}(C)); var d = new D(); diff --git a/tests/baselines/reference/superCallParameterContextualTyping1.js b/tests/baselines/reference/superCallParameterContextualTyping1.js index b7508e4cd7d..5bfe3927a51 100644 --- a/tests/baselines/reference/superCallParameterContextualTyping1.js +++ b/tests/baselines/reference/superCallParameterContextualTyping1.js @@ -23,7 +23,7 @@ var A = (function () { this.map = map; } return A; -})(); +}()); var B = (function (_super) { __extends(B, _super); // Ensure 'value' is of type 'number (and not '{}') by using its 'toExponential()' method. @@ -31,4 +31,4 @@ var B = (function (_super) { _super.call(this, function (value) { return String(value.toExponential()); }); } return B; -})(A); +}(A)); diff --git a/tests/baselines/reference/superCallParameterContextualTyping2.js b/tests/baselines/reference/superCallParameterContextualTyping2.js index 996e0374c7f..539ecbed065 100644 --- a/tests/baselines/reference/superCallParameterContextualTyping2.js +++ b/tests/baselines/reference/superCallParameterContextualTyping2.js @@ -22,7 +22,7 @@ var A = (function () { this.map = map; } return A; -})(); +}()); var C = (function (_super) { __extends(C, _super); // Ensure 'value' is not of type 'any' by invoking it with type arguments. @@ -30,4 +30,4 @@ var C = (function (_super) { _super.call(this, function (value) { return String(value()); }); } return C; -})(A); +}(A)); diff --git a/tests/baselines/reference/superCallParameterContextualTyping3.js b/tests/baselines/reference/superCallParameterContextualTyping3.js index 6f1311e58ab..d35a1707bb7 100644 --- a/tests/baselines/reference/superCallParameterContextualTyping3.js +++ b/tests/baselines/reference/superCallParameterContextualTyping3.js @@ -43,7 +43,7 @@ var CBase = (function () { CBase.prototype.foo = function (param) { }; return CBase; -})(); +}()); var C = (function (_super) { __extends(C, _super); function C() { @@ -63,4 +63,4 @@ var C = (function (_super) { }); } return C; -})(CBase); +}(CBase)); diff --git a/tests/baselines/reference/superCallWithMissingBaseClass.js b/tests/baselines/reference/superCallWithMissingBaseClass.js index 101e709653e..7758bcfd89d 100644 --- a/tests/baselines/reference/superCallWithMissingBaseClass.js +++ b/tests/baselines/reference/superCallWithMissingBaseClass.js @@ -27,4 +27,4 @@ var Foo = (function (_super) { return _super.m2.call(this); }; return Foo; -})(Bar); +}(Bar)); diff --git a/tests/baselines/reference/superCalls.js b/tests/baselines/reference/superCalls.js index bd54ba34b56..ae8327ec200 100644 --- a/tests/baselines/reference/superCalls.js +++ b/tests/baselines/reference/superCalls.js @@ -41,7 +41,7 @@ var Base = (function () { this.x = 43; } return Base; -})(); +}()); function v() { } var Derived = (function (_super) { __extends(Derived, _super); @@ -54,12 +54,12 @@ var Derived = (function (_super) { var p = v(); } return Derived; -})(Base); +}(Base)); var OtherBase = (function () { function OtherBase() { } return OtherBase; -})(); +}()); var OtherDerived = (function (_super) { __extends(OtherDerived, _super); function OtherDerived() { @@ -67,4 +67,4 @@ var OtherDerived = (function (_super) { _super.call(this); } return OtherDerived; -})(OtherBase); +}(OtherBase)); diff --git a/tests/baselines/reference/superCallsInConstructor.js b/tests/baselines/reference/superCallsInConstructor.js index c238808b959..434f730c76b 100644 --- a/tests/baselines/reference/superCallsInConstructor.js +++ b/tests/baselines/reference/superCallsInConstructor.js @@ -32,12 +32,12 @@ var C = (function () { C.prototype.foo = function () { }; C.prototype.bar = function () { }; return C; -})(); +}()); var Base = (function () { function Base() { } return Base; -})(); +}()); var Derived = (function (_super) { __extends(Derived, _super); function Derived() { @@ -52,4 +52,4 @@ var Derived = (function (_super) { } } return Derived; -})(Base); +}(Base)); diff --git a/tests/baselines/reference/superErrors.js b/tests/baselines/reference/superErrors.js index 3a3de509120..0208e720b0c 100644 --- a/tests/baselines/reference/superErrors.js +++ b/tests/baselines/reference/superErrors.js @@ -71,7 +71,7 @@ var User = (function () { //console.log("Hello, " + this.name); }; return User; -})(); +}()); var RegisteredUser = (function (_super) { __extends(RegisteredUser, _super); function RegisteredUser() { @@ -106,4 +106,4 @@ var RegisteredUser = (function (_super) { var y = function () { return function () { return function () { return _super.; }; }; }; }; return RegisteredUser; -})(User); +}(User)); diff --git a/tests/baselines/reference/superInCatchBlock1.js b/tests/baselines/reference/superInCatchBlock1.js index cf4c69c7b61..9d5cb1affdc 100644 --- a/tests/baselines/reference/superInCatchBlock1.js +++ b/tests/baselines/reference/superInCatchBlock1.js @@ -24,7 +24,7 @@ var A = (function () { } A.prototype.m = function () { }; return A; -})(); +}()); var B = (function (_super) { __extends(B, _super); function B() { @@ -38,4 +38,4 @@ var B = (function (_super) { } }; return B; -})(A); +}(A)); diff --git a/tests/baselines/reference/superInConstructorParam1.js b/tests/baselines/reference/superInConstructorParam1.js index 7c0cc7bf40d..9c3c11d105c 100644 --- a/tests/baselines/reference/superInConstructorParam1.js +++ b/tests/baselines/reference/superInConstructorParam1.js @@ -23,11 +23,11 @@ var B = (function () { return 0; }; return B; -})(); +}()); var C = (function (_super) { __extends(C, _super); function C(a) { if (a === void 0) { a = _super.prototype.foo.call(this); } } return C; -})(B); +}(B)); diff --git a/tests/baselines/reference/superInLambdas.js b/tests/baselines/reference/superInLambdas.js index 89d5798f882..b0940b1d538 100644 --- a/tests/baselines/reference/superInLambdas.js +++ b/tests/baselines/reference/superInLambdas.js @@ -81,7 +81,7 @@ var User = (function () { //console.log("Hello, " + this.name); }; return User; -})(); +}()); var RegisteredUser = (function (_super) { __extends(RegisteredUser, _super); function RegisteredUser() { @@ -101,7 +101,7 @@ var RegisteredUser = (function (_super) { var x = function () { return _super.prototype.sayHello.call(_this); }; }; return RegisteredUser; -})(User); +}(User)); var RegisteredUser2 = (function (_super) { __extends(RegisteredUser2, _super); function RegisteredUser2() { @@ -117,7 +117,7 @@ var RegisteredUser2 = (function (_super) { var x = function () { return function () { return function () { return _super.prototype.sayHello.call(_this); }; }; }; }; return RegisteredUser2; -})(User); +}(User)); var RegisteredUser3 = (function (_super) { __extends(RegisteredUser3, _super); function RegisteredUser3() { @@ -133,7 +133,7 @@ var RegisteredUser3 = (function (_super) { var superName = function () { return function () { return function () { return _super.prototype.name; }; }; }; }; return RegisteredUser3; -})(User); +}(User)); var RegisteredUser4 = (function (_super) { __extends(RegisteredUser4, _super); function RegisteredUser4() { @@ -149,4 +149,4 @@ var RegisteredUser4 = (function (_super) { var x = function () { return function () { return _super.prototype.; }; }; }; return RegisteredUser4; -})(User); +}(User)); diff --git a/tests/baselines/reference/superNewCall1.js b/tests/baselines/reference/superNewCall1.js index aa25e65e14d..01ae169b598 100644 --- a/tests/baselines/reference/superNewCall1.js +++ b/tests/baselines/reference/superNewCall1.js @@ -23,11 +23,11 @@ var A = (function () { this.map = map; } return A; -})(); +}()); var B = (function (_super) { __extends(B, _super); function B() { new _super.prototype(function (value) { return String(value); }); } return B; -})(A); +}(A)); diff --git a/tests/baselines/reference/superPropertyAccess.js b/tests/baselines/reference/superPropertyAccess.js index 95dbb2f94e0..0e1e8783448 100644 --- a/tests/baselines/reference/superPropertyAccess.js +++ b/tests/baselines/reference/superPropertyAccess.js @@ -57,7 +57,7 @@ var MyBase = (function () { configurable: true }); return MyBase; -})(); +}()); var MyDerived = (function (_super) { __extends(MyDerived, _super); function MyDerived() { @@ -76,4 +76,4 @@ var MyDerived = (function (_super) { var z = _super.prototype.value; // Should error, instance data property not a public instance member function }; return MyDerived; -})(MyBase); +}(MyBase)); diff --git a/tests/baselines/reference/superPropertyAccess1.js b/tests/baselines/reference/superPropertyAccess1.js index 748331af95f..4df9398024c 100644 --- a/tests/baselines/reference/superPropertyAccess1.js +++ b/tests/baselines/reference/superPropertyAccess1.js @@ -46,7 +46,7 @@ var C = (function () { }); C.prototype.bar = function () { }; return C; -})(); +}()); var D = (function (_super) { __extends(D, _super); function D() { @@ -68,4 +68,4 @@ var D = (function (_super) { configurable: true }); return D; -})(C); +}(C)); diff --git a/tests/baselines/reference/superPropertyAccess2.js b/tests/baselines/reference/superPropertyAccess2.js index dccd4717ee0..ec74a2ea069 100644 --- a/tests/baselines/reference/superPropertyAccess2.js +++ b/tests/baselines/reference/superPropertyAccess2.js @@ -46,7 +46,7 @@ var C = (function () { }); C.bar = function () { }; return C; -})(); +}()); var D = (function (_super) { __extends(D, _super); function D() { @@ -68,4 +68,4 @@ var D = (function (_super) { configurable: true }); return D; -})(C); +}(C)); diff --git a/tests/baselines/reference/superPropertyAccessNoError.js b/tests/baselines/reference/superPropertyAccessNoError.js index 44a6910a386..a9d2f88738e 100644 --- a/tests/baselines/reference/superPropertyAccessNoError.js +++ b/tests/baselines/reference/superPropertyAccessNoError.js @@ -82,7 +82,7 @@ var SomeBaseClass = (function () { return 3; }; return SomeBaseClass; -})(); +}()); var SomeDerivedClass = (function (_super) { __extends(SomeDerivedClass, _super); function SomeDerivedClass() { @@ -127,4 +127,4 @@ var SomeDerivedClass = (function (_super) { configurable: true }); return SomeDerivedClass; -})(SomeBaseClass); +}(SomeBaseClass)); diff --git a/tests/baselines/reference/superSymbolIndexedAccess5.js b/tests/baselines/reference/superSymbolIndexedAccess5.js index 64a8ac5094c..5bc46dbaed5 100644 --- a/tests/baselines/reference/superSymbolIndexedAccess5.js +++ b/tests/baselines/reference/superSymbolIndexedAccess5.js @@ -27,7 +27,7 @@ var Foo = (function () { return 0; }; return Foo; -})(); +}()); var Bar = (function (_super) { __extends(Bar, _super); function Bar() { @@ -37,4 +37,4 @@ var Bar = (function (_super) { return _super.prototype[symbol](); }; return Bar; -})(Foo); +}(Foo)); diff --git a/tests/baselines/reference/superSymbolIndexedAccess6.js b/tests/baselines/reference/superSymbolIndexedAccess6.js index e014cf47c1a..417edd9c338 100644 --- a/tests/baselines/reference/superSymbolIndexedAccess6.js +++ b/tests/baselines/reference/superSymbolIndexedAccess6.js @@ -27,7 +27,7 @@ var Foo = (function () { return 0; }; return Foo; -})(); +}()); var Bar = (function (_super) { __extends(Bar, _super); function Bar() { @@ -37,4 +37,4 @@ var Bar = (function (_super) { return _super[symbol](); }; return Bar; -})(Foo); +}(Foo)); diff --git a/tests/baselines/reference/superWithGenericSpecialization.js b/tests/baselines/reference/superWithGenericSpecialization.js index 3d1ea0f77a9..a54ee1bbcbc 100644 --- a/tests/baselines/reference/superWithGenericSpecialization.js +++ b/tests/baselines/reference/superWithGenericSpecialization.js @@ -24,14 +24,14 @@ var C = (function () { function C() { } return C; -})(); +}()); var D = (function (_super) { __extends(D, _super); function D() { _super.call(this); // uses the type parameter type of the base class, ie string } return D; -})(C); +}(C)); var d; var r = d.x; var r2 = d.y; diff --git a/tests/baselines/reference/superWithGenerics.js b/tests/baselines/reference/superWithGenerics.js index 482c7ba0694..b4fe56bee4c 100644 --- a/tests/baselines/reference/superWithGenerics.js +++ b/tests/baselines/reference/superWithGenerics.js @@ -23,4 +23,4 @@ var D = (function (_super) { _super.call(this); } return D; -})(B); +}(B)); diff --git a/tests/baselines/reference/superWithTypeArgument.js b/tests/baselines/reference/superWithTypeArgument.js index 6d5690cd689..766b5f7920e 100644 --- a/tests/baselines/reference/superWithTypeArgument.js +++ b/tests/baselines/reference/superWithTypeArgument.js @@ -19,11 +19,11 @@ var C = (function () { function C() { } return C; -})(); +}()); var D = (function (_super) { __extends(D, _super); function D() { _super.prototype..call(this); } return D; -})(C); +}(C)); diff --git a/tests/baselines/reference/superWithTypeArgument2.js b/tests/baselines/reference/superWithTypeArgument2.js index 588094cd864..e0d2a40633f 100644 --- a/tests/baselines/reference/superWithTypeArgument2.js +++ b/tests/baselines/reference/superWithTypeArgument2.js @@ -19,11 +19,11 @@ var C = (function () { function C() { } return C; -})(); +}()); var D = (function (_super) { __extends(D, _super); function D(x) { _super.prototype..call(this, x); } return D; -})(C); +}(C)); diff --git a/tests/baselines/reference/superWithTypeArgument3.js b/tests/baselines/reference/superWithTypeArgument3.js index 8f0ba6c0861..586dc595b39 100644 --- a/tests/baselines/reference/superWithTypeArgument3.js +++ b/tests/baselines/reference/superWithTypeArgument3.js @@ -24,7 +24,7 @@ var C = (function () { } C.prototype.bar = function (x) { }; return C; -})(); +}()); var D = (function (_super) { __extends(D, _super); function D() { @@ -34,4 +34,4 @@ var D = (function (_super) { _super.prototype.bar.call(this, null); }; return D; -})(C); +}(C)); diff --git a/tests/baselines/reference/super_inside-object-literal-getters-and-setters.js b/tests/baselines/reference/super_inside-object-literal-getters-and-setters.js index d2f240b766d..be70ee33183 100644 --- a/tests/baselines/reference/super_inside-object-literal-getters-and-setters.js +++ b/tests/baselines/reference/super_inside-object-literal-getters-and-setters.js @@ -53,7 +53,7 @@ var F = (function () { } F.prototype.test = function () { return ""; }; return F; -})(); +}()); var SuperObjectTest = (function (_super) { __extends(SuperObjectTest, _super); function SuperObjectTest() { @@ -67,4 +67,4 @@ var SuperObjectTest = (function (_super) { }; }; return SuperObjectTest; -})(F); +}(F)); diff --git a/tests/baselines/reference/switchAssignmentCompat.js b/tests/baselines/reference/switchAssignmentCompat.js index 1e6792ee378..c88b07059a2 100644 --- a/tests/baselines/reference/switchAssignmentCompat.js +++ b/tests/baselines/reference/switchAssignmentCompat.js @@ -11,7 +11,7 @@ var Foo = (function () { function Foo() { } return Foo; -})(); +}()); switch (0) { case Foo: break; // Error expected } diff --git a/tests/baselines/reference/switchCasesExpressionTypeMismatch.js b/tests/baselines/reference/switchCasesExpressionTypeMismatch.js index ca354779be1..ba929691d25 100644 --- a/tests/baselines/reference/switchCasesExpressionTypeMismatch.js +++ b/tests/baselines/reference/switchCasesExpressionTypeMismatch.js @@ -23,7 +23,7 @@ var Foo = (function () { function Foo() { } return Foo; -})(); +}()); switch (0) { case Foo: break; // Error case "sss": break; // Error diff --git a/tests/baselines/reference/switchStatements.js b/tests/baselines/reference/switchStatements.js index 39a4b2c901d..093a7fb2f2c 100644 --- a/tests/baselines/reference/switchStatements.js +++ b/tests/baselines/reference/switchStatements.js @@ -94,14 +94,14 @@ var C = (function () { function C() { } return C; -})(); +}()); var D = (function (_super) { __extends(D, _super); function D() { _super.apply(this, arguments); } return D; -})(C); +}(C)); switch (new C()) { case new D(): case { id: 12, name: '' }: diff --git a/tests/baselines/reference/systemModule17.js b/tests/baselines/reference/systemModule17.js index 7ef4d441823..6daa119d287 100644 --- a/tests/baselines/reference/systemModule17.js +++ b/tests/baselines/reference/systemModule17.js @@ -52,7 +52,7 @@ System.register([], function(exports_1) { function A() { } return A; - })(); + }()); exports_1("A", A); } } diff --git a/tests/baselines/reference/systemModule3.js b/tests/baselines/reference/systemModule3.js index c7aeb7f508c..dbef74f3036 100644 --- a/tests/baselines/reference/systemModule3.js +++ b/tests/baselines/reference/systemModule3.js @@ -50,7 +50,7 @@ System.register([], function(exports_1) { function C() { } return C; - })(); + }()); exports_1("default", C); } } @@ -66,7 +66,7 @@ System.register([], function(exports_1) { function default_1() { } return default_1; - })(); + }()); exports_1("default", default_1); } } diff --git a/tests/baselines/reference/systemModule6.js b/tests/baselines/reference/systemModule6.js index 7d93ee1df03..51c8fbc68fb 100644 --- a/tests/baselines/reference/systemModule6.js +++ b/tests/baselines/reference/systemModule6.js @@ -20,7 +20,7 @@ System.register([], function(exports_1) { function C() { } return C; - })(); + }()); exports_1("C", C); } } diff --git a/tests/baselines/reference/systemModuleDeclarationMerging.js b/tests/baselines/reference/systemModuleDeclarationMerging.js index f11c5d9a360..5ed029a769a 100644 --- a/tests/baselines/reference/systemModuleDeclarationMerging.js +++ b/tests/baselines/reference/systemModuleDeclarationMerging.js @@ -26,7 +26,7 @@ System.register([], function(exports_1) { function C() { } return C; - })(); + }()); exports_1("C", C); (function (C) { var x; diff --git a/tests/baselines/reference/systemModuleExportDefault.js b/tests/baselines/reference/systemModuleExportDefault.js index 6befe63b267..cf1a99a4ad7 100644 --- a/tests/baselines/reference/systemModuleExportDefault.js +++ b/tests/baselines/reference/systemModuleExportDefault.js @@ -48,7 +48,7 @@ System.register([], function(exports_1) { function default_1() { } return default_1; - })(); + }()); exports_1("default", default_1); } } @@ -64,7 +64,7 @@ System.register([], function(exports_1) { function C() { } return C; - })(); + }()); exports_1("default", C); } } diff --git a/tests/baselines/reference/systemModuleNonTopLevelModuleMembers.js b/tests/baselines/reference/systemModuleNonTopLevelModuleMembers.js index b7ec776e483..ee9858a7fec 100644 --- a/tests/baselines/reference/systemModuleNonTopLevelModuleMembers.js +++ b/tests/baselines/reference/systemModuleNonTopLevelModuleMembers.js @@ -25,7 +25,7 @@ System.register([], function(exports_1) { function TopLevelClass() { } return TopLevelClass; - })(); + }()); exports_1("TopLevelClass", TopLevelClass); (function (TopLevelModule) { var v; @@ -40,7 +40,7 @@ System.register([], function(exports_1) { function NonTopLevelClass() { } return NonTopLevelClass; - })(); + }()); TopLevelModule2.NonTopLevelClass = NonTopLevelClass; var NonTopLevelModule; (function (NonTopLevelModule) { diff --git a/tests/baselines/reference/systemModuleWithSuperClass.js b/tests/baselines/reference/systemModuleWithSuperClass.js index 8b528f281ed..fe9c2742f2d 100644 --- a/tests/baselines/reference/systemModuleWithSuperClass.js +++ b/tests/baselines/reference/systemModuleWithSuperClass.js @@ -23,7 +23,7 @@ System.register([], function(exports_1) { function Foo() { } return Foo; - })(); + }()); exports_1("Foo", Foo); } } @@ -50,7 +50,7 @@ System.register(['./foo'], function(exports_1) { _super.apply(this, arguments); } return Bar; - })(foo_1.Foo); + }(foo_1.Foo)); exports_1("Bar", Bar); } } diff --git a/tests/baselines/reference/targetTypeBaseCalls.js b/tests/baselines/reference/targetTypeBaseCalls.js index 41673a62efd..d028c04d711 100644 --- a/tests/baselines/reference/targetTypeBaseCalls.js +++ b/tests/baselines/reference/targetTypeBaseCalls.js @@ -29,7 +29,7 @@ var Foo = (function () { function Foo(x) { } return Foo; -})(); +}()); foo(function (s) { s = 5; }); // Error, can’t assign number to string new Foo(function (s) { s = 5; }); // error, if types are applied correctly var Bar = (function (_super) { @@ -38,4 +38,4 @@ var Bar = (function (_super) { _super.call(this, function (s) { s = 5; }); } return Bar; -})(Foo); // error, if types are applied correctly +}(Foo)); // error, if types are applied correctly diff --git a/tests/baselines/reference/templateStringsArrayTypeDefinedInES5Mode.js b/tests/baselines/reference/templateStringsArrayTypeDefinedInES5Mode.js index 5d5f925fe69..1ebc479593d 100644 --- a/tests/baselines/reference/templateStringsArrayTypeDefinedInES5Mode.js +++ b/tests/baselines/reference/templateStringsArrayTypeDefinedInES5Mode.js @@ -15,7 +15,7 @@ var TemplateStringsArray = (function () { function TemplateStringsArray() { } return TemplateStringsArray; -})(); +}()); function f(x, y, z) { } f({}, 10, 10); diff --git a/tests/baselines/reference/testContainerList.js b/tests/baselines/reference/testContainerList.js index dca80c7fa51..19e54a2782f 100644 --- a/tests/baselines/reference/testContainerList.js +++ b/tests/baselines/reference/testContainerList.js @@ -16,5 +16,5 @@ var A; this.d = d; } return C; - })(); + }()); })(A || (A = {})); diff --git a/tests/baselines/reference/thisBinding.js b/tests/baselines/reference/thisBinding.js index 79a27b19fd8..d8d7f5b7c0a 100644 --- a/tests/baselines/reference/thisBinding.js +++ b/tests/baselines/reference/thisBinding.js @@ -34,7 +34,7 @@ var M; x.z; // ok }; return C; - })(); + }()); M.C = C; })(M || (M = {})); var C = (function () { @@ -43,4 +43,4 @@ var C = (function () { C.prototype.f = function (x) { }; return C; -})(); +}()); diff --git a/tests/baselines/reference/thisBinding2.js b/tests/baselines/reference/thisBinding2.js index 76b99797e16..142cd9db4a5 100644 --- a/tests/baselines/reference/thisBinding2.js +++ b/tests/baselines/reference/thisBinding2.js @@ -35,7 +35,7 @@ var C = (function () { }(); } return C; -})(); +}()); var messenger = { message: "Hello World", start: function () { diff --git a/tests/baselines/reference/thisCapture1.js b/tests/baselines/reference/thisCapture1.js index 53d01b8f8ca..8ee3fa2fddc 100644 --- a/tests/baselines/reference/thisCapture1.js +++ b/tests/baselines/reference/thisCapture1.js @@ -22,4 +22,4 @@ var X = (function () { }).promise(); }; return X; -})(); +}()); diff --git a/tests/baselines/reference/thisExpressionInCallExpressionWithTypeArguments.js b/tests/baselines/reference/thisExpressionInCallExpressionWithTypeArguments.js index 78b06d30dd2..9aea88edf46 100644 --- a/tests/baselines/reference/thisExpressionInCallExpressionWithTypeArguments.js +++ b/tests/baselines/reference/thisExpressionInCallExpressionWithTypeArguments.js @@ -13,4 +13,4 @@ var C = (function () { [1, 2, 3].map(function (x) { return _this; }); }; return C; -})(); +}()); diff --git a/tests/baselines/reference/thisExpressionOfGenericObject.js b/tests/baselines/reference/thisExpressionOfGenericObject.js index e790050069e..a6cfdeb4d07 100644 --- a/tests/baselines/reference/thisExpressionOfGenericObject.js +++ b/tests/baselines/reference/thisExpressionOfGenericObject.js @@ -14,4 +14,4 @@ var MyClass1 = (function () { (function () { return _this; }); } return MyClass1; -})(); +}()); diff --git a/tests/baselines/reference/thisInAccessors.js b/tests/baselines/reference/thisInAccessors.js index ab521649292..6c0b492d878 100644 --- a/tests/baselines/reference/thisInAccessors.js +++ b/tests/baselines/reference/thisInAccessors.js @@ -47,7 +47,7 @@ var GetterOnly = (function () { configurable: true }); return GetterOnly; -})(); +}()); // this capture only in setter var SetterOnly = (function () { function SetterOnly() { @@ -64,7 +64,7 @@ var SetterOnly = (function () { configurable: true }); return SetterOnly; -})(); +}()); // this capture only in both setter and getter var GetterAndSetter = (function () { function GetterAndSetter() { @@ -83,4 +83,4 @@ var GetterAndSetter = (function () { configurable: true }); return GetterAndSetter; -})(); +}()); diff --git a/tests/baselines/reference/thisInArrowFunctionInStaticInitializer1.js b/tests/baselines/reference/thisInArrowFunctionInStaticInitializer1.js index 03e6ddb64d9..4b23326c7a3 100644 --- a/tests/baselines/reference/thisInArrowFunctionInStaticInitializer1.js +++ b/tests/baselines/reference/thisInArrowFunctionInStaticInitializer1.js @@ -19,4 +19,4 @@ var Vector = (function () { log(_this); }; return Vector; -})(); +}()); diff --git a/tests/baselines/reference/thisInConstructorParameter1.js b/tests/baselines/reference/thisInConstructorParameter1.js index a489999c955..32d50bc1ede 100644 --- a/tests/baselines/reference/thisInConstructorParameter1.js +++ b/tests/baselines/reference/thisInConstructorParameter1.js @@ -10,4 +10,4 @@ var Foo = (function () { if (x === void 0) { x = this.y; } } return Foo; -})(); +}()); diff --git a/tests/baselines/reference/thisInConstructorParameter2.js b/tests/baselines/reference/thisInConstructorParameter2.js index 6d07f66becb..7260ecafcb9 100644 --- a/tests/baselines/reference/thisInConstructorParameter2.js +++ b/tests/baselines/reference/thisInConstructorParameter2.js @@ -27,4 +27,4 @@ var P = (function () { }; P.y = this; return P; -})(); +}()); diff --git a/tests/baselines/reference/thisInGenericStaticMembers.js b/tests/baselines/reference/thisInGenericStaticMembers.js index 9699941206e..11dc7b28081 100644 --- a/tests/baselines/reference/thisInGenericStaticMembers.js +++ b/tests/baselines/reference/thisInGenericStaticMembers.js @@ -38,7 +38,7 @@ var A = (function () { return this.one(source, 42); }; return A; -})(); +}()); var B = (function () { function B() { } @@ -49,4 +49,4 @@ var B = (function () { return this.one(source, 42); }; return B; -})(); +}()); diff --git a/tests/baselines/reference/thisInInnerFunctions.js b/tests/baselines/reference/thisInInnerFunctions.js index d9ba3adfdf3..ec8a387bd1b 100644 --- a/tests/baselines/reference/thisInInnerFunctions.js +++ b/tests/baselines/reference/thisInInnerFunctions.js @@ -30,7 +30,7 @@ var Foo = (function () { } }; return Foo; -})(); +}()); function test() { var _this = this; var x = function () { diff --git a/tests/baselines/reference/thisInInstanceMemberInitializer.js b/tests/baselines/reference/thisInInstanceMemberInitializer.js index 6b7ebb8f056..71db30b0540 100644 --- a/tests/baselines/reference/thisInInstanceMemberInitializer.js +++ b/tests/baselines/reference/thisInInstanceMemberInitializer.js @@ -14,10 +14,10 @@ var C = (function () { this.x = this; } return C; -})(); +}()); var D = (function () { function D() { this.x = this; } return D; -})(); +}()); diff --git a/tests/baselines/reference/thisInInvalidContexts.js b/tests/baselines/reference/thisInInvalidContexts.js index d5ba69ff536..63a39b33b0e 100644 --- a/tests/baselines/reference/thisInInvalidContexts.js +++ b/tests/baselines/reference/thisInInvalidContexts.js @@ -60,12 +60,12 @@ var ErrClass1 = (function () { } ErrClass1.t = this; // Error return ErrClass1; -})(); +}()); var BaseErrClass = (function () { function BaseErrClass(t) { } return BaseErrClass; -})(); +}()); var ClassWithNoInitializer = (function (_super) { __extends(ClassWithNoInitializer, _super); //'this' in optional super call @@ -73,7 +73,7 @@ var ClassWithNoInitializer = (function (_super) { _super.call(this, this); // OK } return ClassWithNoInitializer; -})(BaseErrClass); +}(BaseErrClass)); var ClassWithInitializer = (function (_super) { __extends(ClassWithInitializer, _super); //'this' in required super call @@ -82,7 +82,7 @@ var ClassWithInitializer = (function (_super) { this.t = 4; } return ClassWithInitializer; -})(BaseErrClass); +}(BaseErrClass)); var M; (function (M) { //'this' in module variable @@ -99,7 +99,7 @@ var ErrClass3 = (function (_super) { _super.apply(this, arguments); } return ErrClass3; -})(this); +}(this)); //'this' as a computed enum value var SomeEnum; (function (SomeEnum) { diff --git a/tests/baselines/reference/thisInInvalidContextsExternalModule.js b/tests/baselines/reference/thisInInvalidContextsExternalModule.js index 31a2e995a18..3df51877d13 100644 --- a/tests/baselines/reference/thisInInvalidContextsExternalModule.js +++ b/tests/baselines/reference/thisInInvalidContextsExternalModule.js @@ -61,12 +61,12 @@ var ErrClass1 = (function () { } ErrClass1.t = this; // Error return ErrClass1; -})(); +}()); var BaseErrClass = (function () { function BaseErrClass(t) { } return BaseErrClass; -})(); +}()); var ClassWithNoInitializer = (function (_super) { __extends(ClassWithNoInitializer, _super); //'this' in optional super call @@ -74,7 +74,7 @@ var ClassWithNoInitializer = (function (_super) { _super.call(this, this); // OK } return ClassWithNoInitializer; -})(BaseErrClass); +}(BaseErrClass)); var ClassWithInitializer = (function (_super) { __extends(ClassWithInitializer, _super); //'this' in required super call @@ -83,7 +83,7 @@ var ClassWithInitializer = (function (_super) { this.t = 4; } return ClassWithInitializer; -})(BaseErrClass); +}(BaseErrClass)); var M; (function (M) { //'this' in module variable @@ -100,7 +100,7 @@ var ErrClass3 = (function (_super) { _super.apply(this, arguments); } return ErrClass3; -})(this); +}(this)); //'this' as a computed enum value var SomeEnum; (function (SomeEnum) { diff --git a/tests/baselines/reference/thisInLambda.js b/tests/baselines/reference/thisInLambda.js index 94c86bd5a80..b121947ce9b 100644 --- a/tests/baselines/reference/thisInLambda.js +++ b/tests/baselines/reference/thisInLambda.js @@ -29,7 +29,7 @@ var Foo = (function () { var f = function () { return _this.x; }; // 'this' should be type 'Foo' as well }; return Foo; -})(); +}()); function myFn(a) { } var myCls = (function () { function myCls() { @@ -41,4 +41,4 @@ var myCls = (function () { }); } return myCls; -})(); +}()); diff --git a/tests/baselines/reference/thisInObjectLiterals.js b/tests/baselines/reference/thisInObjectLiterals.js index 79e834be154..4e71347a366 100644 --- a/tests/baselines/reference/thisInObjectLiterals.js +++ b/tests/baselines/reference/thisInObjectLiterals.js @@ -28,7 +28,7 @@ var MyClass = (function () { var t; }; return MyClass; -})(); +}()); //type of 'this' in an object literal property of a function type is Any var obj = { f: function () { diff --git a/tests/baselines/reference/thisInOuterClassBody.js b/tests/baselines/reference/thisInOuterClassBody.js index 0dff441bb1e..40e4a2e2485 100644 --- a/tests/baselines/reference/thisInOuterClassBody.js +++ b/tests/baselines/reference/thisInOuterClassBody.js @@ -38,4 +38,4 @@ var Foo = (function () { }; Foo.y = this; return Foo; -})(); +}()); diff --git a/tests/baselines/reference/thisInPropertyBoundDeclarations.js b/tests/baselines/reference/thisInPropertyBoundDeclarations.js index e5004eed431..0b378cec51a 100644 --- a/tests/baselines/reference/thisInPropertyBoundDeclarations.js +++ b/tests/baselines/reference/thisInPropertyBoundDeclarations.js @@ -80,7 +80,7 @@ var Bug = (function () { } ]; return Bug; -})(); +}()); // Valid use of this in a property bound decl var A = (function () { function A() { @@ -109,7 +109,7 @@ var A = (function () { }; } return A; -})(); +}()); var B = (function () { function B() { var _this = this; @@ -131,4 +131,4 @@ var B = (function () { }; } return B; -})(); +}()); diff --git a/tests/baselines/reference/thisInStaticMethod1.js b/tests/baselines/reference/thisInStaticMethod1.js index 1021e32cc20..a42415c0b62 100644 --- a/tests/baselines/reference/thisInStaticMethod1.js +++ b/tests/baselines/reference/thisInStaticMethod1.js @@ -16,5 +16,5 @@ var foo = (function () { }; foo.x = 3; return foo; -})(); +}()); var x = foo.bar(); diff --git a/tests/baselines/reference/thisInStatics.js b/tests/baselines/reference/thisInStatics.js index a7d6a5890cc..b3f688903c6 100644 --- a/tests/baselines/reference/thisInStatics.js +++ b/tests/baselines/reference/thisInStatics.js @@ -26,4 +26,4 @@ var C = (function () { configurable: true }); return C; -})(); +}()); diff --git a/tests/baselines/reference/thisInSuperCall.js b/tests/baselines/reference/thisInSuperCall.js index f7d7ca4e4fd..a867715957f 100644 --- a/tests/baselines/reference/thisInSuperCall.js +++ b/tests/baselines/reference/thisInSuperCall.js @@ -32,14 +32,14 @@ var Base = (function () { function Base(x) { } return Base; -})(); +}()); var Foo = (function (_super) { __extends(Foo, _super); function Foo() { _super.call(this, this); // no error } return Foo; -})(Base); +}(Base)); var Foo2 = (function (_super) { __extends(Foo2, _super); function Foo2() { @@ -47,7 +47,7 @@ var Foo2 = (function (_super) { this.p = 0; } return Foo2; -})(Base); +}(Base)); var Foo3 = (function (_super) { __extends(Foo3, _super); function Foo3(p) { @@ -55,4 +55,4 @@ var Foo3 = (function (_super) { this.p = p; } return Foo3; -})(Base); +}(Base)); diff --git a/tests/baselines/reference/thisInSuperCall1.js b/tests/baselines/reference/thisInSuperCall1.js index 4ae43784fe0..a1cfc196ac6 100644 --- a/tests/baselines/reference/thisInSuperCall1.js +++ b/tests/baselines/reference/thisInSuperCall1.js @@ -20,7 +20,7 @@ var Base = (function () { function Base(a) { } return Base; -})(); +}()); var Foo = (function (_super) { __extends(Foo, _super); function Foo(x) { @@ -28,4 +28,4 @@ var Foo = (function (_super) { this.x = x; } return Foo; -})(Base); +}(Base)); diff --git a/tests/baselines/reference/thisInSuperCall2.js b/tests/baselines/reference/thisInSuperCall2.js index a9bbeda9fe7..82cae46b2d6 100644 --- a/tests/baselines/reference/thisInSuperCall2.js +++ b/tests/baselines/reference/thisInSuperCall2.js @@ -29,14 +29,14 @@ var Base = (function () { function Base(a) { } return Base; -})(); +}()); var Foo = (function (_super) { __extends(Foo, _super); function Foo() { _super.call(this, this); // no error } return Foo; -})(Base); +}(Base)); var Foo2 = (function (_super) { __extends(Foo2, _super); function Foo2() { @@ -44,4 +44,4 @@ var Foo2 = (function (_super) { this.x = 0; } return Foo2; -})(Base); +}(Base)); diff --git a/tests/baselines/reference/thisInSuperCall3.js b/tests/baselines/reference/thisInSuperCall3.js index ba27add2d97..09ad6b705a9 100644 --- a/tests/baselines/reference/thisInSuperCall3.js +++ b/tests/baselines/reference/thisInSuperCall3.js @@ -22,7 +22,7 @@ var Base = (function () { function Base(a) { } return Base; -})(); +}()); var Foo = (function (_super) { __extends(Foo, _super); function Foo() { @@ -30,4 +30,4 @@ var Foo = (function (_super) { this.x = 0; } return Foo; -})(Base); +}(Base)); diff --git a/tests/baselines/reference/thisTypeAndConstraints.js b/tests/baselines/reference/thisTypeAndConstraints.js index d62ebe6917c..3800b8bc5e3 100644 --- a/tests/baselines/reference/thisTypeAndConstraints.js +++ b/tests/baselines/reference/thisTypeAndConstraints.js @@ -30,7 +30,7 @@ var A = (function () { return this; }; return A; -})(); +}()); function f(x) { function g(x) { x = x.self(); @@ -47,4 +47,4 @@ var B = (function () { x = x.self(); }; return B; -})(); +}()); diff --git a/tests/baselines/reference/thisTypeErrors.js b/tests/baselines/reference/thisTypeErrors.js index 677feb374e1..f246b80f4f4 100644 --- a/tests/baselines/reference/thisTypeErrors.js +++ b/tests/baselines/reference/thisTypeErrors.js @@ -68,7 +68,7 @@ var C1 = (function () { function C1() { } return C1; -})(); +}()); var C2 = (function () { function C2() { } @@ -77,7 +77,7 @@ var C2 = (function () { }; C2.y = undefined; return C2; -})(); +}()); var N1; (function (N1) { N1.y = this; @@ -101,4 +101,4 @@ var C3 = (function () { }; }; return C3; -})(); +}()); diff --git a/tests/baselines/reference/thisTypeErrors2.js b/tests/baselines/reference/thisTypeErrors2.js index f48d0874e53..4546dcd2199 100644 --- a/tests/baselines/reference/thisTypeErrors2.js +++ b/tests/baselines/reference/thisTypeErrors2.js @@ -19,12 +19,12 @@ var Base = (function () { function Base(a) { } return Base; -})(); +}()); var Generic = (function () { function Generic() { } return Generic; -})(); +}()); var Derived = (function () { function Derived(host) { this.host = host; @@ -32,4 +32,4 @@ var Derived = (function () { this.n = 12; } return Derived; -})(); +}()); diff --git a/tests/baselines/reference/thisTypeInClasses.js b/tests/baselines/reference/thisTypeInClasses.js index 52ad452aa56..c6790b3d52d 100644 --- a/tests/baselines/reference/thisTypeInClasses.js +++ b/tests/baselines/reference/thisTypeInClasses.js @@ -56,17 +56,17 @@ var C1 = (function () { } C1.prototype.f = function (x) { return undefined; }; return C1; -})(); +}()); var C2 = (function () { function C2() { } return C2; -})(); +}()); var C3 = (function () { function C3() { } return C3; -})(); +}()); var C5 = (function () { function C5() { } @@ -87,4 +87,4 @@ var C5 = (function () { var x2 = undefined; }; return C5; -})(); +}()); diff --git a/tests/baselines/reference/thisWhenTypeCheckFails.js b/tests/baselines/reference/thisWhenTypeCheckFails.js index 1a3ac7b2da2..fee1ef2d61e 100644 --- a/tests/baselines/reference/thisWhenTypeCheckFails.js +++ b/tests/baselines/reference/thisWhenTypeCheckFails.js @@ -19,4 +19,4 @@ var c = (function () { }; }; return c; -})(); +}()); diff --git a/tests/baselines/reference/throwInEnclosingStatements.js b/tests/baselines/reference/throwInEnclosingStatements.js index 4d9200776e7..83928d71bff 100644 --- a/tests/baselines/reference/throwInEnclosingStatements.js +++ b/tests/baselines/reference/throwInEnclosingStatements.js @@ -84,7 +84,7 @@ var C = (function () { throw this.value; }; return C; -})(); +}()); var aa = { id: 12, biz: function () { diff --git a/tests/baselines/reference/throwStatements.js b/tests/baselines/reference/throwStatements.js index 556ebc55e37..eb25d0a895b 100644 --- a/tests/baselines/reference/throwStatements.js +++ b/tests/baselines/reference/throwStatements.js @@ -92,12 +92,12 @@ var C = (function () { function C() { } return C; -})(); +}()); var D = (function () { function D() { } return D; -})(); +}()); function F(x) { return 42; } var M; (function (M) { @@ -105,7 +105,7 @@ var M; function A() { } return A; - })(); + }()); M.A = A; function F2(x) { return x.toString(); } M.F2 = F2; diff --git a/tests/baselines/reference/tooManyTypeParameters1.js b/tests/baselines/reference/tooManyTypeParameters1.js index 892731cbd43..085a6bd13e3 100644 --- a/tests/baselines/reference/tooManyTypeParameters1.js +++ b/tests/baselines/reference/tooManyTypeParameters1.js @@ -20,6 +20,6 @@ var C = (function () { function C() { } return C; -})(); +}()); var c = new C(); var i; diff --git a/tests/baselines/reference/topLevel.js b/tests/baselines/reference/topLevel.js index 528ecb58381..1908ab8c729 100644 --- a/tests/baselines/reference/topLevel.js +++ b/tests/baselines/reference/topLevel.js @@ -42,7 +42,7 @@ var Point = (function () { return ("(" + this.x + "," + this.y + ")"); }; return Point; -})(); +}()); var result = ""; result += (new Point(3, 4).move(2, 2)); var M; diff --git a/tests/baselines/reference/trailingCommaInHeterogenousArrayLiteral1.js b/tests/baselines/reference/trailingCommaInHeterogenousArrayLiteral1.js index 7dd59ee840e..8041025f66a 100644 --- a/tests/baselines/reference/trailingCommaInHeterogenousArrayLiteral1.js +++ b/tests/baselines/reference/trailingCommaInHeterogenousArrayLiteral1.js @@ -20,4 +20,4 @@ var arrTest = (function () { this.test([1, 2, "hi", 5]); }; return arrTest; -})(); +}()); diff --git a/tests/baselines/reference/transitiveTypeArgumentInference1.js b/tests/baselines/reference/transitiveTypeArgumentInference1.js index 96d14dd4605..3f7aed892e1 100644 --- a/tests/baselines/reference/transitiveTypeArgumentInference1.js +++ b/tests/baselines/reference/transitiveTypeArgumentInference1.js @@ -19,5 +19,5 @@ var C = (function () { function C(p) { } return C; -})(); +}()); var c = new C(i); diff --git a/tests/baselines/reference/tsxAttributeResolution10.js b/tests/baselines/reference/tsxAttributeResolution10.js index e0bb6d8efc1..798bbb4c7af 100644 --- a/tests/baselines/reference/tsxAttributeResolution10.js +++ b/tests/baselines/reference/tsxAttributeResolution10.js @@ -40,7 +40,7 @@ define(["require", "exports"], function (require, exports) { MyComponent.prototype.render = function () { }; return MyComponent; - })(); + }()); exports.MyComponent = MyComponent; // Should be an error ; diff --git a/tests/baselines/reference/tsxAttributeResolution9.js b/tests/baselines/reference/tsxAttributeResolution9.js index 3879372a672..cd6946636a6 100644 --- a/tests/baselines/reference/tsxAttributeResolution9.js +++ b/tests/baselines/reference/tsxAttributeResolution9.js @@ -36,7 +36,7 @@ define(["require", "exports"], function (require, exports) { MyComponent.prototype.render = function () { }; return MyComponent; - })(); + }()); exports.MyComponent = MyComponent; ; // ok ; // should be an error diff --git a/tests/baselines/reference/tsxElementResolution.js b/tests/baselines/reference/tsxElementResolution.js index e7a4ae95e94..fb606aa4ccc 100644 --- a/tests/baselines/reference/tsxElementResolution.js +++ b/tests/baselines/reference/tsxElementResolution.js @@ -30,19 +30,19 @@ var foundFirst = (function () { function foundFirst() { } return foundFirst; -})(); +}()); var Other = (function () { function Other() { } return Other; -})(); +}()); var Dotted; (function (Dotted) { var Name = (function () { function Name() { } return Name; - })(); + }()); Dotted.Name = Name; })(Dotted || (Dotted = {})); // Should find the intrinsic element, not the class element diff --git a/tests/baselines/reference/tsxElementResolution19.js b/tests/baselines/reference/tsxElementResolution19.js index cb1a61dd59f..8114c5e4be5 100644 --- a/tests/baselines/reference/tsxElementResolution19.js +++ b/tests/baselines/reference/tsxElementResolution19.js @@ -28,7 +28,7 @@ define(["require", "exports"], function (require, exports) { function MyClass() { } return MyClass; - })(); + }()); exports.MyClass = MyClass; }); //// [file2.js] diff --git a/tests/baselines/reference/tsxEmit1.js b/tests/baselines/reference/tsxEmit1.js index bfa78a3e96c..dacb3ad621a 100644 --- a/tests/baselines/reference/tsxEmit1.js +++ b/tests/baselines/reference/tsxEmit1.js @@ -67,7 +67,7 @@ var SomeClass = (function () { var rewrites6 =
; }; return SomeClass; -})(); +}()); var whitespace1 =
; var whitespace2 =
{p}
; var whitespace3 =
diff --git a/tests/baselines/reference/tsxEmit3.js b/tests/baselines/reference/tsxEmit3.js index ccb9041e931..9501df4e237 100644 --- a/tests/baselines/reference/tsxEmit3.js +++ b/tests/baselines/reference/tsxEmit3.js @@ -48,7 +48,7 @@ var M; function Foo() { } return Foo; - })(); + }()); M.Foo = Foo; var S; (function (S) { @@ -56,7 +56,7 @@ var M; function Bar() { } return Bar; - })(); + }()); S.Bar = Bar; })(S = M.S || (M.S = {})); })(M || (M = {})); diff --git a/tests/baselines/reference/tsxEmit3.sourcemap.txt b/tests/baselines/reference/tsxEmit3.sourcemap.txt index bf03147b689..b8fdbbfc4ba 100644 --- a/tests/baselines/reference/tsxEmit3.sourcemap.txt +++ b/tests/baselines/reference/tsxEmit3.sourcemap.txt @@ -85,7 +85,7 @@ sourceFile:file.tsx 1->Emitted(6, 9) Source(8, 39) + SourceIndex(0) 2 >Emitted(6, 19) Source(8, 40) + SourceIndex(0) --- ->>> })(); +>>> }()); 1 >^^^^ 2 > ^ 3 > @@ -183,7 +183,7 @@ sourceFile:file.tsx 1->Emitted(14, 13) Source(10, 22) + SourceIndex(0) 2 >Emitted(14, 23) Source(10, 23) + SourceIndex(0) --- ->>> })(); +>>> }()); 1 >^^^^^^^^ 2 > ^ 3 > diff --git a/tests/baselines/reference/tsxExternalModuleEmit1.js b/tests/baselines/reference/tsxExternalModuleEmit1.js index 2830137f3b0..29aee544b3c 100644 --- a/tests/baselines/reference/tsxExternalModuleEmit1.js +++ b/tests/baselines/reference/tsxExternalModuleEmit1.js @@ -48,7 +48,7 @@ var Button = (function (_super) { return ; }; return Button; -})(React.Component); +}(React.Component)); exports.Button = Button; //// [app.jsx] "use strict"; @@ -69,5 +69,5 @@ var App = (function (_super) { return ; }; return App; -})(React.Component); +}(React.Component)); exports.App = App; diff --git a/tests/baselines/reference/tsxReactEmit1.js b/tests/baselines/reference/tsxReactEmit1.js index 5b13c463bd6..05781ab8530 100644 --- a/tests/baselines/reference/tsxReactEmit1.js +++ b/tests/baselines/reference/tsxReactEmit1.js @@ -68,7 +68,7 @@ var SomeClass = (function () { var rewrites6 = React.createElement("div", {a: { p: p }}); }; return SomeClass; -})(); +}()); var whitespace1 = React.createElement("div", null, " "); var whitespace2 = React.createElement("div", null, " ", p, " "); var whitespace3 = React.createElement("div", null, p); diff --git a/tests/baselines/reference/tsxStatelessFunctionComponents2.js b/tests/baselines/reference/tsxStatelessFunctionComponents2.js index 251586743ef..04d61d41218 100644 --- a/tests/baselines/reference/tsxStatelessFunctionComponents2.js +++ b/tests/baselines/reference/tsxStatelessFunctionComponents2.js @@ -58,7 +58,7 @@ var BigGreeter = (function (_super) { return
; }; return BigGreeter; -})(React.Component); +}(React.Component)); // OK var a = ; // OK - always valid to specify 'key' diff --git a/tests/baselines/reference/tsxTypeErrors.js b/tests/baselines/reference/tsxTypeErrors.js index f195a459747..fd28f9a5bcb 100644 --- a/tests/baselines/reference/tsxTypeErrors.js +++ b/tests/baselines/reference/tsxTypeErrors.js @@ -49,7 +49,7 @@ var MyClass = (function () { function MyClass() { } return MyClass; -})(); +}()); // Let's use it // TODO: Error on missing 'reqd' var b1 = ; diff --git a/tests/baselines/reference/twoAccessorsWithSameName.js b/tests/baselines/reference/twoAccessorsWithSameName.js index 1e447ea1205..0021c5ac131 100644 --- a/tests/baselines/reference/twoAccessorsWithSameName.js +++ b/tests/baselines/reference/twoAccessorsWithSameName.js @@ -44,7 +44,7 @@ var C = (function () { configurable: true }); return C; -})(); +}()); var D = (function () { function D() { } @@ -54,7 +54,7 @@ var D = (function () { configurable: true }); return D; -})(); +}()); var E = (function () { function E() { } @@ -67,7 +67,7 @@ var E = (function () { configurable: true }); return E; -})(); +}()); var x = { get x() { return 1; diff --git a/tests/baselines/reference/twoAccessorsWithSameName2.js b/tests/baselines/reference/twoAccessorsWithSameName2.js index 847f83e6a70..12210f49dae 100644 --- a/tests/baselines/reference/twoAccessorsWithSameName2.js +++ b/tests/baselines/reference/twoAccessorsWithSameName2.js @@ -26,7 +26,7 @@ var C = (function () { configurable: true }); return C; -})(); +}()); var D = (function () { function D() { } @@ -36,7 +36,7 @@ var D = (function () { configurable: true }); return D; -})(); +}()); var E = (function () { function E() { } @@ -49,4 +49,4 @@ var E = (function () { configurable: true }); return E; -})(); +}()); diff --git a/tests/baselines/reference/typeAliases.js b/tests/baselines/reference/typeAliases.js index c31a52bff45..fd63fc6ca4a 100644 --- a/tests/baselines/reference/typeAliases.js +++ b/tests/baselines/reference/typeAliases.js @@ -98,7 +98,7 @@ var C7 = (function () { function C7() { } return C7; -})(); +}()); var x7; var x7; var x8; diff --git a/tests/baselines/reference/typeAliasesForObjectTypes.js b/tests/baselines/reference/typeAliasesForObjectTypes.js index 0b583528ade..0c78e7f42a4 100644 --- a/tests/baselines/reference/typeAliasesForObjectTypes.js +++ b/tests/baselines/reference/typeAliasesForObjectTypes.js @@ -20,4 +20,4 @@ var C1 = (function () { function C1() { } return C1; -})(); +}()); diff --git a/tests/baselines/reference/typeArgumentInferenceOrdering.js b/tests/baselines/reference/typeArgumentInferenceOrdering.js index 96978bfd489..d6e5666b550 100644 --- a/tests/baselines/reference/typeArgumentInferenceOrdering.js +++ b/tests/baselines/reference/typeArgumentInferenceOrdering.js @@ -22,4 +22,4 @@ var C = (function () { function C() { } return C; -})(); +}()); diff --git a/tests/baselines/reference/typeArgumentInferenceWithClassExpression1.js b/tests/baselines/reference/typeArgumentInferenceWithClassExpression1.js index 25ce3743fa2..d18181dd1dc 100644 --- a/tests/baselines/reference/typeArgumentInferenceWithClassExpression1.js +++ b/tests/baselines/reference/typeArgumentInferenceWithClassExpression1.js @@ -11,7 +11,7 @@ function foo(x) { function class_1() { } return class_1; - })(); } + }()); } return undefined; } foo((function () { @@ -19,4 +19,4 @@ foo((function () { } class_2.prop = "hello"; return class_2; -})()).length; +}())).length; diff --git a/tests/baselines/reference/typeArgumentInferenceWithClassExpression2.js b/tests/baselines/reference/typeArgumentInferenceWithClassExpression2.js index c4a7872b016..66da2ffbff6 100644 --- a/tests/baselines/reference/typeArgumentInferenceWithClassExpression2.js +++ b/tests/baselines/reference/typeArgumentInferenceWithClassExpression2.js @@ -12,7 +12,7 @@ function foo(x) { function class_1() { } return class_1; - })(); } + }()); } return undefined; } // Should not infer string because it is a static property @@ -21,4 +21,4 @@ foo((function () { } class_2.prop = "hello"; return class_2; -})()).length; +}())).length; diff --git a/tests/baselines/reference/typeArgumentInferenceWithClassExpression3.js b/tests/baselines/reference/typeArgumentInferenceWithClassExpression3.js index f3a3470e1c3..1fb9cf8c3cf 100644 --- a/tests/baselines/reference/typeArgumentInferenceWithClassExpression3.js +++ b/tests/baselines/reference/typeArgumentInferenceWithClassExpression3.js @@ -11,7 +11,7 @@ function foo(x) { function class_1() { } return class_1; - })(); } + }()); } return undefined; } foo((function () { @@ -19,4 +19,4 @@ foo((function () { this.prop = "hello"; } return class_2; -})()).length; +}())).length; diff --git a/tests/baselines/reference/typeAssertions.js b/tests/baselines/reference/typeAssertions.js index 3645e61f2ba..b58a46c37f6 100644 --- a/tests/baselines/reference/typeAssertions.js +++ b/tests/baselines/reference/typeAssertions.js @@ -61,19 +61,19 @@ var SomeBase = (function () { function SomeBase() { } return SomeBase; -})(); +}()); var SomeDerived = (function (_super) { __extends(SomeDerived, _super); function SomeDerived() { _super.apply(this, arguments); } return SomeDerived; -})(SomeBase); +}(SomeBase)); var SomeOther = (function () { function SomeOther() { } return SomeOther; -})(); +}()); // Type assertion should check for assignability in either direction var someBase = new SomeBase(); var someDerived = new SomeDerived(); diff --git a/tests/baselines/reference/typeCheckTypeArgument.js b/tests/baselines/reference/typeCheckTypeArgument.js index 633eb75ed91..e47fb18b7d6 100644 --- a/tests/baselines/reference/typeCheckTypeArgument.js +++ b/tests/baselines/reference/typeCheckTypeArgument.js @@ -20,12 +20,12 @@ var Foo = (function () { function Foo() { } return Foo; -})(); +}()); function bar() { } var Foo2 = (function () { function Foo2() { } Foo2.prototype.method = function () { }; return Foo2; -})(); +}()); (function (a) { }); diff --git a/tests/baselines/reference/typeConstraintsWithConstructSignatures.js b/tests/baselines/reference/typeConstraintsWithConstructSignatures.js index 749a55de9a4..b5d2574834a 100644 --- a/tests/baselines/reference/typeConstraintsWithConstructSignatures.js +++ b/tests/baselines/reference/typeConstraintsWithConstructSignatures.js @@ -23,4 +23,4 @@ var C = (function () { var x2 = new this.data2(); // should not error }; return C; -})(); +}()); diff --git a/tests/baselines/reference/typeGuardFunction.js b/tests/baselines/reference/typeGuardFunction.js index bff304682af..fcd6435ca1d 100644 --- a/tests/baselines/reference/typeGuardFunction.js +++ b/tests/baselines/reference/typeGuardFunction.js @@ -93,19 +93,19 @@ var A = (function () { function A() { } return A; -})(); +}()); var B = (function () { function B() { } return B; -})(); +}()); var C = (function (_super) { __extends(C, _super); function C() { _super.apply(this, arguments); } return C; -})(A); +}(A)); var a; var b; // Basic @@ -134,7 +134,7 @@ var D = (function () { return true; }; return D; -})(); +}()); // Arrow function var f1 = function (p1) { return false; }; // Function expressions diff --git a/tests/baselines/reference/typeGuardFunctionErrors.js b/tests/baselines/reference/typeGuardFunctionErrors.js index 4923f544345..5e69749e582 100644 --- a/tests/baselines/reference/typeGuardFunctionErrors.js +++ b/tests/baselines/reference/typeGuardFunctionErrors.js @@ -155,19 +155,19 @@ var A = (function () { function A() { } return A; -})(); +}()); var B = (function () { function B() { } return B; -})(); +}()); var C = (function (_super) { __extends(C, _super); function C() { _super.apply(this, arguments); } return C; -})(A); +}(A)); function hasANonBooleanReturnStatement(x) { return ''; } @@ -251,7 +251,7 @@ var D = (function () { configurable: true }); return D; -})(); +}()); // Reference to rest parameter function b4() { var a = []; diff --git a/tests/baselines/reference/typeGuardFunctionGenerics.js b/tests/baselines/reference/typeGuardFunctionGenerics.js index edf5cb97fe4..2b5bd5e8265 100644 --- a/tests/baselines/reference/typeGuardFunctionGenerics.js +++ b/tests/baselines/reference/typeGuardFunctionGenerics.js @@ -43,19 +43,19 @@ var A = (function () { function A() { } return A; -})(); +}()); var B = (function () { function B() { } return B; -})(); +}()); var C = (function (_super) { __extends(C, _super); function C() { _super.apply(this, arguments); } return C; -})(A); +}(A)); var a; var test1 = funA(isB); if (funB(retC, a)) { diff --git a/tests/baselines/reference/typeGuardInClass.js b/tests/baselines/reference/typeGuardInClass.js index 0ce25a7c11c..4d3eac9d0e3 100644 --- a/tests/baselines/reference/typeGuardInClass.js +++ b/tests/baselines/reference/typeGuardInClass.js @@ -25,7 +25,7 @@ if (typeof x === "string") { var y = x; } return class_1; - })(); + }()); } else { var m = (function () { @@ -33,5 +33,5 @@ else { var y = x; } return class_2; - })(); + }()); } diff --git a/tests/baselines/reference/typeGuardOfFormExpr1AndExpr2.js b/tests/baselines/reference/typeGuardOfFormExpr1AndExpr2.js index 42bab3cdbe7..5724c218ad3 100644 --- a/tests/baselines/reference/typeGuardOfFormExpr1AndExpr2.js +++ b/tests/baselines/reference/typeGuardOfFormExpr1AndExpr2.js @@ -57,7 +57,7 @@ var C = (function () { function C() { } return C; -})(); +}()); var c; var cOrBool; var strOrNumOrBoolOrC; diff --git a/tests/baselines/reference/typeGuardOfFormExpr1OrExpr2.js b/tests/baselines/reference/typeGuardOfFormExpr1OrExpr2.js index 7e38232a738..78a6e7732fb 100644 --- a/tests/baselines/reference/typeGuardOfFormExpr1OrExpr2.js +++ b/tests/baselines/reference/typeGuardOfFormExpr1OrExpr2.js @@ -57,7 +57,7 @@ var C = (function () { function C() { } return C; -})(); +}()); var c; var cOrBool; var strOrNumOrBoolOrC; diff --git a/tests/baselines/reference/typeGuardOfFormInstanceOf.js b/tests/baselines/reference/typeGuardOfFormInstanceOf.js index 1431b4b9c60..a6881cf3cea 100644 --- a/tests/baselines/reference/typeGuardOfFormInstanceOf.js +++ b/tests/baselines/reference/typeGuardOfFormInstanceOf.js @@ -82,24 +82,24 @@ var C1 = (function () { function C1() { } return C1; -})(); +}()); var C2 = (function () { function C2() { } return C2; -})(); +}()); var D1 = (function (_super) { __extends(D1, _super); function D1() { _super.apply(this, arguments); } return D1; -})(C1); +}(C1)); var C3 = (function () { function C3() { } return C3; -})(); +}()); var str; var num; var strOrNum; diff --git a/tests/baselines/reference/typeGuardOfFormIsType.js b/tests/baselines/reference/typeGuardOfFormIsType.js index 8400aef59ad..3f55b9d41ea 100644 --- a/tests/baselines/reference/typeGuardOfFormIsType.js +++ b/tests/baselines/reference/typeGuardOfFormIsType.js @@ -47,19 +47,19 @@ var C1 = (function () { function C1() { } return C1; -})(); +}()); var C2 = (function () { function C2() { } return C2; -})(); +}()); var D1 = (function (_super) { __extends(D1, _super); function D1() { _super.apply(this, arguments); } return D1; -})(C1); +}(C1)); var str; var num; var strOrNum; diff --git a/tests/baselines/reference/typeGuardOfFormTypeOfBoolean.js b/tests/baselines/reference/typeGuardOfFormTypeOfBoolean.js index 3b0ead5b3c7..e9e11275d0d 100644 --- a/tests/baselines/reference/typeGuardOfFormTypeOfBoolean.js +++ b/tests/baselines/reference/typeGuardOfFormTypeOfBoolean.js @@ -93,7 +93,7 @@ var C = (function () { function C() { } return C; -})(); +}()); ; var str; var bool; diff --git a/tests/baselines/reference/typeGuardOfFormTypeOfEqualEqualHasNoEffect.js b/tests/baselines/reference/typeGuardOfFormTypeOfEqualEqualHasNoEffect.js index 0e7ada149df..b3a3b8028ec 100644 --- a/tests/baselines/reference/typeGuardOfFormTypeOfEqualEqualHasNoEffect.js +++ b/tests/baselines/reference/typeGuardOfFormTypeOfEqualEqualHasNoEffect.js @@ -40,7 +40,7 @@ var C = (function () { function C() { } return C; -})(); +}()); ; var strOrNum; var strOrBool; diff --git a/tests/baselines/reference/typeGuardOfFormTypeOfNotEqualHasNoEffect.js b/tests/baselines/reference/typeGuardOfFormTypeOfNotEqualHasNoEffect.js index 6a9851b51ab..3c095f19507 100644 --- a/tests/baselines/reference/typeGuardOfFormTypeOfNotEqualHasNoEffect.js +++ b/tests/baselines/reference/typeGuardOfFormTypeOfNotEqualHasNoEffect.js @@ -40,7 +40,7 @@ var C = (function () { function C() { } return C; -})(); +}()); ; var strOrNum; var strOrBool; diff --git a/tests/baselines/reference/typeGuardOfFormTypeOfNumber.js b/tests/baselines/reference/typeGuardOfFormTypeOfNumber.js index b65ccbb882f..66fcff0c387 100644 --- a/tests/baselines/reference/typeGuardOfFormTypeOfNumber.js +++ b/tests/baselines/reference/typeGuardOfFormTypeOfNumber.js @@ -92,7 +92,7 @@ var C = (function () { function C() { } return C; -})(); +}()); ; var str; var bool; diff --git a/tests/baselines/reference/typeGuardOfFormTypeOfOther.js b/tests/baselines/reference/typeGuardOfFormTypeOfOther.js index d1cb4994196..b1e6ca26566 100644 --- a/tests/baselines/reference/typeGuardOfFormTypeOfOther.js +++ b/tests/baselines/reference/typeGuardOfFormTypeOfOther.js @@ -82,7 +82,7 @@ var C = (function () { function C() { } return C; -})(); +}()); ; var str; var bool; diff --git a/tests/baselines/reference/typeGuardOfFormTypeOfString.js b/tests/baselines/reference/typeGuardOfFormTypeOfString.js index 4f6652c440a..5626396f73d 100644 --- a/tests/baselines/reference/typeGuardOfFormTypeOfString.js +++ b/tests/baselines/reference/typeGuardOfFormTypeOfString.js @@ -92,7 +92,7 @@ var C = (function () { function C() { } return C; -})(); +}()); ; var str; var bool; diff --git a/tests/baselines/reference/typeGuardsInClassAccessors.js b/tests/baselines/reference/typeGuardsInClassAccessors.js index 8f487b72535..7aeaf043004 100644 --- a/tests/baselines/reference/typeGuardsInClassAccessors.js +++ b/tests/baselines/reference/typeGuardsInClassAccessors.js @@ -206,4 +206,4 @@ var ClassWithAccessors = (function () { configurable: true }); return ClassWithAccessors; -})(); +}()); diff --git a/tests/baselines/reference/typeGuardsInClassMethods.js b/tests/baselines/reference/typeGuardsInClassMethods.js index cbe6dfe161a..f5ad4e6325d 100644 --- a/tests/baselines/reference/typeGuardsInClassMethods.js +++ b/tests/baselines/reference/typeGuardsInClassMethods.js @@ -125,4 +125,4 @@ var C1 = (function () { num = typeof param === "string" && param.length; // string }; return C1; -})(); +}()); diff --git a/tests/baselines/reference/typeGuardsInProperties.js b/tests/baselines/reference/typeGuardsInProperties.js index 78ad29a28b0..72429b58ca4 100644 --- a/tests/baselines/reference/typeGuardsInProperties.js +++ b/tests/baselines/reference/typeGuardsInProperties.js @@ -48,7 +48,7 @@ var C1 = (function () { strOrNum = typeof this.pp3 === "string" && this.pp3; // string | number }; return C1; -})(); +}()); var c1; strOrNum = typeof c1.pp2 === "string" && c1.pp2; // string | number strOrNum = typeof c1.pp3 === "string" && c1.pp3; // string | number diff --git a/tests/baselines/reference/typeGuardsOnClassProperty.js b/tests/baselines/reference/typeGuardsOnClassProperty.js index de4fcb50638..abe031e96e6 100644 --- a/tests/baselines/reference/typeGuardsOnClassProperty.js +++ b/tests/baselines/reference/typeGuardsOnClassProperty.js @@ -44,7 +44,7 @@ var D = (function () { return typeof this.data === "string" ? this.data : this.data.join(" "); }; return D; -})(); +}()); var o = { prop1: "string", prop2: true diff --git a/tests/baselines/reference/typeIdentityConsidersBrands.js b/tests/baselines/reference/typeIdentityConsidersBrands.js index 2398033c2c6..c3b25239024 100644 --- a/tests/baselines/reference/typeIdentityConsidersBrands.js +++ b/tests/baselines/reference/typeIdentityConsidersBrands.js @@ -37,22 +37,22 @@ var X = (function () { function X() { } return X; -})(); +}()); var Y = (function () { function Y() { } return Y; -})(); +}()); var X_1 = (function () { function X_1() { } return X_1; -})(); +}()); var Y_1 = (function () { function Y_1() { } return Y_1; -})(); +}()); function foo(arg) { } var a = new Y(); var b = new X(); diff --git a/tests/baselines/reference/typeInferenceReturnTypeCallback.js b/tests/baselines/reference/typeInferenceReturnTypeCallback.js index 1368366f94f..6de0cb5524c 100644 --- a/tests/baselines/reference/typeInferenceReturnTypeCallback.js +++ b/tests/baselines/reference/typeInferenceReturnTypeCallback.js @@ -29,7 +29,7 @@ var Nil = (function () { return null; }; return Nil; -})(); +}()); var Cons = (function () { function Cons() { } @@ -42,4 +42,4 @@ var Cons = (function () { return null; }; return Cons; -})(); +}()); diff --git a/tests/baselines/reference/typeMatch1.js b/tests/baselines/reference/typeMatch1.js index 9f62a9958b4..f78cb04f285 100644 --- a/tests/baselines/reference/typeMatch1.js +++ b/tests/baselines/reference/typeMatch1.js @@ -35,12 +35,12 @@ var C = (function () { function C() { } return C; -})(); +}()); var D = (function () { function D() { } return D; -})(); +}()); var x6 = new C(); var x7 = new D(); x6 = x7; diff --git a/tests/baselines/reference/typeMatch2.js b/tests/baselines/reference/typeMatch2.js index c4550750ca2..57ba67752e2 100644 --- a/tests/baselines/reference/typeMatch2.js +++ b/tests/baselines/reference/typeMatch2.js @@ -61,14 +61,14 @@ var Animal = (function () { function Animal() { } return Animal; -})(); +}()); var Giraffe = (function (_super) { __extends(Giraffe, _super); function Giraffe() { _super.apply(this, arguments); } return Giraffe; -})(Animal); +}(Animal)); function f2() { var a = new Animal(); var g = new Giraffe(); diff --git a/tests/baselines/reference/typeName1.js b/tests/baselines/reference/typeName1.js index 4448e9cb8a8..3d65ccd6d00 100644 --- a/tests/baselines/reference/typeName1.js +++ b/tests/baselines/reference/typeName1.js @@ -32,7 +32,7 @@ var C = (function () { function C() { } return C; -})(); +}()); var x1 = 3; var x2 = 3; var x3 = 3; diff --git a/tests/baselines/reference/typeOfPrototype.js b/tests/baselines/reference/typeOfPrototype.js index 8ab4392438e..3e8b3186936 100644 --- a/tests/baselines/reference/typeOfPrototype.js +++ b/tests/baselines/reference/typeOfPrototype.js @@ -13,5 +13,5 @@ var Foo = (function () { } Foo.bar = ''; return Foo; -})(); +}()); Foo.prototype.bar = undefined; // Should be OK diff --git a/tests/baselines/reference/typeOfSuperCall.js b/tests/baselines/reference/typeOfSuperCall.js index 72cdd7d528e..94215d4ae1b 100644 --- a/tests/baselines/reference/typeOfSuperCall.js +++ b/tests/baselines/reference/typeOfSuperCall.js @@ -18,11 +18,11 @@ var C = (function () { function C() { } return C; -})(); +}()); var D = (function (_super) { __extends(D, _super); function D() { var x = _super.call(this); } return D; -})(C); +}(C)); diff --git a/tests/baselines/reference/typeOfThis.js b/tests/baselines/reference/typeOfThis.js index 7de34712e15..c1febeae4e4 100644 --- a/tests/baselines/reference/typeOfThis.js +++ b/tests/baselines/reference/typeOfThis.js @@ -248,7 +248,7 @@ var MyTestClass = (function () { configurable: true }); return MyTestClass; -})(); +}()); var MyGenericTestClass = (function () { function MyGenericTestClass() { var _this = this; @@ -318,7 +318,7 @@ var MyGenericTestClass = (function () { configurable: true }); return MyGenericTestClass; -})(); +}()); //type of 'this' in a function declaration param list is Any function fn(s) { if (s === void 0) { s = this; } diff --git a/tests/baselines/reference/typeOfThisInAccessor.js b/tests/baselines/reference/typeOfThisInAccessor.js index 34d1bfaf2d0..eff26c713d7 100644 --- a/tests/baselines/reference/typeOfThisInAccessor.js +++ b/tests/baselines/reference/typeOfThisInAccessor.js @@ -52,7 +52,7 @@ var C = (function () { configurable: true }); return C; -})(); +}()); var D = (function () { function D() { } @@ -73,7 +73,7 @@ var D = (function () { configurable: true }); return D; -})(); +}()); var x = { get a() { var r3 = this; // any diff --git a/tests/baselines/reference/typeOfThisInConstructorParamList.js b/tests/baselines/reference/typeOfThisInConstructorParamList.js index feabb8dbd13..bee1710ca58 100644 --- a/tests/baselines/reference/typeOfThisInConstructorParamList.js +++ b/tests/baselines/reference/typeOfThisInConstructorParamList.js @@ -14,4 +14,4 @@ var ErrClass = (function () { if (f === void 0) { f = this; } } return ErrClass; -})(); +}()); diff --git a/tests/baselines/reference/typeOfThisInFunctionExpression.js b/tests/baselines/reference/typeOfThisInFunctionExpression.js index 83bad9e6d1a..9fafdcd11b6 100644 --- a/tests/baselines/reference/typeOfThisInFunctionExpression.js +++ b/tests/baselines/reference/typeOfThisInFunctionExpression.js @@ -71,7 +71,7 @@ var C = (function () { }; } return C; -})(); +}()); var M; (function (M) { function fn() { diff --git a/tests/baselines/reference/typeOfThisInInstanceMember.js b/tests/baselines/reference/typeOfThisInInstanceMember.js index 5e4b4f2970d..fce84290d5e 100644 --- a/tests/baselines/reference/typeOfThisInInstanceMember.js +++ b/tests/baselines/reference/typeOfThisInInstanceMember.js @@ -52,7 +52,7 @@ var C = (function () { configurable: true }); return C; -})(); +}()); var c; // all ok var r = c.x; diff --git a/tests/baselines/reference/typeOfThisInInstanceMember2.js b/tests/baselines/reference/typeOfThisInInstanceMember2.js index b2b81ce3a23..2b8867e7ec8 100644 --- a/tests/baselines/reference/typeOfThisInInstanceMember2.js +++ b/tests/baselines/reference/typeOfThisInInstanceMember2.js @@ -56,7 +56,7 @@ var C = (function () { configurable: true }); return C; -})(); +}()); var c; // all ok var r = c.x; diff --git a/tests/baselines/reference/typeOfThisInMemberFunctions.js b/tests/baselines/reference/typeOfThisInMemberFunctions.js index 3ac02393740..9ef1e3a4d7d 100644 --- a/tests/baselines/reference/typeOfThisInMemberFunctions.js +++ b/tests/baselines/reference/typeOfThisInMemberFunctions.js @@ -42,7 +42,7 @@ var C = (function () { var r2 = this; }; return C; -})(); +}()); var D = (function () { function D() { } @@ -53,7 +53,7 @@ var D = (function () { var r2 = this; }; return D; -})(); +}()); var E = (function () { function E() { } @@ -64,4 +64,4 @@ var E = (function () { var r2 = this; }; return E; -})(); +}()); diff --git a/tests/baselines/reference/typeOfThisInStaticMembers.js b/tests/baselines/reference/typeOfThisInStaticMembers.js index 17754171ab3..039693224b7 100644 --- a/tests/baselines/reference/typeOfThisInStaticMembers.js +++ b/tests/baselines/reference/typeOfThisInStaticMembers.js @@ -44,7 +44,7 @@ var C = (function () { return this; }; return C; -})(); +}()); var t = C.bar(); // all ok var r2 = t.foo + 1; @@ -59,7 +59,7 @@ var C2 = (function () { return this; }; return C2; -})(); +}()); var t2 = C2.bar(); // all ok var r5 = t2.foo + 1; diff --git a/tests/baselines/reference/typeOfThisInStaticMembers2.js b/tests/baselines/reference/typeOfThisInStaticMembers2.js index 9de5695640d..b01770446be 100644 --- a/tests/baselines/reference/typeOfThisInStaticMembers2.js +++ b/tests/baselines/reference/typeOfThisInStaticMembers2.js @@ -13,10 +13,10 @@ var C = (function () { } C.foo = this; // error return C; -})(); +}()); var C2 = (function () { function C2() { } C2.foo = this; // error return C2; -})(); +}()); diff --git a/tests/baselines/reference/typeOfThisInStatics.js b/tests/baselines/reference/typeOfThisInStatics.js index 5d59f6d7eb9..01519018ba2 100644 --- a/tests/baselines/reference/typeOfThisInStatics.js +++ b/tests/baselines/reference/typeOfThisInStatics.js @@ -26,4 +26,4 @@ var C = (function () { configurable: true }); return C; -})(); +}()); diff --git a/tests/baselines/reference/typeParamExtendsOtherTypeParam.js b/tests/baselines/reference/typeParamExtendsOtherTypeParam.js index 36a83bab712..70c6aa84370 100644 --- a/tests/baselines/reference/typeParamExtendsOtherTypeParam.js +++ b/tests/baselines/reference/typeParamExtendsOtherTypeParam.js @@ -35,12 +35,12 @@ var A = (function () { function A() { } return A; -})(); +}()); var B = (function () { function B() { } return B; -})(); +}()); // Below 2 should compile without error var x; var y; diff --git a/tests/baselines/reference/typeParameterAsBaseClass.js b/tests/baselines/reference/typeParameterAsBaseClass.js index f17db28f657..a01b6a0cac2 100644 --- a/tests/baselines/reference/typeParameterAsBaseClass.js +++ b/tests/baselines/reference/typeParameterAsBaseClass.js @@ -14,9 +14,9 @@ var C = (function (_super) { _super.apply(this, arguments); } return C; -})(T); +}(T)); var C2 = (function () { function C2() { } return C2; -})(); +}()); diff --git a/tests/baselines/reference/typeParameterAsBaseType.js b/tests/baselines/reference/typeParameterAsBaseType.js index de9a0ed2587..9c3a9bcfcd0 100644 --- a/tests/baselines/reference/typeParameterAsBaseType.js +++ b/tests/baselines/reference/typeParameterAsBaseType.js @@ -24,11 +24,11 @@ var C = (function (_super) { _super.apply(this, arguments); } return C; -})(T); +}(T)); var C2 = (function (_super) { __extends(C2, _super); function C2() { _super.apply(this, arguments); } return C2; -})(U); +}(U)); diff --git a/tests/baselines/reference/typeParameterAsTypeArgument.js b/tests/baselines/reference/typeParameterAsTypeArgument.js index cc9bd485852..957177c2735 100644 --- a/tests/baselines/reference/typeParameterAsTypeArgument.js +++ b/tests/baselines/reference/typeParameterAsTypeArgument.js @@ -38,7 +38,7 @@ var C = (function () { function C() { } return C; -})(); +}()); //function foo(x: T, y: U) { // foo(y, y); // return new C(); diff --git a/tests/baselines/reference/typeParameterAssignability3.js b/tests/baselines/reference/typeParameterAssignability3.js index b488bcb5ad2..f0391571e2b 100644 --- a/tests/baselines/reference/typeParameterAssignability3.js +++ b/tests/baselines/reference/typeParameterAssignability3.js @@ -31,7 +31,7 @@ var Foo = (function () { function Foo() { } return Foo; -})(); +}()); function foo(t, u) { var a; var b; @@ -51,4 +51,4 @@ var C = (function () { }; } return C; -})(); +}()); diff --git a/tests/baselines/reference/typeParameterAssignmentCompat1.js b/tests/baselines/reference/typeParameterAssignmentCompat1.js index 995213d0807..c7570a7d065 100644 --- a/tests/baselines/reference/typeParameterAssignmentCompat1.js +++ b/tests/baselines/reference/typeParameterAssignmentCompat1.js @@ -36,4 +36,4 @@ var C = (function () { return x; }; return C; -})(); +}()); diff --git a/tests/baselines/reference/typeParameterDirectlyConstrainedToItself.js b/tests/baselines/reference/typeParameterDirectlyConstrainedToItself.js index a14e010515b..bf7106c6e37 100644 --- a/tests/baselines/reference/typeParameterDirectlyConstrainedToItself.js +++ b/tests/baselines/reference/typeParameterDirectlyConstrainedToItself.js @@ -24,12 +24,12 @@ var C = (function () { function C() { } return C; -})(); +}()); var C2 = (function () { function C2() { } return C2; -})(); +}()); function f() { } function f2() { } var a; diff --git a/tests/baselines/reference/typeParameterExtendingUnion1.js b/tests/baselines/reference/typeParameterExtendingUnion1.js index 3027f119fb9..75614f46d21 100644 --- a/tests/baselines/reference/typeParameterExtendingUnion1.js +++ b/tests/baselines/reference/typeParameterExtendingUnion1.js @@ -23,21 +23,21 @@ var Animal = (function () { } Animal.prototype.run = function () { }; return Animal; -})(); +}()); var Cat = (function (_super) { __extends(Cat, _super); function Cat() { _super.apply(this, arguments); } return Cat; -})(Animal); +}(Animal)); var Dog = (function (_super) { __extends(Dog, _super); function Dog() { _super.apply(this, arguments); } return Dog; -})(Animal); +}(Animal)); function run(a) { a.run(); } diff --git a/tests/baselines/reference/typeParameterExtendingUnion2.js b/tests/baselines/reference/typeParameterExtendingUnion2.js index 55f6d3e07e2..b32c43bc5ec 100644 --- a/tests/baselines/reference/typeParameterExtendingUnion2.js +++ b/tests/baselines/reference/typeParameterExtendingUnion2.js @@ -23,21 +23,21 @@ var Animal = (function () { } Animal.prototype.run = function () { }; return Animal; -})(); +}()); var Cat = (function (_super) { __extends(Cat, _super); function Cat() { _super.apply(this, arguments); } return Cat; -})(Animal); +}(Animal)); var Dog = (function (_super) { __extends(Dog, _super); function Dog() { _super.apply(this, arguments); } return Dog; -})(Animal); +}(Animal)); function run(a) { a.run(); } diff --git a/tests/baselines/reference/typeParameterInConstraint1.js b/tests/baselines/reference/typeParameterInConstraint1.js index 1cce707112d..d49a72f871a 100644 --- a/tests/baselines/reference/typeParameterInConstraint1.js +++ b/tests/baselines/reference/typeParameterInConstraint1.js @@ -7,4 +7,4 @@ var C = (function () { function C() { } return C; -})(); +}()); diff --git a/tests/baselines/reference/typeParameterIndirectlyConstrainedToItself.js b/tests/baselines/reference/typeParameterIndirectlyConstrainedToItself.js index 3cdb735adfb..25f410c3a7b 100644 --- a/tests/baselines/reference/typeParameterIndirectlyConstrainedToItself.js +++ b/tests/baselines/reference/typeParameterIndirectlyConstrainedToItself.js @@ -23,12 +23,12 @@ var C = (function () { function C() { } return C; -})(); +}()); var C2 = (function () { function C2() { } return C2; -})(); +}()); function f() { } function f2() { } var a; @@ -38,4 +38,4 @@ var D = (function () { function D() { } return D; -})(); +}()); diff --git a/tests/baselines/reference/typeParameterListWithTrailingComma1.js b/tests/baselines/reference/typeParameterListWithTrailingComma1.js index 3891310fcb4..b0121fde8fe 100644 --- a/tests/baselines/reference/typeParameterListWithTrailingComma1.js +++ b/tests/baselines/reference/typeParameterListWithTrailingComma1.js @@ -7,4 +7,4 @@ var C = (function () { function C() { } return C; -})(); +}()); diff --git a/tests/baselines/reference/typeParameterUsedAsConstraint.js b/tests/baselines/reference/typeParameterUsedAsConstraint.js index b1c55343aa0..627eb6cc64e 100644 --- a/tests/baselines/reference/typeParameterUsedAsConstraint.js +++ b/tests/baselines/reference/typeParameterUsedAsConstraint.js @@ -40,32 +40,32 @@ var C = (function () { function C() { } return C; -})(); +}()); var C2 = (function () { function C2() { } return C2; -})(); +}()); var C3 = (function () { function C3() { } return C3; -})(); +}()); var C4 = (function () { function C4() { } return C4; -})(); +}()); var C5 = (function () { function C5() { } return C5; -})(); +}()); var C6 = (function () { function C6() { } return C6; -})(); +}()); function f() { } function f2() { } function f3() { } diff --git a/tests/baselines/reference/typeParameterUsedAsTypeParameterConstraint4.js b/tests/baselines/reference/typeParameterUsedAsTypeParameterConstraint4.js index 56132d49acc..d78cf2aa366 100644 --- a/tests/baselines/reference/typeParameterUsedAsTypeParameterConstraint4.js +++ b/tests/baselines/reference/typeParameterUsedAsTypeParameterConstraint4.js @@ -64,7 +64,7 @@ var C = (function () { return x; }; return C; -})(); +}()); function foo(x, y) { function bar() { function baz(a, b) { diff --git a/tests/baselines/reference/typeParameterWithInvalidConstraintType.js b/tests/baselines/reference/typeParameterWithInvalidConstraintType.js index 4985519911a..a40056f6a59 100644 --- a/tests/baselines/reference/typeParameterWithInvalidConstraintType.js +++ b/tests/baselines/reference/typeParameterWithInvalidConstraintType.js @@ -23,4 +23,4 @@ var A = (function () { var d = x(); }; return A; -})(); +}()); diff --git a/tests/baselines/reference/typeParametersAndParametersInComputedNames.js b/tests/baselines/reference/typeParametersAndParametersInComputedNames.js index 1cb53663fbd..7f2c04c2ec3 100644 --- a/tests/baselines/reference/typeParametersAndParametersInComputedNames.js +++ b/tests/baselines/reference/typeParametersAndParametersInComputedNames.js @@ -18,4 +18,4 @@ var A = (function () { A.prototype[foo(a)] = function (a) { }; return A; -})(); +}()); diff --git a/tests/baselines/reference/typeParametersAreIdenticalToThemselves.js b/tests/baselines/reference/typeParametersAreIdenticalToThemselves.js index c6c624f7e2b..699f3f2f26e 100644 --- a/tests/baselines/reference/typeParametersAreIdenticalToThemselves.js +++ b/tests/baselines/reference/typeParametersAreIdenticalToThemselves.js @@ -92,7 +92,7 @@ var C = (function () { C.prototype.foo3 = function (x) { }; C.prototype.foo4 = function (x) { }; return C; -})(); +}()); var C2 = (function () { function C2() { } @@ -100,4 +100,4 @@ var C2 = (function () { C2.prototype.foo2 = function (a, x) { }; C2.prototype.foo3 = function (x) { }; return C2; -})(); +}()); diff --git a/tests/baselines/reference/typeParametersAvailableInNestedScope.js b/tests/baselines/reference/typeParametersAvailableInNestedScope.js index 7262a867df7..d1b50029d23 100644 --- a/tests/baselines/reference/typeParametersAvailableInNestedScope.js +++ b/tests/baselines/reference/typeParametersAvailableInNestedScope.js @@ -37,7 +37,7 @@ var C = (function () { return temp(null); }; return C; -})(); +}()); var c = new C(); c.data = c.x(null); c.data = c.foo(); diff --git a/tests/baselines/reference/typeParametersInStaticAccessors.js b/tests/baselines/reference/typeParametersInStaticAccessors.js index c621de910bc..d9b33399af1 100644 --- a/tests/baselines/reference/typeParametersInStaticAccessors.js +++ b/tests/baselines/reference/typeParametersInStaticAccessors.js @@ -19,4 +19,4 @@ var foo = (function () { configurable: true }); return foo; -})(); +}()); diff --git a/tests/baselines/reference/typeParametersInStaticMethods.js b/tests/baselines/reference/typeParametersInStaticMethods.js index f0cb2784641..be69c87e599 100644 --- a/tests/baselines/reference/typeParametersInStaticMethods.js +++ b/tests/baselines/reference/typeParametersInStaticMethods.js @@ -11,4 +11,4 @@ var foo = (function () { foo.M = function (x) { }; return foo; -})(); +}()); diff --git a/tests/baselines/reference/typeParametersInStaticProperties.js b/tests/baselines/reference/typeParametersInStaticProperties.js index 5f5b109f8ee..071dbf28dcb 100644 --- a/tests/baselines/reference/typeParametersInStaticProperties.js +++ b/tests/baselines/reference/typeParametersInStaticProperties.js @@ -8,4 +8,4 @@ var foo = (function () { function foo() { } return foo; -})(); +}()); diff --git a/tests/baselines/reference/typeQueryOnClass.js b/tests/baselines/reference/typeQueryOnClass.js index 1c8b2424a7e..85dff0de831 100644 --- a/tests/baselines/reference/typeQueryOnClass.js +++ b/tests/baselines/reference/typeQueryOnClass.js @@ -102,7 +102,7 @@ var C = (function () { C.sa = 1; C.sb = function () { return 1; }; return C; -})(); +}()); var c; // BUG 820454 var r1; @@ -113,7 +113,7 @@ var D = (function () { } D.prototype.foo = function () { }; return D; -})(); +}()); var d; var r3; var r4; diff --git a/tests/baselines/reference/typeQueryWithReservedWords.js b/tests/baselines/reference/typeQueryWithReservedWords.js index e6e7f86541b..7561eeddb75 100644 --- a/tests/baselines/reference/typeQueryWithReservedWords.js +++ b/tests/baselines/reference/typeQueryWithReservedWords.js @@ -26,4 +26,4 @@ var Controller = (function () { Controller.prototype.var = function () { }; return Controller; -})(); +}()); diff --git a/tests/baselines/reference/typeRelationships.js b/tests/baselines/reference/typeRelationships.js index 1e31009f9b7..6f8f1ccd4cc 100644 --- a/tests/baselines/reference/typeRelationships.js +++ b/tests/baselines/reference/typeRelationships.js @@ -68,7 +68,7 @@ var C = (function () { return b ? this.c : this.self; // Should be C }; return C; -})(); +}()); var D = (function (_super) { __extends(D, _super); function D() { @@ -91,4 +91,4 @@ var D = (function (_super) { this.c = this.d; }; return D; -})(C); +}(C)); diff --git a/tests/baselines/reference/typeResolution.js b/tests/baselines/reference/typeResolution.js index ed5ae95f23c..cc2bd589bb0 100644 --- a/tests/baselines/reference/typeResolution.js +++ b/tests/baselines/reference/typeResolution.js @@ -147,7 +147,7 @@ define(["require", "exports"], function (require, exports) { d2.XisIn1_1_1(); }; return ClassA; - })(); + }()); SubSubModule1.ClassA = ClassA; var ClassB = (function () { function ClassB() { @@ -180,7 +180,7 @@ define(["require", "exports"], function (require, exports) { d2.XisIn1_1_1(); }; return ClassB; - })(); + }()); SubSubModule1.ClassB = ClassB; var NonExportedClassQ = (function () { function NonExportedClassQ() { @@ -197,7 +197,7 @@ define(["require", "exports"], function (require, exports) { } } return NonExportedClassQ; - })(); + }()); })(SubSubModule1 = SubModule1.SubSubModule1 || (SubModule1.SubSubModule1 = {})); // Should have no effect on S1.SS1.ClassA above because it is not exported var ClassA = (function () { @@ -215,7 +215,7 @@ define(["require", "exports"], function (require, exports) { } } return ClassA; - })(); + }()); })(SubModule1 = TopLevelModule1.SubModule1 || (TopLevelModule1.SubModule1 = {})); var SubModule2; (function (SubModule2) { @@ -227,21 +227,21 @@ define(["require", "exports"], function (require, exports) { } ClassA.prototype.AisIn1_2_2 = function () { }; return ClassA; - })(); + }()); SubSubModule2.ClassA = ClassA; var ClassB = (function () { function ClassB() { } ClassB.prototype.BisIn1_2_2 = function () { }; return ClassB; - })(); + }()); SubSubModule2.ClassB = ClassB; var ClassC = (function () { function ClassC() { } ClassC.prototype.CisIn1_2_2 = function () { }; return ClassC; - })(); + }()); SubSubModule2.ClassC = ClassC; })(SubSubModule2 = SubModule2.SubSubModule2 || (SubModule2.SubSubModule2 = {})); })(SubModule2 = TopLevelModule1.SubModule2 || (TopLevelModule1.SubModule2 = {})); @@ -250,14 +250,14 @@ define(["require", "exports"], function (require, exports) { } ClassA.prototype.AisIn1 = function () { }; return ClassA; - })(); + }()); var NotExportedModule; (function (NotExportedModule) { var ClassA = (function () { function ClassA() { } return ClassA; - })(); + }()); NotExportedModule.ClassA = ClassA; })(NotExportedModule || (NotExportedModule = {})); })(TopLevelModule1 = exports.TopLevelModule1 || (exports.TopLevelModule1 = {})); @@ -270,7 +270,7 @@ define(["require", "exports"], function (require, exports) { } ClassA.prototype.AisIn2_3 = function () { }; return ClassA; - })(); + }()); SubModule3.ClassA = ClassA; })(SubModule3 = TopLevelModule2.SubModule3 || (TopLevelModule2.SubModule3 = {})); })(TopLevelModule2 || (TopLevelModule2 = {})); diff --git a/tests/baselines/reference/typeResolution.sourcemap.txt b/tests/baselines/reference/typeResolution.sourcemap.txt index 69023ac9506..2c109916e6c 100644 --- a/tests/baselines/reference/typeResolution.sourcemap.txt +++ b/tests/baselines/reference/typeResolution.sourcemap.txt @@ -774,7 +774,7 @@ sourceFile:typeResolution.ts 1->Emitted(36, 21) Source(23, 13) + SourceIndex(0) 2 >Emitted(36, 34) Source(23, 14) + SourceIndex(0) --- ->>> })(); +>>> }()); 1 >^^^^^^^^^^^^^^^^ 2 > ^ 3 > @@ -1328,7 +1328,7 @@ sourceFile:typeResolution.ts 1->Emitted(69, 21) Source(46, 13) + SourceIndex(0) 2 >Emitted(69, 34) Source(46, 14) + SourceIndex(0) --- ->>> })(); +>>> }()); 1 >^^^^^^^^^^^^^^^^ 2 > ^ 3 > @@ -1605,7 +1605,7 @@ sourceFile:typeResolution.ts 1->Emitted(86, 21) Source(58, 13) + SourceIndex(0) 2 >Emitted(86, 45) Source(58, 14) + SourceIndex(0) --- ->>> })(); +>>> }()); 1 >^^^^^^^^^^^^^^^^ 2 > ^ 3 > @@ -1930,7 +1930,7 @@ sourceFile:typeResolution.ts 1->Emitted(104, 17) Source(73, 9) + SourceIndex(0) 2 >Emitted(104, 30) Source(73, 10) + SourceIndex(0) --- ->>> })(); +>>> }()); 1 >^^^^^^^^^^^^ 2 > ^ 3 > @@ -2200,7 +2200,7 @@ sourceFile:typeResolution.ts 1 >Emitted(116, 21) Source(79, 59) + SourceIndex(0) 2 >Emitted(116, 34) Source(79, 60) + SourceIndex(0) --- ->>> })(); +>>> }()); 1 >^^^^^^^^^^^^^^^^ 2 > ^ 3 > @@ -2276,7 +2276,7 @@ sourceFile:typeResolution.ts 1 >Emitted(123, 21) Source(80, 59) + SourceIndex(0) 2 >Emitted(123, 34) Source(80, 60) + SourceIndex(0) --- ->>> })(); +>>> }()); 1 >^^^^^^^^^^^^^^^^ 2 > ^ 3 > @@ -2352,7 +2352,7 @@ sourceFile:typeResolution.ts 1 >Emitted(130, 21) Source(81, 59) + SourceIndex(0) 2 >Emitted(130, 34) Source(81, 60) + SourceIndex(0) --- ->>> })(); +>>> }()); 1 >^^^^^^^^^^^^^^^^ 2 > ^ 3 > @@ -2515,7 +2515,7 @@ sourceFile:typeResolution.ts 1 >Emitted(139, 13) Source(91, 5) + SourceIndex(0) 2 >Emitted(139, 26) Source(91, 6) + SourceIndex(0) --- ->>> })(); +>>> }()); 1 >^^^^^^^^ 2 > ^ 3 > @@ -2603,7 +2603,7 @@ sourceFile:typeResolution.ts 1->Emitted(146, 17) Source(98, 31) + SourceIndex(0) 2 >Emitted(146, 30) Source(98, 32) + SourceIndex(0) --- ->>> })(); +>>> }()); 1 >^^^^^^^^^^^^ 2 > ^ 3 > @@ -2917,7 +2917,7 @@ sourceFile:typeResolution.ts 1 >Emitted(159, 17) Source(106, 9) + SourceIndex(0) 2 >Emitted(159, 30) Source(106, 10) + SourceIndex(0) --- ->>> })(); +>>> }()); 1 >^^^^^^^^^^^^ 2 > ^ 3 > diff --git a/tests/baselines/reference/typeValueConflict1.js b/tests/baselines/reference/typeValueConflict1.js index 0a6e92d0d62..eaca97d31dd 100644 --- a/tests/baselines/reference/typeValueConflict1.js +++ b/tests/baselines/reference/typeValueConflict1.js @@ -23,7 +23,7 @@ var M1; function A() { } return A; - })(); + }()); M1.A = A; })(M1 || (M1 = {})); var M2; @@ -36,5 +36,5 @@ var M2; _super.apply(this, arguments); } return B; - })(M1.A); + }(M1.A)); })(M2 || (M2 = {})); diff --git a/tests/baselines/reference/typeValueConflict2.js b/tests/baselines/reference/typeValueConflict2.js index 6e925b535a3..d89ab0fd357 100644 --- a/tests/baselines/reference/typeValueConflict2.js +++ b/tests/baselines/reference/typeValueConflict2.js @@ -30,7 +30,7 @@ var M1; function A(a) { } return A; - })(); + }()); M1.A = A; })(M1 || (M1 = {})); var M2; @@ -43,7 +43,7 @@ var M2; _super.apply(this, arguments); } return B; - })(M1.A); + }(M1.A)); })(M2 || (M2 = {})); var M3; (function (M3) { @@ -54,5 +54,5 @@ var M3; _super.apply(this, arguments); } return B; - })(M1.A); + }(M1.A)); })(M3 || (M3 = {})); diff --git a/tests/baselines/reference/typedGenericPrototypeMember.js b/tests/baselines/reference/typedGenericPrototypeMember.js index e5ba2e0e75f..16b4d93315f 100644 --- a/tests/baselines/reference/typedGenericPrototypeMember.js +++ b/tests/baselines/reference/typedGenericPrototypeMember.js @@ -12,5 +12,5 @@ var List = (function () { } List.prototype.add = function (item) { }; return List; -})(); +}()); List.prototype.add("abc"); // Valid because T is instantiated to any diff --git a/tests/baselines/reference/typeofANonExportedType.js b/tests/baselines/reference/typeofANonExportedType.js index b575d4f8d4b..76e908e622d 100644 --- a/tests/baselines/reference/typeofANonExportedType.js +++ b/tests/baselines/reference/typeofANonExportedType.js @@ -59,7 +59,7 @@ var C = (function () { function C() { } return C; -})(); +}()); var c2; var i2; var M; @@ -69,7 +69,7 @@ var M; function C() { } return C; - })(); + }()); M.C = C; })(M || (M = {})); var E; @@ -84,6 +84,6 @@ var foo; function C() { } return C; - })(); + }()); foo.C = C; })(foo || (foo = {})); diff --git a/tests/baselines/reference/typeofAmbientExternalModules.js b/tests/baselines/reference/typeofAmbientExternalModules.js index 258ca3fdc2e..9bcc5a2fa15 100644 --- a/tests/baselines/reference/typeofAmbientExternalModules.js +++ b/tests/baselines/reference/typeofAmbientExternalModules.js @@ -24,7 +24,7 @@ var C = (function () { function C() { } return C; -})(); +}()); exports.C = C; //// [typeofAmbientExternalModules_1.js] "use strict"; @@ -32,7 +32,7 @@ var D = (function () { function D() { } return D; -})(); +}()); module.exports = D; //// [typeofAmbientExternalModules_2.js] "use strict"; diff --git a/tests/baselines/reference/typeofAnExportedType.js b/tests/baselines/reference/typeofAnExportedType.js index 83c928fd40a..0930039d253 100644 --- a/tests/baselines/reference/typeofAnExportedType.js +++ b/tests/baselines/reference/typeofAnExportedType.js @@ -59,7 +59,7 @@ var C = (function () { function C() { } return C; -})(); +}()); exports.C = C; var c2; var i2; @@ -70,7 +70,7 @@ var M; function C() { } return C; - })(); + }()); M.C = C; })(M = exports.M || (exports.M = {})); exports.Z = M; @@ -87,6 +87,6 @@ var foo; function C() { } return C; - })(); + }()); foo.C = C; })(foo = exports.foo || (exports.foo = {})); diff --git a/tests/baselines/reference/typeofClass.js b/tests/baselines/reference/typeofClass.js index 13487fe9c30..8b257583d7b 100644 --- a/tests/baselines/reference/typeofClass.js +++ b/tests/baselines/reference/typeofClass.js @@ -16,7 +16,7 @@ var K = (function () { function K() { } return K; -})(); +}()); var k1; k1.foo; k1.bar; diff --git a/tests/baselines/reference/typeofClass2.js b/tests/baselines/reference/typeofClass2.js index d16abbda6e5..a0c30c1b166 100644 --- a/tests/baselines/reference/typeofClass2.js +++ b/tests/baselines/reference/typeofClass2.js @@ -33,7 +33,7 @@ var C = (function () { C.foo = function (x) { }; C.bar = function (x) { }; return C; -})(); +}()); var D = (function (_super) { __extends(D, _super); function D() { @@ -42,7 +42,7 @@ var D = (function (_super) { D.baz = function (x) { }; D.prototype.foo = function () { }; return D; -})(C); +}(C)); var d; var r1; var r2; diff --git a/tests/baselines/reference/typeofClassWithPrivates.js b/tests/baselines/reference/typeofClassWithPrivates.js index 53b46c43bbb..e517f6e4712 100644 --- a/tests/baselines/reference/typeofClassWithPrivates.js +++ b/tests/baselines/reference/typeofClassWithPrivates.js @@ -15,7 +15,7 @@ var C = (function () { function C() { } return C; -})(); +}()); var c; var r; var r2; diff --git a/tests/baselines/reference/typeofExternalModules.js b/tests/baselines/reference/typeofExternalModules.js index 95c3202ed36..0bb9f6820f6 100644 --- a/tests/baselines/reference/typeofExternalModules.js +++ b/tests/baselines/reference/typeofExternalModules.js @@ -22,7 +22,7 @@ var C = (function () { function C() { } return C; -})(); +}()); exports.C = C; //// [typeofExternalModules_exportAssign.js] "use strict"; @@ -30,7 +30,7 @@ var D = (function () { function D() { } return D; -})(); +}()); module.exports = D; //// [typeofExternalModules_core.js] "use strict"; diff --git a/tests/baselines/reference/typeofInternalModules.js b/tests/baselines/reference/typeofInternalModules.js index b885d8c9dce..7f15dc87a46 100644 --- a/tests/baselines/reference/typeofInternalModules.js +++ b/tests/baselines/reference/typeofInternalModules.js @@ -33,7 +33,7 @@ var Outer; function C() { } return C; - })(); + }()); instantiated.C = C; })(instantiated = Outer.instantiated || (Outer.instantiated = {})); })(Outer || (Outer = {})); diff --git a/tests/baselines/reference/typeofModuleWithoutExports.js b/tests/baselines/reference/typeofModuleWithoutExports.js index 96034be3c1b..a29bd9b6a37 100644 --- a/tests/baselines/reference/typeofModuleWithoutExports.js +++ b/tests/baselines/reference/typeofModuleWithoutExports.js @@ -16,6 +16,6 @@ var M; function C() { } return C; - })(); + }()); })(M || (M = {})); var r; diff --git a/tests/baselines/reference/typeofOperatorWithAnyOtherType.js b/tests/baselines/reference/typeofOperatorWithAnyOtherType.js index 1c66c5f4d1e..a868aad1815 100644 --- a/tests/baselines/reference/typeofOperatorWithAnyOtherType.js +++ b/tests/baselines/reference/typeofOperatorWithAnyOtherType.js @@ -93,7 +93,7 @@ var A = (function () { return a; }; return A; -})(); +}()); var M; (function (M) { })(M || (M = {})); diff --git a/tests/baselines/reference/typeofOperatorWithBooleanType.js b/tests/baselines/reference/typeofOperatorWithBooleanType.js index b9db33b11a4..cf7bbcd5f73 100644 --- a/tests/baselines/reference/typeofOperatorWithBooleanType.js +++ b/tests/baselines/reference/typeofOperatorWithBooleanType.js @@ -60,7 +60,7 @@ var A = (function () { } A.foo = function () { return false; }; return A; -})(); +}()); var M; (function (M) { })(M || (M = {})); diff --git a/tests/baselines/reference/typeofOperatorWithNumberType.js b/tests/baselines/reference/typeofOperatorWithNumberType.js index b980b820ce1..ecf3eebe5b6 100644 --- a/tests/baselines/reference/typeofOperatorWithNumberType.js +++ b/tests/baselines/reference/typeofOperatorWithNumberType.js @@ -67,7 +67,7 @@ var A = (function () { } A.foo = function () { return 1; }; return A; -})(); +}()); var M; (function (M) { })(M || (M = {})); diff --git a/tests/baselines/reference/typeofOperatorWithStringType.js b/tests/baselines/reference/typeofOperatorWithStringType.js index 9b5cbb20b36..14b712397df 100644 --- a/tests/baselines/reference/typeofOperatorWithStringType.js +++ b/tests/baselines/reference/typeofOperatorWithStringType.js @@ -67,7 +67,7 @@ var A = (function () { } A.foo = function () { return ""; }; return A; -})(); +}()); var M; (function (M) { })(M || (M = {})); diff --git a/tests/baselines/reference/typeofProperty.js b/tests/baselines/reference/typeofProperty.js index 6735883bc8f..b7f1ea68cc4 100644 --- a/tests/baselines/reference/typeofProperty.js +++ b/tests/baselines/reference/typeofProperty.js @@ -53,22 +53,22 @@ var C1 = (function () { function C1() { } return C1; -})(); +}()); var C2 = (function () { function C2() { } return C2; -})(); +}()); var C3 = (function () { function C3() { } return C3; -})(); +}()); var ValidClass = (function () { function ValidClass() { } return ValidClass; -})(); +}()); var vcInstance = new ValidClass(); var viInstance = vcInstance; var x1; // x1: string diff --git a/tests/baselines/reference/typesWithDuplicateTypeParameters.js b/tests/baselines/reference/typesWithDuplicateTypeParameters.js index cc80d4d57b4..d0c6c450e4b 100644 --- a/tests/baselines/reference/typesWithDuplicateTypeParameters.js +++ b/tests/baselines/reference/typesWithDuplicateTypeParameters.js @@ -13,11 +13,11 @@ var C = (function () { function C() { } return C; -})(); +}()); var C2 = (function () { function C2() { } return C2; -})(); +}()); function f() { } function f2() { } diff --git a/tests/baselines/reference/typesWithPrivateConstructor.js b/tests/baselines/reference/typesWithPrivateConstructor.js index 0faaa4428b5..d894eeda49a 100644 --- a/tests/baselines/reference/typesWithPrivateConstructor.js +++ b/tests/baselines/reference/typesWithPrivateConstructor.js @@ -22,13 +22,13 @@ var C = (function () { function C() { } return C; -})(); +}()); var c = new C(); var r = c.constructor; var C2 = (function () { function C2(x) { } return C2; -})(); +}()); var c2 = new C2(); var r2 = c2.constructor; diff --git a/tests/baselines/reference/typesWithPublicConstructor.js b/tests/baselines/reference/typesWithPublicConstructor.js index 3a037ec0253..1078c95467c 100644 --- a/tests/baselines/reference/typesWithPublicConstructor.js +++ b/tests/baselines/reference/typesWithPublicConstructor.js @@ -22,13 +22,13 @@ var C = (function () { function C() { } return C; -})(); +}()); var c = new C(); var r = c.constructor; var C2 = (function () { function C2(x) { } return C2; -})(); +}()); var c2 = new C2(); var r2 = c2.constructor; diff --git a/tests/baselines/reference/typesWithSpecializedCallSignatures.js b/tests/baselines/reference/typesWithSpecializedCallSignatures.js index 3de4134789e..e83fd36ae62 100644 --- a/tests/baselines/reference/typesWithSpecializedCallSignatures.js +++ b/tests/baselines/reference/typesWithSpecializedCallSignatures.js @@ -52,21 +52,21 @@ var Base = (function () { function Base() { } return Base; -})(); +}()); var Derived1 = (function (_super) { __extends(Derived1, _super); function Derived1() { _super.apply(this, arguments); } return Derived1; -})(Base); +}(Base)); var Derived2 = (function (_super) { __extends(Derived2, _super); function Derived2() { _super.apply(this, arguments); } return Derived2; -})(Base); +}(Base)); var C = (function () { function C() { } @@ -74,7 +74,7 @@ var C = (function () { return x; }; return C; -})(); +}()); var c = new C(); var i; var a; diff --git a/tests/baselines/reference/typesWithSpecializedConstructSignatures.js b/tests/baselines/reference/typesWithSpecializedConstructSignatures.js index c66c471b3a1..63d5e9bb5b2 100644 --- a/tests/baselines/reference/typesWithSpecializedConstructSignatures.js +++ b/tests/baselines/reference/typesWithSpecializedConstructSignatures.js @@ -50,27 +50,27 @@ var Base = (function () { function Base() { } return Base; -})(); +}()); var Derived1 = (function (_super) { __extends(Derived1, _super); function Derived1() { _super.apply(this, arguments); } return Derived1; -})(Base); +}(Base)); var Derived2 = (function (_super) { __extends(Derived2, _super); function Derived2() { _super.apply(this, arguments); } return Derived2; -})(Base); +}(Base)); var C = (function () { function C(x) { return x; } return C; -})(); +}()); var c = new C('a'); var i; var a; diff --git a/tests/baselines/reference/undeclaredBase.js b/tests/baselines/reference/undeclaredBase.js index b1efffc0e24..3dd27a3dbfb 100644 --- a/tests/baselines/reference/undeclaredBase.js +++ b/tests/baselines/reference/undeclaredBase.js @@ -17,6 +17,6 @@ var M; _super.apply(this, arguments); } return C; - })(M.I); + }(M.I)); M.C = C; })(M || (M = {})); diff --git a/tests/baselines/reference/undeclaredMethod.js b/tests/baselines/reference/undeclaredMethod.js index 2cef06cc593..f80d9552724 100644 --- a/tests/baselines/reference/undeclaredMethod.js +++ b/tests/baselines/reference/undeclaredMethod.js @@ -21,7 +21,7 @@ var M; } C.prototype.salt = function () { }; return C; - })(); + }()); M.C = C; })(M || (M = {})); var c = new M.C(); diff --git a/tests/baselines/reference/undefinedAssignableToEveryType.js b/tests/baselines/reference/undefinedAssignableToEveryType.js index 08e1c4f1070..9646e7f4e87 100644 --- a/tests/baselines/reference/undefinedAssignableToEveryType.js +++ b/tests/baselines/reference/undefinedAssignableToEveryType.js @@ -47,7 +47,7 @@ var C = (function () { function C() { } return C; -})(); +}()); var ac; var ai; var E; diff --git a/tests/baselines/reference/undefinedIsSubtypeOfEverything.js b/tests/baselines/reference/undefinedIsSubtypeOfEverything.js index c89c3f65381..513464daa85 100644 --- a/tests/baselines/reference/undefinedIsSubtypeOfEverything.js +++ b/tests/baselines/reference/undefinedIsSubtypeOfEverything.js @@ -132,112 +132,112 @@ var Base = (function () { function Base() { } return Base; -})(); +}()); var D0 = (function (_super) { __extends(D0, _super); function D0() { _super.apply(this, arguments); } return D0; -})(Base); +}(Base)); var DA = (function (_super) { __extends(DA, _super); function DA() { _super.apply(this, arguments); } return DA; -})(Base); +}(Base)); var D1 = (function (_super) { __extends(D1, _super); function D1() { _super.apply(this, arguments); } return D1; -})(Base); +}(Base)); var D1A = (function (_super) { __extends(D1A, _super); function D1A() { _super.apply(this, arguments); } return D1A; -})(Base); +}(Base)); var D2 = (function (_super) { __extends(D2, _super); function D2() { _super.apply(this, arguments); } return D2; -})(Base); +}(Base)); var D2A = (function (_super) { __extends(D2A, _super); function D2A() { _super.apply(this, arguments); } return D2A; -})(Base); +}(Base)); var D3 = (function (_super) { __extends(D3, _super); function D3() { _super.apply(this, arguments); } return D3; -})(Base); +}(Base)); var D3A = (function (_super) { __extends(D3A, _super); function D3A() { _super.apply(this, arguments); } return D3A; -})(Base); +}(Base)); var D4 = (function (_super) { __extends(D4, _super); function D4() { _super.apply(this, arguments); } return D4; -})(Base); +}(Base)); var D5 = (function (_super) { __extends(D5, _super); function D5() { _super.apply(this, arguments); } return D5; -})(Base); +}(Base)); var D6 = (function (_super) { __extends(D6, _super); function D6() { _super.apply(this, arguments); } return D6; -})(Base); +}(Base)); var D7 = (function (_super) { __extends(D7, _super); function D7() { _super.apply(this, arguments); } return D7; -})(Base); +}(Base)); var D8 = (function (_super) { __extends(D8, _super); function D8() { _super.apply(this, arguments); } return D8; -})(Base); +}(Base)); var D9 = (function (_super) { __extends(D9, _super); function D9() { _super.apply(this, arguments); } return D9; -})(Base); +}(Base)); var D10 = (function (_super) { __extends(D10, _super); function D10() { _super.apply(this, arguments); } return D10; -})(Base); +}(Base)); var E; (function (E) { E[E["A"] = 0] = "A"; @@ -248,7 +248,7 @@ var D11 = (function (_super) { _super.apply(this, arguments); } return D11; -})(Base); +}(Base)); function f() { } var f; (function (f) { @@ -260,12 +260,12 @@ var D12 = (function (_super) { _super.apply(this, arguments); } return D12; -})(Base); +}(Base)); var c = (function () { function c() { } return c; -})(); +}()); var c; (function (c) { c.bar = 1; @@ -276,21 +276,21 @@ var D13 = (function (_super) { _super.apply(this, arguments); } return D13; -})(Base); +}(Base)); var D14 = (function (_super) { __extends(D14, _super); function D14() { _super.apply(this, arguments); } return D14; -})(Base); +}(Base)); var D15 = (function (_super) { __extends(D15, _super); function D15() { _super.apply(this, arguments); } return D15; -})(Base); +}(Base)); //class D15 extends Base { // foo: U; //} @@ -300,11 +300,11 @@ var D16 = (function (_super) { _super.apply(this, arguments); } return D16; -})(Base); +}(Base)); var D17 = (function (_super) { __extends(D17, _super); function D17() { _super.apply(this, arguments); } return D17; -})(Base); +}(Base)); diff --git a/tests/baselines/reference/undefinedTypeAssignment4.js b/tests/baselines/reference/undefinedTypeAssignment4.js index 186afd872c3..a5d7a117a9d 100644 --- a/tests/baselines/reference/undefinedTypeAssignment4.js +++ b/tests/baselines/reference/undefinedTypeAssignment4.js @@ -17,7 +17,7 @@ var undefined = (function () { function undefined() { } return undefined; -})(); +}()); var undefined; (function (undefined) { undefined.x = 42; diff --git a/tests/baselines/reference/underscoreMapFirst.js b/tests/baselines/reference/underscoreMapFirst.js index 4ee69572f1d..a615faea805 100644 --- a/tests/baselines/reference/underscoreMapFirst.js +++ b/tests/baselines/reference/underscoreMapFirst.js @@ -65,4 +65,4 @@ var MyView = (function (_super) { return _.map(allSeries, _.first); }; return MyView; -})(View); +}(View)); diff --git a/tests/baselines/reference/unexpectedStatementBlockTerminator.js b/tests/baselines/reference/unexpectedStatementBlockTerminator.js index 87b4652375a..f06b75c1340 100644 --- a/tests/baselines/reference/unexpectedStatementBlockTerminator.js +++ b/tests/baselines/reference/unexpectedStatementBlockTerminator.js @@ -12,10 +12,10 @@ var Foo = (function () { function Foo() { } return Foo; -})(); +}()); var Bar = (function () { function Bar() { } return Bar; -})(); +}()); function Goo() { return { a: 1, b: 2 }; } diff --git a/tests/baselines/reference/unexportedInstanceClassVariables.js b/tests/baselines/reference/unexportedInstanceClassVariables.js index 95bdbc032b7..7ac4f6d1b16 100644 --- a/tests/baselines/reference/unexportedInstanceClassVariables.js +++ b/tests/baselines/reference/unexportedInstanceClassVariables.js @@ -19,7 +19,7 @@ var M; function A(val) { } return A; - })(); + }()); })(M || (M = {})); var M; (function (M) { @@ -27,6 +27,6 @@ var M; function A() { } return A; - })(); + }()); var a = new A(); })(M || (M = {})); diff --git a/tests/baselines/reference/unionSubtypeIfEveryConstituentTypeIsSubtype.js b/tests/baselines/reference/unionSubtypeIfEveryConstituentTypeIsSubtype.js index d30b78ca2c3..c1c6918c770 100644 --- a/tests/baselines/reference/unionSubtypeIfEveryConstituentTypeIsSubtype.js +++ b/tests/baselines/reference/unionSubtypeIfEveryConstituentTypeIsSubtype.js @@ -153,12 +153,12 @@ var A = (function () { function A() { } return A; -})(); +}()); var A2 = (function () { function A2() { } return A2; -})(); +}()); var E2; (function (E2) { E2[E2["A"] = 0] = "A"; @@ -172,7 +172,7 @@ var c = (function () { function c() { } return c; -})(); +}()); var c; (function (c) { c.bar = 1; diff --git a/tests/baselines/reference/unionTypeEquivalence.js b/tests/baselines/reference/unionTypeEquivalence.js index 3f4ad647dd5..1ff47f68e5f 100644 --- a/tests/baselines/reference/unionTypeEquivalence.js +++ b/tests/baselines/reference/unionTypeEquivalence.js @@ -30,7 +30,7 @@ var C = (function () { function C() { } return C; -})(); +}()); var D = (function (_super) { __extends(D, _super); function D() { @@ -38,7 +38,7 @@ var D = (function (_super) { } D.prototype.foo = function () { }; return D; -})(C); +}(C)); var x; var x; // A | B is equivalent to B | A. diff --git a/tests/baselines/reference/unionTypeFromArrayLiteral.js b/tests/baselines/reference/unionTypeFromArrayLiteral.js index 1bfadd68ca6..95dd9d39853 100644 --- a/tests/baselines/reference/unionTypeFromArrayLiteral.js +++ b/tests/baselines/reference/unionTypeFromArrayLiteral.js @@ -44,13 +44,13 @@ var C = (function () { } C.prototype.foo = function () { }; return C; -})(); +}()); var D = (function () { function D() { } D.prototype.foo2 = function () { }; return D; -})(); +}()); var E = (function (_super) { __extends(E, _super); function E() { @@ -58,7 +58,7 @@ var E = (function (_super) { } E.prototype.foo3 = function () { }; return E; -})(C); +}(C)); var F = (function (_super) { __extends(F, _super); function F() { @@ -66,7 +66,7 @@ var F = (function (_super) { } F.prototype.foo4 = function () { }; return F; -})(C); +}(C)); var c, d, e, f; var arr6 = [c, d]; // (C | D)[] var arr7 = [c, d, e]; // (C | D)[] diff --git a/tests/baselines/reference/unionTypePropertyAccessibility.js b/tests/baselines/reference/unionTypePropertyAccessibility.js index 3c5c4b42fee..afa8d07c242 100644 --- a/tests/baselines/reference/unionTypePropertyAccessibility.js +++ b/tests/baselines/reference/unionTypePropertyAccessibility.js @@ -53,22 +53,22 @@ var Default = (function () { function Default() { } return Default; -})(); +}()); var Public = (function () { function Public() { } return Public; -})(); +}()); var Protected = (function () { function Protected() { } return Protected; -})(); +}()); var Private = (function () { function Private() { } return Private; -})(); +}()); var v1; var v2; var v3; diff --git a/tests/baselines/reference/unionTypeWithRecursiveSubtypeReduction1.js b/tests/baselines/reference/unionTypeWithRecursiveSubtypeReduction1.js index f8a5cd96b48..46ca2a40e83 100644 --- a/tests/baselines/reference/unionTypeWithRecursiveSubtypeReduction1.js +++ b/tests/baselines/reference/unionTypeWithRecursiveSubtypeReduction1.js @@ -24,21 +24,21 @@ var Module = (function () { function Module() { } return Module; -})(); +}()); var Namespace = (function () { function Namespace() { } return Namespace; -})(); +}()); var Class = (function () { function Class() { } return Class; -})(); +}()); var Property = (function () { function Property() { } return Property; -})(); +}()); var t; t.parent; diff --git a/tests/baselines/reference/unionTypeWithRecursiveSubtypeReduction2.js b/tests/baselines/reference/unionTypeWithRecursiveSubtypeReduction2.js index 69411b1ffcb..b3eeb8ea244 100644 --- a/tests/baselines/reference/unionTypeWithRecursiveSubtypeReduction2.js +++ b/tests/baselines/reference/unionTypeWithRecursiveSubtypeReduction2.js @@ -26,22 +26,22 @@ var Module = (function () { function Module() { } return Module; -})(); +}()); var Namespace = (function () { function Namespace() { } return Namespace; -})(); +}()); var Class = (function () { function Class() { } return Class; -})(); +}()); var Property = (function () { function Property() { } return Property; -})(); +}()); var c; var p; c = p; diff --git a/tests/baselines/reference/unionTypesAssignability.js b/tests/baselines/reference/unionTypesAssignability.js index 80eafb4f506..e07901347a5 100644 --- a/tests/baselines/reference/unionTypesAssignability.js +++ b/tests/baselines/reference/unionTypesAssignability.js @@ -83,7 +83,7 @@ var C = (function () { function C() { } return C; -})(); +}()); var D = (function (_super) { __extends(D, _super); function D() { @@ -91,7 +91,7 @@ var D = (function (_super) { } D.prototype.foo1 = function () { }; return D; -})(C); +}(C)); var E = (function (_super) { __extends(E, _super); function E() { @@ -99,7 +99,7 @@ var E = (function (_super) { } E.prototype.foo2 = function () { }; return E; -})(C); +}(C)); var unionDE; var num; var str; diff --git a/tests/baselines/reference/unknownSymbolInGenericReturnType.js b/tests/baselines/reference/unknownSymbolInGenericReturnType.js index b3ca034f20d..27788285b24 100644 --- a/tests/baselines/reference/unknownSymbolInGenericReturnType.js +++ b/tests/baselines/reference/unknownSymbolInGenericReturnType.js @@ -24,4 +24,4 @@ var Linq = (function () { return result; }; return Linq; -})(); +}()); diff --git a/tests/baselines/reference/unknownSymbols1.js b/tests/baselines/reference/unknownSymbols1.js index cab42726c73..03ed4990c29 100644 --- a/tests/baselines/reference/unknownSymbols1.js +++ b/tests/baselines/reference/unknownSymbols1.js @@ -49,28 +49,28 @@ var C = (function () { function C() { } return C; -})(); +}()); var C2 = (function () { function C2() { } return C2; -})(); +}()); var C3 = (function () { function C3(x) { } return C3; -})(); +}()); var C4 = (function (_super) { __extends(C4, _super); function C4() { _super.call(this, asdf); } return C4; -})(C3); +}(C3)); var x2 = this.asdf; // no error, this is any var C5 = (function () { function C5() { this.asdf = asdf; } return C5; -})(); +}()); diff --git a/tests/baselines/reference/unknownTypeArgOnCall.js b/tests/baselines/reference/unknownTypeArgOnCall.js index 6e1da3b5257..129e2e351f1 100644 --- a/tests/baselines/reference/unknownTypeArgOnCall.js +++ b/tests/baselines/reference/unknownTypeArgOnCall.js @@ -16,6 +16,6 @@ var Foo = (function () { return null; }; return Foo; -})(); +}()); var f = new Foo(); var r = f.clone(); diff --git a/tests/baselines/reference/unqualifiedCallToClassStatic1.js b/tests/baselines/reference/unqualifiedCallToClassStatic1.js index 6de5634af9c..6c78a737fe8 100644 --- a/tests/baselines/reference/unqualifiedCallToClassStatic1.js +++ b/tests/baselines/reference/unqualifiedCallToClassStatic1.js @@ -15,4 +15,4 @@ var Vector = (function () { foo(); }; return Vector; -})(); +}()); diff --git a/tests/baselines/reference/unspecializedConstraints.js b/tests/baselines/reference/unspecializedConstraints.js index ed844f740ba..7b3938c7099 100644 --- a/tests/baselines/reference/unspecializedConstraints.js +++ b/tests/baselines/reference/unspecializedConstraints.js @@ -165,7 +165,7 @@ var ts; function Symbol() { } return Symbol; - })(); + }()); var Type = (function (_super) { __extends(Type, _super); function Type() { @@ -229,7 +229,7 @@ var ts; Type.prototype.isSubTypeOf = function (type) { }; return Type; - })(Symbol); + }(Symbol)); var Property = (function (_super) { __extends(Property, _super); function Property(name, type, flags) { @@ -244,7 +244,7 @@ var ts; this.type.equals(other.type); }; return Property; - })(Symbol); + }(Symbol)); var PropertyFlags; (function (PropertyFlags) { PropertyFlags[PropertyFlags["Optional"] = 1] = "Optional"; @@ -269,7 +269,7 @@ var ts; this.returnType.equals(other.returnType); }; return Signature; - })(Symbol); + }(Symbol)); var Parameter = (function (_super) { __extends(Parameter, _super); function Parameter(name, type, flags) { @@ -284,7 +284,7 @@ var ts; this.type.equals(other.type); }; return Parameter; - })(Symbol); + }(Symbol)); var ParameterFlags; (function (ParameterFlags) { ParameterFlags[ParameterFlags["Optional"] = 1] = "Optional"; diff --git a/tests/baselines/reference/untypedFunctionCallsWithTypeParameters1.js b/tests/baselines/reference/untypedFunctionCallsWithTypeParameters1.js index 2f2d4e87c46..e991db69367 100644 --- a/tests/baselines/reference/untypedFunctionCallsWithTypeParameters1.js +++ b/tests/baselines/reference/untypedFunctionCallsWithTypeParameters1.js @@ -64,7 +64,7 @@ var C = (function () { this.caller = function () { }; } return C; -})(); +}()); var c2; var r4 = c2(); // should be an error var C2 = (function (_super) { @@ -73,7 +73,7 @@ var C2 = (function (_super) { _super.apply(this, arguments); } return C2; -})(Function); // error +}(Function)); // error var c3; var r5 = c3(); // error var z; diff --git a/tests/baselines/reference/unusedImportDeclaration.js b/tests/baselines/reference/unusedImportDeclaration.js index 7ed19f775f6..ef1d5018892 100644 --- a/tests/baselines/reference/unusedImportDeclaration.js +++ b/tests/baselines/reference/unusedImportDeclaration.js @@ -21,7 +21,7 @@ var TesterB = (function () { function TesterB() { } return TesterB; -})(); +}()); module.exports = TesterB; //// [unusedImportDeclaration_testerA.js] "use strict"; diff --git a/tests/baselines/reference/usingModuleWithExportImportInValuePosition.js b/tests/baselines/reference/usingModuleWithExportImportInValuePosition.js index 4c5009eca96..a57e18fec72 100644 --- a/tests/baselines/reference/usingModuleWithExportImportInValuePosition.js +++ b/tests/baselines/reference/usingModuleWithExportImportInValuePosition.js @@ -29,7 +29,7 @@ var A; this.y = y; } return Point; - })(); + }()); A.Point = Point; })(A || (A = {})); var C; diff --git a/tests/baselines/reference/validNullAssignments.js b/tests/baselines/reference/validNullAssignments.js index 46ef3807464..8509a46cc97 100644 --- a/tests/baselines/reference/validNullAssignments.js +++ b/tests/baselines/reference/validNullAssignments.js @@ -46,7 +46,7 @@ var C = (function () { function C() { } return C; -})(); +}()); var f; f = null; // ok C = null; // error diff --git a/tests/baselines/reference/validUndefinedAssignments.js b/tests/baselines/reference/validUndefinedAssignments.js index d91875da8a5..792b277ae17 100644 --- a/tests/baselines/reference/validUndefinedAssignments.js +++ b/tests/baselines/reference/validUndefinedAssignments.js @@ -35,7 +35,7 @@ var C = (function () { function C() { } return C; -})(); +}()); var f; f = x; var g; diff --git a/tests/baselines/reference/validUseOfThisInSuper.js b/tests/baselines/reference/validUseOfThisInSuper.js index 4378d89ad4b..027ba254ae0 100644 --- a/tests/baselines/reference/validUseOfThisInSuper.js +++ b/tests/baselines/reference/validUseOfThisInSuper.js @@ -20,7 +20,7 @@ var Base = (function () { this.b = b; } return Base; -})(); +}()); var Super = (function (_super) { __extends(Super, _super); function Super() { @@ -28,4 +28,4 @@ var Super = (function (_super) { _super.call(this, (function () { return _this; })()); // ok since this is not the case: The constructor declares parameter properties or the containing class declares instance member variables with initializers. } return Super; -})(Base); +}(Base)); diff --git a/tests/baselines/reference/varArgConstructorMemberParameter.js b/tests/baselines/reference/varArgConstructorMemberParameter.js index 7f1ef8d5b3a..620642a7514 100644 --- a/tests/baselines/reference/varArgConstructorMemberParameter.js +++ b/tests/baselines/reference/varArgConstructorMemberParameter.js @@ -21,13 +21,13 @@ var Foo1 = (function () { } } return Foo1; -})(); +}()); var Foo2 = (function () { function Foo2(args) { this.args = args; } return Foo2; -})(); +}()); var Foo3 = (function () { function Foo3(public) { var args = []; @@ -36,4 +36,4 @@ var Foo3 = (function () { } } return Foo3; -})(); +}()); diff --git a/tests/baselines/reference/varArgsOnConstructorTypes.js b/tests/baselines/reference/varArgsOnConstructorTypes.js index eb9571c97f5..db8f566702a 100644 --- a/tests/baselines/reference/varArgsOnConstructorTypes.js +++ b/tests/baselines/reference/varArgsOnConstructorTypes.js @@ -36,7 +36,7 @@ define(["require", "exports"], function (require, exports) { function A(ctor) { } return A; - })(); + }()); exports.A = A; var B = (function (_super) { __extends(B, _super); @@ -46,7 +46,7 @@ define(["require", "exports"], function (require, exports) { this.p2 = url; } return B; - })(A); + }(A)); exports.B = B; var reg; reg.register(B); diff --git a/tests/baselines/reference/varAsID.js b/tests/baselines/reference/varAsID.js index d123d10c531..5ce1d82d165 100644 --- a/tests/baselines/reference/varAsID.js +++ b/tests/baselines/reference/varAsID.js @@ -25,12 +25,12 @@ var Foo = (function () { this.x = 1; } return Foo; -})(); +}()); var f = new Foo(); var Foo2 = (function () { function Foo2() { this.x = 1; } return Foo2; -})(); +}()); var f2 = new Foo2(); diff --git a/tests/baselines/reference/vararg.js b/tests/baselines/reference/vararg.js index 038afb90cbc..015c8c9957a 100644 --- a/tests/baselines/reference/vararg.js +++ b/tests/baselines/reference/vararg.js @@ -74,7 +74,7 @@ var M; return builder; }; return C; - })(); + }()); M.C = C; })(M || (M = {})); var x = new M.C(); diff --git a/tests/baselines/reference/vardecl.js b/tests/baselines/reference/vardecl.js index 9b19e1000a9..a7ebb811c50 100644 --- a/tests/baselines/reference/vardecl.js +++ b/tests/baselines/reference/vardecl.js @@ -139,13 +139,13 @@ var m2; this.b = b; } return C; - })(); + }()); var C2 = (function () { function C2(b) { this.b = b; } return C2; - })(); + }()); m2.C2 = C2; var m; var b23; diff --git a/tests/baselines/reference/variableDeclaratorResolvedDuringContextualTyping.js b/tests/baselines/reference/variableDeclaratorResolvedDuringContextualTyping.js index cddf9ebf254..692c4e3aebe 100644 --- a/tests/baselines/reference/variableDeclaratorResolvedDuringContextualTyping.js +++ b/tests/baselines/reference/variableDeclaratorResolvedDuringContextualTyping.js @@ -135,7 +135,7 @@ var Errors; function ConnectionError /* extends Error */(request) { } return ConnectionError /* extends Error */; - })(); + }()); Errors.ConnectionError /* extends Error */ = ConnectionError /* extends Error */; })(Errors || (Errors = {})); var FileService = (function () { @@ -160,4 +160,4 @@ var FileService = (function () { }); }; return FileService; -})(); +}()); diff --git a/tests/baselines/reference/visSyntax.js b/tests/baselines/reference/visSyntax.js index be62516fd07..8d7d5991503 100644 --- a/tests/baselines/reference/visSyntax.js +++ b/tests/baselines/reference/visSyntax.js @@ -18,7 +18,7 @@ var M; function C() { } return C; - })(); + }()); M.C = C; M.x = 10; })(M || (M = {})); diff --git a/tests/baselines/reference/visibilityOfTypeParameters.js b/tests/baselines/reference/visibilityOfTypeParameters.js index 170a8ef5d37..e9cd9f4deda 100644 --- a/tests/baselines/reference/visibilityOfTypeParameters.js +++ b/tests/baselines/reference/visibilityOfTypeParameters.js @@ -15,7 +15,7 @@ var MyClass = (function () { return val; }; return MyClass; -})(); +}()); exports.MyClass = MyClass; diff --git a/tests/baselines/reference/voidOperatorWithAnyOtherType.js b/tests/baselines/reference/voidOperatorWithAnyOtherType.js index fbe85326d3a..cbae98f67fc 100644 --- a/tests/baselines/reference/voidOperatorWithAnyOtherType.js +++ b/tests/baselines/reference/voidOperatorWithAnyOtherType.js @@ -79,7 +79,7 @@ var A = (function () { return a; }; return A; -})(); +}()); var M; (function (M) { })(M || (M = {})); diff --git a/tests/baselines/reference/voidOperatorWithBooleanType.js b/tests/baselines/reference/voidOperatorWithBooleanType.js index 25099108b9b..bd6faedcb2b 100644 --- a/tests/baselines/reference/voidOperatorWithBooleanType.js +++ b/tests/baselines/reference/voidOperatorWithBooleanType.js @@ -47,7 +47,7 @@ var A = (function () { } A.foo = function () { return false; }; return A; -})(); +}()); var M; (function (M) { })(M || (M = {})); diff --git a/tests/baselines/reference/voidOperatorWithNumberType.js b/tests/baselines/reference/voidOperatorWithNumberType.js index 9a0a31d4fe5..ca17612c6cc 100644 --- a/tests/baselines/reference/voidOperatorWithNumberType.js +++ b/tests/baselines/reference/voidOperatorWithNumberType.js @@ -55,7 +55,7 @@ var A = (function () { } A.foo = function () { return 1; }; return A; -})(); +}()); var M; (function (M) { })(M || (M = {})); diff --git a/tests/baselines/reference/voidOperatorWithStringType.js b/tests/baselines/reference/voidOperatorWithStringType.js index 5949c93acd4..eaaa981528d 100644 --- a/tests/baselines/reference/voidOperatorWithStringType.js +++ b/tests/baselines/reference/voidOperatorWithStringType.js @@ -54,7 +54,7 @@ var A = (function () { } A.foo = function () { return ""; }; return A; -})(); +}()); var M; (function (M) { })(M || (M = {})); diff --git a/tests/baselines/reference/withImportDecl.js b/tests/baselines/reference/withImportDecl.js index 275d5fcadcc..92a90cb2177 100644 --- a/tests/baselines/reference/withImportDecl.js +++ b/tests/baselines/reference/withImportDecl.js @@ -50,7 +50,7 @@ define(["require", "exports"], function (require, exports) { function A() { } return A; - })(); + }()); exports.A = A; }); //// [withImportDecl_1.js] diff --git a/tests/baselines/reference/withStatementErrors.js b/tests/baselines/reference/withStatementErrors.js index 7c496f014a7..de2fb40dac9 100644 --- a/tests/baselines/reference/withStatementErrors.js +++ b/tests/baselines/reference/withStatementErrors.js @@ -28,5 +28,5 @@ with (ooo.eee.oo.ah_ah.ting.tang.walla.walla) { function C() { } return C; - })(); // error + }()); // error } diff --git a/tests/baselines/reference/witness.js b/tests/baselines/reference/witness.js index 82a1298f156..e0a4c356873 100644 --- a/tests/baselines/reference/witness.js +++ b/tests/baselines/reference/witness.js @@ -157,7 +157,7 @@ var InitClass = (function () { var y; }; return InitClass; -})(); +}()); // Return type function fnReturn1() { return fnReturn1(); @@ -231,7 +231,7 @@ var C = (function () { return new a(this.fn3); }; return C; -})(); +}()); function fn5() { var a; return new a(fn5); @@ -255,7 +255,7 @@ var C2 = (function () { this.n = this.n; // n: any } return C2; -})(); +}()); var c2inst = new C2().n; var c2inst; // Constructor function property access @@ -264,7 +264,7 @@ var C3 = (function () { } C3.q = C3.q; return C3; -})(); +}()); var qq = C3.q; var qq; // Parentheses - tested a bunch above diff --git a/tests/baselines/reference/wrappedAndRecursiveConstraints.js b/tests/baselines/reference/wrappedAndRecursiveConstraints.js index 91227a03222..06103235ecb 100644 --- a/tests/baselines/reference/wrappedAndRecursiveConstraints.js +++ b/tests/baselines/reference/wrappedAndRecursiveConstraints.js @@ -26,7 +26,7 @@ var C = (function () { return x; }; return C; -})(); +}()); var y = null; var c = new C(y); var r = c.foo(y); diff --git a/tests/baselines/reference/wrappedAndRecursiveConstraints2.js b/tests/baselines/reference/wrappedAndRecursiveConstraints2.js index 4e752fd7ac3..ae8b28c5eb0 100644 --- a/tests/baselines/reference/wrappedAndRecursiveConstraints2.js +++ b/tests/baselines/reference/wrappedAndRecursiveConstraints2.js @@ -11,6 +11,6 @@ var C = (function () { function C(x) { } return C; -})(); +}()); var c = new C(1); var c = new C(new C('')); // error diff --git a/tests/baselines/reference/wrappedAndRecursiveConstraints3.js b/tests/baselines/reference/wrappedAndRecursiveConstraints3.js index fb0f5388aaa..b5d6e65a183 100644 --- a/tests/baselines/reference/wrappedAndRecursiveConstraints3.js +++ b/tests/baselines/reference/wrappedAndRecursiveConstraints3.js @@ -27,7 +27,7 @@ var C = (function () { return bar; }; return C; -})(); +}()); var c = new C({ length: 2 }); var r = c.foo({ length: 3, charAt: function (x) { ''; diff --git a/tests/baselines/reference/wrappedAndRecursiveConstraints4.js b/tests/baselines/reference/wrappedAndRecursiveConstraints4.js index 998c16a9f87..2a84f8cc426 100644 --- a/tests/baselines/reference/wrappedAndRecursiveConstraints4.js +++ b/tests/baselines/reference/wrappedAndRecursiveConstraints4.js @@ -24,7 +24,7 @@ var C = (function () { return bar; }; return C; -})(); +}()); var c = new C({ length: 2 }); var r = c.foo(''); var r2 = r({ length: 3, charAt: function (x) { From 0c4ac799d98587bb15b9a78fc6fe2e41ba466f2f Mon Sep 17 00:00:00 2001 From: Daniel Rosenwasser Date: Tue, 8 Dec 2015 17:52:06 -0800 Subject: [PATCH 065/177] Accepted project baselines. --- .../project/declarationsCascadingImports/amd/m4.js | 2 +- .../project/declarationsCascadingImports/node/m4.js | 2 +- .../project/declarationsGlobalImport/amd/glo_m4.js | 2 +- .../project/declarationsGlobalImport/node/glo_m4.js | 2 +- .../declarationsImportedInPrivate/amd/private_m4.js | 2 +- .../declarationsImportedInPrivate/node/private_m4.js | 2 +- .../declarationsImportedUseInFunction/amd/fncOnly_m4.js | 2 +- .../declarationsImportedUseInFunction/node/fncOnly_m4.js | 2 +- .../amd/m4.js | 2 +- .../node/m4.js | 2 +- .../project/declarationsMultipleTimesImport/amd/m4.js | 2 +- .../project/declarationsMultipleTimesImport/node/m4.js | 2 +- .../declarationsMultipleTimesMultipleImport/amd/m4.js | 2 +- .../declarationsMultipleTimesMultipleImport/node/m4.js | 2 +- .../reference/project/declarationsSimpleImport/amd/m4.js | 2 +- .../reference/project/declarationsSimpleImport/node/m4.js | 2 +- ...apRootAbsolutePathMixedSubfolderNoOutdir.sourcemap.txt | 6 +++--- .../amd/ref/m1.js | 2 +- ...apRootAbsolutePathMixedSubfolderNoOutdir.sourcemap.txt | 6 +++--- .../node/ref/m1.js | 2 +- ...PathMixedSubfolderSpecifyOutputDirectory.sourcemap.txt | 6 +++--- .../amd/outdir/simple/ref/m1.js | 2 +- ...PathMixedSubfolderSpecifyOutputDirectory.sourcemap.txt | 6 +++--- .../node/outdir/simple/ref/m1.js | 2 +- .../amd/bin/test.js | 6 +++--- ...olutePathMixedSubfolderSpecifyOutputFile.sourcemap.txt | 6 +++--- .../node/bin/test.js | 4 ++-- ...olutePathMixedSubfolderSpecifyOutputFile.sourcemap.txt | 4 ++-- .../amd/bin/outAndOutDirFile.js | 6 +++--- ...olderSpecifyOutputFileAndOutputDirectory.sourcemap.txt | 6 +++--- .../node/bin/outAndOutDirFile.js | 4 ++-- ...olderSpecifyOutputFileAndOutputDirectory.sourcemap.txt | 4 ++-- ...ootAbsolutePathModuleMultifolderNoOutdir.sourcemap.txt | 6 +++--- .../amd/ref/m1.js | 2 +- ...ootAbsolutePathModuleMultifolderNoOutdir.sourcemap.txt | 6 +++--- .../node/ref/m1.js | 2 +- ...hModuleMultifolderSpecifyOutputDirectory.sourcemap.txt | 6 +++--- .../outdir/simple/outputdir_module_multifolder/ref/m1.js | 2 +- ...hModuleMultifolderSpecifyOutputDirectory.sourcemap.txt | 6 +++--- .../outdir/simple/outputdir_module_multifolder/ref/m1.js | 2 +- .../amd/bin/test.js | 6 +++--- ...tePathModuleMultifolderSpecifyOutputFile.sourcemap.txt | 6 +++--- .../mapRootAbsolutePathModuleSimpleNoOutdir/amd/m1.js | 2 +- .../mapRootAbsolutePathModuleSimpleNoOutdir.sourcemap.txt | 4 ++-- .../mapRootAbsolutePathModuleSimpleNoOutdir/node/m1.js | 2 +- .../mapRootAbsolutePathModuleSimpleNoOutdir.sourcemap.txt | 4 ++-- ...tePathModuleSimpleSpecifyOutputDirectory.sourcemap.txt | 4 ++-- .../amd/outdir/simple/m1.js | 2 +- ...tePathModuleSimpleSpecifyOutputDirectory.sourcemap.txt | 4 ++-- .../node/outdir/simple/m1.js | 2 +- .../amd/bin/test.js | 4 ++-- ...bsolutePathModuleSimpleSpecifyOutputFile.sourcemap.txt | 4 ++-- ...pRootAbsolutePathModuleSubfolderNoOutdir.sourcemap.txt | 4 ++-- .../amd/ref/m1.js | 2 +- ...pRootAbsolutePathModuleSubfolderNoOutdir.sourcemap.txt | 4 ++-- .../node/ref/m1.js | 2 +- ...athModuleSubfolderSpecifyOutputDirectory.sourcemap.txt | 4 ++-- .../amd/outdir/simple/ref/m1.js | 2 +- ...athModuleSubfolderSpecifyOutputDirectory.sourcemap.txt | 4 ++-- .../node/outdir/simple/ref/m1.js | 2 +- .../amd/bin/test.js | 4 ++-- ...lutePathModuleSubfolderSpecifyOutputFile.sourcemap.txt | 4 ++-- .../mapRootAbsolutePathMultifolderNoOutdir.sourcemap.txt | 6 +++--- .../mapRootAbsolutePathMultifolderNoOutdir/amd/ref/m1.js | 2 +- .../mapRootAbsolutePathMultifolderNoOutdir.sourcemap.txt | 6 +++--- .../mapRootAbsolutePathMultifolderNoOutdir/node/ref/m1.js | 2 +- ...utePathMultifolderSpecifyOutputDirectory.sourcemap.txt | 6 +++--- .../amd/outdir/simple/outputdir_multifolder/ref/m1.js | 2 +- ...utePathMultifolderSpecifyOutputDirectory.sourcemap.txt | 6 +++--- .../node/outdir/simple/outputdir_multifolder/ref/m1.js | 2 +- .../amd/bin/test.js | 6 +++--- ...AbsolutePathMultifolderSpecifyOutputFile.sourcemap.txt | 6 +++--- .../node/bin/test.js | 6 +++--- ...AbsolutePathMultifolderSpecifyOutputFile.sourcemap.txt | 6 +++--- .../project/mapRootAbsolutePathSimpleNoOutdir/amd/m1.js | 2 +- .../amd/mapRootAbsolutePathSimpleNoOutdir.sourcemap.txt | 4 ++-- .../project/mapRootAbsolutePathSimpleNoOutdir/node/m1.js | 2 +- .../node/mapRootAbsolutePathSimpleNoOutdir.sourcemap.txt | 4 ++-- ...AbsolutePathSimpleSpecifyOutputDirectory.sourcemap.txt | 4 ++-- .../amd/outdir/simple/m1.js | 2 +- ...AbsolutePathSimpleSpecifyOutputDirectory.sourcemap.txt | 4 ++-- .../node/outdir/simple/m1.js | 2 +- .../amd/bin/test.js | 4 ++-- ...pRootAbsolutePathSimpleSpecifyOutputFile.sourcemap.txt | 4 ++-- .../node/bin/test.js | 4 ++-- ...pRootAbsolutePathSimpleSpecifyOutputFile.sourcemap.txt | 4 ++-- .../mapRootAbsolutePathSingleFileNoOutdir.sourcemap.txt | 2 +- .../mapRootAbsolutePathSingleFileNoOutdir/amd/test.js | 2 +- .../mapRootAbsolutePathSingleFileNoOutdir.sourcemap.txt | 2 +- .../mapRootAbsolutePathSingleFileNoOutdir/node/test.js | 2 +- ...lutePathSingleFileSpecifyOutputDirectory.sourcemap.txt | 2 +- .../amd/outdir/simple/test.js | 2 +- ...lutePathSingleFileSpecifyOutputDirectory.sourcemap.txt | 2 +- .../node/outdir/simple/test.js | 2 +- .../amd/bin/test.js | 2 +- ...tAbsolutePathSingleFileSpecifyOutputFile.sourcemap.txt | 2 +- .../node/bin/test.js | 2 +- ...tAbsolutePathSingleFileSpecifyOutputFile.sourcemap.txt | 2 +- .../mapRootAbsolutePathSubfolderNoOutdir.sourcemap.txt | 4 ++-- .../mapRootAbsolutePathSubfolderNoOutdir/amd/ref/m1.js | 2 +- .../mapRootAbsolutePathSubfolderNoOutdir.sourcemap.txt | 4 ++-- .../mapRootAbsolutePathSubfolderNoOutdir/node/ref/m1.js | 2 +- ...olutePathSubfolderSpecifyOutputDirectory.sourcemap.txt | 4 ++-- .../amd/outdir/simple/ref/m1.js | 2 +- ...olutePathSubfolderSpecifyOutputDirectory.sourcemap.txt | 4 ++-- .../node/outdir/simple/ref/m1.js | 2 +- .../amd/bin/test.js | 4 ++-- ...otAbsolutePathSubfolderSpecifyOutputFile.sourcemap.txt | 4 ++-- .../node/bin/test.js | 4 ++-- ...otAbsolutePathSubfolderSpecifyOutputFile.sourcemap.txt | 4 ++-- ...apRootRelativePathMixedSubfolderNoOutdir.sourcemap.txt | 6 +++--- .../amd/ref/m1.js | 2 +- ...apRootRelativePathMixedSubfolderNoOutdir.sourcemap.txt | 6 +++--- .../node/ref/m1.js | 2 +- ...PathMixedSubfolderSpecifyOutputDirectory.sourcemap.txt | 6 +++--- .../amd/outdir/simple/ref/m1.js | 2 +- ...PathMixedSubfolderSpecifyOutputDirectory.sourcemap.txt | 6 +++--- .../node/outdir/simple/ref/m1.js | 2 +- .../amd/bin/test.js | 6 +++--- ...ativePathMixedSubfolderSpecifyOutputFile.sourcemap.txt | 6 +++--- .../node/bin/test.js | 4 ++-- ...ativePathMixedSubfolderSpecifyOutputFile.sourcemap.txt | 4 ++-- .../amd/bin/outAndOutDirFile.js | 6 +++--- ...olderSpecifyOutputFileAndOutputDirectory.sourcemap.txt | 6 +++--- .../node/bin/outAndOutDirFile.js | 4 ++-- ...olderSpecifyOutputFileAndOutputDirectory.sourcemap.txt | 4 ++-- ...ootRelativePathModuleMultifolderNoOutdir.sourcemap.txt | 6 +++--- .../amd/ref/m1.js | 2 +- ...ootRelativePathModuleMultifolderNoOutdir.sourcemap.txt | 6 +++--- .../node/ref/m1.js | 2 +- ...hModuleMultifolderSpecifyOutputDirectory.sourcemap.txt | 6 +++--- .../outdir/simple/outputdir_module_multifolder/ref/m1.js | 2 +- ...hModuleMultifolderSpecifyOutputDirectory.sourcemap.txt | 6 +++--- .../outdir/simple/outputdir_module_multifolder/ref/m1.js | 2 +- .../amd/bin/test.js | 6 +++--- ...vePathModuleMultifolderSpecifyOutputFile.sourcemap.txt | 6 +++--- .../mapRootRelativePathModuleSimpleNoOutdir/amd/m1.js | 2 +- .../mapRootRelativePathModuleSimpleNoOutdir.sourcemap.txt | 4 ++-- .../mapRootRelativePathModuleSimpleNoOutdir/node/m1.js | 2 +- .../mapRootRelativePathModuleSimpleNoOutdir.sourcemap.txt | 4 ++-- ...vePathModuleSimpleSpecifyOutputDirectory.sourcemap.txt | 4 ++-- .../amd/outdir/simple/m1.js | 2 +- ...vePathModuleSimpleSpecifyOutputDirectory.sourcemap.txt | 4 ++-- .../node/outdir/simple/m1.js | 2 +- .../amd/bin/test.js | 4 ++-- ...elativePathModuleSimpleSpecifyOutputFile.sourcemap.txt | 4 ++-- ...pRootRelativePathModuleSubfolderNoOutdir.sourcemap.txt | 4 ++-- .../amd/ref/m1.js | 2 +- ...pRootRelativePathModuleSubfolderNoOutdir.sourcemap.txt | 4 ++-- .../node/ref/m1.js | 2 +- ...athModuleSubfolderSpecifyOutputDirectory.sourcemap.txt | 4 ++-- .../amd/outdir/simple/ref/m1.js | 2 +- ...athModuleSubfolderSpecifyOutputDirectory.sourcemap.txt | 4 ++-- .../node/outdir/simple/ref/m1.js | 2 +- .../amd/bin/test.js | 4 ++-- ...tivePathModuleSubfolderSpecifyOutputFile.sourcemap.txt | 4 ++-- .../mapRootRelativePathMultifolderNoOutdir.sourcemap.txt | 6 +++--- .../mapRootRelativePathMultifolderNoOutdir/amd/ref/m1.js | 2 +- .../mapRootRelativePathMultifolderNoOutdir.sourcemap.txt | 6 +++--- .../mapRootRelativePathMultifolderNoOutdir/node/ref/m1.js | 2 +- ...ivePathMultifolderSpecifyOutputDirectory.sourcemap.txt | 6 +++--- .../amd/outdir/simple/outputdir_multifolder/ref/m1.js | 2 +- ...ivePathMultifolderSpecifyOutputDirectory.sourcemap.txt | 6 +++--- .../node/outdir/simple/outputdir_multifolder/ref/m1.js | 2 +- .../amd/bin/test.js | 6 +++--- ...RelativePathMultifolderSpecifyOutputFile.sourcemap.txt | 6 +++--- .../node/bin/test.js | 6 +++--- ...RelativePathMultifolderSpecifyOutputFile.sourcemap.txt | 6 +++--- .../project/mapRootRelativePathSimpleNoOutdir/amd/m1.js | 2 +- .../amd/mapRootRelativePathSimpleNoOutdir.sourcemap.txt | 4 ++-- .../project/mapRootRelativePathSimpleNoOutdir/node/m1.js | 2 +- .../node/mapRootRelativePathSimpleNoOutdir.sourcemap.txt | 4 ++-- ...RelativePathSimpleSpecifyOutputDirectory.sourcemap.txt | 4 ++-- .../amd/outdir/simple/m1.js | 2 +- ...RelativePathSimpleSpecifyOutputDirectory.sourcemap.txt | 4 ++-- .../node/outdir/simple/m1.js | 2 +- .../amd/bin/test.js | 4 ++-- ...pRootRelativePathSimpleSpecifyOutputFile.sourcemap.txt | 4 ++-- .../node/bin/test.js | 4 ++-- ...pRootRelativePathSimpleSpecifyOutputFile.sourcemap.txt | 4 ++-- .../mapRootRelativePathSingleFileNoOutdir.sourcemap.txt | 2 +- .../mapRootRelativePathSingleFileNoOutdir/amd/test.js | 2 +- .../mapRootRelativePathSingleFileNoOutdir.sourcemap.txt | 2 +- .../mapRootRelativePathSingleFileNoOutdir/node/test.js | 2 +- ...tivePathSingleFileSpecifyOutputDirectory.sourcemap.txt | 2 +- .../amd/outdir/simple/test.js | 2 +- ...tivePathSingleFileSpecifyOutputDirectory.sourcemap.txt | 2 +- .../node/outdir/simple/test.js | 2 +- .../amd/bin/test.js | 2 +- ...tRelativePathSingleFileSpecifyOutputFile.sourcemap.txt | 2 +- .../node/bin/test.js | 2 +- ...tRelativePathSingleFileSpecifyOutputFile.sourcemap.txt | 2 +- .../mapRootRelativePathSubfolderNoOutdir.sourcemap.txt | 4 ++-- .../mapRootRelativePathSubfolderNoOutdir/amd/ref/m1.js | 2 +- .../mapRootRelativePathSubfolderNoOutdir.sourcemap.txt | 4 ++-- .../mapRootRelativePathSubfolderNoOutdir/node/ref/m1.js | 2 +- ...ativePathSubfolderSpecifyOutputDirectory.sourcemap.txt | 4 ++-- .../amd/outdir/simple/ref/m1.js | 2 +- ...ativePathSubfolderSpecifyOutputDirectory.sourcemap.txt | 4 ++-- .../node/outdir/simple/ref/m1.js | 2 +- .../amd/bin/test.js | 4 ++-- ...otRelativePathSubfolderSpecifyOutputFile.sourcemap.txt | 4 ++-- .../node/bin/test.js | 4 ++-- ...otRelativePathSubfolderSpecifyOutputFile.sourcemap.txt | 4 ++-- .../amd/maprootUrlMixedSubfolderNoOutdir.sourcemap.txt | 6 +++--- .../maprootUrlMixedSubfolderNoOutdir/amd/ref/m1.js | 2 +- .../node/maprootUrlMixedSubfolderNoOutdir.sourcemap.txt | 6 +++--- .../maprootUrlMixedSubfolderNoOutdir/node/ref/m1.js | 2 +- ...tUrlMixedSubfolderSpecifyOutputDirectory.sourcemap.txt | 6 +++--- .../amd/outdir/simple/ref/m1.js | 2 +- ...tUrlMixedSubfolderSpecifyOutputDirectory.sourcemap.txt | 6 +++--- .../node/outdir/simple/ref/m1.js | 2 +- .../amd/bin/test.js | 6 +++--- ...aprootUrlMixedSubfolderSpecifyOutputFile.sourcemap.txt | 6 +++--- .../node/bin/test.js | 4 ++-- ...aprootUrlMixedSubfolderSpecifyOutputFile.sourcemap.txt | 4 ++-- .../amd/bin/outAndOutDirFile.js | 6 +++--- ...olderSpecifyOutputFileAndOutputDirectory.sourcemap.txt | 6 +++--- .../node/bin/outAndOutDirFile.js | 4 ++-- ...olderSpecifyOutputFileAndOutputDirectory.sourcemap.txt | 4 ++-- .../amd/maprootUrlModuleMultifolderNoOutdir.sourcemap.txt | 6 +++--- .../maprootUrlModuleMultifolderNoOutdir/amd/ref/m1.js | 2 +- .../maprootUrlModuleMultifolderNoOutdir.sourcemap.txt | 6 +++--- .../maprootUrlModuleMultifolderNoOutdir/node/ref/m1.js | 2 +- ...lModuleMultifolderSpecifyOutputDirectory.sourcemap.txt | 6 +++--- .../outdir/simple/outputdir_module_multifolder/ref/m1.js | 2 +- ...lModuleMultifolderSpecifyOutputDirectory.sourcemap.txt | 6 +++--- .../outdir/simple/outputdir_module_multifolder/ref/m1.js | 2 +- .../amd/bin/test.js | 6 +++--- ...ootUrlModuleMultifolderSpecifyOutputFile.sourcemap.txt | 6 +++--- .../project/maprootUrlModuleSimpleNoOutdir/amd/m1.js | 2 +- .../amd/maprootUrlModuleSimpleNoOutdir.sourcemap.txt | 4 ++-- .../project/maprootUrlModuleSimpleNoOutdir/node/m1.js | 2 +- .../node/maprootUrlModuleSimpleNoOutdir.sourcemap.txt | 4 ++-- ...ootUrlModuleSimpleSpecifyOutputDirectory.sourcemap.txt | 4 ++-- .../amd/outdir/simple/m1.js | 2 +- ...ootUrlModuleSimpleSpecifyOutputDirectory.sourcemap.txt | 4 ++-- .../node/outdir/simple/m1.js | 2 +- .../amd/bin/test.js | 4 ++-- .../maprootUrlModuleSimpleSpecifyOutputFile.sourcemap.txt | 4 ++-- .../amd/maprootUrlModuleSubfolderNoOutdir.sourcemap.txt | 4 ++-- .../maprootUrlModuleSubfolderNoOutdir/amd/ref/m1.js | 2 +- .../node/maprootUrlModuleSubfolderNoOutdir.sourcemap.txt | 4 ++-- .../maprootUrlModuleSubfolderNoOutdir/node/ref/m1.js | 2 +- ...UrlModuleSubfolderSpecifyOutputDirectory.sourcemap.txt | 4 ++-- .../amd/outdir/simple/ref/m1.js | 2 +- ...UrlModuleSubfolderSpecifyOutputDirectory.sourcemap.txt | 4 ++-- .../node/outdir/simple/ref/m1.js | 2 +- .../amd/bin/test.js | 4 ++-- ...prootUrlModuleSubfolderSpecifyOutputFile.sourcemap.txt | 4 ++-- .../amd/maprootUrlMultifolderNoOutdir.sourcemap.txt | 6 +++--- .../project/maprootUrlMultifolderNoOutdir/amd/ref/m1.js | 2 +- .../node/maprootUrlMultifolderNoOutdir.sourcemap.txt | 6 +++--- .../project/maprootUrlMultifolderNoOutdir/node/ref/m1.js | 2 +- ...rootUrlMultifolderSpecifyOutputDirectory.sourcemap.txt | 6 +++--- .../amd/outdir/simple/outputdir_multifolder/ref/m1.js | 2 +- ...rootUrlMultifolderSpecifyOutputDirectory.sourcemap.txt | 6 +++--- .../node/outdir/simple/outputdir_multifolder/ref/m1.js | 2 +- .../amd/bin/test.js | 6 +++--- .../maprootUrlMultifolderSpecifyOutputFile.sourcemap.txt | 6 +++--- .../node/bin/test.js | 6 +++--- .../maprootUrlMultifolderSpecifyOutputFile.sourcemap.txt | 6 +++--- .../reference/project/maprootUrlSimpleNoOutdir/amd/m1.js | 2 +- .../amd/maprootUrlSimpleNoOutdir.sourcemap.txt | 4 ++-- .../reference/project/maprootUrlSimpleNoOutdir/node/m1.js | 2 +- .../node/maprootUrlSimpleNoOutdir.sourcemap.txt | 4 ++-- .../maprootUrlSimpleSpecifyOutputDirectory.sourcemap.txt | 4 ++-- .../amd/outdir/simple/m1.js | 2 +- .../maprootUrlSimpleSpecifyOutputDirectory.sourcemap.txt | 4 ++-- .../node/outdir/simple/m1.js | 2 +- .../maprootUrlSimpleSpecifyOutputFile/amd/bin/test.js | 4 ++-- .../amd/maprootUrlSimpleSpecifyOutputFile.sourcemap.txt | 4 ++-- .../maprootUrlSimpleSpecifyOutputFile/node/bin/test.js | 4 ++-- .../node/maprootUrlSimpleSpecifyOutputFile.sourcemap.txt | 4 ++-- .../amd/maprootUrlSingleFileNoOutdir.sourcemap.txt | 2 +- .../project/maprootUrlSingleFileNoOutdir/amd/test.js | 2 +- .../node/maprootUrlSingleFileNoOutdir.sourcemap.txt | 2 +- .../project/maprootUrlSingleFileNoOutdir/node/test.js | 2 +- ...prootUrlSingleFileSpecifyOutputDirectory.sourcemap.txt | 2 +- .../amd/outdir/simple/test.js | 2 +- ...prootUrlSingleFileSpecifyOutputDirectory.sourcemap.txt | 2 +- .../node/outdir/simple/test.js | 2 +- .../maprootUrlSingleFileSpecifyOutputFile/amd/bin/test.js | 2 +- .../maprootUrlSingleFileSpecifyOutputFile.sourcemap.txt | 2 +- .../node/bin/test.js | 2 +- .../maprootUrlSingleFileSpecifyOutputFile.sourcemap.txt | 2 +- .../amd/maprootUrlSubfolderNoOutdir.sourcemap.txt | 4 ++-- .../project/maprootUrlSubfolderNoOutdir/amd/ref/m1.js | 2 +- .../node/maprootUrlSubfolderNoOutdir.sourcemap.txt | 4 ++-- .../project/maprootUrlSubfolderNoOutdir/node/ref/m1.js | 2 +- ...aprootUrlSubfolderSpecifyOutputDirectory.sourcemap.txt | 4 ++-- .../amd/outdir/simple/ref/m1.js | 2 +- ...aprootUrlSubfolderSpecifyOutputDirectory.sourcemap.txt | 4 ++-- .../node/outdir/simple/ref/m1.js | 2 +- .../maprootUrlSubfolderSpecifyOutputFile/amd/bin/test.js | 4 ++-- .../maprootUrlSubfolderSpecifyOutputFile.sourcemap.txt | 4 ++-- .../maprootUrlSubfolderSpecifyOutputFile/node/bin/test.js | 4 ++-- .../maprootUrlSubfolderSpecifyOutputFile.sourcemap.txt | 4 ++-- ...otUrlsourcerootUrlMixedSubfolderNoOutdir.sourcemap.txt | 6 +++--- .../amd/ref/m1.js | 2 +- ...otUrlsourcerootUrlMixedSubfolderNoOutdir.sourcemap.txt | 6 +++--- .../node/ref/m1.js | 2 +- ...tUrlMixedSubfolderSpecifyOutputDirectory.sourcemap.txt | 6 +++--- .../amd/outdir/simple/ref/m1.js | 2 +- ...tUrlMixedSubfolderSpecifyOutputDirectory.sourcemap.txt | 6 +++--- .../node/outdir/simple/ref/m1.js | 2 +- .../amd/bin/test.js | 6 +++--- ...cerootUrlMixedSubfolderSpecifyOutputFile.sourcemap.txt | 6 +++--- .../node/bin/test.js | 4 ++-- ...cerootUrlMixedSubfolderSpecifyOutputFile.sourcemap.txt | 4 ++-- .../amd/bin/outAndOutDirFile.js | 6 +++--- ...olderSpecifyOutputFileAndOutputDirectory.sourcemap.txt | 6 +++--- .../node/bin/outAndOutDirFile.js | 4 ++-- ...olderSpecifyOutputFileAndOutputDirectory.sourcemap.txt | 4 ++-- ...rlsourcerootUrlModuleMultifolderNoOutdir.sourcemap.txt | 6 +++--- .../amd/ref/m1.js | 2 +- ...rlsourcerootUrlModuleMultifolderNoOutdir.sourcemap.txt | 6 +++--- .../node/ref/m1.js | 2 +- ...lModuleMultifolderSpecifyOutputDirectory.sourcemap.txt | 6 +++--- .../outdir/simple/outputdir_module_multifolder/ref/m1.js | 2 +- ...lModuleMultifolderSpecifyOutputDirectory.sourcemap.txt | 6 +++--- .../outdir/simple/outputdir_module_multifolder/ref/m1.js | 2 +- .../amd/bin/test.js | 6 +++--- ...ootUrlModuleMultifolderSpecifyOutputFile.sourcemap.txt | 6 +++--- .../maprootUrlsourcerootUrlModuleSimpleNoOutdir/amd/m1.js | 2 +- ...rootUrlsourcerootUrlModuleSimpleNoOutdir.sourcemap.txt | 4 ++-- .../node/m1.js | 2 +- ...rootUrlsourcerootUrlModuleSimpleNoOutdir.sourcemap.txt | 4 ++-- ...ootUrlModuleSimpleSpecifyOutputDirectory.sourcemap.txt | 4 ++-- .../amd/outdir/simple/m1.js | 2 +- ...ootUrlModuleSimpleSpecifyOutputDirectory.sourcemap.txt | 4 ++-- .../node/outdir/simple/m1.js | 2 +- .../amd/bin/test.js | 4 ++-- ...urcerootUrlModuleSimpleSpecifyOutputFile.sourcemap.txt | 4 ++-- ...tUrlsourcerootUrlModuleSubfolderNoOutdir.sourcemap.txt | 4 ++-- .../amd/ref/m1.js | 2 +- ...tUrlsourcerootUrlModuleSubfolderNoOutdir.sourcemap.txt | 4 ++-- .../node/ref/m1.js | 2 +- ...UrlModuleSubfolderSpecifyOutputDirectory.sourcemap.txt | 4 ++-- .../amd/outdir/simple/ref/m1.js | 2 +- ...UrlModuleSubfolderSpecifyOutputDirectory.sourcemap.txt | 4 ++-- .../node/outdir/simple/ref/m1.js | 2 +- .../amd/bin/test.js | 4 ++-- ...erootUrlModuleSubfolderSpecifyOutputFile.sourcemap.txt | 4 ++-- ...prootUrlsourcerootUrlMultifolderNoOutdir.sourcemap.txt | 6 +++--- .../amd/ref/m1.js | 2 +- ...prootUrlsourcerootUrlMultifolderNoOutdir.sourcemap.txt | 6 +++--- .../node/ref/m1.js | 2 +- ...rootUrlMultifolderSpecifyOutputDirectory.sourcemap.txt | 6 +++--- .../amd/outdir/simple/outputdir_multifolder/ref/m1.js | 2 +- ...rootUrlMultifolderSpecifyOutputDirectory.sourcemap.txt | 6 +++--- .../node/outdir/simple/outputdir_multifolder/ref/m1.js | 2 +- .../amd/bin/test.js | 6 +++--- ...ourcerootUrlMultifolderSpecifyOutputFile.sourcemap.txt | 6 +++--- .../node/bin/test.js | 6 +++--- ...ourcerootUrlMultifolderSpecifyOutputFile.sourcemap.txt | 6 +++--- .../maprootUrlsourcerootUrlSimpleNoOutdir/amd/m1.js | 2 +- .../maprootUrlsourcerootUrlSimpleNoOutdir.sourcemap.txt | 4 ++-- .../maprootUrlsourcerootUrlSimpleNoOutdir/node/m1.js | 2 +- .../maprootUrlsourcerootUrlSimpleNoOutdir.sourcemap.txt | 4 ++-- ...ourcerootUrlSimpleSpecifyOutputDirectory.sourcemap.txt | 4 ++-- .../amd/outdir/simple/m1.js | 2 +- ...ourcerootUrlSimpleSpecifyOutputDirectory.sourcemap.txt | 4 ++-- .../node/outdir/simple/m1.js | 2 +- .../amd/bin/test.js | 4 ++-- ...tUrlsourcerootUrlSimpleSpecifyOutputFile.sourcemap.txt | 4 ++-- .../node/bin/test.js | 4 ++-- ...tUrlsourcerootUrlSimpleSpecifyOutputFile.sourcemap.txt | 4 ++-- ...aprootUrlsourcerootUrlSingleFileNoOutdir.sourcemap.txt | 2 +- .../maprootUrlsourcerootUrlSingleFileNoOutdir/amd/test.js | 2 +- ...aprootUrlsourcerootUrlSingleFileNoOutdir.sourcemap.txt | 2 +- .../node/test.js | 2 +- ...erootUrlSingleFileSpecifyOutputDirectory.sourcemap.txt | 2 +- .../amd/outdir/simple/test.js | 2 +- ...erootUrlSingleFileSpecifyOutputDirectory.sourcemap.txt | 2 +- .../node/outdir/simple/test.js | 2 +- .../amd/bin/test.js | 2 +- ...sourcerootUrlSingleFileSpecifyOutputFile.sourcemap.txt | 2 +- .../node/bin/test.js | 2 +- ...sourcerootUrlSingleFileSpecifyOutputFile.sourcemap.txt | 2 +- ...maprootUrlsourcerootUrlSubfolderNoOutdir.sourcemap.txt | 4 ++-- .../amd/ref/m1.js | 2 +- ...maprootUrlsourcerootUrlSubfolderNoOutdir.sourcemap.txt | 4 ++-- .../node/ref/m1.js | 2 +- ...cerootUrlSubfolderSpecifyOutputDirectory.sourcemap.txt | 4 ++-- .../amd/outdir/simple/ref/m1.js | 2 +- ...cerootUrlSubfolderSpecifyOutputDirectory.sourcemap.txt | 4 ++-- .../node/outdir/simple/ref/m1.js | 2 +- .../amd/bin/test.js | 4 ++-- ...lsourcerootUrlSubfolderSpecifyOutputFile.sourcemap.txt | 4 ++-- .../node/bin/test.js | 4 ++-- ...lsourcerootUrlSubfolderSpecifyOutputFile.sourcemap.txt | 4 ++-- .../project/outMixedSubfolderNoOutdir/amd/ref/m1.js | 2 +- .../project/outMixedSubfolderNoOutdir/node/ref/m1.js | 2 +- .../amd/outdir/simple/ref/m1.js | 2 +- .../node/outdir/simple/ref/m1.js | 2 +- .../outMixedSubfolderSpecifyOutputFile/amd/bin/test.js | 6 +++--- .../outMixedSubfolderSpecifyOutputFile/node/bin/test.js | 4 ++-- .../amd/bin/outAndOutDirFile.js | 6 +++--- .../node/bin/outAndOutDirFile.js | 4 ++-- .../project/outModuleMultifolderNoOutdir/amd/ref/m1.js | 2 +- .../project/outModuleMultifolderNoOutdir/node/ref/m1.js | 2 +- .../outdir/simple/outputdir_module_multifolder/ref/m1.js | 2 +- .../outdir/simple/outputdir_module_multifolder/ref/m1.js | 2 +- .../outModuleMultifolderSpecifyOutputFile/amd/bin/test.js | 6 +++--- .../reference/project/outModuleSimpleNoOutdir/amd/m1.js | 2 +- .../reference/project/outModuleSimpleNoOutdir/node/m1.js | 2 +- .../amd/outdir/simple/m1.js | 2 +- .../node/outdir/simple/m1.js | 2 +- .../outModuleSimpleSpecifyOutputFile/amd/bin/test.js | 4 ++-- .../project/outModuleSubfolderNoOutdir/amd/ref/m1.js | 2 +- .../project/outModuleSubfolderNoOutdir/node/ref/m1.js | 2 +- .../amd/outdir/simple/ref/m1.js | 2 +- .../node/outdir/simple/ref/m1.js | 2 +- .../outModuleSubfolderSpecifyOutputFile/amd/bin/test.js | 4 ++-- .../project/outMultifolderNoOutdir/amd/ref/m1.js | 2 +- .../project/outMultifolderNoOutdir/node/ref/m1.js | 2 +- .../amd/outdir/simple/outputdir_multifolder/ref/m1.js | 2 +- .../node/outdir/simple/outputdir_multifolder/ref/m1.js | 2 +- .../outMultifolderSpecifyOutputFile/amd/bin/test.js | 6 +++--- .../outMultifolderSpecifyOutputFile/node/bin/test.js | 6 +++--- .../reference/project/outSimpleNoOutdir/amd/m1.js | 2 +- .../reference/project/outSimpleNoOutdir/node/m1.js | 2 +- .../amd/outdir/simple/m1.js | 2 +- .../node/outdir/simple/m1.js | 2 +- .../project/outSimpleSpecifyOutputFile/amd/bin/test.js | 4 ++-- .../project/outSimpleSpecifyOutputFile/node/bin/test.js | 4 ++-- .../reference/project/outSingleFileNoOutdir/amd/test.js | 2 +- .../reference/project/outSingleFileNoOutdir/node/test.js | 2 +- .../amd/outdir/simple/test.js | 2 +- .../node/outdir/simple/test.js | 2 +- .../outSingleFileSpecifyOutputFile/amd/bin/test.js | 2 +- .../outSingleFileSpecifyOutputFile/node/bin/test.js | 2 +- .../reference/project/outSubfolderNoOutdir/amd/ref/m1.js | 2 +- .../reference/project/outSubfolderNoOutdir/node/ref/m1.js | 2 +- .../amd/outdir/simple/ref/m1.js | 2 +- .../node/outdir/simple/ref/m1.js | 2 +- .../project/outSubfolderSpecifyOutputFile/amd/bin/test.js | 4 ++-- .../outSubfolderSpecifyOutputFile/node/bin/test.js | 4 ++-- .../amd/testGlo.js | 8 ++++---- .../node/testGlo.js | 8 ++++---- tests/baselines/reference/project/prologueEmit/amd/out.js | 4 ++-- .../baselines/reference/project/prologueEmit/node/out.js | 4 ++-- .../quotesInFileAndDirectoryNames/amd/li'b/class'A.js | 2 +- .../quotesInFileAndDirectoryNames/node/li'b/class'A.js | 2 +- .../referenceResolutionRelativePaths/amd/diskFile0.js | 2 +- .../referenceResolutionRelativePaths/node/diskFile0.js | 2 +- .../amd/bar/bar.js | 2 +- .../node/bar/bar.js | 2 +- .../referenceResolutionRelativePathsNoResolve/amd/foo.js | 2 +- .../referenceResolutionRelativePathsNoResolve/node/foo.js | 2 +- .../amd/diskFile0.js | 2 +- .../node/diskFile0.js | 2 +- .../project/referenceResolutionSameFileTwice/amd/test.js | 2 +- .../project/referenceResolutionSameFileTwice/node/test.js | 2 +- .../referenceResolutionSameFileTwiceNoResolve/amd/test.js | 2 +- .../node/test.js | 2 +- .../amd/outdir/simple/FolderB/FolderC/fileC.js | 2 +- .../project/rootDirectory/amd/rootDirectory.sourcemap.txt | 4 ++-- .../node/outdir/simple/FolderB/FolderC/fileC.js | 2 +- .../rootDirectory/node/rootDirectory.sourcemap.txt | 4 ++-- .../amd/outdir/simple/FolderC/fileC.js | 2 +- .../node/outdir/simple/FolderC/fileC.js | 2 +- .../amd/outdir/simple/FolderB/FolderC/fileC.js | 2 +- .../amd/rootDirectoryWithSourceRoot.sourcemap.txt | 4 ++-- .../node/outdir/simple/FolderB/FolderC/fileC.js | 2 +- .../node/rootDirectoryWithSourceRoot.sourcemap.txt | 4 ++-- .../amd/ref/m1.js | 2 +- ...ceRootAbsolutePathMixedSubfolderNoOutdir.sourcemap.txt | 6 +++--- .../node/ref/m1.js | 2 +- ...ceRootAbsolutePathMixedSubfolderNoOutdir.sourcemap.txt | 6 +++--- .../amd/outdir/simple/ref/m1.js | 2 +- ...PathMixedSubfolderSpecifyOutputDirectory.sourcemap.txt | 6 +++--- .../node/outdir/simple/ref/m1.js | 2 +- ...PathMixedSubfolderSpecifyOutputDirectory.sourcemap.txt | 6 +++--- .../amd/bin/test.js | 6 +++--- ...olutePathMixedSubfolderSpecifyOutputFile.sourcemap.txt | 6 +++--- .../node/bin/test.js | 4 ++-- ...olutePathMixedSubfolderSpecifyOutputFile.sourcemap.txt | 4 ++-- .../amd/bin/outAndOutDirFile.js | 6 +++--- ...olderSpecifyOutputFileAndOutputDirectory.sourcemap.txt | 6 +++--- .../node/bin/outAndOutDirFile.js | 4 ++-- ...olderSpecifyOutputFileAndOutputDirectory.sourcemap.txt | 4 ++-- .../amd/ref/m1.js | 2 +- ...ootAbsolutePathModuleMultifolderNoOutdir.sourcemap.txt | 6 +++--- .../node/ref/m1.js | 2 +- ...ootAbsolutePathModuleMultifolderNoOutdir.sourcemap.txt | 6 +++--- .../outdir/simple/outputdir_module_multifolder/ref/m1.js | 2 +- ...hModuleMultifolderSpecifyOutputDirectory.sourcemap.txt | 6 +++--- .../outdir/simple/outputdir_module_multifolder/ref/m1.js | 2 +- ...hModuleMultifolderSpecifyOutputDirectory.sourcemap.txt | 6 +++--- .../amd/bin/test.js | 6 +++--- ...tePathModuleMultifolderSpecifyOutputFile.sourcemap.txt | 6 +++--- .../sourceRootAbsolutePathModuleSimpleNoOutdir/amd/m1.js | 2 +- ...urceRootAbsolutePathModuleSimpleNoOutdir.sourcemap.txt | 4 ++-- .../sourceRootAbsolutePathModuleSimpleNoOutdir/node/m1.js | 2 +- ...urceRootAbsolutePathModuleSimpleNoOutdir.sourcemap.txt | 4 ++-- .../amd/outdir/simple/m1.js | 2 +- ...tePathModuleSimpleSpecifyOutputDirectory.sourcemap.txt | 4 ++-- .../node/outdir/simple/m1.js | 2 +- ...tePathModuleSimpleSpecifyOutputDirectory.sourcemap.txt | 4 ++-- .../amd/bin/test.js | 4 ++-- ...bsolutePathModuleSimpleSpecifyOutputFile.sourcemap.txt | 4 ++-- .../amd/ref/m1.js | 2 +- ...eRootAbsolutePathModuleSubfolderNoOutdir.sourcemap.txt | 4 ++-- .../node/ref/m1.js | 2 +- ...eRootAbsolutePathModuleSubfolderNoOutdir.sourcemap.txt | 4 ++-- .../amd/outdir/simple/ref/m1.js | 2 +- ...athModuleSubfolderSpecifyOutputDirectory.sourcemap.txt | 4 ++-- .../node/outdir/simple/ref/m1.js | 2 +- ...athModuleSubfolderSpecifyOutputDirectory.sourcemap.txt | 4 ++-- .../amd/bin/test.js | 4 ++-- ...lutePathModuleSubfolderSpecifyOutputFile.sourcemap.txt | 4 ++-- .../amd/ref/m1.js | 2 +- ...ourceRootAbsolutePathMultifolderNoOutdir.sourcemap.txt | 6 +++--- .../node/ref/m1.js | 2 +- ...ourceRootAbsolutePathMultifolderNoOutdir.sourcemap.txt | 6 +++--- .../amd/outdir/simple/outputdir_multifolder/ref/m1.js | 2 +- ...utePathMultifolderSpecifyOutputDirectory.sourcemap.txt | 6 +++--- .../node/outdir/simple/outputdir_multifolder/ref/m1.js | 2 +- ...utePathMultifolderSpecifyOutputDirectory.sourcemap.txt | 6 +++--- .../amd/bin/test.js | 6 +++--- ...AbsolutePathMultifolderSpecifyOutputFile.sourcemap.txt | 6 +++--- .../node/bin/test.js | 6 +++--- ...AbsolutePathMultifolderSpecifyOutputFile.sourcemap.txt | 6 +++--- .../sourceRootAbsolutePathSimpleNoOutdir/amd/m1.js | 2 +- .../sourceRootAbsolutePathSimpleNoOutdir.sourcemap.txt | 4 ++-- .../sourceRootAbsolutePathSimpleNoOutdir/node/m1.js | 2 +- .../sourceRootAbsolutePathSimpleNoOutdir.sourcemap.txt | 4 ++-- .../amd/outdir/simple/m1.js | 2 +- ...AbsolutePathSimpleSpecifyOutputDirectory.sourcemap.txt | 4 ++-- .../node/outdir/simple/m1.js | 2 +- ...AbsolutePathSimpleSpecifyOutputDirectory.sourcemap.txt | 4 ++-- .../amd/bin/test.js | 4 ++-- ...eRootAbsolutePathSimpleSpecifyOutputFile.sourcemap.txt | 4 ++-- .../node/bin/test.js | 4 ++-- ...eRootAbsolutePathSimpleSpecifyOutputFile.sourcemap.txt | 4 ++-- ...sourceRootAbsolutePathSingleFileNoOutdir.sourcemap.txt | 2 +- .../sourceRootAbsolutePathSingleFileNoOutdir/amd/test.js | 2 +- ...sourceRootAbsolutePathSingleFileNoOutdir.sourcemap.txt | 2 +- .../sourceRootAbsolutePathSingleFileNoOutdir/node/test.js | 2 +- .../amd/outdir/simple/test.js | 2 +- ...lutePathSingleFileSpecifyOutputDirectory.sourcemap.txt | 2 +- .../node/outdir/simple/test.js | 2 +- ...lutePathSingleFileSpecifyOutputDirectory.sourcemap.txt | 2 +- .../amd/bin/test.js | 2 +- ...tAbsolutePathSingleFileSpecifyOutputFile.sourcemap.txt | 2 +- .../node/bin/test.js | 2 +- ...tAbsolutePathSingleFileSpecifyOutputFile.sourcemap.txt | 2 +- .../sourceRootAbsolutePathSubfolderNoOutdir/amd/ref/m1.js | 2 +- .../sourceRootAbsolutePathSubfolderNoOutdir.sourcemap.txt | 4 ++-- .../node/ref/m1.js | 2 +- .../sourceRootAbsolutePathSubfolderNoOutdir.sourcemap.txt | 4 ++-- .../amd/outdir/simple/ref/m1.js | 2 +- ...olutePathSubfolderSpecifyOutputDirectory.sourcemap.txt | 4 ++-- .../node/outdir/simple/ref/m1.js | 2 +- ...olutePathSubfolderSpecifyOutputDirectory.sourcemap.txt | 4 ++-- .../amd/bin/test.js | 4 ++-- ...otAbsolutePathSubfolderSpecifyOutputFile.sourcemap.txt | 4 ++-- .../node/bin/test.js | 4 ++-- ...otAbsolutePathSubfolderSpecifyOutputFile.sourcemap.txt | 4 ++-- .../amd/ref/m1.js | 2 +- ...ceRootRelativePathMixedSubfolderNoOutdir.sourcemap.txt | 6 +++--- .../node/ref/m1.js | 2 +- ...ceRootRelativePathMixedSubfolderNoOutdir.sourcemap.txt | 6 +++--- .../amd/outdir/simple/ref/m1.js | 2 +- ...PathMixedSubfolderSpecifyOutputDirectory.sourcemap.txt | 6 +++--- .../node/outdir/simple/ref/m1.js | 2 +- ...PathMixedSubfolderSpecifyOutputDirectory.sourcemap.txt | 6 +++--- .../amd/bin/test.js | 6 +++--- ...ativePathMixedSubfolderSpecifyOutputFile.sourcemap.txt | 6 +++--- .../node/bin/test.js | 4 ++-- ...ativePathMixedSubfolderSpecifyOutputFile.sourcemap.txt | 4 ++-- .../amd/bin/outAndOutDirFile.js | 6 +++--- ...olderSpecifyOutputFileAndOutputDirectory.sourcemap.txt | 6 +++--- .../node/bin/outAndOutDirFile.js | 4 ++-- ...olderSpecifyOutputFileAndOutputDirectory.sourcemap.txt | 4 ++-- .../amd/ref/m1.js | 2 +- ...ootRelativePathModuleMultifolderNoOutdir.sourcemap.txt | 6 +++--- .../node/ref/m1.js | 2 +- ...ootRelativePathModuleMultifolderNoOutdir.sourcemap.txt | 6 +++--- .../outdir/simple/outputdir_module_multifolder/ref/m1.js | 2 +- ...hModuleMultifolderSpecifyOutputDirectory.sourcemap.txt | 6 +++--- .../outdir/simple/outputdir_module_multifolder/ref/m1.js | 2 +- ...hModuleMultifolderSpecifyOutputDirectory.sourcemap.txt | 6 +++--- .../amd/bin/test.js | 6 +++--- ...vePathModuleMultifolderSpecifyOutputFile.sourcemap.txt | 6 +++--- .../sourceRootRelativePathModuleSimpleNoOutdir/amd/m1.js | 2 +- ...urceRootRelativePathModuleSimpleNoOutdir.sourcemap.txt | 4 ++-- .../sourceRootRelativePathModuleSimpleNoOutdir/node/m1.js | 2 +- ...urceRootRelativePathModuleSimpleNoOutdir.sourcemap.txt | 4 ++-- .../amd/outdir/simple/m1.js | 2 +- ...vePathModuleSimpleSpecifyOutputDirectory.sourcemap.txt | 4 ++-- .../node/outdir/simple/m1.js | 2 +- ...vePathModuleSimpleSpecifyOutputDirectory.sourcemap.txt | 4 ++-- .../amd/bin/test.js | 4 ++-- ...elativePathModuleSimpleSpecifyOutputFile.sourcemap.txt | 4 ++-- .../amd/ref/m1.js | 2 +- ...eRootRelativePathModuleSubfolderNoOutdir.sourcemap.txt | 4 ++-- .../node/ref/m1.js | 2 +- ...eRootRelativePathModuleSubfolderNoOutdir.sourcemap.txt | 4 ++-- .../amd/outdir/simple/ref/m1.js | 2 +- ...athModuleSubfolderSpecifyOutputDirectory.sourcemap.txt | 4 ++-- .../node/outdir/simple/ref/m1.js | 2 +- ...athModuleSubfolderSpecifyOutputDirectory.sourcemap.txt | 4 ++-- .../amd/bin/test.js | 4 ++-- ...tivePathModuleSubfolderSpecifyOutputFile.sourcemap.txt | 4 ++-- .../amd/ref/m1.js | 2 +- ...ourceRootRelativePathMultifolderNoOutdir.sourcemap.txt | 6 +++--- .../node/ref/m1.js | 2 +- ...ourceRootRelativePathMultifolderNoOutdir.sourcemap.txt | 6 +++--- .../amd/outdir/simple/outputdir_multifolder/ref/m1.js | 2 +- ...ivePathMultifolderSpecifyOutputDirectory.sourcemap.txt | 6 +++--- .../node/outdir/simple/outputdir_multifolder/ref/m1.js | 2 +- ...ivePathMultifolderSpecifyOutputDirectory.sourcemap.txt | 6 +++--- .../amd/bin/test.js | 6 +++--- ...RelativePathMultifolderSpecifyOutputFile.sourcemap.txt | 6 +++--- .../node/bin/test.js | 6 +++--- ...RelativePathMultifolderSpecifyOutputFile.sourcemap.txt | 6 +++--- .../sourceRootRelativePathSimpleNoOutdir/amd/m1.js | 2 +- .../sourceRootRelativePathSimpleNoOutdir.sourcemap.txt | 4 ++-- .../sourceRootRelativePathSimpleNoOutdir/node/m1.js | 2 +- .../sourceRootRelativePathSimpleNoOutdir.sourcemap.txt | 4 ++-- .../amd/outdir/simple/m1.js | 2 +- ...RelativePathSimpleSpecifyOutputDirectory.sourcemap.txt | 4 ++-- .../node/outdir/simple/m1.js | 2 +- ...RelativePathSimpleSpecifyOutputDirectory.sourcemap.txt | 4 ++-- .../amd/bin/test.js | 4 ++-- ...eRootRelativePathSimpleSpecifyOutputFile.sourcemap.txt | 4 ++-- .../node/bin/test.js | 4 ++-- ...eRootRelativePathSimpleSpecifyOutputFile.sourcemap.txt | 4 ++-- ...sourceRootRelativePathSingleFileNoOutdir.sourcemap.txt | 2 +- .../sourceRootRelativePathSingleFileNoOutdir/amd/test.js | 2 +- ...sourceRootRelativePathSingleFileNoOutdir.sourcemap.txt | 2 +- .../sourceRootRelativePathSingleFileNoOutdir/node/test.js | 2 +- .../amd/outdir/simple/test.js | 2 +- ...tivePathSingleFileSpecifyOutputDirectory.sourcemap.txt | 2 +- .../node/outdir/simple/test.js | 2 +- ...tivePathSingleFileSpecifyOutputDirectory.sourcemap.txt | 2 +- .../amd/bin/test.js | 2 +- ...tRelativePathSingleFileSpecifyOutputFile.sourcemap.txt | 2 +- .../node/bin/test.js | 2 +- ...tRelativePathSingleFileSpecifyOutputFile.sourcemap.txt | 2 +- .../sourceRootRelativePathSubfolderNoOutdir/amd/ref/m1.js | 2 +- .../sourceRootRelativePathSubfolderNoOutdir.sourcemap.txt | 4 ++-- .../node/ref/m1.js | 2 +- .../sourceRootRelativePathSubfolderNoOutdir.sourcemap.txt | 4 ++-- .../amd/outdir/simple/ref/m1.js | 2 +- ...ativePathSubfolderSpecifyOutputDirectory.sourcemap.txt | 4 ++-- .../node/outdir/simple/ref/m1.js | 2 +- ...ativePathSubfolderSpecifyOutputDirectory.sourcemap.txt | 4 ++-- .../amd/bin/test.js | 4 ++-- ...otRelativePathSubfolderSpecifyOutputFile.sourcemap.txt | 4 ++-- .../node/bin/test.js | 4 ++-- ...otRelativePathSubfolderSpecifyOutputFile.sourcemap.txt | 4 ++-- .../project/sourcemapMixedSubfolderNoOutdir/amd/ref/m1.js | 2 +- .../amd/sourcemapMixedSubfolderNoOutdir.sourcemap.txt | 6 +++--- .../sourcemapMixedSubfolderNoOutdir/node/ref/m1.js | 2 +- .../node/sourcemapMixedSubfolderNoOutdir.sourcemap.txt | 6 +++--- .../amd/outdir/simple/ref/m1.js | 2 +- ...emapMixedSubfolderSpecifyOutputDirectory.sourcemap.txt | 6 +++--- .../node/outdir/simple/ref/m1.js | 2 +- ...emapMixedSubfolderSpecifyOutputDirectory.sourcemap.txt | 6 +++--- .../amd/bin/test.js | 6 +++--- ...sourcemapMixedSubfolderSpecifyOutputFile.sourcemap.txt | 6 +++--- .../node/bin/test.js | 4 ++-- ...sourcemapMixedSubfolderSpecifyOutputFile.sourcemap.txt | 4 ++-- .../amd/bin/outAndOutDirFile.js | 6 +++--- ...olderSpecifyOutputFileAndOutputDirectory.sourcemap.txt | 6 +++--- .../node/bin/outAndOutDirFile.js | 4 ++-- ...olderSpecifyOutputFileAndOutputDirectory.sourcemap.txt | 4 ++-- .../sourcemapModuleMultifolderNoOutdir/amd/ref/m1.js | 2 +- .../amd/sourcemapModuleMultifolderNoOutdir.sourcemap.txt | 6 +++--- .../sourcemapModuleMultifolderNoOutdir/node/ref/m1.js | 2 +- .../node/sourcemapModuleMultifolderNoOutdir.sourcemap.txt | 6 +++--- .../outdir/simple/outputdir_module_multifolder/ref/m1.js | 2 +- ...pModuleMultifolderSpecifyOutputDirectory.sourcemap.txt | 6 +++--- .../outdir/simple/outputdir_module_multifolder/ref/m1.js | 2 +- ...pModuleMultifolderSpecifyOutputDirectory.sourcemap.txt | 6 +++--- .../amd/bin/test.js | 6 +++--- ...rcemapModuleMultifolderSpecifyOutputFile.sourcemap.txt | 6 +++--- .../project/sourcemapModuleSimpleNoOutdir/amd/m1.js | 2 +- .../amd/sourcemapModuleSimpleNoOutdir.sourcemap.txt | 4 ++-- .../project/sourcemapModuleSimpleNoOutdir/node/m1.js | 2 +- .../node/sourcemapModuleSimpleNoOutdir.sourcemap.txt | 4 ++-- .../amd/outdir/simple/m1.js | 2 +- ...rcemapModuleSimpleSpecifyOutputDirectory.sourcemap.txt | 4 ++-- .../node/outdir/simple/m1.js | 2 +- ...rcemapModuleSimpleSpecifyOutputDirectory.sourcemap.txt | 4 ++-- .../amd/bin/test.js | 4 ++-- .../sourcemapModuleSimpleSpecifyOutputFile.sourcemap.txt | 4 ++-- .../sourcemapModuleSubfolderNoOutdir/amd/ref/m1.js | 2 +- .../amd/sourcemapModuleSubfolderNoOutdir.sourcemap.txt | 4 ++-- .../sourcemapModuleSubfolderNoOutdir/node/ref/m1.js | 2 +- .../node/sourcemapModuleSubfolderNoOutdir.sourcemap.txt | 4 ++-- .../amd/outdir/simple/ref/m1.js | 2 +- ...mapModuleSubfolderSpecifyOutputDirectory.sourcemap.txt | 4 ++-- .../node/outdir/simple/ref/m1.js | 2 +- ...mapModuleSubfolderSpecifyOutputDirectory.sourcemap.txt | 4 ++-- .../amd/bin/test.js | 4 ++-- ...ourcemapModuleSubfolderSpecifyOutputFile.sourcemap.txt | 4 ++-- .../project/sourcemapMultifolderNoOutdir/amd/ref/m1.js | 2 +- .../amd/sourcemapMultifolderNoOutdir.sourcemap.txt | 6 +++--- .../project/sourcemapMultifolderNoOutdir/node/ref/m1.js | 2 +- .../node/sourcemapMultifolderNoOutdir.sourcemap.txt | 6 +++--- .../amd/outdir/simple/outputdir_multifolder/ref/m1.js | 2 +- ...urcemapMultifolderSpecifyOutputDirectory.sourcemap.txt | 6 +++--- .../node/outdir/simple/outputdir_multifolder/ref/m1.js | 2 +- ...urcemapMultifolderSpecifyOutputDirectory.sourcemap.txt | 6 +++--- .../sourcemapMultifolderSpecifyOutputFile/amd/bin/test.js | 6 +++--- .../sourcemapMultifolderSpecifyOutputFile.sourcemap.txt | 6 +++--- .../node/bin/test.js | 6 +++--- .../sourcemapMultifolderSpecifyOutputFile.sourcemap.txt | 6 +++--- .../reference/project/sourcemapSimpleNoOutdir/amd/m1.js | 2 +- .../amd/sourcemapSimpleNoOutdir.sourcemap.txt | 4 ++-- .../reference/project/sourcemapSimpleNoOutdir/node/m1.js | 2 +- .../node/sourcemapSimpleNoOutdir.sourcemap.txt | 4 ++-- .../amd/outdir/simple/m1.js | 2 +- .../sourcemapSimpleSpecifyOutputDirectory.sourcemap.txt | 4 ++-- .../node/outdir/simple/m1.js | 2 +- .../sourcemapSimpleSpecifyOutputDirectory.sourcemap.txt | 4 ++-- .../sourcemapSimpleSpecifyOutputFile/amd/bin/test.js | 4 ++-- .../amd/sourcemapSimpleSpecifyOutputFile.sourcemap.txt | 4 ++-- .../sourcemapSimpleSpecifyOutputFile/node/bin/test.js | 4 ++-- .../node/sourcemapSimpleSpecifyOutputFile.sourcemap.txt | 4 ++-- .../amd/sourcemapSingleFileNoOutdir.sourcemap.txt | 2 +- .../project/sourcemapSingleFileNoOutdir/amd/test.js | 2 +- .../node/sourcemapSingleFileNoOutdir.sourcemap.txt | 2 +- .../project/sourcemapSingleFileNoOutdir/node/test.js | 2 +- .../amd/outdir/simple/test.js | 2 +- ...ourcemapSingleFileSpecifyOutputDirectory.sourcemap.txt | 2 +- .../node/outdir/simple/test.js | 2 +- ...ourcemapSingleFileSpecifyOutputDirectory.sourcemap.txt | 2 +- .../sourcemapSingleFileSpecifyOutputFile/amd/bin/test.js | 2 +- .../sourcemapSingleFileSpecifyOutputFile.sourcemap.txt | 2 +- .../sourcemapSingleFileSpecifyOutputFile/node/bin/test.js | 2 +- .../sourcemapSingleFileSpecifyOutputFile.sourcemap.txt | 2 +- .../project/sourcemapSubfolderNoOutdir/amd/ref/m1.js | 2 +- .../amd/sourcemapSubfolderNoOutdir.sourcemap.txt | 4 ++-- .../project/sourcemapSubfolderNoOutdir/node/ref/m1.js | 2 +- .../node/sourcemapSubfolderNoOutdir.sourcemap.txt | 4 ++-- .../amd/outdir/simple/ref/m1.js | 2 +- ...sourcemapSubfolderSpecifyOutputDirectory.sourcemap.txt | 4 ++-- .../node/outdir/simple/ref/m1.js | 2 +- ...sourcemapSubfolderSpecifyOutputDirectory.sourcemap.txt | 4 ++-- .../sourcemapSubfolderSpecifyOutputFile/amd/bin/test.js | 4 ++-- .../amd/sourcemapSubfolderSpecifyOutputFile.sourcemap.txt | 4 ++-- .../sourcemapSubfolderSpecifyOutputFile/node/bin/test.js | 4 ++-- .../sourcemapSubfolderSpecifyOutputFile.sourcemap.txt | 4 ++-- .../sourcerootUrlMixedSubfolderNoOutdir/amd/ref/m1.js | 2 +- .../amd/sourcerootUrlMixedSubfolderNoOutdir.sourcemap.txt | 6 +++--- .../sourcerootUrlMixedSubfolderNoOutdir/node/ref/m1.js | 2 +- .../sourcerootUrlMixedSubfolderNoOutdir.sourcemap.txt | 6 +++--- .../amd/outdir/simple/ref/m1.js | 2 +- ...tUrlMixedSubfolderSpecifyOutputDirectory.sourcemap.txt | 6 +++--- .../node/outdir/simple/ref/m1.js | 2 +- ...tUrlMixedSubfolderSpecifyOutputDirectory.sourcemap.txt | 6 +++--- .../amd/bin/test.js | 6 +++--- ...cerootUrlMixedSubfolderSpecifyOutputFile.sourcemap.txt | 6 +++--- .../node/bin/test.js | 4 ++-- ...cerootUrlMixedSubfolderSpecifyOutputFile.sourcemap.txt | 4 ++-- .../amd/bin/outAndOutDirFile.js | 6 +++--- ...olderSpecifyOutputFileAndOutputDirectory.sourcemap.txt | 6 +++--- .../node/bin/outAndOutDirFile.js | 4 ++-- ...olderSpecifyOutputFileAndOutputDirectory.sourcemap.txt | 4 ++-- .../sourcerootUrlModuleMultifolderNoOutdir/amd/ref/m1.js | 2 +- .../sourcerootUrlModuleMultifolderNoOutdir.sourcemap.txt | 6 +++--- .../sourcerootUrlModuleMultifolderNoOutdir/node/ref/m1.js | 2 +- .../sourcerootUrlModuleMultifolderNoOutdir.sourcemap.txt | 6 +++--- .../outdir/simple/outputdir_module_multifolder/ref/m1.js | 2 +- ...lModuleMultifolderSpecifyOutputDirectory.sourcemap.txt | 6 +++--- .../outdir/simple/outputdir_module_multifolder/ref/m1.js | 2 +- ...lModuleMultifolderSpecifyOutputDirectory.sourcemap.txt | 6 +++--- .../amd/bin/test.js | 6 +++--- ...ootUrlModuleMultifolderSpecifyOutputFile.sourcemap.txt | 6 +++--- .../project/sourcerootUrlModuleSimpleNoOutdir/amd/m1.js | 2 +- .../amd/sourcerootUrlModuleSimpleNoOutdir.sourcemap.txt | 4 ++-- .../project/sourcerootUrlModuleSimpleNoOutdir/node/m1.js | 2 +- .../node/sourcerootUrlModuleSimpleNoOutdir.sourcemap.txt | 4 ++-- .../amd/outdir/simple/m1.js | 2 +- ...ootUrlModuleSimpleSpecifyOutputDirectory.sourcemap.txt | 4 ++-- .../node/outdir/simple/m1.js | 2 +- ...ootUrlModuleSimpleSpecifyOutputDirectory.sourcemap.txt | 4 ++-- .../amd/bin/test.js | 4 ++-- ...urcerootUrlModuleSimpleSpecifyOutputFile.sourcemap.txt | 4 ++-- .../sourcerootUrlModuleSubfolderNoOutdir/amd/ref/m1.js | 2 +- .../sourcerootUrlModuleSubfolderNoOutdir.sourcemap.txt | 4 ++-- .../sourcerootUrlModuleSubfolderNoOutdir/node/ref/m1.js | 2 +- .../sourcerootUrlModuleSubfolderNoOutdir.sourcemap.txt | 4 ++-- .../amd/outdir/simple/ref/m1.js | 2 +- ...UrlModuleSubfolderSpecifyOutputDirectory.sourcemap.txt | 4 ++-- .../node/outdir/simple/ref/m1.js | 2 +- ...UrlModuleSubfolderSpecifyOutputDirectory.sourcemap.txt | 4 ++-- .../amd/bin/test.js | 4 ++-- ...erootUrlModuleSubfolderSpecifyOutputFile.sourcemap.txt | 4 ++-- .../sourcerootUrlMultifolderNoOutdir/amd/ref/m1.js | 2 +- .../amd/sourcerootUrlMultifolderNoOutdir.sourcemap.txt | 6 +++--- .../sourcerootUrlMultifolderNoOutdir/node/ref/m1.js | 2 +- .../node/sourcerootUrlMultifolderNoOutdir.sourcemap.txt | 6 +++--- .../amd/outdir/simple/outputdir_multifolder/ref/m1.js | 2 +- ...rootUrlMultifolderSpecifyOutputDirectory.sourcemap.txt | 6 +++--- .../node/outdir/simple/outputdir_multifolder/ref/m1.js | 2 +- ...rootUrlMultifolderSpecifyOutputDirectory.sourcemap.txt | 6 +++--- .../amd/bin/test.js | 6 +++--- ...ourcerootUrlMultifolderSpecifyOutputFile.sourcemap.txt | 6 +++--- .../node/bin/test.js | 6 +++--- ...ourcerootUrlMultifolderSpecifyOutputFile.sourcemap.txt | 6 +++--- .../project/sourcerootUrlSimpleNoOutdir/amd/m1.js | 2 +- .../amd/sourcerootUrlSimpleNoOutdir.sourcemap.txt | 4 ++-- .../project/sourcerootUrlSimpleNoOutdir/node/m1.js | 2 +- .../node/sourcerootUrlSimpleNoOutdir.sourcemap.txt | 4 ++-- .../amd/outdir/simple/m1.js | 2 +- ...ourcerootUrlSimpleSpecifyOutputDirectory.sourcemap.txt | 4 ++-- .../node/outdir/simple/m1.js | 2 +- ...ourcerootUrlSimpleSpecifyOutputDirectory.sourcemap.txt | 4 ++-- .../sourcerootUrlSimpleSpecifyOutputFile/amd/bin/test.js | 4 ++-- .../sourcerootUrlSimpleSpecifyOutputFile.sourcemap.txt | 4 ++-- .../sourcerootUrlSimpleSpecifyOutputFile/node/bin/test.js | 4 ++-- .../sourcerootUrlSimpleSpecifyOutputFile.sourcemap.txt | 4 ++-- .../amd/sourcerootUrlSingleFileNoOutdir.sourcemap.txt | 2 +- .../project/sourcerootUrlSingleFileNoOutdir/amd/test.js | 2 +- .../node/sourcerootUrlSingleFileNoOutdir.sourcemap.txt | 2 +- .../project/sourcerootUrlSingleFileNoOutdir/node/test.js | 2 +- .../amd/outdir/simple/test.js | 2 +- ...erootUrlSingleFileSpecifyOutputDirectory.sourcemap.txt | 2 +- .../node/outdir/simple/test.js | 2 +- ...erootUrlSingleFileSpecifyOutputDirectory.sourcemap.txt | 2 +- .../amd/bin/test.js | 2 +- ...sourcerootUrlSingleFileSpecifyOutputFile.sourcemap.txt | 2 +- .../node/bin/test.js | 2 +- ...sourcerootUrlSingleFileSpecifyOutputFile.sourcemap.txt | 2 +- .../project/sourcerootUrlSubfolderNoOutdir/amd/ref/m1.js | 2 +- .../amd/sourcerootUrlSubfolderNoOutdir.sourcemap.txt | 4 ++-- .../project/sourcerootUrlSubfolderNoOutdir/node/ref/m1.js | 2 +- .../node/sourcerootUrlSubfolderNoOutdir.sourcemap.txt | 4 ++-- .../amd/outdir/simple/ref/m1.js | 2 +- ...cerootUrlSubfolderSpecifyOutputDirectory.sourcemap.txt | 4 ++-- .../node/outdir/simple/ref/m1.js | 2 +- ...cerootUrlSubfolderSpecifyOutputDirectory.sourcemap.txt | 4 ++-- .../amd/bin/test.js | 4 ++-- .../sourcerootUrlSubfolderSpecifyOutputFile.sourcemap.txt | 4 ++-- .../node/bin/test.js | 4 ++-- .../sourcerootUrlSubfolderSpecifyOutputFile.sourcemap.txt | 4 ++-- .../project/visibilityOfTypeUsedAcrossModules/amd/fs.js | 2 +- .../project/visibilityOfTypeUsedAcrossModules/node/fs.js | 2 +- 845 files changed, 1483 insertions(+), 1483 deletions(-) diff --git a/tests/baselines/reference/project/declarationsCascadingImports/amd/m4.js b/tests/baselines/reference/project/declarationsCascadingImports/amd/m4.js index 1d46a3ca302..bb607f4b5b0 100644 --- a/tests/baselines/reference/project/declarationsCascadingImports/amd/m4.js +++ b/tests/baselines/reference/project/declarationsCascadingImports/amd/m4.js @@ -4,7 +4,7 @@ define(["require", "exports"], function (require, exports) { function d() { } return d; - })(); + }()); exports.d = d; ; function foo() { diff --git a/tests/baselines/reference/project/declarationsCascadingImports/node/m4.js b/tests/baselines/reference/project/declarationsCascadingImports/node/m4.js index 505e7d74da8..52ecf390373 100644 --- a/tests/baselines/reference/project/declarationsCascadingImports/node/m4.js +++ b/tests/baselines/reference/project/declarationsCascadingImports/node/m4.js @@ -3,7 +3,7 @@ var d = (function () { function d() { } return d; -})(); +}()); exports.d = d; ; function foo() { diff --git a/tests/baselines/reference/project/declarationsGlobalImport/amd/glo_m4.js b/tests/baselines/reference/project/declarationsGlobalImport/amd/glo_m4.js index 1d46a3ca302..bb607f4b5b0 100644 --- a/tests/baselines/reference/project/declarationsGlobalImport/amd/glo_m4.js +++ b/tests/baselines/reference/project/declarationsGlobalImport/amd/glo_m4.js @@ -4,7 +4,7 @@ define(["require", "exports"], function (require, exports) { function d() { } return d; - })(); + }()); exports.d = d; ; function foo() { diff --git a/tests/baselines/reference/project/declarationsGlobalImport/node/glo_m4.js b/tests/baselines/reference/project/declarationsGlobalImport/node/glo_m4.js index 505e7d74da8..52ecf390373 100644 --- a/tests/baselines/reference/project/declarationsGlobalImport/node/glo_m4.js +++ b/tests/baselines/reference/project/declarationsGlobalImport/node/glo_m4.js @@ -3,7 +3,7 @@ var d = (function () { function d() { } return d; -})(); +}()); exports.d = d; ; function foo() { diff --git a/tests/baselines/reference/project/declarationsImportedInPrivate/amd/private_m4.js b/tests/baselines/reference/project/declarationsImportedInPrivate/amd/private_m4.js index 1d46a3ca302..bb607f4b5b0 100644 --- a/tests/baselines/reference/project/declarationsImportedInPrivate/amd/private_m4.js +++ b/tests/baselines/reference/project/declarationsImportedInPrivate/amd/private_m4.js @@ -4,7 +4,7 @@ define(["require", "exports"], function (require, exports) { function d() { } return d; - })(); + }()); exports.d = d; ; function foo() { diff --git a/tests/baselines/reference/project/declarationsImportedInPrivate/node/private_m4.js b/tests/baselines/reference/project/declarationsImportedInPrivate/node/private_m4.js index 505e7d74da8..52ecf390373 100644 --- a/tests/baselines/reference/project/declarationsImportedInPrivate/node/private_m4.js +++ b/tests/baselines/reference/project/declarationsImportedInPrivate/node/private_m4.js @@ -3,7 +3,7 @@ var d = (function () { function d() { } return d; -})(); +}()); exports.d = d; ; function foo() { diff --git a/tests/baselines/reference/project/declarationsImportedUseInFunction/amd/fncOnly_m4.js b/tests/baselines/reference/project/declarationsImportedUseInFunction/amd/fncOnly_m4.js index 1d46a3ca302..bb607f4b5b0 100644 --- a/tests/baselines/reference/project/declarationsImportedUseInFunction/amd/fncOnly_m4.js +++ b/tests/baselines/reference/project/declarationsImportedUseInFunction/amd/fncOnly_m4.js @@ -4,7 +4,7 @@ define(["require", "exports"], function (require, exports) { function d() { } return d; - })(); + }()); exports.d = d; ; function foo() { diff --git a/tests/baselines/reference/project/declarationsImportedUseInFunction/node/fncOnly_m4.js b/tests/baselines/reference/project/declarationsImportedUseInFunction/node/fncOnly_m4.js index 505e7d74da8..52ecf390373 100644 --- a/tests/baselines/reference/project/declarationsImportedUseInFunction/node/fncOnly_m4.js +++ b/tests/baselines/reference/project/declarationsImportedUseInFunction/node/fncOnly_m4.js @@ -3,7 +3,7 @@ var d = (function () { function d() { } return d; -})(); +}()); exports.d = d; ; function foo() { diff --git a/tests/baselines/reference/project/declarationsIndirectImportShouldResultInError/amd/m4.js b/tests/baselines/reference/project/declarationsIndirectImportShouldResultInError/amd/m4.js index 1d46a3ca302..bb607f4b5b0 100644 --- a/tests/baselines/reference/project/declarationsIndirectImportShouldResultInError/amd/m4.js +++ b/tests/baselines/reference/project/declarationsIndirectImportShouldResultInError/amd/m4.js @@ -4,7 +4,7 @@ define(["require", "exports"], function (require, exports) { function d() { } return d; - })(); + }()); exports.d = d; ; function foo() { diff --git a/tests/baselines/reference/project/declarationsIndirectImportShouldResultInError/node/m4.js b/tests/baselines/reference/project/declarationsIndirectImportShouldResultInError/node/m4.js index 505e7d74da8..52ecf390373 100644 --- a/tests/baselines/reference/project/declarationsIndirectImportShouldResultInError/node/m4.js +++ b/tests/baselines/reference/project/declarationsIndirectImportShouldResultInError/node/m4.js @@ -3,7 +3,7 @@ var d = (function () { function d() { } return d; -})(); +}()); exports.d = d; ; function foo() { diff --git a/tests/baselines/reference/project/declarationsMultipleTimesImport/amd/m4.js b/tests/baselines/reference/project/declarationsMultipleTimesImport/amd/m4.js index 1d46a3ca302..bb607f4b5b0 100644 --- a/tests/baselines/reference/project/declarationsMultipleTimesImport/amd/m4.js +++ b/tests/baselines/reference/project/declarationsMultipleTimesImport/amd/m4.js @@ -4,7 +4,7 @@ define(["require", "exports"], function (require, exports) { function d() { } return d; - })(); + }()); exports.d = d; ; function foo() { diff --git a/tests/baselines/reference/project/declarationsMultipleTimesImport/node/m4.js b/tests/baselines/reference/project/declarationsMultipleTimesImport/node/m4.js index 505e7d74da8..52ecf390373 100644 --- a/tests/baselines/reference/project/declarationsMultipleTimesImport/node/m4.js +++ b/tests/baselines/reference/project/declarationsMultipleTimesImport/node/m4.js @@ -3,7 +3,7 @@ var d = (function () { function d() { } return d; -})(); +}()); exports.d = d; ; function foo() { diff --git a/tests/baselines/reference/project/declarationsMultipleTimesMultipleImport/amd/m4.js b/tests/baselines/reference/project/declarationsMultipleTimesMultipleImport/amd/m4.js index 1d46a3ca302..bb607f4b5b0 100644 --- a/tests/baselines/reference/project/declarationsMultipleTimesMultipleImport/amd/m4.js +++ b/tests/baselines/reference/project/declarationsMultipleTimesMultipleImport/amd/m4.js @@ -4,7 +4,7 @@ define(["require", "exports"], function (require, exports) { function d() { } return d; - })(); + }()); exports.d = d; ; function foo() { diff --git a/tests/baselines/reference/project/declarationsMultipleTimesMultipleImport/node/m4.js b/tests/baselines/reference/project/declarationsMultipleTimesMultipleImport/node/m4.js index 505e7d74da8..52ecf390373 100644 --- a/tests/baselines/reference/project/declarationsMultipleTimesMultipleImport/node/m4.js +++ b/tests/baselines/reference/project/declarationsMultipleTimesMultipleImport/node/m4.js @@ -3,7 +3,7 @@ var d = (function () { function d() { } return d; -})(); +}()); exports.d = d; ; function foo() { diff --git a/tests/baselines/reference/project/declarationsSimpleImport/amd/m4.js b/tests/baselines/reference/project/declarationsSimpleImport/amd/m4.js index 1d46a3ca302..bb607f4b5b0 100644 --- a/tests/baselines/reference/project/declarationsSimpleImport/amd/m4.js +++ b/tests/baselines/reference/project/declarationsSimpleImport/amd/m4.js @@ -4,7 +4,7 @@ define(["require", "exports"], function (require, exports) { function d() { } return d; - })(); + }()); exports.d = d; ; function foo() { diff --git a/tests/baselines/reference/project/declarationsSimpleImport/node/m4.js b/tests/baselines/reference/project/declarationsSimpleImport/node/m4.js index 505e7d74da8..52ecf390373 100644 --- a/tests/baselines/reference/project/declarationsSimpleImport/node/m4.js +++ b/tests/baselines/reference/project/declarationsSimpleImport/node/m4.js @@ -3,7 +3,7 @@ var d = (function () { function d() { } return d; -})(); +}()); exports.d = d; ; function foo() { diff --git a/tests/baselines/reference/project/mapRootAbsolutePathMixedSubfolderNoOutdir/amd/mapRootAbsolutePathMixedSubfolderNoOutdir.sourcemap.txt b/tests/baselines/reference/project/mapRootAbsolutePathMixedSubfolderNoOutdir/amd/mapRootAbsolutePathMixedSubfolderNoOutdir.sourcemap.txt index a72b4af337b..6a3d66ff920 100644 --- a/tests/baselines/reference/project/mapRootAbsolutePathMixedSubfolderNoOutdir/amd/mapRootAbsolutePathMixedSubfolderNoOutdir.sourcemap.txt +++ b/tests/baselines/reference/project/mapRootAbsolutePathMixedSubfolderNoOutdir/amd/mapRootAbsolutePathMixedSubfolderNoOutdir.sourcemap.txt @@ -61,7 +61,7 @@ sourceFile:../../ref/m1.ts 1->Emitted(5, 5) Source(4, 1) + SourceIndex(0) 2 >Emitted(5, 17) Source(4, 2) + SourceIndex(0) --- ->>>})(); +>>>}()); 1 > 2 >^ 3 > @@ -203,7 +203,7 @@ sourceFile:../../ref/m2.ts 1->Emitted(7, 9) Source(4, 1) + SourceIndex(0) 2 >Emitted(7, 21) Source(4, 2) + SourceIndex(0) --- ->>> })(); +>>> }()); 1 >^^^^ 2 > ^ 3 > @@ -396,7 +396,7 @@ sourceFile:../test.ts 1->Emitted(7, 5) Source(6, 1) + SourceIndex(0) 2 >Emitted(7, 14) Source(6, 2) + SourceIndex(0) --- ->>>})(); +>>>}()); 1 > 2 >^ 3 > diff --git a/tests/baselines/reference/project/mapRootAbsolutePathMixedSubfolderNoOutdir/amd/ref/m1.js b/tests/baselines/reference/project/mapRootAbsolutePathMixedSubfolderNoOutdir/amd/ref/m1.js index 80c5ac103c9..b27cc353db5 100644 --- a/tests/baselines/reference/project/mapRootAbsolutePathMixedSubfolderNoOutdir/amd/ref/m1.js +++ b/tests/baselines/reference/project/mapRootAbsolutePathMixedSubfolderNoOutdir/amd/ref/m1.js @@ -3,7 +3,7 @@ var m1_c1 = (function () { function m1_c1() { } return m1_c1; -})(); +}()); var m1_instance1 = new m1_c1(); function m1_f1() { return m1_instance1; diff --git a/tests/baselines/reference/project/mapRootAbsolutePathMixedSubfolderNoOutdir/node/mapRootAbsolutePathMixedSubfolderNoOutdir.sourcemap.txt b/tests/baselines/reference/project/mapRootAbsolutePathMixedSubfolderNoOutdir/node/mapRootAbsolutePathMixedSubfolderNoOutdir.sourcemap.txt index 062e42a5e5f..90f439ae62e 100644 --- a/tests/baselines/reference/project/mapRootAbsolutePathMixedSubfolderNoOutdir/node/mapRootAbsolutePathMixedSubfolderNoOutdir.sourcemap.txt +++ b/tests/baselines/reference/project/mapRootAbsolutePathMixedSubfolderNoOutdir/node/mapRootAbsolutePathMixedSubfolderNoOutdir.sourcemap.txt @@ -61,7 +61,7 @@ sourceFile:../../ref/m1.ts 1->Emitted(5, 5) Source(4, 1) + SourceIndex(0) 2 >Emitted(5, 17) Source(4, 2) + SourceIndex(0) --- ->>>})(); +>>>}()); 1 > 2 >^ 3 > @@ -202,7 +202,7 @@ sourceFile:../../ref/m2.ts 1->Emitted(6, 5) Source(4, 1) + SourceIndex(0) 2 >Emitted(6, 17) Source(4, 2) + SourceIndex(0) --- ->>>})(); +>>>}()); 1 > 2 >^ 3 > @@ -395,7 +395,7 @@ sourceFile:../test.ts 1->Emitted(7, 5) Source(6, 1) + SourceIndex(0) 2 >Emitted(7, 14) Source(6, 2) + SourceIndex(0) --- ->>>})(); +>>>}()); 1 > 2 >^ 3 > diff --git a/tests/baselines/reference/project/mapRootAbsolutePathMixedSubfolderNoOutdir/node/ref/m1.js b/tests/baselines/reference/project/mapRootAbsolutePathMixedSubfolderNoOutdir/node/ref/m1.js index 80c5ac103c9..b27cc353db5 100644 --- a/tests/baselines/reference/project/mapRootAbsolutePathMixedSubfolderNoOutdir/node/ref/m1.js +++ b/tests/baselines/reference/project/mapRootAbsolutePathMixedSubfolderNoOutdir/node/ref/m1.js @@ -3,7 +3,7 @@ var m1_c1 = (function () { function m1_c1() { } return m1_c1; -})(); +}()); var m1_instance1 = new m1_c1(); function m1_f1() { return m1_instance1; diff --git a/tests/baselines/reference/project/mapRootAbsolutePathMixedSubfolderSpecifyOutputDirectory/amd/mapRootAbsolutePathMixedSubfolderSpecifyOutputDirectory.sourcemap.txt b/tests/baselines/reference/project/mapRootAbsolutePathMixedSubfolderSpecifyOutputDirectory/amd/mapRootAbsolutePathMixedSubfolderSpecifyOutputDirectory.sourcemap.txt index 0dd9d248ed8..5568b3b59cc 100644 --- a/tests/baselines/reference/project/mapRootAbsolutePathMixedSubfolderSpecifyOutputDirectory/amd/mapRootAbsolutePathMixedSubfolderSpecifyOutputDirectory.sourcemap.txt +++ b/tests/baselines/reference/project/mapRootAbsolutePathMixedSubfolderSpecifyOutputDirectory/amd/mapRootAbsolutePathMixedSubfolderSpecifyOutputDirectory.sourcemap.txt @@ -61,7 +61,7 @@ sourceFile:../../ref/m1.ts 1->Emitted(5, 5) Source(4, 1) + SourceIndex(0) 2 >Emitted(5, 17) Source(4, 2) + SourceIndex(0) --- ->>>})(); +>>>}()); 1 > 2 >^ 3 > @@ -203,7 +203,7 @@ sourceFile:../../ref/m2.ts 1->Emitted(7, 9) Source(4, 1) + SourceIndex(0) 2 >Emitted(7, 21) Source(4, 2) + SourceIndex(0) --- ->>> })(); +>>> }()); 1 >^^^^ 2 > ^ 3 > @@ -396,7 +396,7 @@ sourceFile:../test.ts 1->Emitted(7, 5) Source(6, 1) + SourceIndex(0) 2 >Emitted(7, 14) Source(6, 2) + SourceIndex(0) --- ->>>})(); +>>>}()); 1 > 2 >^ 3 > diff --git a/tests/baselines/reference/project/mapRootAbsolutePathMixedSubfolderSpecifyOutputDirectory/amd/outdir/simple/ref/m1.js b/tests/baselines/reference/project/mapRootAbsolutePathMixedSubfolderSpecifyOutputDirectory/amd/outdir/simple/ref/m1.js index 80c5ac103c9..b27cc353db5 100644 --- a/tests/baselines/reference/project/mapRootAbsolutePathMixedSubfolderSpecifyOutputDirectory/amd/outdir/simple/ref/m1.js +++ b/tests/baselines/reference/project/mapRootAbsolutePathMixedSubfolderSpecifyOutputDirectory/amd/outdir/simple/ref/m1.js @@ -3,7 +3,7 @@ var m1_c1 = (function () { function m1_c1() { } return m1_c1; -})(); +}()); var m1_instance1 = new m1_c1(); function m1_f1() { return m1_instance1; diff --git a/tests/baselines/reference/project/mapRootAbsolutePathMixedSubfolderSpecifyOutputDirectory/node/mapRootAbsolutePathMixedSubfolderSpecifyOutputDirectory.sourcemap.txt b/tests/baselines/reference/project/mapRootAbsolutePathMixedSubfolderSpecifyOutputDirectory/node/mapRootAbsolutePathMixedSubfolderSpecifyOutputDirectory.sourcemap.txt index 4d2bfe89559..146568254f8 100644 --- a/tests/baselines/reference/project/mapRootAbsolutePathMixedSubfolderSpecifyOutputDirectory/node/mapRootAbsolutePathMixedSubfolderSpecifyOutputDirectory.sourcemap.txt +++ b/tests/baselines/reference/project/mapRootAbsolutePathMixedSubfolderSpecifyOutputDirectory/node/mapRootAbsolutePathMixedSubfolderSpecifyOutputDirectory.sourcemap.txt @@ -61,7 +61,7 @@ sourceFile:../../ref/m1.ts 1->Emitted(5, 5) Source(4, 1) + SourceIndex(0) 2 >Emitted(5, 17) Source(4, 2) + SourceIndex(0) --- ->>>})(); +>>>}()); 1 > 2 >^ 3 > @@ -202,7 +202,7 @@ sourceFile:../../ref/m2.ts 1->Emitted(6, 5) Source(4, 1) + SourceIndex(0) 2 >Emitted(6, 17) Source(4, 2) + SourceIndex(0) --- ->>>})(); +>>>}()); 1 > 2 >^ 3 > @@ -395,7 +395,7 @@ sourceFile:../test.ts 1->Emitted(7, 5) Source(6, 1) + SourceIndex(0) 2 >Emitted(7, 14) Source(6, 2) + SourceIndex(0) --- ->>>})(); +>>>}()); 1 > 2 >^ 3 > diff --git a/tests/baselines/reference/project/mapRootAbsolutePathMixedSubfolderSpecifyOutputDirectory/node/outdir/simple/ref/m1.js b/tests/baselines/reference/project/mapRootAbsolutePathMixedSubfolderSpecifyOutputDirectory/node/outdir/simple/ref/m1.js index 80c5ac103c9..b27cc353db5 100644 --- a/tests/baselines/reference/project/mapRootAbsolutePathMixedSubfolderSpecifyOutputDirectory/node/outdir/simple/ref/m1.js +++ b/tests/baselines/reference/project/mapRootAbsolutePathMixedSubfolderSpecifyOutputDirectory/node/outdir/simple/ref/m1.js @@ -3,7 +3,7 @@ var m1_c1 = (function () { function m1_c1() { } return m1_c1; -})(); +}()); var m1_instance1 = new m1_c1(); function m1_f1() { return m1_instance1; diff --git a/tests/baselines/reference/project/mapRootAbsolutePathMixedSubfolderSpecifyOutputFile/amd/bin/test.js b/tests/baselines/reference/project/mapRootAbsolutePathMixedSubfolderSpecifyOutputFile/amd/bin/test.js index 75f7b767aea..3dd9960df14 100644 --- a/tests/baselines/reference/project/mapRootAbsolutePathMixedSubfolderSpecifyOutputFile/amd/bin/test.js +++ b/tests/baselines/reference/project/mapRootAbsolutePathMixedSubfolderSpecifyOutputFile/amd/bin/test.js @@ -3,7 +3,7 @@ var m1_c1 = (function () { function m1_c1() { } return m1_c1; -})(); +}()); var m1_instance1 = new m1_c1(); function m1_f1() { return m1_instance1; @@ -15,7 +15,7 @@ define("ref/m2", ["require", "exports"], function (require, exports) { function m2_c1() { } return m2_c1; - })(); + }()); exports.m2_c1 = m2_c1; exports.m2_instance1 = new m2_c1(); function m2_f1() { @@ -30,7 +30,7 @@ var c1 = (function () { function c1() { } return c1; -})(); +}()); var instance1 = new c1(); function f1() { return instance1; diff --git a/tests/baselines/reference/project/mapRootAbsolutePathMixedSubfolderSpecifyOutputFile/amd/mapRootAbsolutePathMixedSubfolderSpecifyOutputFile.sourcemap.txt b/tests/baselines/reference/project/mapRootAbsolutePathMixedSubfolderSpecifyOutputFile/amd/mapRootAbsolutePathMixedSubfolderSpecifyOutputFile.sourcemap.txt index 90faa19dd08..ac740512f7d 100644 --- a/tests/baselines/reference/project/mapRootAbsolutePathMixedSubfolderSpecifyOutputFile/amd/mapRootAbsolutePathMixedSubfolderSpecifyOutputFile.sourcemap.txt +++ b/tests/baselines/reference/project/mapRootAbsolutePathMixedSubfolderSpecifyOutputFile/amd/mapRootAbsolutePathMixedSubfolderSpecifyOutputFile.sourcemap.txt @@ -61,7 +61,7 @@ sourceFile:../ref/m1.ts 1->Emitted(5, 5) Source(4, 1) + SourceIndex(0) 2 >Emitted(5, 17) Source(4, 2) + SourceIndex(0) --- ->>>})(); +>>>}()); 1 > 2 >^ 3 > @@ -197,7 +197,7 @@ sourceFile:../ref/m2.ts 1->Emitted(17, 9) Source(4, 1) + SourceIndex(1) 2 >Emitted(17, 21) Source(4, 2) + SourceIndex(1) --- ->>> })(); +>>> }()); 1 >^^^^ 2 > ^ 3 > @@ -384,7 +384,7 @@ sourceFile:../test.ts 1->Emitted(32, 5) Source(6, 1) + SourceIndex(2) 2 >Emitted(32, 14) Source(6, 2) + SourceIndex(2) --- ->>>})(); +>>>}()); 1 > 2 >^ 3 > diff --git a/tests/baselines/reference/project/mapRootAbsolutePathMixedSubfolderSpecifyOutputFile/node/bin/test.js b/tests/baselines/reference/project/mapRootAbsolutePathMixedSubfolderSpecifyOutputFile/node/bin/test.js index 7ef36232b8d..a857aef135a 100644 --- a/tests/baselines/reference/project/mapRootAbsolutePathMixedSubfolderSpecifyOutputFile/node/bin/test.js +++ b/tests/baselines/reference/project/mapRootAbsolutePathMixedSubfolderSpecifyOutputFile/node/bin/test.js @@ -3,7 +3,7 @@ var m1_c1 = (function () { function m1_c1() { } return m1_c1; -})(); +}()); var m1_instance1 = new m1_c1(); function m1_f1() { return m1_instance1; @@ -15,7 +15,7 @@ var c1 = (function () { function c1() { } return c1; -})(); +}()); var instance1 = new c1(); function f1() { return instance1; diff --git a/tests/baselines/reference/project/mapRootAbsolutePathMixedSubfolderSpecifyOutputFile/node/mapRootAbsolutePathMixedSubfolderSpecifyOutputFile.sourcemap.txt b/tests/baselines/reference/project/mapRootAbsolutePathMixedSubfolderSpecifyOutputFile/node/mapRootAbsolutePathMixedSubfolderSpecifyOutputFile.sourcemap.txt index 783a11edfd4..3a3cdb547f5 100644 --- a/tests/baselines/reference/project/mapRootAbsolutePathMixedSubfolderSpecifyOutputFile/node/mapRootAbsolutePathMixedSubfolderSpecifyOutputFile.sourcemap.txt +++ b/tests/baselines/reference/project/mapRootAbsolutePathMixedSubfolderSpecifyOutputFile/node/mapRootAbsolutePathMixedSubfolderSpecifyOutputFile.sourcemap.txt @@ -61,7 +61,7 @@ sourceFile:../ref/m1.ts 1->Emitted(5, 5) Source(4, 1) + SourceIndex(0) 2 >Emitted(5, 17) Source(4, 2) + SourceIndex(0) --- ->>>})(); +>>>}()); 1 > 2 >^ 3 > @@ -217,7 +217,7 @@ sourceFile:../test.ts 1->Emitted(17, 5) Source(6, 1) + SourceIndex(2) 2 >Emitted(17, 14) Source(6, 2) + SourceIndex(2) --- ->>>})(); +>>>}()); 1 > 2 >^ 3 > diff --git a/tests/baselines/reference/project/mapRootAbsolutePathMixedSubfolderSpecifyOutputFileAndOutputDirectory/amd/bin/outAndOutDirFile.js b/tests/baselines/reference/project/mapRootAbsolutePathMixedSubfolderSpecifyOutputFileAndOutputDirectory/amd/bin/outAndOutDirFile.js index 67d10604405..ccf78301cb1 100644 --- a/tests/baselines/reference/project/mapRootAbsolutePathMixedSubfolderSpecifyOutputFileAndOutputDirectory/amd/bin/outAndOutDirFile.js +++ b/tests/baselines/reference/project/mapRootAbsolutePathMixedSubfolderSpecifyOutputFileAndOutputDirectory/amd/bin/outAndOutDirFile.js @@ -3,7 +3,7 @@ var m1_c1 = (function () { function m1_c1() { } return m1_c1; -})(); +}()); var m1_instance1 = new m1_c1(); function m1_f1() { return m1_instance1; @@ -15,7 +15,7 @@ define("ref/m2", ["require", "exports"], function (require, exports) { function m2_c1() { } return m2_c1; - })(); + }()); exports.m2_c1 = m2_c1; exports.m2_instance1 = new m2_c1(); function m2_f1() { @@ -30,7 +30,7 @@ var c1 = (function () { function c1() { } return c1; -})(); +}()); var instance1 = new c1(); function f1() { return instance1; diff --git a/tests/baselines/reference/project/mapRootAbsolutePathMixedSubfolderSpecifyOutputFileAndOutputDirectory/amd/mapRootAbsolutePathMixedSubfolderSpecifyOutputFileAndOutputDirectory.sourcemap.txt b/tests/baselines/reference/project/mapRootAbsolutePathMixedSubfolderSpecifyOutputFileAndOutputDirectory/amd/mapRootAbsolutePathMixedSubfolderSpecifyOutputFileAndOutputDirectory.sourcemap.txt index e772acc4db4..0dfcd7002be 100644 --- a/tests/baselines/reference/project/mapRootAbsolutePathMixedSubfolderSpecifyOutputFileAndOutputDirectory/amd/mapRootAbsolutePathMixedSubfolderSpecifyOutputFileAndOutputDirectory.sourcemap.txt +++ b/tests/baselines/reference/project/mapRootAbsolutePathMixedSubfolderSpecifyOutputFileAndOutputDirectory/amd/mapRootAbsolutePathMixedSubfolderSpecifyOutputFileAndOutputDirectory.sourcemap.txt @@ -61,7 +61,7 @@ sourceFile:../ref/m1.ts 1->Emitted(5, 5) Source(4, 1) + SourceIndex(0) 2 >Emitted(5, 17) Source(4, 2) + SourceIndex(0) --- ->>>})(); +>>>}()); 1 > 2 >^ 3 > @@ -197,7 +197,7 @@ sourceFile:../ref/m2.ts 1->Emitted(17, 9) Source(4, 1) + SourceIndex(1) 2 >Emitted(17, 21) Source(4, 2) + SourceIndex(1) --- ->>> })(); +>>> }()); 1 >^^^^ 2 > ^ 3 > @@ -384,7 +384,7 @@ sourceFile:../test.ts 1->Emitted(32, 5) Source(6, 1) + SourceIndex(2) 2 >Emitted(32, 14) Source(6, 2) + SourceIndex(2) --- ->>>})(); +>>>}()); 1 > 2 >^ 3 > diff --git a/tests/baselines/reference/project/mapRootAbsolutePathMixedSubfolderSpecifyOutputFileAndOutputDirectory/node/bin/outAndOutDirFile.js b/tests/baselines/reference/project/mapRootAbsolutePathMixedSubfolderSpecifyOutputFileAndOutputDirectory/node/bin/outAndOutDirFile.js index fc53d59d7cb..feea00eb8c7 100644 --- a/tests/baselines/reference/project/mapRootAbsolutePathMixedSubfolderSpecifyOutputFileAndOutputDirectory/node/bin/outAndOutDirFile.js +++ b/tests/baselines/reference/project/mapRootAbsolutePathMixedSubfolderSpecifyOutputFileAndOutputDirectory/node/bin/outAndOutDirFile.js @@ -3,7 +3,7 @@ var m1_c1 = (function () { function m1_c1() { } return m1_c1; -})(); +}()); var m1_instance1 = new m1_c1(); function m1_f1() { return m1_instance1; @@ -15,7 +15,7 @@ var c1 = (function () { function c1() { } return c1; -})(); +}()); var instance1 = new c1(); function f1() { return instance1; diff --git a/tests/baselines/reference/project/mapRootAbsolutePathMixedSubfolderSpecifyOutputFileAndOutputDirectory/node/mapRootAbsolutePathMixedSubfolderSpecifyOutputFileAndOutputDirectory.sourcemap.txt b/tests/baselines/reference/project/mapRootAbsolutePathMixedSubfolderSpecifyOutputFileAndOutputDirectory/node/mapRootAbsolutePathMixedSubfolderSpecifyOutputFileAndOutputDirectory.sourcemap.txt index 67d311777c1..4ff78d4d802 100644 --- a/tests/baselines/reference/project/mapRootAbsolutePathMixedSubfolderSpecifyOutputFileAndOutputDirectory/node/mapRootAbsolutePathMixedSubfolderSpecifyOutputFileAndOutputDirectory.sourcemap.txt +++ b/tests/baselines/reference/project/mapRootAbsolutePathMixedSubfolderSpecifyOutputFileAndOutputDirectory/node/mapRootAbsolutePathMixedSubfolderSpecifyOutputFileAndOutputDirectory.sourcemap.txt @@ -61,7 +61,7 @@ sourceFile:../ref/m1.ts 1->Emitted(5, 5) Source(4, 1) + SourceIndex(0) 2 >Emitted(5, 17) Source(4, 2) + SourceIndex(0) --- ->>>})(); +>>>}()); 1 > 2 >^ 3 > @@ -217,7 +217,7 @@ sourceFile:../test.ts 1->Emitted(17, 5) Source(6, 1) + SourceIndex(2) 2 >Emitted(17, 14) Source(6, 2) + SourceIndex(2) --- ->>>})(); +>>>}()); 1 > 2 >^ 3 > diff --git a/tests/baselines/reference/project/mapRootAbsolutePathModuleMultifolderNoOutdir/amd/mapRootAbsolutePathModuleMultifolderNoOutdir.sourcemap.txt b/tests/baselines/reference/project/mapRootAbsolutePathModuleMultifolderNoOutdir/amd/mapRootAbsolutePathModuleMultifolderNoOutdir.sourcemap.txt index c62d96fdcce..3d3d83e8604 100644 --- a/tests/baselines/reference/project/mapRootAbsolutePathModuleMultifolderNoOutdir/amd/mapRootAbsolutePathModuleMultifolderNoOutdir.sourcemap.txt +++ b/tests/baselines/reference/project/mapRootAbsolutePathModuleMultifolderNoOutdir/amd/mapRootAbsolutePathModuleMultifolderNoOutdir.sourcemap.txt @@ -60,7 +60,7 @@ sourceFile:../../../ref/m1.ts 1->Emitted(7, 9) Source(4, 1) + SourceIndex(0) 2 >Emitted(7, 21) Source(4, 2) + SourceIndex(0) --- ->>> })(); +>>> }()); 1 >^^^^ 2 > ^ 3 > @@ -233,7 +233,7 @@ sourceFile:../../../outputdir_module_multifolder_ref/m2.ts 1->Emitted(7, 9) Source(4, 1) + SourceIndex(0) 2 >Emitted(7, 21) Source(4, 2) + SourceIndex(0) --- ->>> })(); +>>> }()); 1 >^^^^ 2 > ^ 3 > @@ -408,7 +408,7 @@ sourceFile:../../test.ts 1->Emitted(7, 9) Source(6, 1) + SourceIndex(0) 2 >Emitted(7, 18) Source(6, 2) + SourceIndex(0) --- ->>> })(); +>>> }()); 1 >^^^^ 2 > ^ 3 > diff --git a/tests/baselines/reference/project/mapRootAbsolutePathModuleMultifolderNoOutdir/amd/ref/m1.js b/tests/baselines/reference/project/mapRootAbsolutePathModuleMultifolderNoOutdir/amd/ref/m1.js index 2285204e0bd..b663057aeff 100644 --- a/tests/baselines/reference/project/mapRootAbsolutePathModuleMultifolderNoOutdir/amd/ref/m1.js +++ b/tests/baselines/reference/project/mapRootAbsolutePathModuleMultifolderNoOutdir/amd/ref/m1.js @@ -5,7 +5,7 @@ define(["require", "exports"], function (require, exports) { function m1_c1() { } return m1_c1; - })(); + }()); exports.m1_c1 = m1_c1; exports.m1_instance1 = new m1_c1(); function m1_f1() { diff --git a/tests/baselines/reference/project/mapRootAbsolutePathModuleMultifolderNoOutdir/node/mapRootAbsolutePathModuleMultifolderNoOutdir.sourcemap.txt b/tests/baselines/reference/project/mapRootAbsolutePathModuleMultifolderNoOutdir/node/mapRootAbsolutePathModuleMultifolderNoOutdir.sourcemap.txt index d38a02260ac..f9461bb3244 100644 --- a/tests/baselines/reference/project/mapRootAbsolutePathModuleMultifolderNoOutdir/node/mapRootAbsolutePathModuleMultifolderNoOutdir.sourcemap.txt +++ b/tests/baselines/reference/project/mapRootAbsolutePathModuleMultifolderNoOutdir/node/mapRootAbsolutePathModuleMultifolderNoOutdir.sourcemap.txt @@ -59,7 +59,7 @@ sourceFile:../../../ref/m1.ts 1->Emitted(6, 5) Source(4, 1) + SourceIndex(0) 2 >Emitted(6, 17) Source(4, 2) + SourceIndex(0) --- ->>>})(); +>>>}()); 1 > 2 >^ 3 > @@ -231,7 +231,7 @@ sourceFile:../../../outputdir_module_multifolder_ref/m2.ts 1->Emitted(6, 5) Source(4, 1) + SourceIndex(0) 2 >Emitted(6, 17) Source(4, 2) + SourceIndex(0) --- ->>>})(); +>>>}()); 1 > 2 >^ 3 > @@ -452,7 +452,7 @@ sourceFile:../../test.ts 1->Emitted(8, 5) Source(6, 1) + SourceIndex(0) 2 >Emitted(8, 14) Source(6, 2) + SourceIndex(0) --- ->>>})(); +>>>}()); 1 > 2 >^ 3 > diff --git a/tests/baselines/reference/project/mapRootAbsolutePathModuleMultifolderNoOutdir/node/ref/m1.js b/tests/baselines/reference/project/mapRootAbsolutePathModuleMultifolderNoOutdir/node/ref/m1.js index 31565374f87..7ad78d4877d 100644 --- a/tests/baselines/reference/project/mapRootAbsolutePathModuleMultifolderNoOutdir/node/ref/m1.js +++ b/tests/baselines/reference/project/mapRootAbsolutePathModuleMultifolderNoOutdir/node/ref/m1.js @@ -4,7 +4,7 @@ var m1_c1 = (function () { function m1_c1() { } return m1_c1; -})(); +}()); exports.m1_c1 = m1_c1; exports.m1_instance1 = new m1_c1(); function m1_f1() { diff --git a/tests/baselines/reference/project/mapRootAbsolutePathModuleMultifolderSpecifyOutputDirectory/amd/mapRootAbsolutePathModuleMultifolderSpecifyOutputDirectory.sourcemap.txt b/tests/baselines/reference/project/mapRootAbsolutePathModuleMultifolderSpecifyOutputDirectory/amd/mapRootAbsolutePathModuleMultifolderSpecifyOutputDirectory.sourcemap.txt index 31e8687a0ea..672a3d34ea7 100644 --- a/tests/baselines/reference/project/mapRootAbsolutePathModuleMultifolderSpecifyOutputDirectory/amd/mapRootAbsolutePathModuleMultifolderSpecifyOutputDirectory.sourcemap.txt +++ b/tests/baselines/reference/project/mapRootAbsolutePathModuleMultifolderSpecifyOutputDirectory/amd/mapRootAbsolutePathModuleMultifolderSpecifyOutputDirectory.sourcemap.txt @@ -60,7 +60,7 @@ sourceFile:../../../ref/m1.ts 1->Emitted(7, 9) Source(4, 1) + SourceIndex(0) 2 >Emitted(7, 21) Source(4, 2) + SourceIndex(0) --- ->>> })(); +>>> }()); 1 >^^^^ 2 > ^ 3 > @@ -233,7 +233,7 @@ sourceFile:../../../outputdir_module_multifolder_ref/m2.ts 1->Emitted(7, 9) Source(4, 1) + SourceIndex(0) 2 >Emitted(7, 21) Source(4, 2) + SourceIndex(0) --- ->>> })(); +>>> }()); 1 >^^^^ 2 > ^ 3 > @@ -408,7 +408,7 @@ sourceFile:../../test.ts 1->Emitted(7, 9) Source(6, 1) + SourceIndex(0) 2 >Emitted(7, 18) Source(6, 2) + SourceIndex(0) --- ->>> })(); +>>> }()); 1 >^^^^ 2 > ^ 3 > diff --git a/tests/baselines/reference/project/mapRootAbsolutePathModuleMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_module_multifolder/ref/m1.js b/tests/baselines/reference/project/mapRootAbsolutePathModuleMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_module_multifolder/ref/m1.js index 2285204e0bd..b663057aeff 100644 --- a/tests/baselines/reference/project/mapRootAbsolutePathModuleMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_module_multifolder/ref/m1.js +++ b/tests/baselines/reference/project/mapRootAbsolutePathModuleMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_module_multifolder/ref/m1.js @@ -5,7 +5,7 @@ define(["require", "exports"], function (require, exports) { function m1_c1() { } return m1_c1; - })(); + }()); exports.m1_c1 = m1_c1; exports.m1_instance1 = new m1_c1(); function m1_f1() { diff --git a/tests/baselines/reference/project/mapRootAbsolutePathModuleMultifolderSpecifyOutputDirectory/node/mapRootAbsolutePathModuleMultifolderSpecifyOutputDirectory.sourcemap.txt b/tests/baselines/reference/project/mapRootAbsolutePathModuleMultifolderSpecifyOutputDirectory/node/mapRootAbsolutePathModuleMultifolderSpecifyOutputDirectory.sourcemap.txt index a3f617af03e..d75a1f63f6c 100644 --- a/tests/baselines/reference/project/mapRootAbsolutePathModuleMultifolderSpecifyOutputDirectory/node/mapRootAbsolutePathModuleMultifolderSpecifyOutputDirectory.sourcemap.txt +++ b/tests/baselines/reference/project/mapRootAbsolutePathModuleMultifolderSpecifyOutputDirectory/node/mapRootAbsolutePathModuleMultifolderSpecifyOutputDirectory.sourcemap.txt @@ -59,7 +59,7 @@ sourceFile:../../../ref/m1.ts 1->Emitted(6, 5) Source(4, 1) + SourceIndex(0) 2 >Emitted(6, 17) Source(4, 2) + SourceIndex(0) --- ->>>})(); +>>>}()); 1 > 2 >^ 3 > @@ -231,7 +231,7 @@ sourceFile:../../../outputdir_module_multifolder_ref/m2.ts 1->Emitted(6, 5) Source(4, 1) + SourceIndex(0) 2 >Emitted(6, 17) Source(4, 2) + SourceIndex(0) --- ->>>})(); +>>>}()); 1 > 2 >^ 3 > @@ -452,7 +452,7 @@ sourceFile:../../test.ts 1->Emitted(8, 5) Source(6, 1) + SourceIndex(0) 2 >Emitted(8, 14) Source(6, 2) + SourceIndex(0) --- ->>>})(); +>>>}()); 1 > 2 >^ 3 > diff --git a/tests/baselines/reference/project/mapRootAbsolutePathModuleMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_module_multifolder/ref/m1.js b/tests/baselines/reference/project/mapRootAbsolutePathModuleMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_module_multifolder/ref/m1.js index 31565374f87..7ad78d4877d 100644 --- a/tests/baselines/reference/project/mapRootAbsolutePathModuleMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_module_multifolder/ref/m1.js +++ b/tests/baselines/reference/project/mapRootAbsolutePathModuleMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_module_multifolder/ref/m1.js @@ -4,7 +4,7 @@ var m1_c1 = (function () { function m1_c1() { } return m1_c1; -})(); +}()); exports.m1_c1 = m1_c1; exports.m1_instance1 = new m1_c1(); function m1_f1() { diff --git a/tests/baselines/reference/project/mapRootAbsolutePathModuleMultifolderSpecifyOutputFile/amd/bin/test.js b/tests/baselines/reference/project/mapRootAbsolutePathModuleMultifolderSpecifyOutputFile/amd/bin/test.js index a5ff923efe0..29bc22bd61c 100644 --- a/tests/baselines/reference/project/mapRootAbsolutePathModuleMultifolderSpecifyOutputFile/amd/bin/test.js +++ b/tests/baselines/reference/project/mapRootAbsolutePathModuleMultifolderSpecifyOutputFile/amd/bin/test.js @@ -5,7 +5,7 @@ define("outputdir_module_multifolder/ref/m1", ["require", "exports"], function ( function m1_c1() { } return m1_c1; - })(); + }()); exports.m1_c1 = m1_c1; exports.m1_instance1 = new m1_c1(); function m1_f1() { @@ -20,7 +20,7 @@ define("outputdir_module_multifolder_ref/m2", ["require", "exports"], function ( function m2_c1() { } return m2_c1; - })(); + }()); exports.m2_c1 = m2_c1; exports.m2_instance1 = new m2_c1(); function m2_f1() { @@ -35,7 +35,7 @@ define("outputdir_module_multifolder/test", ["require", "exports", "outputdir_mo function c1() { } return c1; - })(); + }()); exports.c1 = c1; exports.instance1 = new c1(); function f1() { diff --git a/tests/baselines/reference/project/mapRootAbsolutePathModuleMultifolderSpecifyOutputFile/amd/mapRootAbsolutePathModuleMultifolderSpecifyOutputFile.sourcemap.txt b/tests/baselines/reference/project/mapRootAbsolutePathModuleMultifolderSpecifyOutputFile/amd/mapRootAbsolutePathModuleMultifolderSpecifyOutputFile.sourcemap.txt index d495eb07607..4358711b5b5 100644 --- a/tests/baselines/reference/project/mapRootAbsolutePathModuleMultifolderSpecifyOutputFile/amd/mapRootAbsolutePathModuleMultifolderSpecifyOutputFile.sourcemap.txt +++ b/tests/baselines/reference/project/mapRootAbsolutePathModuleMultifolderSpecifyOutputFile/amd/mapRootAbsolutePathModuleMultifolderSpecifyOutputFile.sourcemap.txt @@ -60,7 +60,7 @@ sourceFile:../ref/m1.ts 1->Emitted(7, 9) Source(4, 1) + SourceIndex(0) 2 >Emitted(7, 21) Source(4, 2) + SourceIndex(0) --- ->>> })(); +>>> }()); 1 >^^^^ 2 > ^ 3 > @@ -227,7 +227,7 @@ sourceFile:../../outputdir_module_multifolder_ref/m2.ts 1->Emitted(22, 9) Source(4, 1) + SourceIndex(1) 2 >Emitted(22, 21) Source(4, 2) + SourceIndex(1) --- ->>> })(); +>>> }()); 1 >^^^^ 2 > ^ 3 > @@ -396,7 +396,7 @@ sourceFile:../test.ts 1->Emitted(37, 9) Source(6, 1) + SourceIndex(2) 2 >Emitted(37, 18) Source(6, 2) + SourceIndex(2) --- ->>> })(); +>>> }()); 1 >^^^^ 2 > ^ 3 > diff --git a/tests/baselines/reference/project/mapRootAbsolutePathModuleSimpleNoOutdir/amd/m1.js b/tests/baselines/reference/project/mapRootAbsolutePathModuleSimpleNoOutdir/amd/m1.js index 684b6e489f7..3017cac2b88 100644 --- a/tests/baselines/reference/project/mapRootAbsolutePathModuleSimpleNoOutdir/amd/m1.js +++ b/tests/baselines/reference/project/mapRootAbsolutePathModuleSimpleNoOutdir/amd/m1.js @@ -5,7 +5,7 @@ define(["require", "exports"], function (require, exports) { function m1_c1() { } return m1_c1; - })(); + }()); exports.m1_c1 = m1_c1; exports.m1_instance1 = new m1_c1(); function m1_f1() { diff --git a/tests/baselines/reference/project/mapRootAbsolutePathModuleSimpleNoOutdir/amd/mapRootAbsolutePathModuleSimpleNoOutdir.sourcemap.txt b/tests/baselines/reference/project/mapRootAbsolutePathModuleSimpleNoOutdir/amd/mapRootAbsolutePathModuleSimpleNoOutdir.sourcemap.txt index e546405911b..aea9cbc53b3 100644 --- a/tests/baselines/reference/project/mapRootAbsolutePathModuleSimpleNoOutdir/amd/mapRootAbsolutePathModuleSimpleNoOutdir.sourcemap.txt +++ b/tests/baselines/reference/project/mapRootAbsolutePathModuleSimpleNoOutdir/amd/mapRootAbsolutePathModuleSimpleNoOutdir.sourcemap.txt @@ -60,7 +60,7 @@ sourceFile:../m1.ts 1->Emitted(7, 9) Source(4, 1) + SourceIndex(0) 2 >Emitted(7, 21) Source(4, 2) + SourceIndex(0) --- ->>> })(); +>>> }()); 1 >^^^^ 2 > ^ 3 > @@ -234,7 +234,7 @@ sourceFile:../test.ts 1->Emitted(7, 9) Source(5, 1) + SourceIndex(0) 2 >Emitted(7, 18) Source(5, 2) + SourceIndex(0) --- ->>> })(); +>>> }()); 1 >^^^^ 2 > ^ 3 > diff --git a/tests/baselines/reference/project/mapRootAbsolutePathModuleSimpleNoOutdir/node/m1.js b/tests/baselines/reference/project/mapRootAbsolutePathModuleSimpleNoOutdir/node/m1.js index 284d58acdad..efdf4bd9a30 100644 --- a/tests/baselines/reference/project/mapRootAbsolutePathModuleSimpleNoOutdir/node/m1.js +++ b/tests/baselines/reference/project/mapRootAbsolutePathModuleSimpleNoOutdir/node/m1.js @@ -4,7 +4,7 @@ var m1_c1 = (function () { function m1_c1() { } return m1_c1; -})(); +}()); exports.m1_c1 = m1_c1; exports.m1_instance1 = new m1_c1(); function m1_f1() { diff --git a/tests/baselines/reference/project/mapRootAbsolutePathModuleSimpleNoOutdir/node/mapRootAbsolutePathModuleSimpleNoOutdir.sourcemap.txt b/tests/baselines/reference/project/mapRootAbsolutePathModuleSimpleNoOutdir/node/mapRootAbsolutePathModuleSimpleNoOutdir.sourcemap.txt index dcb2c860ca0..c62d5b213f7 100644 --- a/tests/baselines/reference/project/mapRootAbsolutePathModuleSimpleNoOutdir/node/mapRootAbsolutePathModuleSimpleNoOutdir.sourcemap.txt +++ b/tests/baselines/reference/project/mapRootAbsolutePathModuleSimpleNoOutdir/node/mapRootAbsolutePathModuleSimpleNoOutdir.sourcemap.txt @@ -59,7 +59,7 @@ sourceFile:../m1.ts 1->Emitted(6, 5) Source(4, 1) + SourceIndex(0) 2 >Emitted(6, 17) Source(4, 2) + SourceIndex(0) --- ->>>})(); +>>>}()); 1 > 2 >^ 3 > @@ -255,7 +255,7 @@ sourceFile:../test.ts 1->Emitted(7, 5) Source(5, 1) + SourceIndex(0) 2 >Emitted(7, 14) Source(5, 2) + SourceIndex(0) --- ->>>})(); +>>>}()); 1 > 2 >^ 3 > diff --git a/tests/baselines/reference/project/mapRootAbsolutePathModuleSimpleSpecifyOutputDirectory/amd/mapRootAbsolutePathModuleSimpleSpecifyOutputDirectory.sourcemap.txt b/tests/baselines/reference/project/mapRootAbsolutePathModuleSimpleSpecifyOutputDirectory/amd/mapRootAbsolutePathModuleSimpleSpecifyOutputDirectory.sourcemap.txt index 87a12bd64cf..f2118484993 100644 --- a/tests/baselines/reference/project/mapRootAbsolutePathModuleSimpleSpecifyOutputDirectory/amd/mapRootAbsolutePathModuleSimpleSpecifyOutputDirectory.sourcemap.txt +++ b/tests/baselines/reference/project/mapRootAbsolutePathModuleSimpleSpecifyOutputDirectory/amd/mapRootAbsolutePathModuleSimpleSpecifyOutputDirectory.sourcemap.txt @@ -60,7 +60,7 @@ sourceFile:../m1.ts 1->Emitted(7, 9) Source(4, 1) + SourceIndex(0) 2 >Emitted(7, 21) Source(4, 2) + SourceIndex(0) --- ->>> })(); +>>> }()); 1 >^^^^ 2 > ^ 3 > @@ -234,7 +234,7 @@ sourceFile:../test.ts 1->Emitted(7, 9) Source(5, 1) + SourceIndex(0) 2 >Emitted(7, 18) Source(5, 2) + SourceIndex(0) --- ->>> })(); +>>> }()); 1 >^^^^ 2 > ^ 3 > diff --git a/tests/baselines/reference/project/mapRootAbsolutePathModuleSimpleSpecifyOutputDirectory/amd/outdir/simple/m1.js b/tests/baselines/reference/project/mapRootAbsolutePathModuleSimpleSpecifyOutputDirectory/amd/outdir/simple/m1.js index 684b6e489f7..3017cac2b88 100644 --- a/tests/baselines/reference/project/mapRootAbsolutePathModuleSimpleSpecifyOutputDirectory/amd/outdir/simple/m1.js +++ b/tests/baselines/reference/project/mapRootAbsolutePathModuleSimpleSpecifyOutputDirectory/amd/outdir/simple/m1.js @@ -5,7 +5,7 @@ define(["require", "exports"], function (require, exports) { function m1_c1() { } return m1_c1; - })(); + }()); exports.m1_c1 = m1_c1; exports.m1_instance1 = new m1_c1(); function m1_f1() { diff --git a/tests/baselines/reference/project/mapRootAbsolutePathModuleSimpleSpecifyOutputDirectory/node/mapRootAbsolutePathModuleSimpleSpecifyOutputDirectory.sourcemap.txt b/tests/baselines/reference/project/mapRootAbsolutePathModuleSimpleSpecifyOutputDirectory/node/mapRootAbsolutePathModuleSimpleSpecifyOutputDirectory.sourcemap.txt index ff6b403823d..e650d39612b 100644 --- a/tests/baselines/reference/project/mapRootAbsolutePathModuleSimpleSpecifyOutputDirectory/node/mapRootAbsolutePathModuleSimpleSpecifyOutputDirectory.sourcemap.txt +++ b/tests/baselines/reference/project/mapRootAbsolutePathModuleSimpleSpecifyOutputDirectory/node/mapRootAbsolutePathModuleSimpleSpecifyOutputDirectory.sourcemap.txt @@ -59,7 +59,7 @@ sourceFile:../m1.ts 1->Emitted(6, 5) Source(4, 1) + SourceIndex(0) 2 >Emitted(6, 17) Source(4, 2) + SourceIndex(0) --- ->>>})(); +>>>}()); 1 > 2 >^ 3 > @@ -255,7 +255,7 @@ sourceFile:../test.ts 1->Emitted(7, 5) Source(5, 1) + SourceIndex(0) 2 >Emitted(7, 14) Source(5, 2) + SourceIndex(0) --- ->>>})(); +>>>}()); 1 > 2 >^ 3 > diff --git a/tests/baselines/reference/project/mapRootAbsolutePathModuleSimpleSpecifyOutputDirectory/node/outdir/simple/m1.js b/tests/baselines/reference/project/mapRootAbsolutePathModuleSimpleSpecifyOutputDirectory/node/outdir/simple/m1.js index 284d58acdad..efdf4bd9a30 100644 --- a/tests/baselines/reference/project/mapRootAbsolutePathModuleSimpleSpecifyOutputDirectory/node/outdir/simple/m1.js +++ b/tests/baselines/reference/project/mapRootAbsolutePathModuleSimpleSpecifyOutputDirectory/node/outdir/simple/m1.js @@ -4,7 +4,7 @@ var m1_c1 = (function () { function m1_c1() { } return m1_c1; -})(); +}()); exports.m1_c1 = m1_c1; exports.m1_instance1 = new m1_c1(); function m1_f1() { diff --git a/tests/baselines/reference/project/mapRootAbsolutePathModuleSimpleSpecifyOutputFile/amd/bin/test.js b/tests/baselines/reference/project/mapRootAbsolutePathModuleSimpleSpecifyOutputFile/amd/bin/test.js index 3dc74b12b3d..d3a752a0ee4 100644 --- a/tests/baselines/reference/project/mapRootAbsolutePathModuleSimpleSpecifyOutputFile/amd/bin/test.js +++ b/tests/baselines/reference/project/mapRootAbsolutePathModuleSimpleSpecifyOutputFile/amd/bin/test.js @@ -5,7 +5,7 @@ define("m1", ["require", "exports"], function (require, exports) { function m1_c1() { } return m1_c1; - })(); + }()); exports.m1_c1 = m1_c1; exports.m1_instance1 = new m1_c1(); function m1_f1() { @@ -20,7 +20,7 @@ define("test", ["require", "exports", "m1"], function (require, exports, m1) { function c1() { } return c1; - })(); + }()); exports.c1 = c1; exports.instance1 = new c1(); function f1() { diff --git a/tests/baselines/reference/project/mapRootAbsolutePathModuleSimpleSpecifyOutputFile/amd/mapRootAbsolutePathModuleSimpleSpecifyOutputFile.sourcemap.txt b/tests/baselines/reference/project/mapRootAbsolutePathModuleSimpleSpecifyOutputFile/amd/mapRootAbsolutePathModuleSimpleSpecifyOutputFile.sourcemap.txt index 8797275bcda..019ae2bd0aa 100644 --- a/tests/baselines/reference/project/mapRootAbsolutePathModuleSimpleSpecifyOutputFile/amd/mapRootAbsolutePathModuleSimpleSpecifyOutputFile.sourcemap.txt +++ b/tests/baselines/reference/project/mapRootAbsolutePathModuleSimpleSpecifyOutputFile/amd/mapRootAbsolutePathModuleSimpleSpecifyOutputFile.sourcemap.txt @@ -60,7 +60,7 @@ sourceFile:../m1.ts 1->Emitted(7, 9) Source(4, 1) + SourceIndex(0) 2 >Emitted(7, 21) Source(4, 2) + SourceIndex(0) --- ->>> })(); +>>> }()); 1 >^^^^ 2 > ^ 3 > @@ -228,7 +228,7 @@ sourceFile:../test.ts 1->Emitted(22, 9) Source(5, 1) + SourceIndex(1) 2 >Emitted(22, 18) Source(5, 2) + SourceIndex(1) --- ->>> })(); +>>> }()); 1 >^^^^ 2 > ^ 3 > diff --git a/tests/baselines/reference/project/mapRootAbsolutePathModuleSubfolderNoOutdir/amd/mapRootAbsolutePathModuleSubfolderNoOutdir.sourcemap.txt b/tests/baselines/reference/project/mapRootAbsolutePathModuleSubfolderNoOutdir/amd/mapRootAbsolutePathModuleSubfolderNoOutdir.sourcemap.txt index 737f15bf08c..425fd381ad6 100644 --- a/tests/baselines/reference/project/mapRootAbsolutePathModuleSubfolderNoOutdir/amd/mapRootAbsolutePathModuleSubfolderNoOutdir.sourcemap.txt +++ b/tests/baselines/reference/project/mapRootAbsolutePathModuleSubfolderNoOutdir/amd/mapRootAbsolutePathModuleSubfolderNoOutdir.sourcemap.txt @@ -60,7 +60,7 @@ sourceFile:../../ref/m1.ts 1->Emitted(7, 9) Source(4, 1) + SourceIndex(0) 2 >Emitted(7, 21) Source(4, 2) + SourceIndex(0) --- ->>> })(); +>>> }()); 1 >^^^^ 2 > ^ 3 > @@ -234,7 +234,7 @@ sourceFile:../test.ts 1->Emitted(7, 9) Source(5, 1) + SourceIndex(0) 2 >Emitted(7, 18) Source(5, 2) + SourceIndex(0) --- ->>> })(); +>>> }()); 1 >^^^^ 2 > ^ 3 > diff --git a/tests/baselines/reference/project/mapRootAbsolutePathModuleSubfolderNoOutdir/amd/ref/m1.js b/tests/baselines/reference/project/mapRootAbsolutePathModuleSubfolderNoOutdir/amd/ref/m1.js index 24ff184b236..13158547401 100644 --- a/tests/baselines/reference/project/mapRootAbsolutePathModuleSubfolderNoOutdir/amd/ref/m1.js +++ b/tests/baselines/reference/project/mapRootAbsolutePathModuleSubfolderNoOutdir/amd/ref/m1.js @@ -5,7 +5,7 @@ define(["require", "exports"], function (require, exports) { function m1_c1() { } return m1_c1; - })(); + }()); exports.m1_c1 = m1_c1; exports.m1_instance1 = new m1_c1(); function m1_f1() { diff --git a/tests/baselines/reference/project/mapRootAbsolutePathModuleSubfolderNoOutdir/node/mapRootAbsolutePathModuleSubfolderNoOutdir.sourcemap.txt b/tests/baselines/reference/project/mapRootAbsolutePathModuleSubfolderNoOutdir/node/mapRootAbsolutePathModuleSubfolderNoOutdir.sourcemap.txt index b5706736604..94024fb5deb 100644 --- a/tests/baselines/reference/project/mapRootAbsolutePathModuleSubfolderNoOutdir/node/mapRootAbsolutePathModuleSubfolderNoOutdir.sourcemap.txt +++ b/tests/baselines/reference/project/mapRootAbsolutePathModuleSubfolderNoOutdir/node/mapRootAbsolutePathModuleSubfolderNoOutdir.sourcemap.txt @@ -59,7 +59,7 @@ sourceFile:../../ref/m1.ts 1->Emitted(6, 5) Source(4, 1) + SourceIndex(0) 2 >Emitted(6, 17) Source(4, 2) + SourceIndex(0) --- ->>>})(); +>>>}()); 1 > 2 >^ 3 > @@ -255,7 +255,7 @@ sourceFile:../test.ts 1->Emitted(7, 5) Source(5, 1) + SourceIndex(0) 2 >Emitted(7, 14) Source(5, 2) + SourceIndex(0) --- ->>>})(); +>>>}()); 1 > 2 >^ 3 > diff --git a/tests/baselines/reference/project/mapRootAbsolutePathModuleSubfolderNoOutdir/node/ref/m1.js b/tests/baselines/reference/project/mapRootAbsolutePathModuleSubfolderNoOutdir/node/ref/m1.js index 277943cc80d..80d76037a7f 100644 --- a/tests/baselines/reference/project/mapRootAbsolutePathModuleSubfolderNoOutdir/node/ref/m1.js +++ b/tests/baselines/reference/project/mapRootAbsolutePathModuleSubfolderNoOutdir/node/ref/m1.js @@ -4,7 +4,7 @@ var m1_c1 = (function () { function m1_c1() { } return m1_c1; -})(); +}()); exports.m1_c1 = m1_c1; exports.m1_instance1 = new m1_c1(); function m1_f1() { diff --git a/tests/baselines/reference/project/mapRootAbsolutePathModuleSubfolderSpecifyOutputDirectory/amd/mapRootAbsolutePathModuleSubfolderSpecifyOutputDirectory.sourcemap.txt b/tests/baselines/reference/project/mapRootAbsolutePathModuleSubfolderSpecifyOutputDirectory/amd/mapRootAbsolutePathModuleSubfolderSpecifyOutputDirectory.sourcemap.txt index ce3e6a112d2..c5eecc3b50f 100644 --- a/tests/baselines/reference/project/mapRootAbsolutePathModuleSubfolderSpecifyOutputDirectory/amd/mapRootAbsolutePathModuleSubfolderSpecifyOutputDirectory.sourcemap.txt +++ b/tests/baselines/reference/project/mapRootAbsolutePathModuleSubfolderSpecifyOutputDirectory/amd/mapRootAbsolutePathModuleSubfolderSpecifyOutputDirectory.sourcemap.txt @@ -60,7 +60,7 @@ sourceFile:../../ref/m1.ts 1->Emitted(7, 9) Source(4, 1) + SourceIndex(0) 2 >Emitted(7, 21) Source(4, 2) + SourceIndex(0) --- ->>> })(); +>>> }()); 1 >^^^^ 2 > ^ 3 > @@ -234,7 +234,7 @@ sourceFile:../test.ts 1->Emitted(7, 9) Source(5, 1) + SourceIndex(0) 2 >Emitted(7, 18) Source(5, 2) + SourceIndex(0) --- ->>> })(); +>>> }()); 1 >^^^^ 2 > ^ 3 > diff --git a/tests/baselines/reference/project/mapRootAbsolutePathModuleSubfolderSpecifyOutputDirectory/amd/outdir/simple/ref/m1.js b/tests/baselines/reference/project/mapRootAbsolutePathModuleSubfolderSpecifyOutputDirectory/amd/outdir/simple/ref/m1.js index 24ff184b236..13158547401 100644 --- a/tests/baselines/reference/project/mapRootAbsolutePathModuleSubfolderSpecifyOutputDirectory/amd/outdir/simple/ref/m1.js +++ b/tests/baselines/reference/project/mapRootAbsolutePathModuleSubfolderSpecifyOutputDirectory/amd/outdir/simple/ref/m1.js @@ -5,7 +5,7 @@ define(["require", "exports"], function (require, exports) { function m1_c1() { } return m1_c1; - })(); + }()); exports.m1_c1 = m1_c1; exports.m1_instance1 = new m1_c1(); function m1_f1() { diff --git a/tests/baselines/reference/project/mapRootAbsolutePathModuleSubfolderSpecifyOutputDirectory/node/mapRootAbsolutePathModuleSubfolderSpecifyOutputDirectory.sourcemap.txt b/tests/baselines/reference/project/mapRootAbsolutePathModuleSubfolderSpecifyOutputDirectory/node/mapRootAbsolutePathModuleSubfolderSpecifyOutputDirectory.sourcemap.txt index 0ce6c34b1a3..be825d37963 100644 --- a/tests/baselines/reference/project/mapRootAbsolutePathModuleSubfolderSpecifyOutputDirectory/node/mapRootAbsolutePathModuleSubfolderSpecifyOutputDirectory.sourcemap.txt +++ b/tests/baselines/reference/project/mapRootAbsolutePathModuleSubfolderSpecifyOutputDirectory/node/mapRootAbsolutePathModuleSubfolderSpecifyOutputDirectory.sourcemap.txt @@ -59,7 +59,7 @@ sourceFile:../../ref/m1.ts 1->Emitted(6, 5) Source(4, 1) + SourceIndex(0) 2 >Emitted(6, 17) Source(4, 2) + SourceIndex(0) --- ->>>})(); +>>>}()); 1 > 2 >^ 3 > @@ -255,7 +255,7 @@ sourceFile:../test.ts 1->Emitted(7, 5) Source(5, 1) + SourceIndex(0) 2 >Emitted(7, 14) Source(5, 2) + SourceIndex(0) --- ->>>})(); +>>>}()); 1 > 2 >^ 3 > diff --git a/tests/baselines/reference/project/mapRootAbsolutePathModuleSubfolderSpecifyOutputDirectory/node/outdir/simple/ref/m1.js b/tests/baselines/reference/project/mapRootAbsolutePathModuleSubfolderSpecifyOutputDirectory/node/outdir/simple/ref/m1.js index 277943cc80d..80d76037a7f 100644 --- a/tests/baselines/reference/project/mapRootAbsolutePathModuleSubfolderSpecifyOutputDirectory/node/outdir/simple/ref/m1.js +++ b/tests/baselines/reference/project/mapRootAbsolutePathModuleSubfolderSpecifyOutputDirectory/node/outdir/simple/ref/m1.js @@ -4,7 +4,7 @@ var m1_c1 = (function () { function m1_c1() { } return m1_c1; -})(); +}()); exports.m1_c1 = m1_c1; exports.m1_instance1 = new m1_c1(); function m1_f1() { diff --git a/tests/baselines/reference/project/mapRootAbsolutePathModuleSubfolderSpecifyOutputFile/amd/bin/test.js b/tests/baselines/reference/project/mapRootAbsolutePathModuleSubfolderSpecifyOutputFile/amd/bin/test.js index 44b0801e558..d20feb624ba 100644 --- a/tests/baselines/reference/project/mapRootAbsolutePathModuleSubfolderSpecifyOutputFile/amd/bin/test.js +++ b/tests/baselines/reference/project/mapRootAbsolutePathModuleSubfolderSpecifyOutputFile/amd/bin/test.js @@ -5,7 +5,7 @@ define("ref/m1", ["require", "exports"], function (require, exports) { function m1_c1() { } return m1_c1; - })(); + }()); exports.m1_c1 = m1_c1; exports.m1_instance1 = new m1_c1(); function m1_f1() { @@ -20,7 +20,7 @@ define("test", ["require", "exports", "ref/m1"], function (require, exports, m1) function c1() { } return c1; - })(); + }()); exports.c1 = c1; exports.instance1 = new c1(); function f1() { diff --git a/tests/baselines/reference/project/mapRootAbsolutePathModuleSubfolderSpecifyOutputFile/amd/mapRootAbsolutePathModuleSubfolderSpecifyOutputFile.sourcemap.txt b/tests/baselines/reference/project/mapRootAbsolutePathModuleSubfolderSpecifyOutputFile/amd/mapRootAbsolutePathModuleSubfolderSpecifyOutputFile.sourcemap.txt index 0eade6b6f8f..3777aaad545 100644 --- a/tests/baselines/reference/project/mapRootAbsolutePathModuleSubfolderSpecifyOutputFile/amd/mapRootAbsolutePathModuleSubfolderSpecifyOutputFile.sourcemap.txt +++ b/tests/baselines/reference/project/mapRootAbsolutePathModuleSubfolderSpecifyOutputFile/amd/mapRootAbsolutePathModuleSubfolderSpecifyOutputFile.sourcemap.txt @@ -60,7 +60,7 @@ sourceFile:../ref/m1.ts 1->Emitted(7, 9) Source(4, 1) + SourceIndex(0) 2 >Emitted(7, 21) Source(4, 2) + SourceIndex(0) --- ->>> })(); +>>> }()); 1 >^^^^ 2 > ^ 3 > @@ -228,7 +228,7 @@ sourceFile:../test.ts 1->Emitted(22, 9) Source(5, 1) + SourceIndex(1) 2 >Emitted(22, 18) Source(5, 2) + SourceIndex(1) --- ->>> })(); +>>> }()); 1 >^^^^ 2 > ^ 3 > diff --git a/tests/baselines/reference/project/mapRootAbsolutePathMultifolderNoOutdir/amd/mapRootAbsolutePathMultifolderNoOutdir.sourcemap.txt b/tests/baselines/reference/project/mapRootAbsolutePathMultifolderNoOutdir/amd/mapRootAbsolutePathMultifolderNoOutdir.sourcemap.txt index 1c3193cbd20..5ea98f50d2d 100644 --- a/tests/baselines/reference/project/mapRootAbsolutePathMultifolderNoOutdir/amd/mapRootAbsolutePathMultifolderNoOutdir.sourcemap.txt +++ b/tests/baselines/reference/project/mapRootAbsolutePathMultifolderNoOutdir/amd/mapRootAbsolutePathMultifolderNoOutdir.sourcemap.txt @@ -61,7 +61,7 @@ sourceFile:../../../ref/m1.ts 1->Emitted(5, 5) Source(4, 1) + SourceIndex(0) 2 >Emitted(5, 17) Source(4, 2) + SourceIndex(0) --- ->>>})(); +>>>}()); 1 > 2 >^ 3 > @@ -204,7 +204,7 @@ sourceFile:../../../outputdir_multifolder_ref/m2.ts 1->Emitted(5, 5) Source(4, 1) + SourceIndex(0) 2 >Emitted(5, 17) Source(4, 2) + SourceIndex(0) --- ->>>})(); +>>>}()); 1 > 2 >^ 3 > @@ -366,7 +366,7 @@ sourceFile:../../test.ts 1->Emitted(7, 5) Source(6, 1) + SourceIndex(0) 2 >Emitted(7, 14) Source(6, 2) + SourceIndex(0) --- ->>>})(); +>>>}()); 1 > 2 >^ 3 > diff --git a/tests/baselines/reference/project/mapRootAbsolutePathMultifolderNoOutdir/amd/ref/m1.js b/tests/baselines/reference/project/mapRootAbsolutePathMultifolderNoOutdir/amd/ref/m1.js index 77245d4717b..6e43f21bdb1 100644 --- a/tests/baselines/reference/project/mapRootAbsolutePathMultifolderNoOutdir/amd/ref/m1.js +++ b/tests/baselines/reference/project/mapRootAbsolutePathMultifolderNoOutdir/amd/ref/m1.js @@ -3,7 +3,7 @@ var m1_c1 = (function () { function m1_c1() { } return m1_c1; -})(); +}()); var m1_instance1 = new m1_c1(); function m1_f1() { return m1_instance1; diff --git a/tests/baselines/reference/project/mapRootAbsolutePathMultifolderNoOutdir/node/mapRootAbsolutePathMultifolderNoOutdir.sourcemap.txt b/tests/baselines/reference/project/mapRootAbsolutePathMultifolderNoOutdir/node/mapRootAbsolutePathMultifolderNoOutdir.sourcemap.txt index 1c3193cbd20..5ea98f50d2d 100644 --- a/tests/baselines/reference/project/mapRootAbsolutePathMultifolderNoOutdir/node/mapRootAbsolutePathMultifolderNoOutdir.sourcemap.txt +++ b/tests/baselines/reference/project/mapRootAbsolutePathMultifolderNoOutdir/node/mapRootAbsolutePathMultifolderNoOutdir.sourcemap.txt @@ -61,7 +61,7 @@ sourceFile:../../../ref/m1.ts 1->Emitted(5, 5) Source(4, 1) + SourceIndex(0) 2 >Emitted(5, 17) Source(4, 2) + SourceIndex(0) --- ->>>})(); +>>>}()); 1 > 2 >^ 3 > @@ -204,7 +204,7 @@ sourceFile:../../../outputdir_multifolder_ref/m2.ts 1->Emitted(5, 5) Source(4, 1) + SourceIndex(0) 2 >Emitted(5, 17) Source(4, 2) + SourceIndex(0) --- ->>>})(); +>>>}()); 1 > 2 >^ 3 > @@ -366,7 +366,7 @@ sourceFile:../../test.ts 1->Emitted(7, 5) Source(6, 1) + SourceIndex(0) 2 >Emitted(7, 14) Source(6, 2) + SourceIndex(0) --- ->>>})(); +>>>}()); 1 > 2 >^ 3 > diff --git a/tests/baselines/reference/project/mapRootAbsolutePathMultifolderNoOutdir/node/ref/m1.js b/tests/baselines/reference/project/mapRootAbsolutePathMultifolderNoOutdir/node/ref/m1.js index 77245d4717b..6e43f21bdb1 100644 --- a/tests/baselines/reference/project/mapRootAbsolutePathMultifolderNoOutdir/node/ref/m1.js +++ b/tests/baselines/reference/project/mapRootAbsolutePathMultifolderNoOutdir/node/ref/m1.js @@ -3,7 +3,7 @@ var m1_c1 = (function () { function m1_c1() { } return m1_c1; -})(); +}()); var m1_instance1 = new m1_c1(); function m1_f1() { return m1_instance1; diff --git a/tests/baselines/reference/project/mapRootAbsolutePathMultifolderSpecifyOutputDirectory/amd/mapRootAbsolutePathMultifolderSpecifyOutputDirectory.sourcemap.txt b/tests/baselines/reference/project/mapRootAbsolutePathMultifolderSpecifyOutputDirectory/amd/mapRootAbsolutePathMultifolderSpecifyOutputDirectory.sourcemap.txt index 7e1b50667b8..63c897e4e57 100644 --- a/tests/baselines/reference/project/mapRootAbsolutePathMultifolderSpecifyOutputDirectory/amd/mapRootAbsolutePathMultifolderSpecifyOutputDirectory.sourcemap.txt +++ b/tests/baselines/reference/project/mapRootAbsolutePathMultifolderSpecifyOutputDirectory/amd/mapRootAbsolutePathMultifolderSpecifyOutputDirectory.sourcemap.txt @@ -61,7 +61,7 @@ sourceFile:../../../ref/m1.ts 1->Emitted(5, 5) Source(4, 1) + SourceIndex(0) 2 >Emitted(5, 17) Source(4, 2) + SourceIndex(0) --- ->>>})(); +>>>}()); 1 > 2 >^ 3 > @@ -204,7 +204,7 @@ sourceFile:../../../outputdir_multifolder_ref/m2.ts 1->Emitted(5, 5) Source(4, 1) + SourceIndex(0) 2 >Emitted(5, 17) Source(4, 2) + SourceIndex(0) --- ->>>})(); +>>>}()); 1 > 2 >^ 3 > @@ -366,7 +366,7 @@ sourceFile:../../test.ts 1->Emitted(7, 5) Source(6, 1) + SourceIndex(0) 2 >Emitted(7, 14) Source(6, 2) + SourceIndex(0) --- ->>>})(); +>>>}()); 1 > 2 >^ 3 > diff --git a/tests/baselines/reference/project/mapRootAbsolutePathMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_multifolder/ref/m1.js b/tests/baselines/reference/project/mapRootAbsolutePathMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_multifolder/ref/m1.js index 77245d4717b..6e43f21bdb1 100644 --- a/tests/baselines/reference/project/mapRootAbsolutePathMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_multifolder/ref/m1.js +++ b/tests/baselines/reference/project/mapRootAbsolutePathMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_multifolder/ref/m1.js @@ -3,7 +3,7 @@ var m1_c1 = (function () { function m1_c1() { } return m1_c1; -})(); +}()); var m1_instance1 = new m1_c1(); function m1_f1() { return m1_instance1; diff --git a/tests/baselines/reference/project/mapRootAbsolutePathMultifolderSpecifyOutputDirectory/node/mapRootAbsolutePathMultifolderSpecifyOutputDirectory.sourcemap.txt b/tests/baselines/reference/project/mapRootAbsolutePathMultifolderSpecifyOutputDirectory/node/mapRootAbsolutePathMultifolderSpecifyOutputDirectory.sourcemap.txt index 7e1b50667b8..63c897e4e57 100644 --- a/tests/baselines/reference/project/mapRootAbsolutePathMultifolderSpecifyOutputDirectory/node/mapRootAbsolutePathMultifolderSpecifyOutputDirectory.sourcemap.txt +++ b/tests/baselines/reference/project/mapRootAbsolutePathMultifolderSpecifyOutputDirectory/node/mapRootAbsolutePathMultifolderSpecifyOutputDirectory.sourcemap.txt @@ -61,7 +61,7 @@ sourceFile:../../../ref/m1.ts 1->Emitted(5, 5) Source(4, 1) + SourceIndex(0) 2 >Emitted(5, 17) Source(4, 2) + SourceIndex(0) --- ->>>})(); +>>>}()); 1 > 2 >^ 3 > @@ -204,7 +204,7 @@ sourceFile:../../../outputdir_multifolder_ref/m2.ts 1->Emitted(5, 5) Source(4, 1) + SourceIndex(0) 2 >Emitted(5, 17) Source(4, 2) + SourceIndex(0) --- ->>>})(); +>>>}()); 1 > 2 >^ 3 > @@ -366,7 +366,7 @@ sourceFile:../../test.ts 1->Emitted(7, 5) Source(6, 1) + SourceIndex(0) 2 >Emitted(7, 14) Source(6, 2) + SourceIndex(0) --- ->>>})(); +>>>}()); 1 > 2 >^ 3 > diff --git a/tests/baselines/reference/project/mapRootAbsolutePathMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_multifolder/ref/m1.js b/tests/baselines/reference/project/mapRootAbsolutePathMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_multifolder/ref/m1.js index 77245d4717b..6e43f21bdb1 100644 --- a/tests/baselines/reference/project/mapRootAbsolutePathMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_multifolder/ref/m1.js +++ b/tests/baselines/reference/project/mapRootAbsolutePathMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_multifolder/ref/m1.js @@ -3,7 +3,7 @@ var m1_c1 = (function () { function m1_c1() { } return m1_c1; -})(); +}()); var m1_instance1 = new m1_c1(); function m1_f1() { return m1_instance1; diff --git a/tests/baselines/reference/project/mapRootAbsolutePathMultifolderSpecifyOutputFile/amd/bin/test.js b/tests/baselines/reference/project/mapRootAbsolutePathMultifolderSpecifyOutputFile/amd/bin/test.js index cbcbe046961..f658a89ca9d 100644 --- a/tests/baselines/reference/project/mapRootAbsolutePathMultifolderSpecifyOutputFile/amd/bin/test.js +++ b/tests/baselines/reference/project/mapRootAbsolutePathMultifolderSpecifyOutputFile/amd/bin/test.js @@ -3,7 +3,7 @@ var m1_c1 = (function () { function m1_c1() { } return m1_c1; -})(); +}()); var m1_instance1 = new m1_c1(); function m1_f1() { return m1_instance1; @@ -13,7 +13,7 @@ var m2_c1 = (function () { function m2_c1() { } return m2_c1; -})(); +}()); var m2_instance1 = new m2_c1(); function m2_f1() { return m2_instance1; @@ -25,7 +25,7 @@ var c1 = (function () { function c1() { } return c1; -})(); +}()); var instance1 = new c1(); function f1() { return instance1; diff --git a/tests/baselines/reference/project/mapRootAbsolutePathMultifolderSpecifyOutputFile/amd/mapRootAbsolutePathMultifolderSpecifyOutputFile.sourcemap.txt b/tests/baselines/reference/project/mapRootAbsolutePathMultifolderSpecifyOutputFile/amd/mapRootAbsolutePathMultifolderSpecifyOutputFile.sourcemap.txt index 1d83cb2c734..e22b9099a6f 100644 --- a/tests/baselines/reference/project/mapRootAbsolutePathMultifolderSpecifyOutputFile/amd/mapRootAbsolutePathMultifolderSpecifyOutputFile.sourcemap.txt +++ b/tests/baselines/reference/project/mapRootAbsolutePathMultifolderSpecifyOutputFile/amd/mapRootAbsolutePathMultifolderSpecifyOutputFile.sourcemap.txt @@ -61,7 +61,7 @@ sourceFile:../ref/m1.ts 1->Emitted(5, 5) Source(4, 1) + SourceIndex(0) 2 >Emitted(5, 17) Source(4, 2) + SourceIndex(0) --- ->>>})(); +>>>}()); 1 > 2 >^ 3 > @@ -198,7 +198,7 @@ sourceFile:../../outputdir_multifolder_ref/m2.ts 1->Emitted(15, 5) Source(4, 1) + SourceIndex(1) 2 >Emitted(15, 17) Source(4, 2) + SourceIndex(1) --- ->>>})(); +>>>}()); 1 > 2 >^ 3 > @@ -354,7 +354,7 @@ sourceFile:../test.ts 1->Emitted(27, 5) Source(6, 1) + SourceIndex(2) 2 >Emitted(27, 14) Source(6, 2) + SourceIndex(2) --- ->>>})(); +>>>}()); 1 > 2 >^ 3 > diff --git a/tests/baselines/reference/project/mapRootAbsolutePathMultifolderSpecifyOutputFile/node/bin/test.js b/tests/baselines/reference/project/mapRootAbsolutePathMultifolderSpecifyOutputFile/node/bin/test.js index cbcbe046961..f658a89ca9d 100644 --- a/tests/baselines/reference/project/mapRootAbsolutePathMultifolderSpecifyOutputFile/node/bin/test.js +++ b/tests/baselines/reference/project/mapRootAbsolutePathMultifolderSpecifyOutputFile/node/bin/test.js @@ -3,7 +3,7 @@ var m1_c1 = (function () { function m1_c1() { } return m1_c1; -})(); +}()); var m1_instance1 = new m1_c1(); function m1_f1() { return m1_instance1; @@ -13,7 +13,7 @@ var m2_c1 = (function () { function m2_c1() { } return m2_c1; -})(); +}()); var m2_instance1 = new m2_c1(); function m2_f1() { return m2_instance1; @@ -25,7 +25,7 @@ var c1 = (function () { function c1() { } return c1; -})(); +}()); var instance1 = new c1(); function f1() { return instance1; diff --git a/tests/baselines/reference/project/mapRootAbsolutePathMultifolderSpecifyOutputFile/node/mapRootAbsolutePathMultifolderSpecifyOutputFile.sourcemap.txt b/tests/baselines/reference/project/mapRootAbsolutePathMultifolderSpecifyOutputFile/node/mapRootAbsolutePathMultifolderSpecifyOutputFile.sourcemap.txt index 1d83cb2c734..e22b9099a6f 100644 --- a/tests/baselines/reference/project/mapRootAbsolutePathMultifolderSpecifyOutputFile/node/mapRootAbsolutePathMultifolderSpecifyOutputFile.sourcemap.txt +++ b/tests/baselines/reference/project/mapRootAbsolutePathMultifolderSpecifyOutputFile/node/mapRootAbsolutePathMultifolderSpecifyOutputFile.sourcemap.txt @@ -61,7 +61,7 @@ sourceFile:../ref/m1.ts 1->Emitted(5, 5) Source(4, 1) + SourceIndex(0) 2 >Emitted(5, 17) Source(4, 2) + SourceIndex(0) --- ->>>})(); +>>>}()); 1 > 2 >^ 3 > @@ -198,7 +198,7 @@ sourceFile:../../outputdir_multifolder_ref/m2.ts 1->Emitted(15, 5) Source(4, 1) + SourceIndex(1) 2 >Emitted(15, 17) Source(4, 2) + SourceIndex(1) --- ->>>})(); +>>>}()); 1 > 2 >^ 3 > @@ -354,7 +354,7 @@ sourceFile:../test.ts 1->Emitted(27, 5) Source(6, 1) + SourceIndex(2) 2 >Emitted(27, 14) Source(6, 2) + SourceIndex(2) --- ->>>})(); +>>>}()); 1 > 2 >^ 3 > diff --git a/tests/baselines/reference/project/mapRootAbsolutePathSimpleNoOutdir/amd/m1.js b/tests/baselines/reference/project/mapRootAbsolutePathSimpleNoOutdir/amd/m1.js index 5139d59fad0..95947305417 100644 --- a/tests/baselines/reference/project/mapRootAbsolutePathSimpleNoOutdir/amd/m1.js +++ b/tests/baselines/reference/project/mapRootAbsolutePathSimpleNoOutdir/amd/m1.js @@ -3,7 +3,7 @@ var m1_c1 = (function () { function m1_c1() { } return m1_c1; -})(); +}()); var m1_instance1 = new m1_c1(); function m1_f1() { return m1_instance1; diff --git a/tests/baselines/reference/project/mapRootAbsolutePathSimpleNoOutdir/amd/mapRootAbsolutePathSimpleNoOutdir.sourcemap.txt b/tests/baselines/reference/project/mapRootAbsolutePathSimpleNoOutdir/amd/mapRootAbsolutePathSimpleNoOutdir.sourcemap.txt index 3098d176cee..6aabde30079 100644 --- a/tests/baselines/reference/project/mapRootAbsolutePathSimpleNoOutdir/amd/mapRootAbsolutePathSimpleNoOutdir.sourcemap.txt +++ b/tests/baselines/reference/project/mapRootAbsolutePathSimpleNoOutdir/amd/mapRootAbsolutePathSimpleNoOutdir.sourcemap.txt @@ -61,7 +61,7 @@ sourceFile:../m1.ts 1->Emitted(5, 5) Source(4, 1) + SourceIndex(0) 2 >Emitted(5, 17) Source(4, 2) + SourceIndex(0) --- ->>>})(); +>>>}()); 1 > 2 >^ 3 > @@ -213,7 +213,7 @@ sourceFile:../test.ts 1->Emitted(6, 5) Source(5, 1) + SourceIndex(0) 2 >Emitted(6, 14) Source(5, 2) + SourceIndex(0) --- ->>>})(); +>>>}()); 1 > 2 >^ 3 > diff --git a/tests/baselines/reference/project/mapRootAbsolutePathSimpleNoOutdir/node/m1.js b/tests/baselines/reference/project/mapRootAbsolutePathSimpleNoOutdir/node/m1.js index 5139d59fad0..95947305417 100644 --- a/tests/baselines/reference/project/mapRootAbsolutePathSimpleNoOutdir/node/m1.js +++ b/tests/baselines/reference/project/mapRootAbsolutePathSimpleNoOutdir/node/m1.js @@ -3,7 +3,7 @@ var m1_c1 = (function () { function m1_c1() { } return m1_c1; -})(); +}()); var m1_instance1 = new m1_c1(); function m1_f1() { return m1_instance1; diff --git a/tests/baselines/reference/project/mapRootAbsolutePathSimpleNoOutdir/node/mapRootAbsolutePathSimpleNoOutdir.sourcemap.txt b/tests/baselines/reference/project/mapRootAbsolutePathSimpleNoOutdir/node/mapRootAbsolutePathSimpleNoOutdir.sourcemap.txt index 3098d176cee..6aabde30079 100644 --- a/tests/baselines/reference/project/mapRootAbsolutePathSimpleNoOutdir/node/mapRootAbsolutePathSimpleNoOutdir.sourcemap.txt +++ b/tests/baselines/reference/project/mapRootAbsolutePathSimpleNoOutdir/node/mapRootAbsolutePathSimpleNoOutdir.sourcemap.txt @@ -61,7 +61,7 @@ sourceFile:../m1.ts 1->Emitted(5, 5) Source(4, 1) + SourceIndex(0) 2 >Emitted(5, 17) Source(4, 2) + SourceIndex(0) --- ->>>})(); +>>>}()); 1 > 2 >^ 3 > @@ -213,7 +213,7 @@ sourceFile:../test.ts 1->Emitted(6, 5) Source(5, 1) + SourceIndex(0) 2 >Emitted(6, 14) Source(5, 2) + SourceIndex(0) --- ->>>})(); +>>>}()); 1 > 2 >^ 3 > diff --git a/tests/baselines/reference/project/mapRootAbsolutePathSimpleSpecifyOutputDirectory/amd/mapRootAbsolutePathSimpleSpecifyOutputDirectory.sourcemap.txt b/tests/baselines/reference/project/mapRootAbsolutePathSimpleSpecifyOutputDirectory/amd/mapRootAbsolutePathSimpleSpecifyOutputDirectory.sourcemap.txt index 39e884c2e81..65b461791aa 100644 --- a/tests/baselines/reference/project/mapRootAbsolutePathSimpleSpecifyOutputDirectory/amd/mapRootAbsolutePathSimpleSpecifyOutputDirectory.sourcemap.txt +++ b/tests/baselines/reference/project/mapRootAbsolutePathSimpleSpecifyOutputDirectory/amd/mapRootAbsolutePathSimpleSpecifyOutputDirectory.sourcemap.txt @@ -61,7 +61,7 @@ sourceFile:../m1.ts 1->Emitted(5, 5) Source(4, 1) + SourceIndex(0) 2 >Emitted(5, 17) Source(4, 2) + SourceIndex(0) --- ->>>})(); +>>>}()); 1 > 2 >^ 3 > @@ -213,7 +213,7 @@ sourceFile:../test.ts 1->Emitted(6, 5) Source(5, 1) + SourceIndex(0) 2 >Emitted(6, 14) Source(5, 2) + SourceIndex(0) --- ->>>})(); +>>>}()); 1 > 2 >^ 3 > diff --git a/tests/baselines/reference/project/mapRootAbsolutePathSimpleSpecifyOutputDirectory/amd/outdir/simple/m1.js b/tests/baselines/reference/project/mapRootAbsolutePathSimpleSpecifyOutputDirectory/amd/outdir/simple/m1.js index 5139d59fad0..95947305417 100644 --- a/tests/baselines/reference/project/mapRootAbsolutePathSimpleSpecifyOutputDirectory/amd/outdir/simple/m1.js +++ b/tests/baselines/reference/project/mapRootAbsolutePathSimpleSpecifyOutputDirectory/amd/outdir/simple/m1.js @@ -3,7 +3,7 @@ var m1_c1 = (function () { function m1_c1() { } return m1_c1; -})(); +}()); var m1_instance1 = new m1_c1(); function m1_f1() { return m1_instance1; diff --git a/tests/baselines/reference/project/mapRootAbsolutePathSimpleSpecifyOutputDirectory/node/mapRootAbsolutePathSimpleSpecifyOutputDirectory.sourcemap.txt b/tests/baselines/reference/project/mapRootAbsolutePathSimpleSpecifyOutputDirectory/node/mapRootAbsolutePathSimpleSpecifyOutputDirectory.sourcemap.txt index 39e884c2e81..65b461791aa 100644 --- a/tests/baselines/reference/project/mapRootAbsolutePathSimpleSpecifyOutputDirectory/node/mapRootAbsolutePathSimpleSpecifyOutputDirectory.sourcemap.txt +++ b/tests/baselines/reference/project/mapRootAbsolutePathSimpleSpecifyOutputDirectory/node/mapRootAbsolutePathSimpleSpecifyOutputDirectory.sourcemap.txt @@ -61,7 +61,7 @@ sourceFile:../m1.ts 1->Emitted(5, 5) Source(4, 1) + SourceIndex(0) 2 >Emitted(5, 17) Source(4, 2) + SourceIndex(0) --- ->>>})(); +>>>}()); 1 > 2 >^ 3 > @@ -213,7 +213,7 @@ sourceFile:../test.ts 1->Emitted(6, 5) Source(5, 1) + SourceIndex(0) 2 >Emitted(6, 14) Source(5, 2) + SourceIndex(0) --- ->>>})(); +>>>}()); 1 > 2 >^ 3 > diff --git a/tests/baselines/reference/project/mapRootAbsolutePathSimpleSpecifyOutputDirectory/node/outdir/simple/m1.js b/tests/baselines/reference/project/mapRootAbsolutePathSimpleSpecifyOutputDirectory/node/outdir/simple/m1.js index 5139d59fad0..95947305417 100644 --- a/tests/baselines/reference/project/mapRootAbsolutePathSimpleSpecifyOutputDirectory/node/outdir/simple/m1.js +++ b/tests/baselines/reference/project/mapRootAbsolutePathSimpleSpecifyOutputDirectory/node/outdir/simple/m1.js @@ -3,7 +3,7 @@ var m1_c1 = (function () { function m1_c1() { } return m1_c1; -})(); +}()); var m1_instance1 = new m1_c1(); function m1_f1() { return m1_instance1; diff --git a/tests/baselines/reference/project/mapRootAbsolutePathSimpleSpecifyOutputFile/amd/bin/test.js b/tests/baselines/reference/project/mapRootAbsolutePathSimpleSpecifyOutputFile/amd/bin/test.js index 54a21de3149..5325afdbd55 100644 --- a/tests/baselines/reference/project/mapRootAbsolutePathSimpleSpecifyOutputFile/amd/bin/test.js +++ b/tests/baselines/reference/project/mapRootAbsolutePathSimpleSpecifyOutputFile/amd/bin/test.js @@ -3,7 +3,7 @@ var m1_c1 = (function () { function m1_c1() { } return m1_c1; -})(); +}()); var m1_instance1 = new m1_c1(); function m1_f1() { return m1_instance1; @@ -14,7 +14,7 @@ var c1 = (function () { function c1() { } return c1; -})(); +}()); var instance1 = new c1(); function f1() { return instance1; diff --git a/tests/baselines/reference/project/mapRootAbsolutePathSimpleSpecifyOutputFile/amd/mapRootAbsolutePathSimpleSpecifyOutputFile.sourcemap.txt b/tests/baselines/reference/project/mapRootAbsolutePathSimpleSpecifyOutputFile/amd/mapRootAbsolutePathSimpleSpecifyOutputFile.sourcemap.txt index 809260bb3bf..997e0b9d7b4 100644 --- a/tests/baselines/reference/project/mapRootAbsolutePathSimpleSpecifyOutputFile/amd/mapRootAbsolutePathSimpleSpecifyOutputFile.sourcemap.txt +++ b/tests/baselines/reference/project/mapRootAbsolutePathSimpleSpecifyOutputFile/amd/mapRootAbsolutePathSimpleSpecifyOutputFile.sourcemap.txt @@ -61,7 +61,7 @@ sourceFile:../m1.ts 1->Emitted(5, 5) Source(4, 1) + SourceIndex(0) 2 >Emitted(5, 17) Source(4, 2) + SourceIndex(0) --- ->>>})(); +>>>}()); 1 > 2 >^ 3 > @@ -207,7 +207,7 @@ sourceFile:../test.ts 1->Emitted(16, 5) Source(5, 1) + SourceIndex(1) 2 >Emitted(16, 14) Source(5, 2) + SourceIndex(1) --- ->>>})(); +>>>}()); 1 > 2 >^ 3 > diff --git a/tests/baselines/reference/project/mapRootAbsolutePathSimpleSpecifyOutputFile/node/bin/test.js b/tests/baselines/reference/project/mapRootAbsolutePathSimpleSpecifyOutputFile/node/bin/test.js index 54a21de3149..5325afdbd55 100644 --- a/tests/baselines/reference/project/mapRootAbsolutePathSimpleSpecifyOutputFile/node/bin/test.js +++ b/tests/baselines/reference/project/mapRootAbsolutePathSimpleSpecifyOutputFile/node/bin/test.js @@ -3,7 +3,7 @@ var m1_c1 = (function () { function m1_c1() { } return m1_c1; -})(); +}()); var m1_instance1 = new m1_c1(); function m1_f1() { return m1_instance1; @@ -14,7 +14,7 @@ var c1 = (function () { function c1() { } return c1; -})(); +}()); var instance1 = new c1(); function f1() { return instance1; diff --git a/tests/baselines/reference/project/mapRootAbsolutePathSimpleSpecifyOutputFile/node/mapRootAbsolutePathSimpleSpecifyOutputFile.sourcemap.txt b/tests/baselines/reference/project/mapRootAbsolutePathSimpleSpecifyOutputFile/node/mapRootAbsolutePathSimpleSpecifyOutputFile.sourcemap.txt index 809260bb3bf..997e0b9d7b4 100644 --- a/tests/baselines/reference/project/mapRootAbsolutePathSimpleSpecifyOutputFile/node/mapRootAbsolutePathSimpleSpecifyOutputFile.sourcemap.txt +++ b/tests/baselines/reference/project/mapRootAbsolutePathSimpleSpecifyOutputFile/node/mapRootAbsolutePathSimpleSpecifyOutputFile.sourcemap.txt @@ -61,7 +61,7 @@ sourceFile:../m1.ts 1->Emitted(5, 5) Source(4, 1) + SourceIndex(0) 2 >Emitted(5, 17) Source(4, 2) + SourceIndex(0) --- ->>>})(); +>>>}()); 1 > 2 >^ 3 > @@ -207,7 +207,7 @@ sourceFile:../test.ts 1->Emitted(16, 5) Source(5, 1) + SourceIndex(1) 2 >Emitted(16, 14) Source(5, 2) + SourceIndex(1) --- ->>>})(); +>>>}()); 1 > 2 >^ 3 > diff --git a/tests/baselines/reference/project/mapRootAbsolutePathSingleFileNoOutdir/amd/mapRootAbsolutePathSingleFileNoOutdir.sourcemap.txt b/tests/baselines/reference/project/mapRootAbsolutePathSingleFileNoOutdir/amd/mapRootAbsolutePathSingleFileNoOutdir.sourcemap.txt index 78f3538ee65..f1b1b6d0916 100644 --- a/tests/baselines/reference/project/mapRootAbsolutePathSingleFileNoOutdir/amd/mapRootAbsolutePathSingleFileNoOutdir.sourcemap.txt +++ b/tests/baselines/reference/project/mapRootAbsolutePathSingleFileNoOutdir/amd/mapRootAbsolutePathSingleFileNoOutdir.sourcemap.txt @@ -61,7 +61,7 @@ sourceFile:../test.ts 1->Emitted(5, 5) Source(4, 1) + SourceIndex(0) 2 >Emitted(5, 14) Source(4, 2) + SourceIndex(0) --- ->>>})(); +>>>}()); 1 > 2 >^ 3 > diff --git a/tests/baselines/reference/project/mapRootAbsolutePathSingleFileNoOutdir/amd/test.js b/tests/baselines/reference/project/mapRootAbsolutePathSingleFileNoOutdir/amd/test.js index c2399b3d024..f299e0d0080 100644 --- a/tests/baselines/reference/project/mapRootAbsolutePathSingleFileNoOutdir/amd/test.js +++ b/tests/baselines/reference/project/mapRootAbsolutePathSingleFileNoOutdir/amd/test.js @@ -3,7 +3,7 @@ var c1 = (function () { function c1() { } return c1; -})(); +}()); var instance1 = new c1(); function f1() { return instance1; diff --git a/tests/baselines/reference/project/mapRootAbsolutePathSingleFileNoOutdir/node/mapRootAbsolutePathSingleFileNoOutdir.sourcemap.txt b/tests/baselines/reference/project/mapRootAbsolutePathSingleFileNoOutdir/node/mapRootAbsolutePathSingleFileNoOutdir.sourcemap.txt index 78f3538ee65..f1b1b6d0916 100644 --- a/tests/baselines/reference/project/mapRootAbsolutePathSingleFileNoOutdir/node/mapRootAbsolutePathSingleFileNoOutdir.sourcemap.txt +++ b/tests/baselines/reference/project/mapRootAbsolutePathSingleFileNoOutdir/node/mapRootAbsolutePathSingleFileNoOutdir.sourcemap.txt @@ -61,7 +61,7 @@ sourceFile:../test.ts 1->Emitted(5, 5) Source(4, 1) + SourceIndex(0) 2 >Emitted(5, 14) Source(4, 2) + SourceIndex(0) --- ->>>})(); +>>>}()); 1 > 2 >^ 3 > diff --git a/tests/baselines/reference/project/mapRootAbsolutePathSingleFileNoOutdir/node/test.js b/tests/baselines/reference/project/mapRootAbsolutePathSingleFileNoOutdir/node/test.js index c2399b3d024..f299e0d0080 100644 --- a/tests/baselines/reference/project/mapRootAbsolutePathSingleFileNoOutdir/node/test.js +++ b/tests/baselines/reference/project/mapRootAbsolutePathSingleFileNoOutdir/node/test.js @@ -3,7 +3,7 @@ var c1 = (function () { function c1() { } return c1; -})(); +}()); var instance1 = new c1(); function f1() { return instance1; diff --git a/tests/baselines/reference/project/mapRootAbsolutePathSingleFileSpecifyOutputDirectory/amd/mapRootAbsolutePathSingleFileSpecifyOutputDirectory.sourcemap.txt b/tests/baselines/reference/project/mapRootAbsolutePathSingleFileSpecifyOutputDirectory/amd/mapRootAbsolutePathSingleFileSpecifyOutputDirectory.sourcemap.txt index 4528840f69b..00d6a44bcf5 100644 --- a/tests/baselines/reference/project/mapRootAbsolutePathSingleFileSpecifyOutputDirectory/amd/mapRootAbsolutePathSingleFileSpecifyOutputDirectory.sourcemap.txt +++ b/tests/baselines/reference/project/mapRootAbsolutePathSingleFileSpecifyOutputDirectory/amd/mapRootAbsolutePathSingleFileSpecifyOutputDirectory.sourcemap.txt @@ -61,7 +61,7 @@ sourceFile:../test.ts 1->Emitted(5, 5) Source(4, 1) + SourceIndex(0) 2 >Emitted(5, 14) Source(4, 2) + SourceIndex(0) --- ->>>})(); +>>>}()); 1 > 2 >^ 3 > diff --git a/tests/baselines/reference/project/mapRootAbsolutePathSingleFileSpecifyOutputDirectory/amd/outdir/simple/test.js b/tests/baselines/reference/project/mapRootAbsolutePathSingleFileSpecifyOutputDirectory/amd/outdir/simple/test.js index c2399b3d024..f299e0d0080 100644 --- a/tests/baselines/reference/project/mapRootAbsolutePathSingleFileSpecifyOutputDirectory/amd/outdir/simple/test.js +++ b/tests/baselines/reference/project/mapRootAbsolutePathSingleFileSpecifyOutputDirectory/amd/outdir/simple/test.js @@ -3,7 +3,7 @@ var c1 = (function () { function c1() { } return c1; -})(); +}()); var instance1 = new c1(); function f1() { return instance1; diff --git a/tests/baselines/reference/project/mapRootAbsolutePathSingleFileSpecifyOutputDirectory/node/mapRootAbsolutePathSingleFileSpecifyOutputDirectory.sourcemap.txt b/tests/baselines/reference/project/mapRootAbsolutePathSingleFileSpecifyOutputDirectory/node/mapRootAbsolutePathSingleFileSpecifyOutputDirectory.sourcemap.txt index 4528840f69b..00d6a44bcf5 100644 --- a/tests/baselines/reference/project/mapRootAbsolutePathSingleFileSpecifyOutputDirectory/node/mapRootAbsolutePathSingleFileSpecifyOutputDirectory.sourcemap.txt +++ b/tests/baselines/reference/project/mapRootAbsolutePathSingleFileSpecifyOutputDirectory/node/mapRootAbsolutePathSingleFileSpecifyOutputDirectory.sourcemap.txt @@ -61,7 +61,7 @@ sourceFile:../test.ts 1->Emitted(5, 5) Source(4, 1) + SourceIndex(0) 2 >Emitted(5, 14) Source(4, 2) + SourceIndex(0) --- ->>>})(); +>>>}()); 1 > 2 >^ 3 > diff --git a/tests/baselines/reference/project/mapRootAbsolutePathSingleFileSpecifyOutputDirectory/node/outdir/simple/test.js b/tests/baselines/reference/project/mapRootAbsolutePathSingleFileSpecifyOutputDirectory/node/outdir/simple/test.js index c2399b3d024..f299e0d0080 100644 --- a/tests/baselines/reference/project/mapRootAbsolutePathSingleFileSpecifyOutputDirectory/node/outdir/simple/test.js +++ b/tests/baselines/reference/project/mapRootAbsolutePathSingleFileSpecifyOutputDirectory/node/outdir/simple/test.js @@ -3,7 +3,7 @@ var c1 = (function () { function c1() { } return c1; -})(); +}()); var instance1 = new c1(); function f1() { return instance1; diff --git a/tests/baselines/reference/project/mapRootAbsolutePathSingleFileSpecifyOutputFile/amd/bin/test.js b/tests/baselines/reference/project/mapRootAbsolutePathSingleFileSpecifyOutputFile/amd/bin/test.js index c2399b3d024..f299e0d0080 100644 --- a/tests/baselines/reference/project/mapRootAbsolutePathSingleFileSpecifyOutputFile/amd/bin/test.js +++ b/tests/baselines/reference/project/mapRootAbsolutePathSingleFileSpecifyOutputFile/amd/bin/test.js @@ -3,7 +3,7 @@ var c1 = (function () { function c1() { } return c1; -})(); +}()); var instance1 = new c1(); function f1() { return instance1; diff --git a/tests/baselines/reference/project/mapRootAbsolutePathSingleFileSpecifyOutputFile/amd/mapRootAbsolutePathSingleFileSpecifyOutputFile.sourcemap.txt b/tests/baselines/reference/project/mapRootAbsolutePathSingleFileSpecifyOutputFile/amd/mapRootAbsolutePathSingleFileSpecifyOutputFile.sourcemap.txt index ed57bdb6f1e..35b71a7e999 100644 --- a/tests/baselines/reference/project/mapRootAbsolutePathSingleFileSpecifyOutputFile/amd/mapRootAbsolutePathSingleFileSpecifyOutputFile.sourcemap.txt +++ b/tests/baselines/reference/project/mapRootAbsolutePathSingleFileSpecifyOutputFile/amd/mapRootAbsolutePathSingleFileSpecifyOutputFile.sourcemap.txt @@ -61,7 +61,7 @@ sourceFile:../test.ts 1->Emitted(5, 5) Source(4, 1) + SourceIndex(0) 2 >Emitted(5, 14) Source(4, 2) + SourceIndex(0) --- ->>>})(); +>>>}()); 1 > 2 >^ 3 > diff --git a/tests/baselines/reference/project/mapRootAbsolutePathSingleFileSpecifyOutputFile/node/bin/test.js b/tests/baselines/reference/project/mapRootAbsolutePathSingleFileSpecifyOutputFile/node/bin/test.js index c2399b3d024..f299e0d0080 100644 --- a/tests/baselines/reference/project/mapRootAbsolutePathSingleFileSpecifyOutputFile/node/bin/test.js +++ b/tests/baselines/reference/project/mapRootAbsolutePathSingleFileSpecifyOutputFile/node/bin/test.js @@ -3,7 +3,7 @@ var c1 = (function () { function c1() { } return c1; -})(); +}()); var instance1 = new c1(); function f1() { return instance1; diff --git a/tests/baselines/reference/project/mapRootAbsolutePathSingleFileSpecifyOutputFile/node/mapRootAbsolutePathSingleFileSpecifyOutputFile.sourcemap.txt b/tests/baselines/reference/project/mapRootAbsolutePathSingleFileSpecifyOutputFile/node/mapRootAbsolutePathSingleFileSpecifyOutputFile.sourcemap.txt index ed57bdb6f1e..35b71a7e999 100644 --- a/tests/baselines/reference/project/mapRootAbsolutePathSingleFileSpecifyOutputFile/node/mapRootAbsolutePathSingleFileSpecifyOutputFile.sourcemap.txt +++ b/tests/baselines/reference/project/mapRootAbsolutePathSingleFileSpecifyOutputFile/node/mapRootAbsolutePathSingleFileSpecifyOutputFile.sourcemap.txt @@ -61,7 +61,7 @@ sourceFile:../test.ts 1->Emitted(5, 5) Source(4, 1) + SourceIndex(0) 2 >Emitted(5, 14) Source(4, 2) + SourceIndex(0) --- ->>>})(); +>>>}()); 1 > 2 >^ 3 > diff --git a/tests/baselines/reference/project/mapRootAbsolutePathSubfolderNoOutdir/amd/mapRootAbsolutePathSubfolderNoOutdir.sourcemap.txt b/tests/baselines/reference/project/mapRootAbsolutePathSubfolderNoOutdir/amd/mapRootAbsolutePathSubfolderNoOutdir.sourcemap.txt index 4834c4ee4c4..d4bc9c6831c 100644 --- a/tests/baselines/reference/project/mapRootAbsolutePathSubfolderNoOutdir/amd/mapRootAbsolutePathSubfolderNoOutdir.sourcemap.txt +++ b/tests/baselines/reference/project/mapRootAbsolutePathSubfolderNoOutdir/amd/mapRootAbsolutePathSubfolderNoOutdir.sourcemap.txt @@ -61,7 +61,7 @@ sourceFile:../../ref/m1.ts 1->Emitted(5, 5) Source(4, 1) + SourceIndex(0) 2 >Emitted(5, 17) Source(4, 2) + SourceIndex(0) --- ->>>})(); +>>>}()); 1 > 2 >^ 3 > @@ -213,7 +213,7 @@ sourceFile:../test.ts 1->Emitted(6, 5) Source(5, 1) + SourceIndex(0) 2 >Emitted(6, 14) Source(5, 2) + SourceIndex(0) --- ->>>})(); +>>>}()); 1 > 2 >^ 3 > diff --git a/tests/baselines/reference/project/mapRootAbsolutePathSubfolderNoOutdir/amd/ref/m1.js b/tests/baselines/reference/project/mapRootAbsolutePathSubfolderNoOutdir/amd/ref/m1.js index 02f4c47bdc7..7d09551625e 100644 --- a/tests/baselines/reference/project/mapRootAbsolutePathSubfolderNoOutdir/amd/ref/m1.js +++ b/tests/baselines/reference/project/mapRootAbsolutePathSubfolderNoOutdir/amd/ref/m1.js @@ -3,7 +3,7 @@ var m1_c1 = (function () { function m1_c1() { } return m1_c1; -})(); +}()); var m1_instance1 = new m1_c1(); function m1_f1() { return m1_instance1; diff --git a/tests/baselines/reference/project/mapRootAbsolutePathSubfolderNoOutdir/node/mapRootAbsolutePathSubfolderNoOutdir.sourcemap.txt b/tests/baselines/reference/project/mapRootAbsolutePathSubfolderNoOutdir/node/mapRootAbsolutePathSubfolderNoOutdir.sourcemap.txt index 4834c4ee4c4..d4bc9c6831c 100644 --- a/tests/baselines/reference/project/mapRootAbsolutePathSubfolderNoOutdir/node/mapRootAbsolutePathSubfolderNoOutdir.sourcemap.txt +++ b/tests/baselines/reference/project/mapRootAbsolutePathSubfolderNoOutdir/node/mapRootAbsolutePathSubfolderNoOutdir.sourcemap.txt @@ -61,7 +61,7 @@ sourceFile:../../ref/m1.ts 1->Emitted(5, 5) Source(4, 1) + SourceIndex(0) 2 >Emitted(5, 17) Source(4, 2) + SourceIndex(0) --- ->>>})(); +>>>}()); 1 > 2 >^ 3 > @@ -213,7 +213,7 @@ sourceFile:../test.ts 1->Emitted(6, 5) Source(5, 1) + SourceIndex(0) 2 >Emitted(6, 14) Source(5, 2) + SourceIndex(0) --- ->>>})(); +>>>}()); 1 > 2 >^ 3 > diff --git a/tests/baselines/reference/project/mapRootAbsolutePathSubfolderNoOutdir/node/ref/m1.js b/tests/baselines/reference/project/mapRootAbsolutePathSubfolderNoOutdir/node/ref/m1.js index 02f4c47bdc7..7d09551625e 100644 --- a/tests/baselines/reference/project/mapRootAbsolutePathSubfolderNoOutdir/node/ref/m1.js +++ b/tests/baselines/reference/project/mapRootAbsolutePathSubfolderNoOutdir/node/ref/m1.js @@ -3,7 +3,7 @@ var m1_c1 = (function () { function m1_c1() { } return m1_c1; -})(); +}()); var m1_instance1 = new m1_c1(); function m1_f1() { return m1_instance1; diff --git a/tests/baselines/reference/project/mapRootAbsolutePathSubfolderSpecifyOutputDirectory/amd/mapRootAbsolutePathSubfolderSpecifyOutputDirectory.sourcemap.txt b/tests/baselines/reference/project/mapRootAbsolutePathSubfolderSpecifyOutputDirectory/amd/mapRootAbsolutePathSubfolderSpecifyOutputDirectory.sourcemap.txt index 186e55039a0..f166b50b856 100644 --- a/tests/baselines/reference/project/mapRootAbsolutePathSubfolderSpecifyOutputDirectory/amd/mapRootAbsolutePathSubfolderSpecifyOutputDirectory.sourcemap.txt +++ b/tests/baselines/reference/project/mapRootAbsolutePathSubfolderSpecifyOutputDirectory/amd/mapRootAbsolutePathSubfolderSpecifyOutputDirectory.sourcemap.txt @@ -61,7 +61,7 @@ sourceFile:../../ref/m1.ts 1->Emitted(5, 5) Source(4, 1) + SourceIndex(0) 2 >Emitted(5, 17) Source(4, 2) + SourceIndex(0) --- ->>>})(); +>>>}()); 1 > 2 >^ 3 > @@ -213,7 +213,7 @@ sourceFile:../test.ts 1->Emitted(6, 5) Source(5, 1) + SourceIndex(0) 2 >Emitted(6, 14) Source(5, 2) + SourceIndex(0) --- ->>>})(); +>>>}()); 1 > 2 >^ 3 > diff --git a/tests/baselines/reference/project/mapRootAbsolutePathSubfolderSpecifyOutputDirectory/amd/outdir/simple/ref/m1.js b/tests/baselines/reference/project/mapRootAbsolutePathSubfolderSpecifyOutputDirectory/amd/outdir/simple/ref/m1.js index 02f4c47bdc7..7d09551625e 100644 --- a/tests/baselines/reference/project/mapRootAbsolutePathSubfolderSpecifyOutputDirectory/amd/outdir/simple/ref/m1.js +++ b/tests/baselines/reference/project/mapRootAbsolutePathSubfolderSpecifyOutputDirectory/amd/outdir/simple/ref/m1.js @@ -3,7 +3,7 @@ var m1_c1 = (function () { function m1_c1() { } return m1_c1; -})(); +}()); var m1_instance1 = new m1_c1(); function m1_f1() { return m1_instance1; diff --git a/tests/baselines/reference/project/mapRootAbsolutePathSubfolderSpecifyOutputDirectory/node/mapRootAbsolutePathSubfolderSpecifyOutputDirectory.sourcemap.txt b/tests/baselines/reference/project/mapRootAbsolutePathSubfolderSpecifyOutputDirectory/node/mapRootAbsolutePathSubfolderSpecifyOutputDirectory.sourcemap.txt index 186e55039a0..f166b50b856 100644 --- a/tests/baselines/reference/project/mapRootAbsolutePathSubfolderSpecifyOutputDirectory/node/mapRootAbsolutePathSubfolderSpecifyOutputDirectory.sourcemap.txt +++ b/tests/baselines/reference/project/mapRootAbsolutePathSubfolderSpecifyOutputDirectory/node/mapRootAbsolutePathSubfolderSpecifyOutputDirectory.sourcemap.txt @@ -61,7 +61,7 @@ sourceFile:../../ref/m1.ts 1->Emitted(5, 5) Source(4, 1) + SourceIndex(0) 2 >Emitted(5, 17) Source(4, 2) + SourceIndex(0) --- ->>>})(); +>>>}()); 1 > 2 >^ 3 > @@ -213,7 +213,7 @@ sourceFile:../test.ts 1->Emitted(6, 5) Source(5, 1) + SourceIndex(0) 2 >Emitted(6, 14) Source(5, 2) + SourceIndex(0) --- ->>>})(); +>>>}()); 1 > 2 >^ 3 > diff --git a/tests/baselines/reference/project/mapRootAbsolutePathSubfolderSpecifyOutputDirectory/node/outdir/simple/ref/m1.js b/tests/baselines/reference/project/mapRootAbsolutePathSubfolderSpecifyOutputDirectory/node/outdir/simple/ref/m1.js index 02f4c47bdc7..7d09551625e 100644 --- a/tests/baselines/reference/project/mapRootAbsolutePathSubfolderSpecifyOutputDirectory/node/outdir/simple/ref/m1.js +++ b/tests/baselines/reference/project/mapRootAbsolutePathSubfolderSpecifyOutputDirectory/node/outdir/simple/ref/m1.js @@ -3,7 +3,7 @@ var m1_c1 = (function () { function m1_c1() { } return m1_c1; -})(); +}()); var m1_instance1 = new m1_c1(); function m1_f1() { return m1_instance1; diff --git a/tests/baselines/reference/project/mapRootAbsolutePathSubfolderSpecifyOutputFile/amd/bin/test.js b/tests/baselines/reference/project/mapRootAbsolutePathSubfolderSpecifyOutputFile/amd/bin/test.js index 561341ee534..275b5e2116b 100644 --- a/tests/baselines/reference/project/mapRootAbsolutePathSubfolderSpecifyOutputFile/amd/bin/test.js +++ b/tests/baselines/reference/project/mapRootAbsolutePathSubfolderSpecifyOutputFile/amd/bin/test.js @@ -3,7 +3,7 @@ var m1_c1 = (function () { function m1_c1() { } return m1_c1; -})(); +}()); var m1_instance1 = new m1_c1(); function m1_f1() { return m1_instance1; @@ -14,7 +14,7 @@ var c1 = (function () { function c1() { } return c1; -})(); +}()); var instance1 = new c1(); function f1() { return instance1; diff --git a/tests/baselines/reference/project/mapRootAbsolutePathSubfolderSpecifyOutputFile/amd/mapRootAbsolutePathSubfolderSpecifyOutputFile.sourcemap.txt b/tests/baselines/reference/project/mapRootAbsolutePathSubfolderSpecifyOutputFile/amd/mapRootAbsolutePathSubfolderSpecifyOutputFile.sourcemap.txt index 7958222249d..d1e7478e384 100644 --- a/tests/baselines/reference/project/mapRootAbsolutePathSubfolderSpecifyOutputFile/amd/mapRootAbsolutePathSubfolderSpecifyOutputFile.sourcemap.txt +++ b/tests/baselines/reference/project/mapRootAbsolutePathSubfolderSpecifyOutputFile/amd/mapRootAbsolutePathSubfolderSpecifyOutputFile.sourcemap.txt @@ -61,7 +61,7 @@ sourceFile:../ref/m1.ts 1->Emitted(5, 5) Source(4, 1) + SourceIndex(0) 2 >Emitted(5, 17) Source(4, 2) + SourceIndex(0) --- ->>>})(); +>>>}()); 1 > 2 >^ 3 > @@ -207,7 +207,7 @@ sourceFile:../test.ts 1->Emitted(16, 5) Source(5, 1) + SourceIndex(1) 2 >Emitted(16, 14) Source(5, 2) + SourceIndex(1) --- ->>>})(); +>>>}()); 1 > 2 >^ 3 > diff --git a/tests/baselines/reference/project/mapRootAbsolutePathSubfolderSpecifyOutputFile/node/bin/test.js b/tests/baselines/reference/project/mapRootAbsolutePathSubfolderSpecifyOutputFile/node/bin/test.js index 561341ee534..275b5e2116b 100644 --- a/tests/baselines/reference/project/mapRootAbsolutePathSubfolderSpecifyOutputFile/node/bin/test.js +++ b/tests/baselines/reference/project/mapRootAbsolutePathSubfolderSpecifyOutputFile/node/bin/test.js @@ -3,7 +3,7 @@ var m1_c1 = (function () { function m1_c1() { } return m1_c1; -})(); +}()); var m1_instance1 = new m1_c1(); function m1_f1() { return m1_instance1; @@ -14,7 +14,7 @@ var c1 = (function () { function c1() { } return c1; -})(); +}()); var instance1 = new c1(); function f1() { return instance1; diff --git a/tests/baselines/reference/project/mapRootAbsolutePathSubfolderSpecifyOutputFile/node/mapRootAbsolutePathSubfolderSpecifyOutputFile.sourcemap.txt b/tests/baselines/reference/project/mapRootAbsolutePathSubfolderSpecifyOutputFile/node/mapRootAbsolutePathSubfolderSpecifyOutputFile.sourcemap.txt index 7958222249d..d1e7478e384 100644 --- a/tests/baselines/reference/project/mapRootAbsolutePathSubfolderSpecifyOutputFile/node/mapRootAbsolutePathSubfolderSpecifyOutputFile.sourcemap.txt +++ b/tests/baselines/reference/project/mapRootAbsolutePathSubfolderSpecifyOutputFile/node/mapRootAbsolutePathSubfolderSpecifyOutputFile.sourcemap.txt @@ -61,7 +61,7 @@ sourceFile:../ref/m1.ts 1->Emitted(5, 5) Source(4, 1) + SourceIndex(0) 2 >Emitted(5, 17) Source(4, 2) + SourceIndex(0) --- ->>>})(); +>>>}()); 1 > 2 >^ 3 > @@ -207,7 +207,7 @@ sourceFile:../test.ts 1->Emitted(16, 5) Source(5, 1) + SourceIndex(1) 2 >Emitted(16, 14) Source(5, 2) + SourceIndex(1) --- ->>>})(); +>>>}()); 1 > 2 >^ 3 > diff --git a/tests/baselines/reference/project/mapRootRelativePathMixedSubfolderNoOutdir/amd/mapRootRelativePathMixedSubfolderNoOutdir.sourcemap.txt b/tests/baselines/reference/project/mapRootRelativePathMixedSubfolderNoOutdir/amd/mapRootRelativePathMixedSubfolderNoOutdir.sourcemap.txt index 9d47375d993..757c3a44e79 100644 --- a/tests/baselines/reference/project/mapRootRelativePathMixedSubfolderNoOutdir/amd/mapRootRelativePathMixedSubfolderNoOutdir.sourcemap.txt +++ b/tests/baselines/reference/project/mapRootRelativePathMixedSubfolderNoOutdir/amd/mapRootRelativePathMixedSubfolderNoOutdir.sourcemap.txt @@ -61,7 +61,7 @@ sourceFile:../../outputdir_mixed_subfolder/ref/m1.ts 1->Emitted(5, 5) Source(4, 1) + SourceIndex(0) 2 >Emitted(5, 17) Source(4, 2) + SourceIndex(0) --- ->>>})(); +>>>}()); 1 > 2 >^ 3 > @@ -203,7 +203,7 @@ sourceFile:../../outputdir_mixed_subfolder/ref/m2.ts 1->Emitted(7, 9) Source(4, 1) + SourceIndex(0) 2 >Emitted(7, 21) Source(4, 2) + SourceIndex(0) --- ->>> })(); +>>> }()); 1 >^^^^ 2 > ^ 3 > @@ -396,7 +396,7 @@ sourceFile:../outputdir_mixed_subfolder/test.ts 1->Emitted(7, 5) Source(6, 1) + SourceIndex(0) 2 >Emitted(7, 14) Source(6, 2) + SourceIndex(0) --- ->>>})(); +>>>}()); 1 > 2 >^ 3 > diff --git a/tests/baselines/reference/project/mapRootRelativePathMixedSubfolderNoOutdir/amd/ref/m1.js b/tests/baselines/reference/project/mapRootRelativePathMixedSubfolderNoOutdir/amd/ref/m1.js index 1317ac6574e..e0e2af2b862 100644 --- a/tests/baselines/reference/project/mapRootRelativePathMixedSubfolderNoOutdir/amd/ref/m1.js +++ b/tests/baselines/reference/project/mapRootRelativePathMixedSubfolderNoOutdir/amd/ref/m1.js @@ -3,7 +3,7 @@ var m1_c1 = (function () { function m1_c1() { } return m1_c1; -})(); +}()); var m1_instance1 = new m1_c1(); function m1_f1() { return m1_instance1; diff --git a/tests/baselines/reference/project/mapRootRelativePathMixedSubfolderNoOutdir/node/mapRootRelativePathMixedSubfolderNoOutdir.sourcemap.txt b/tests/baselines/reference/project/mapRootRelativePathMixedSubfolderNoOutdir/node/mapRootRelativePathMixedSubfolderNoOutdir.sourcemap.txt index 647c7f30e36..4a0ed5bf5e3 100644 --- a/tests/baselines/reference/project/mapRootRelativePathMixedSubfolderNoOutdir/node/mapRootRelativePathMixedSubfolderNoOutdir.sourcemap.txt +++ b/tests/baselines/reference/project/mapRootRelativePathMixedSubfolderNoOutdir/node/mapRootRelativePathMixedSubfolderNoOutdir.sourcemap.txt @@ -61,7 +61,7 @@ sourceFile:../../outputdir_mixed_subfolder/ref/m1.ts 1->Emitted(5, 5) Source(4, 1) + SourceIndex(0) 2 >Emitted(5, 17) Source(4, 2) + SourceIndex(0) --- ->>>})(); +>>>}()); 1 > 2 >^ 3 > @@ -202,7 +202,7 @@ sourceFile:../../outputdir_mixed_subfolder/ref/m2.ts 1->Emitted(6, 5) Source(4, 1) + SourceIndex(0) 2 >Emitted(6, 17) Source(4, 2) + SourceIndex(0) --- ->>>})(); +>>>}()); 1 > 2 >^ 3 > @@ -395,7 +395,7 @@ sourceFile:../outputdir_mixed_subfolder/test.ts 1->Emitted(7, 5) Source(6, 1) + SourceIndex(0) 2 >Emitted(7, 14) Source(6, 2) + SourceIndex(0) --- ->>>})(); +>>>}()); 1 > 2 >^ 3 > diff --git a/tests/baselines/reference/project/mapRootRelativePathMixedSubfolderNoOutdir/node/ref/m1.js b/tests/baselines/reference/project/mapRootRelativePathMixedSubfolderNoOutdir/node/ref/m1.js index 1317ac6574e..e0e2af2b862 100644 --- a/tests/baselines/reference/project/mapRootRelativePathMixedSubfolderNoOutdir/node/ref/m1.js +++ b/tests/baselines/reference/project/mapRootRelativePathMixedSubfolderNoOutdir/node/ref/m1.js @@ -3,7 +3,7 @@ var m1_c1 = (function () { function m1_c1() { } return m1_c1; -})(); +}()); var m1_instance1 = new m1_c1(); function m1_f1() { return m1_instance1; diff --git a/tests/baselines/reference/project/mapRootRelativePathMixedSubfolderSpecifyOutputDirectory/amd/mapRootRelativePathMixedSubfolderSpecifyOutputDirectory.sourcemap.txt b/tests/baselines/reference/project/mapRootRelativePathMixedSubfolderSpecifyOutputDirectory/amd/mapRootRelativePathMixedSubfolderSpecifyOutputDirectory.sourcemap.txt index 93b67a6e3b2..210c6a0aad0 100644 --- a/tests/baselines/reference/project/mapRootRelativePathMixedSubfolderSpecifyOutputDirectory/amd/mapRootRelativePathMixedSubfolderSpecifyOutputDirectory.sourcemap.txt +++ b/tests/baselines/reference/project/mapRootRelativePathMixedSubfolderSpecifyOutputDirectory/amd/mapRootRelativePathMixedSubfolderSpecifyOutputDirectory.sourcemap.txt @@ -61,7 +61,7 @@ sourceFile:../../outputdir_mixed_subfolder/ref/m1.ts 1->Emitted(5, 5) Source(4, 1) + SourceIndex(0) 2 >Emitted(5, 17) Source(4, 2) + SourceIndex(0) --- ->>>})(); +>>>}()); 1 > 2 >^ 3 > @@ -203,7 +203,7 @@ sourceFile:../../outputdir_mixed_subfolder/ref/m2.ts 1->Emitted(7, 9) Source(4, 1) + SourceIndex(0) 2 >Emitted(7, 21) Source(4, 2) + SourceIndex(0) --- ->>> })(); +>>> }()); 1 >^^^^ 2 > ^ 3 > @@ -396,7 +396,7 @@ sourceFile:../outputdir_mixed_subfolder/test.ts 1->Emitted(7, 5) Source(6, 1) + SourceIndex(0) 2 >Emitted(7, 14) Source(6, 2) + SourceIndex(0) --- ->>>})(); +>>>}()); 1 > 2 >^ 3 > diff --git a/tests/baselines/reference/project/mapRootRelativePathMixedSubfolderSpecifyOutputDirectory/amd/outdir/simple/ref/m1.js b/tests/baselines/reference/project/mapRootRelativePathMixedSubfolderSpecifyOutputDirectory/amd/outdir/simple/ref/m1.js index 33cf31f7700..e6670e7a300 100644 --- a/tests/baselines/reference/project/mapRootRelativePathMixedSubfolderSpecifyOutputDirectory/amd/outdir/simple/ref/m1.js +++ b/tests/baselines/reference/project/mapRootRelativePathMixedSubfolderSpecifyOutputDirectory/amd/outdir/simple/ref/m1.js @@ -3,7 +3,7 @@ var m1_c1 = (function () { function m1_c1() { } return m1_c1; -})(); +}()); var m1_instance1 = new m1_c1(); function m1_f1() { return m1_instance1; diff --git a/tests/baselines/reference/project/mapRootRelativePathMixedSubfolderSpecifyOutputDirectory/node/mapRootRelativePathMixedSubfolderSpecifyOutputDirectory.sourcemap.txt b/tests/baselines/reference/project/mapRootRelativePathMixedSubfolderSpecifyOutputDirectory/node/mapRootRelativePathMixedSubfolderSpecifyOutputDirectory.sourcemap.txt index 690652e7092..2fcffbeed8b 100644 --- a/tests/baselines/reference/project/mapRootRelativePathMixedSubfolderSpecifyOutputDirectory/node/mapRootRelativePathMixedSubfolderSpecifyOutputDirectory.sourcemap.txt +++ b/tests/baselines/reference/project/mapRootRelativePathMixedSubfolderSpecifyOutputDirectory/node/mapRootRelativePathMixedSubfolderSpecifyOutputDirectory.sourcemap.txt @@ -61,7 +61,7 @@ sourceFile:../../outputdir_mixed_subfolder/ref/m1.ts 1->Emitted(5, 5) Source(4, 1) + SourceIndex(0) 2 >Emitted(5, 17) Source(4, 2) + SourceIndex(0) --- ->>>})(); +>>>}()); 1 > 2 >^ 3 > @@ -202,7 +202,7 @@ sourceFile:../../outputdir_mixed_subfolder/ref/m2.ts 1->Emitted(6, 5) Source(4, 1) + SourceIndex(0) 2 >Emitted(6, 17) Source(4, 2) + SourceIndex(0) --- ->>>})(); +>>>}()); 1 > 2 >^ 3 > @@ -395,7 +395,7 @@ sourceFile:../outputdir_mixed_subfolder/test.ts 1->Emitted(7, 5) Source(6, 1) + SourceIndex(0) 2 >Emitted(7, 14) Source(6, 2) + SourceIndex(0) --- ->>>})(); +>>>}()); 1 > 2 >^ 3 > diff --git a/tests/baselines/reference/project/mapRootRelativePathMixedSubfolderSpecifyOutputDirectory/node/outdir/simple/ref/m1.js b/tests/baselines/reference/project/mapRootRelativePathMixedSubfolderSpecifyOutputDirectory/node/outdir/simple/ref/m1.js index 33cf31f7700..e6670e7a300 100644 --- a/tests/baselines/reference/project/mapRootRelativePathMixedSubfolderSpecifyOutputDirectory/node/outdir/simple/ref/m1.js +++ b/tests/baselines/reference/project/mapRootRelativePathMixedSubfolderSpecifyOutputDirectory/node/outdir/simple/ref/m1.js @@ -3,7 +3,7 @@ var m1_c1 = (function () { function m1_c1() { } return m1_c1; -})(); +}()); var m1_instance1 = new m1_c1(); function m1_f1() { return m1_instance1; diff --git a/tests/baselines/reference/project/mapRootRelativePathMixedSubfolderSpecifyOutputFile/amd/bin/test.js b/tests/baselines/reference/project/mapRootRelativePathMixedSubfolderSpecifyOutputFile/amd/bin/test.js index 75131b50630..043adb3dd6f 100644 --- a/tests/baselines/reference/project/mapRootRelativePathMixedSubfolderSpecifyOutputFile/amd/bin/test.js +++ b/tests/baselines/reference/project/mapRootRelativePathMixedSubfolderSpecifyOutputFile/amd/bin/test.js @@ -3,7 +3,7 @@ var m1_c1 = (function () { function m1_c1() { } return m1_c1; -})(); +}()); var m1_instance1 = new m1_c1(); function m1_f1() { return m1_instance1; @@ -15,7 +15,7 @@ define("ref/m2", ["require", "exports"], function (require, exports) { function m2_c1() { } return m2_c1; - })(); + }()); exports.m2_c1 = m2_c1; exports.m2_instance1 = new m2_c1(); function m2_f1() { @@ -30,7 +30,7 @@ var c1 = (function () { function c1() { } return c1; -})(); +}()); var instance1 = new c1(); function f1() { return instance1; diff --git a/tests/baselines/reference/project/mapRootRelativePathMixedSubfolderSpecifyOutputFile/amd/mapRootRelativePathMixedSubfolderSpecifyOutputFile.sourcemap.txt b/tests/baselines/reference/project/mapRootRelativePathMixedSubfolderSpecifyOutputFile/amd/mapRootRelativePathMixedSubfolderSpecifyOutputFile.sourcemap.txt index 15b9d4ff17d..2d276f75b03 100644 --- a/tests/baselines/reference/project/mapRootRelativePathMixedSubfolderSpecifyOutputFile/amd/mapRootRelativePathMixedSubfolderSpecifyOutputFile.sourcemap.txt +++ b/tests/baselines/reference/project/mapRootRelativePathMixedSubfolderSpecifyOutputFile/amd/mapRootRelativePathMixedSubfolderSpecifyOutputFile.sourcemap.txt @@ -61,7 +61,7 @@ sourceFile:../outputdir_mixed_subfolder/ref/m1.ts 1->Emitted(5, 5) Source(4, 1) + SourceIndex(0) 2 >Emitted(5, 17) Source(4, 2) + SourceIndex(0) --- ->>>})(); +>>>}()); 1 > 2 >^ 3 > @@ -197,7 +197,7 @@ sourceFile:../outputdir_mixed_subfolder/ref/m2.ts 1->Emitted(17, 9) Source(4, 1) + SourceIndex(1) 2 >Emitted(17, 21) Source(4, 2) + SourceIndex(1) --- ->>> })(); +>>> }()); 1 >^^^^ 2 > ^ 3 > @@ -384,7 +384,7 @@ sourceFile:../outputdir_mixed_subfolder/test.ts 1->Emitted(32, 5) Source(6, 1) + SourceIndex(2) 2 >Emitted(32, 14) Source(6, 2) + SourceIndex(2) --- ->>>})(); +>>>}()); 1 > 2 >^ 3 > diff --git a/tests/baselines/reference/project/mapRootRelativePathMixedSubfolderSpecifyOutputFile/node/bin/test.js b/tests/baselines/reference/project/mapRootRelativePathMixedSubfolderSpecifyOutputFile/node/bin/test.js index c4c79e0454b..c93eed3c7d4 100644 --- a/tests/baselines/reference/project/mapRootRelativePathMixedSubfolderSpecifyOutputFile/node/bin/test.js +++ b/tests/baselines/reference/project/mapRootRelativePathMixedSubfolderSpecifyOutputFile/node/bin/test.js @@ -3,7 +3,7 @@ var m1_c1 = (function () { function m1_c1() { } return m1_c1; -})(); +}()); var m1_instance1 = new m1_c1(); function m1_f1() { return m1_instance1; @@ -15,7 +15,7 @@ var c1 = (function () { function c1() { } return c1; -})(); +}()); var instance1 = new c1(); function f1() { return instance1; diff --git a/tests/baselines/reference/project/mapRootRelativePathMixedSubfolderSpecifyOutputFile/node/mapRootRelativePathMixedSubfolderSpecifyOutputFile.sourcemap.txt b/tests/baselines/reference/project/mapRootRelativePathMixedSubfolderSpecifyOutputFile/node/mapRootRelativePathMixedSubfolderSpecifyOutputFile.sourcemap.txt index 12ac5dd7050..d93d5e398e1 100644 --- a/tests/baselines/reference/project/mapRootRelativePathMixedSubfolderSpecifyOutputFile/node/mapRootRelativePathMixedSubfolderSpecifyOutputFile.sourcemap.txt +++ b/tests/baselines/reference/project/mapRootRelativePathMixedSubfolderSpecifyOutputFile/node/mapRootRelativePathMixedSubfolderSpecifyOutputFile.sourcemap.txt @@ -61,7 +61,7 @@ sourceFile:../outputdir_mixed_subfolder/ref/m1.ts 1->Emitted(5, 5) Source(4, 1) + SourceIndex(0) 2 >Emitted(5, 17) Source(4, 2) + SourceIndex(0) --- ->>>})(); +>>>}()); 1 > 2 >^ 3 > @@ -217,7 +217,7 @@ sourceFile:../outputdir_mixed_subfolder/test.ts 1->Emitted(17, 5) Source(6, 1) + SourceIndex(2) 2 >Emitted(17, 14) Source(6, 2) + SourceIndex(2) --- ->>>})(); +>>>}()); 1 > 2 >^ 3 > diff --git a/tests/baselines/reference/project/mapRootRelativePathMixedSubfolderSpecifyOutputFileAndOutputDirectory/amd/bin/outAndOutDirFile.js b/tests/baselines/reference/project/mapRootRelativePathMixedSubfolderSpecifyOutputFileAndOutputDirectory/amd/bin/outAndOutDirFile.js index 52e051d7ba0..b40b056b6d9 100644 --- a/tests/baselines/reference/project/mapRootRelativePathMixedSubfolderSpecifyOutputFileAndOutputDirectory/amd/bin/outAndOutDirFile.js +++ b/tests/baselines/reference/project/mapRootRelativePathMixedSubfolderSpecifyOutputFileAndOutputDirectory/amd/bin/outAndOutDirFile.js @@ -3,7 +3,7 @@ var m1_c1 = (function () { function m1_c1() { } return m1_c1; -})(); +}()); var m1_instance1 = new m1_c1(); function m1_f1() { return m1_instance1; @@ -15,7 +15,7 @@ define("ref/m2", ["require", "exports"], function (require, exports) { function m2_c1() { } return m2_c1; - })(); + }()); exports.m2_c1 = m2_c1; exports.m2_instance1 = new m2_c1(); function m2_f1() { @@ -30,7 +30,7 @@ var c1 = (function () { function c1() { } return c1; -})(); +}()); var instance1 = new c1(); function f1() { return instance1; diff --git a/tests/baselines/reference/project/mapRootRelativePathMixedSubfolderSpecifyOutputFileAndOutputDirectory/amd/mapRootRelativePathMixedSubfolderSpecifyOutputFileAndOutputDirectory.sourcemap.txt b/tests/baselines/reference/project/mapRootRelativePathMixedSubfolderSpecifyOutputFileAndOutputDirectory/amd/mapRootRelativePathMixedSubfolderSpecifyOutputFileAndOutputDirectory.sourcemap.txt index cc17592a88f..1ad479bc3e3 100644 --- a/tests/baselines/reference/project/mapRootRelativePathMixedSubfolderSpecifyOutputFileAndOutputDirectory/amd/mapRootRelativePathMixedSubfolderSpecifyOutputFileAndOutputDirectory.sourcemap.txt +++ b/tests/baselines/reference/project/mapRootRelativePathMixedSubfolderSpecifyOutputFileAndOutputDirectory/amd/mapRootRelativePathMixedSubfolderSpecifyOutputFileAndOutputDirectory.sourcemap.txt @@ -61,7 +61,7 @@ sourceFile:../outputdir_mixed_subfolder/ref/m1.ts 1->Emitted(5, 5) Source(4, 1) + SourceIndex(0) 2 >Emitted(5, 17) Source(4, 2) + SourceIndex(0) --- ->>>})(); +>>>}()); 1 > 2 >^ 3 > @@ -197,7 +197,7 @@ sourceFile:../outputdir_mixed_subfolder/ref/m2.ts 1->Emitted(17, 9) Source(4, 1) + SourceIndex(1) 2 >Emitted(17, 21) Source(4, 2) + SourceIndex(1) --- ->>> })(); +>>> }()); 1 >^^^^ 2 > ^ 3 > @@ -384,7 +384,7 @@ sourceFile:../outputdir_mixed_subfolder/test.ts 1->Emitted(32, 5) Source(6, 1) + SourceIndex(2) 2 >Emitted(32, 14) Source(6, 2) + SourceIndex(2) --- ->>>})(); +>>>}()); 1 > 2 >^ 3 > diff --git a/tests/baselines/reference/project/mapRootRelativePathMixedSubfolderSpecifyOutputFileAndOutputDirectory/node/bin/outAndOutDirFile.js b/tests/baselines/reference/project/mapRootRelativePathMixedSubfolderSpecifyOutputFileAndOutputDirectory/node/bin/outAndOutDirFile.js index c0138423cae..7ec08c6c0a9 100644 --- a/tests/baselines/reference/project/mapRootRelativePathMixedSubfolderSpecifyOutputFileAndOutputDirectory/node/bin/outAndOutDirFile.js +++ b/tests/baselines/reference/project/mapRootRelativePathMixedSubfolderSpecifyOutputFileAndOutputDirectory/node/bin/outAndOutDirFile.js @@ -3,7 +3,7 @@ var m1_c1 = (function () { function m1_c1() { } return m1_c1; -})(); +}()); var m1_instance1 = new m1_c1(); function m1_f1() { return m1_instance1; @@ -15,7 +15,7 @@ var c1 = (function () { function c1() { } return c1; -})(); +}()); var instance1 = new c1(); function f1() { return instance1; diff --git a/tests/baselines/reference/project/mapRootRelativePathMixedSubfolderSpecifyOutputFileAndOutputDirectory/node/mapRootRelativePathMixedSubfolderSpecifyOutputFileAndOutputDirectory.sourcemap.txt b/tests/baselines/reference/project/mapRootRelativePathMixedSubfolderSpecifyOutputFileAndOutputDirectory/node/mapRootRelativePathMixedSubfolderSpecifyOutputFileAndOutputDirectory.sourcemap.txt index 1d5041d6d00..a593271d041 100644 --- a/tests/baselines/reference/project/mapRootRelativePathMixedSubfolderSpecifyOutputFileAndOutputDirectory/node/mapRootRelativePathMixedSubfolderSpecifyOutputFileAndOutputDirectory.sourcemap.txt +++ b/tests/baselines/reference/project/mapRootRelativePathMixedSubfolderSpecifyOutputFileAndOutputDirectory/node/mapRootRelativePathMixedSubfolderSpecifyOutputFileAndOutputDirectory.sourcemap.txt @@ -61,7 +61,7 @@ sourceFile:../outputdir_mixed_subfolder/ref/m1.ts 1->Emitted(5, 5) Source(4, 1) + SourceIndex(0) 2 >Emitted(5, 17) Source(4, 2) + SourceIndex(0) --- ->>>})(); +>>>}()); 1 > 2 >^ 3 > @@ -217,7 +217,7 @@ sourceFile:../outputdir_mixed_subfolder/test.ts 1->Emitted(17, 5) Source(6, 1) + SourceIndex(2) 2 >Emitted(17, 14) Source(6, 2) + SourceIndex(2) --- ->>>})(); +>>>}()); 1 > 2 >^ 3 > diff --git a/tests/baselines/reference/project/mapRootRelativePathModuleMultifolderNoOutdir/amd/mapRootRelativePathModuleMultifolderNoOutdir.sourcemap.txt b/tests/baselines/reference/project/mapRootRelativePathModuleMultifolderNoOutdir/amd/mapRootRelativePathModuleMultifolderNoOutdir.sourcemap.txt index 1a02d0ed75c..5db83dfb530 100644 --- a/tests/baselines/reference/project/mapRootRelativePathModuleMultifolderNoOutdir/amd/mapRootRelativePathModuleMultifolderNoOutdir.sourcemap.txt +++ b/tests/baselines/reference/project/mapRootRelativePathModuleMultifolderNoOutdir/amd/mapRootRelativePathModuleMultifolderNoOutdir.sourcemap.txt @@ -60,7 +60,7 @@ sourceFile:../../../projects/outputdir_module_multifolder/ref/m1.ts 1->Emitted(7, 9) Source(4, 1) + SourceIndex(0) 2 >Emitted(7, 21) Source(4, 2) + SourceIndex(0) --- ->>> })(); +>>> }()); 1 >^^^^ 2 > ^ 3 > @@ -233,7 +233,7 @@ sourceFile:../../projects/outputdir_module_multifolder_ref/m2.ts 1->Emitted(7, 9) Source(4, 1) + SourceIndex(0) 2 >Emitted(7, 21) Source(4, 2) + SourceIndex(0) --- ->>> })(); +>>> }()); 1 >^^^^ 2 > ^ 3 > @@ -408,7 +408,7 @@ sourceFile:../../projects/outputdir_module_multifolder/test.ts 1->Emitted(7, 9) Source(6, 1) + SourceIndex(0) 2 >Emitted(7, 18) Source(6, 2) + SourceIndex(0) --- ->>> })(); +>>> }()); 1 >^^^^ 2 > ^ 3 > diff --git a/tests/baselines/reference/project/mapRootRelativePathModuleMultifolderNoOutdir/amd/ref/m1.js b/tests/baselines/reference/project/mapRootRelativePathModuleMultifolderNoOutdir/amd/ref/m1.js index 0a11d7abb9c..7ecd677009d 100644 --- a/tests/baselines/reference/project/mapRootRelativePathModuleMultifolderNoOutdir/amd/ref/m1.js +++ b/tests/baselines/reference/project/mapRootRelativePathModuleMultifolderNoOutdir/amd/ref/m1.js @@ -5,7 +5,7 @@ define(["require", "exports"], function (require, exports) { function m1_c1() { } return m1_c1; - })(); + }()); exports.m1_c1 = m1_c1; exports.m1_instance1 = new m1_c1(); function m1_f1() { diff --git a/tests/baselines/reference/project/mapRootRelativePathModuleMultifolderNoOutdir/node/mapRootRelativePathModuleMultifolderNoOutdir.sourcemap.txt b/tests/baselines/reference/project/mapRootRelativePathModuleMultifolderNoOutdir/node/mapRootRelativePathModuleMultifolderNoOutdir.sourcemap.txt index 2140f27c082..f0c44f724e6 100644 --- a/tests/baselines/reference/project/mapRootRelativePathModuleMultifolderNoOutdir/node/mapRootRelativePathModuleMultifolderNoOutdir.sourcemap.txt +++ b/tests/baselines/reference/project/mapRootRelativePathModuleMultifolderNoOutdir/node/mapRootRelativePathModuleMultifolderNoOutdir.sourcemap.txt @@ -59,7 +59,7 @@ sourceFile:../../../projects/outputdir_module_multifolder/ref/m1.ts 1->Emitted(6, 5) Source(4, 1) + SourceIndex(0) 2 >Emitted(6, 17) Source(4, 2) + SourceIndex(0) --- ->>>})(); +>>>}()); 1 > 2 >^ 3 > @@ -231,7 +231,7 @@ sourceFile:../../projects/outputdir_module_multifolder_ref/m2.ts 1->Emitted(6, 5) Source(4, 1) + SourceIndex(0) 2 >Emitted(6, 17) Source(4, 2) + SourceIndex(0) --- ->>>})(); +>>>}()); 1 > 2 >^ 3 > @@ -452,7 +452,7 @@ sourceFile:../../projects/outputdir_module_multifolder/test.ts 1->Emitted(8, 5) Source(6, 1) + SourceIndex(0) 2 >Emitted(8, 14) Source(6, 2) + SourceIndex(0) --- ->>>})(); +>>>}()); 1 > 2 >^ 3 > diff --git a/tests/baselines/reference/project/mapRootRelativePathModuleMultifolderNoOutdir/node/ref/m1.js b/tests/baselines/reference/project/mapRootRelativePathModuleMultifolderNoOutdir/node/ref/m1.js index 6b59fb6f79c..112ae7e7062 100644 --- a/tests/baselines/reference/project/mapRootRelativePathModuleMultifolderNoOutdir/node/ref/m1.js +++ b/tests/baselines/reference/project/mapRootRelativePathModuleMultifolderNoOutdir/node/ref/m1.js @@ -4,7 +4,7 @@ var m1_c1 = (function () { function m1_c1() { } return m1_c1; -})(); +}()); exports.m1_c1 = m1_c1; exports.m1_instance1 = new m1_c1(); function m1_f1() { diff --git a/tests/baselines/reference/project/mapRootRelativePathModuleMultifolderSpecifyOutputDirectory/amd/mapRootRelativePathModuleMultifolderSpecifyOutputDirectory.sourcemap.txt b/tests/baselines/reference/project/mapRootRelativePathModuleMultifolderSpecifyOutputDirectory/amd/mapRootRelativePathModuleMultifolderSpecifyOutputDirectory.sourcemap.txt index 0c068b2496d..38204c88261 100644 --- a/tests/baselines/reference/project/mapRootRelativePathModuleMultifolderSpecifyOutputDirectory/amd/mapRootRelativePathModuleMultifolderSpecifyOutputDirectory.sourcemap.txt +++ b/tests/baselines/reference/project/mapRootRelativePathModuleMultifolderSpecifyOutputDirectory/amd/mapRootRelativePathModuleMultifolderSpecifyOutputDirectory.sourcemap.txt @@ -60,7 +60,7 @@ sourceFile:../../../projects/outputdir_module_multifolder/ref/m1.ts 1->Emitted(7, 9) Source(4, 1) + SourceIndex(0) 2 >Emitted(7, 21) Source(4, 2) + SourceIndex(0) --- ->>> })(); +>>> }()); 1 >^^^^ 2 > ^ 3 > @@ -233,7 +233,7 @@ sourceFile:../../projects/outputdir_module_multifolder_ref/m2.ts 1->Emitted(7, 9) Source(4, 1) + SourceIndex(0) 2 >Emitted(7, 21) Source(4, 2) + SourceIndex(0) --- ->>> })(); +>>> }()); 1 >^^^^ 2 > ^ 3 > @@ -408,7 +408,7 @@ sourceFile:../../projects/outputdir_module_multifolder/test.ts 1->Emitted(7, 9) Source(6, 1) + SourceIndex(0) 2 >Emitted(7, 18) Source(6, 2) + SourceIndex(0) --- ->>> })(); +>>> }()); 1 >^^^^ 2 > ^ 3 > diff --git a/tests/baselines/reference/project/mapRootRelativePathModuleMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_module_multifolder/ref/m1.js b/tests/baselines/reference/project/mapRootRelativePathModuleMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_module_multifolder/ref/m1.js index 57f34664751..4d721e1be5d 100644 --- a/tests/baselines/reference/project/mapRootRelativePathModuleMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_module_multifolder/ref/m1.js +++ b/tests/baselines/reference/project/mapRootRelativePathModuleMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_module_multifolder/ref/m1.js @@ -5,7 +5,7 @@ define(["require", "exports"], function (require, exports) { function m1_c1() { } return m1_c1; - })(); + }()); exports.m1_c1 = m1_c1; exports.m1_instance1 = new m1_c1(); function m1_f1() { diff --git a/tests/baselines/reference/project/mapRootRelativePathModuleMultifolderSpecifyOutputDirectory/node/mapRootRelativePathModuleMultifolderSpecifyOutputDirectory.sourcemap.txt b/tests/baselines/reference/project/mapRootRelativePathModuleMultifolderSpecifyOutputDirectory/node/mapRootRelativePathModuleMultifolderSpecifyOutputDirectory.sourcemap.txt index 72f9ba10fc1..f6897055546 100644 --- a/tests/baselines/reference/project/mapRootRelativePathModuleMultifolderSpecifyOutputDirectory/node/mapRootRelativePathModuleMultifolderSpecifyOutputDirectory.sourcemap.txt +++ b/tests/baselines/reference/project/mapRootRelativePathModuleMultifolderSpecifyOutputDirectory/node/mapRootRelativePathModuleMultifolderSpecifyOutputDirectory.sourcemap.txt @@ -59,7 +59,7 @@ sourceFile:../../../projects/outputdir_module_multifolder/ref/m1.ts 1->Emitted(6, 5) Source(4, 1) + SourceIndex(0) 2 >Emitted(6, 17) Source(4, 2) + SourceIndex(0) --- ->>>})(); +>>>}()); 1 > 2 >^ 3 > @@ -231,7 +231,7 @@ sourceFile:../../projects/outputdir_module_multifolder_ref/m2.ts 1->Emitted(6, 5) Source(4, 1) + SourceIndex(0) 2 >Emitted(6, 17) Source(4, 2) + SourceIndex(0) --- ->>>})(); +>>>}()); 1 > 2 >^ 3 > @@ -452,7 +452,7 @@ sourceFile:../../projects/outputdir_module_multifolder/test.ts 1->Emitted(8, 5) Source(6, 1) + SourceIndex(0) 2 >Emitted(8, 14) Source(6, 2) + SourceIndex(0) --- ->>>})(); +>>>}()); 1 > 2 >^ 3 > diff --git a/tests/baselines/reference/project/mapRootRelativePathModuleMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_module_multifolder/ref/m1.js b/tests/baselines/reference/project/mapRootRelativePathModuleMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_module_multifolder/ref/m1.js index 69476c5b6ca..a1d86ff1857 100644 --- a/tests/baselines/reference/project/mapRootRelativePathModuleMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_module_multifolder/ref/m1.js +++ b/tests/baselines/reference/project/mapRootRelativePathModuleMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_module_multifolder/ref/m1.js @@ -4,7 +4,7 @@ var m1_c1 = (function () { function m1_c1() { } return m1_c1; -})(); +}()); exports.m1_c1 = m1_c1; exports.m1_instance1 = new m1_c1(); function m1_f1() { diff --git a/tests/baselines/reference/project/mapRootRelativePathModuleMultifolderSpecifyOutputFile/amd/bin/test.js b/tests/baselines/reference/project/mapRootRelativePathModuleMultifolderSpecifyOutputFile/amd/bin/test.js index 9f8555682d6..01c28031d8a 100644 --- a/tests/baselines/reference/project/mapRootRelativePathModuleMultifolderSpecifyOutputFile/amd/bin/test.js +++ b/tests/baselines/reference/project/mapRootRelativePathModuleMultifolderSpecifyOutputFile/amd/bin/test.js @@ -5,7 +5,7 @@ define("outputdir_module_multifolder/ref/m1", ["require", "exports"], function ( function m1_c1() { } return m1_c1; - })(); + }()); exports.m1_c1 = m1_c1; exports.m1_instance1 = new m1_c1(); function m1_f1() { @@ -20,7 +20,7 @@ define("outputdir_module_multifolder_ref/m2", ["require", "exports"], function ( function m2_c1() { } return m2_c1; - })(); + }()); exports.m2_c1 = m2_c1; exports.m2_instance1 = new m2_c1(); function m2_f1() { @@ -35,7 +35,7 @@ define("outputdir_module_multifolder/test", ["require", "exports", "outputdir_mo function c1() { } return c1; - })(); + }()); exports.c1 = c1; exports.instance1 = new c1(); function f1() { diff --git a/tests/baselines/reference/project/mapRootRelativePathModuleMultifolderSpecifyOutputFile/amd/mapRootRelativePathModuleMultifolderSpecifyOutputFile.sourcemap.txt b/tests/baselines/reference/project/mapRootRelativePathModuleMultifolderSpecifyOutputFile/amd/mapRootRelativePathModuleMultifolderSpecifyOutputFile.sourcemap.txt index ee3b40dc285..55627ab1167 100644 --- a/tests/baselines/reference/project/mapRootRelativePathModuleMultifolderSpecifyOutputFile/amd/mapRootRelativePathModuleMultifolderSpecifyOutputFile.sourcemap.txt +++ b/tests/baselines/reference/project/mapRootRelativePathModuleMultifolderSpecifyOutputFile/amd/mapRootRelativePathModuleMultifolderSpecifyOutputFile.sourcemap.txt @@ -60,7 +60,7 @@ sourceFile:../projects/outputdir_module_multifolder/ref/m1.ts 1->Emitted(7, 9) Source(4, 1) + SourceIndex(0) 2 >Emitted(7, 21) Source(4, 2) + SourceIndex(0) --- ->>> })(); +>>> }()); 1 >^^^^ 2 > ^ 3 > @@ -227,7 +227,7 @@ sourceFile:../projects/outputdir_module_multifolder_ref/m2.ts 1->Emitted(22, 9) Source(4, 1) + SourceIndex(1) 2 >Emitted(22, 21) Source(4, 2) + SourceIndex(1) --- ->>> })(); +>>> }()); 1 >^^^^ 2 > ^ 3 > @@ -396,7 +396,7 @@ sourceFile:../projects/outputdir_module_multifolder/test.ts 1->Emitted(37, 9) Source(6, 1) + SourceIndex(2) 2 >Emitted(37, 18) Source(6, 2) + SourceIndex(2) --- ->>> })(); +>>> }()); 1 >^^^^ 2 > ^ 3 > diff --git a/tests/baselines/reference/project/mapRootRelativePathModuleSimpleNoOutdir/amd/m1.js b/tests/baselines/reference/project/mapRootRelativePathModuleSimpleNoOutdir/amd/m1.js index d34c484207f..826510699a7 100644 --- a/tests/baselines/reference/project/mapRootRelativePathModuleSimpleNoOutdir/amd/m1.js +++ b/tests/baselines/reference/project/mapRootRelativePathModuleSimpleNoOutdir/amd/m1.js @@ -5,7 +5,7 @@ define(["require", "exports"], function (require, exports) { function m1_c1() { } return m1_c1; - })(); + }()); exports.m1_c1 = m1_c1; exports.m1_instance1 = new m1_c1(); function m1_f1() { diff --git a/tests/baselines/reference/project/mapRootRelativePathModuleSimpleNoOutdir/amd/mapRootRelativePathModuleSimpleNoOutdir.sourcemap.txt b/tests/baselines/reference/project/mapRootRelativePathModuleSimpleNoOutdir/amd/mapRootRelativePathModuleSimpleNoOutdir.sourcemap.txt index 2a501a3a088..f5cf250260f 100644 --- a/tests/baselines/reference/project/mapRootRelativePathModuleSimpleNoOutdir/amd/mapRootRelativePathModuleSimpleNoOutdir.sourcemap.txt +++ b/tests/baselines/reference/project/mapRootRelativePathModuleSimpleNoOutdir/amd/mapRootRelativePathModuleSimpleNoOutdir.sourcemap.txt @@ -60,7 +60,7 @@ sourceFile:../outputdir_module_simple/m1.ts 1->Emitted(7, 9) Source(4, 1) + SourceIndex(0) 2 >Emitted(7, 21) Source(4, 2) + SourceIndex(0) --- ->>> })(); +>>> }()); 1 >^^^^ 2 > ^ 3 > @@ -234,7 +234,7 @@ sourceFile:../outputdir_module_simple/test.ts 1->Emitted(7, 9) Source(5, 1) + SourceIndex(0) 2 >Emitted(7, 18) Source(5, 2) + SourceIndex(0) --- ->>> })(); +>>> }()); 1 >^^^^ 2 > ^ 3 > diff --git a/tests/baselines/reference/project/mapRootRelativePathModuleSimpleNoOutdir/node/m1.js b/tests/baselines/reference/project/mapRootRelativePathModuleSimpleNoOutdir/node/m1.js index bf342f3a037..123e89b6c81 100644 --- a/tests/baselines/reference/project/mapRootRelativePathModuleSimpleNoOutdir/node/m1.js +++ b/tests/baselines/reference/project/mapRootRelativePathModuleSimpleNoOutdir/node/m1.js @@ -4,7 +4,7 @@ var m1_c1 = (function () { function m1_c1() { } return m1_c1; -})(); +}()); exports.m1_c1 = m1_c1; exports.m1_instance1 = new m1_c1(); function m1_f1() { diff --git a/tests/baselines/reference/project/mapRootRelativePathModuleSimpleNoOutdir/node/mapRootRelativePathModuleSimpleNoOutdir.sourcemap.txt b/tests/baselines/reference/project/mapRootRelativePathModuleSimpleNoOutdir/node/mapRootRelativePathModuleSimpleNoOutdir.sourcemap.txt index d9a867d6849..04719a1aae2 100644 --- a/tests/baselines/reference/project/mapRootRelativePathModuleSimpleNoOutdir/node/mapRootRelativePathModuleSimpleNoOutdir.sourcemap.txt +++ b/tests/baselines/reference/project/mapRootRelativePathModuleSimpleNoOutdir/node/mapRootRelativePathModuleSimpleNoOutdir.sourcemap.txt @@ -59,7 +59,7 @@ sourceFile:../outputdir_module_simple/m1.ts 1->Emitted(6, 5) Source(4, 1) + SourceIndex(0) 2 >Emitted(6, 17) Source(4, 2) + SourceIndex(0) --- ->>>})(); +>>>}()); 1 > 2 >^ 3 > @@ -255,7 +255,7 @@ sourceFile:../outputdir_module_simple/test.ts 1->Emitted(7, 5) Source(5, 1) + SourceIndex(0) 2 >Emitted(7, 14) Source(5, 2) + SourceIndex(0) --- ->>>})(); +>>>}()); 1 > 2 >^ 3 > diff --git a/tests/baselines/reference/project/mapRootRelativePathModuleSimpleSpecifyOutputDirectory/amd/mapRootRelativePathModuleSimpleSpecifyOutputDirectory.sourcemap.txt b/tests/baselines/reference/project/mapRootRelativePathModuleSimpleSpecifyOutputDirectory/amd/mapRootRelativePathModuleSimpleSpecifyOutputDirectory.sourcemap.txt index e4875c4f146..3e9d27dcaa3 100644 --- a/tests/baselines/reference/project/mapRootRelativePathModuleSimpleSpecifyOutputDirectory/amd/mapRootRelativePathModuleSimpleSpecifyOutputDirectory.sourcemap.txt +++ b/tests/baselines/reference/project/mapRootRelativePathModuleSimpleSpecifyOutputDirectory/amd/mapRootRelativePathModuleSimpleSpecifyOutputDirectory.sourcemap.txt @@ -60,7 +60,7 @@ sourceFile:../outputdir_module_simple/m1.ts 1->Emitted(7, 9) Source(4, 1) + SourceIndex(0) 2 >Emitted(7, 21) Source(4, 2) + SourceIndex(0) --- ->>> })(); +>>> }()); 1 >^^^^ 2 > ^ 3 > @@ -234,7 +234,7 @@ sourceFile:../outputdir_module_simple/test.ts 1->Emitted(7, 9) Source(5, 1) + SourceIndex(0) 2 >Emitted(7, 18) Source(5, 2) + SourceIndex(0) --- ->>> })(); +>>> }()); 1 >^^^^ 2 > ^ 3 > diff --git a/tests/baselines/reference/project/mapRootRelativePathModuleSimpleSpecifyOutputDirectory/amd/outdir/simple/m1.js b/tests/baselines/reference/project/mapRootRelativePathModuleSimpleSpecifyOutputDirectory/amd/outdir/simple/m1.js index 119c0d64430..415eb731ee6 100644 --- a/tests/baselines/reference/project/mapRootRelativePathModuleSimpleSpecifyOutputDirectory/amd/outdir/simple/m1.js +++ b/tests/baselines/reference/project/mapRootRelativePathModuleSimpleSpecifyOutputDirectory/amd/outdir/simple/m1.js @@ -5,7 +5,7 @@ define(["require", "exports"], function (require, exports) { function m1_c1() { } return m1_c1; - })(); + }()); exports.m1_c1 = m1_c1; exports.m1_instance1 = new m1_c1(); function m1_f1() { diff --git a/tests/baselines/reference/project/mapRootRelativePathModuleSimpleSpecifyOutputDirectory/node/mapRootRelativePathModuleSimpleSpecifyOutputDirectory.sourcemap.txt b/tests/baselines/reference/project/mapRootRelativePathModuleSimpleSpecifyOutputDirectory/node/mapRootRelativePathModuleSimpleSpecifyOutputDirectory.sourcemap.txt index b2bf27e081e..b6dbaeb77b1 100644 --- a/tests/baselines/reference/project/mapRootRelativePathModuleSimpleSpecifyOutputDirectory/node/mapRootRelativePathModuleSimpleSpecifyOutputDirectory.sourcemap.txt +++ b/tests/baselines/reference/project/mapRootRelativePathModuleSimpleSpecifyOutputDirectory/node/mapRootRelativePathModuleSimpleSpecifyOutputDirectory.sourcemap.txt @@ -59,7 +59,7 @@ sourceFile:../outputdir_module_simple/m1.ts 1->Emitted(6, 5) Source(4, 1) + SourceIndex(0) 2 >Emitted(6, 17) Source(4, 2) + SourceIndex(0) --- ->>>})(); +>>>}()); 1 > 2 >^ 3 > @@ -255,7 +255,7 @@ sourceFile:../outputdir_module_simple/test.ts 1->Emitted(7, 5) Source(5, 1) + SourceIndex(0) 2 >Emitted(7, 14) Source(5, 2) + SourceIndex(0) --- ->>>})(); +>>>}()); 1 > 2 >^ 3 > diff --git a/tests/baselines/reference/project/mapRootRelativePathModuleSimpleSpecifyOutputDirectory/node/outdir/simple/m1.js b/tests/baselines/reference/project/mapRootRelativePathModuleSimpleSpecifyOutputDirectory/node/outdir/simple/m1.js index dcf1e846993..4c96696726b 100644 --- a/tests/baselines/reference/project/mapRootRelativePathModuleSimpleSpecifyOutputDirectory/node/outdir/simple/m1.js +++ b/tests/baselines/reference/project/mapRootRelativePathModuleSimpleSpecifyOutputDirectory/node/outdir/simple/m1.js @@ -4,7 +4,7 @@ var m1_c1 = (function () { function m1_c1() { } return m1_c1; -})(); +}()); exports.m1_c1 = m1_c1; exports.m1_instance1 = new m1_c1(); function m1_f1() { diff --git a/tests/baselines/reference/project/mapRootRelativePathModuleSimpleSpecifyOutputFile/amd/bin/test.js b/tests/baselines/reference/project/mapRootRelativePathModuleSimpleSpecifyOutputFile/amd/bin/test.js index a682a1f510d..1e43585f281 100644 --- a/tests/baselines/reference/project/mapRootRelativePathModuleSimpleSpecifyOutputFile/amd/bin/test.js +++ b/tests/baselines/reference/project/mapRootRelativePathModuleSimpleSpecifyOutputFile/amd/bin/test.js @@ -5,7 +5,7 @@ define("m1", ["require", "exports"], function (require, exports) { function m1_c1() { } return m1_c1; - })(); + }()); exports.m1_c1 = m1_c1; exports.m1_instance1 = new m1_c1(); function m1_f1() { @@ -20,7 +20,7 @@ define("test", ["require", "exports", "m1"], function (require, exports, m1) { function c1() { } return c1; - })(); + }()); exports.c1 = c1; exports.instance1 = new c1(); function f1() { diff --git a/tests/baselines/reference/project/mapRootRelativePathModuleSimpleSpecifyOutputFile/amd/mapRootRelativePathModuleSimpleSpecifyOutputFile.sourcemap.txt b/tests/baselines/reference/project/mapRootRelativePathModuleSimpleSpecifyOutputFile/amd/mapRootRelativePathModuleSimpleSpecifyOutputFile.sourcemap.txt index ceb18caf153..fd0ca24c30c 100644 --- a/tests/baselines/reference/project/mapRootRelativePathModuleSimpleSpecifyOutputFile/amd/mapRootRelativePathModuleSimpleSpecifyOutputFile.sourcemap.txt +++ b/tests/baselines/reference/project/mapRootRelativePathModuleSimpleSpecifyOutputFile/amd/mapRootRelativePathModuleSimpleSpecifyOutputFile.sourcemap.txt @@ -60,7 +60,7 @@ sourceFile:../outputdir_module_simple/m1.ts 1->Emitted(7, 9) Source(4, 1) + SourceIndex(0) 2 >Emitted(7, 21) Source(4, 2) + SourceIndex(0) --- ->>> })(); +>>> }()); 1 >^^^^ 2 > ^ 3 > @@ -228,7 +228,7 @@ sourceFile:../outputdir_module_simple/test.ts 1->Emitted(22, 9) Source(5, 1) + SourceIndex(1) 2 >Emitted(22, 18) Source(5, 2) + SourceIndex(1) --- ->>> })(); +>>> }()); 1 >^^^^ 2 > ^ 3 > diff --git a/tests/baselines/reference/project/mapRootRelativePathModuleSubfolderNoOutdir/amd/mapRootRelativePathModuleSubfolderNoOutdir.sourcemap.txt b/tests/baselines/reference/project/mapRootRelativePathModuleSubfolderNoOutdir/amd/mapRootRelativePathModuleSubfolderNoOutdir.sourcemap.txt index 66a7c743036..8e75611fa4c 100644 --- a/tests/baselines/reference/project/mapRootRelativePathModuleSubfolderNoOutdir/amd/mapRootRelativePathModuleSubfolderNoOutdir.sourcemap.txt +++ b/tests/baselines/reference/project/mapRootRelativePathModuleSubfolderNoOutdir/amd/mapRootRelativePathModuleSubfolderNoOutdir.sourcemap.txt @@ -60,7 +60,7 @@ sourceFile:../../outputdir_module_subfolder/ref/m1.ts 1->Emitted(7, 9) Source(4, 1) + SourceIndex(0) 2 >Emitted(7, 21) Source(4, 2) + SourceIndex(0) --- ->>> })(); +>>> }()); 1 >^^^^ 2 > ^ 3 > @@ -234,7 +234,7 @@ sourceFile:../outputdir_module_subfolder/test.ts 1->Emitted(7, 9) Source(5, 1) + SourceIndex(0) 2 >Emitted(7, 18) Source(5, 2) + SourceIndex(0) --- ->>> })(); +>>> }()); 1 >^^^^ 2 > ^ 3 > diff --git a/tests/baselines/reference/project/mapRootRelativePathModuleSubfolderNoOutdir/amd/ref/m1.js b/tests/baselines/reference/project/mapRootRelativePathModuleSubfolderNoOutdir/amd/ref/m1.js index 8d3bff9f961..d7fc22ee9b3 100644 --- a/tests/baselines/reference/project/mapRootRelativePathModuleSubfolderNoOutdir/amd/ref/m1.js +++ b/tests/baselines/reference/project/mapRootRelativePathModuleSubfolderNoOutdir/amd/ref/m1.js @@ -5,7 +5,7 @@ define(["require", "exports"], function (require, exports) { function m1_c1() { } return m1_c1; - })(); + }()); exports.m1_c1 = m1_c1; exports.m1_instance1 = new m1_c1(); function m1_f1() { diff --git a/tests/baselines/reference/project/mapRootRelativePathModuleSubfolderNoOutdir/node/mapRootRelativePathModuleSubfolderNoOutdir.sourcemap.txt b/tests/baselines/reference/project/mapRootRelativePathModuleSubfolderNoOutdir/node/mapRootRelativePathModuleSubfolderNoOutdir.sourcemap.txt index 62ee9347ba2..775700c9f05 100644 --- a/tests/baselines/reference/project/mapRootRelativePathModuleSubfolderNoOutdir/node/mapRootRelativePathModuleSubfolderNoOutdir.sourcemap.txt +++ b/tests/baselines/reference/project/mapRootRelativePathModuleSubfolderNoOutdir/node/mapRootRelativePathModuleSubfolderNoOutdir.sourcemap.txt @@ -59,7 +59,7 @@ sourceFile:../../outputdir_module_subfolder/ref/m1.ts 1->Emitted(6, 5) Source(4, 1) + SourceIndex(0) 2 >Emitted(6, 17) Source(4, 2) + SourceIndex(0) --- ->>>})(); +>>>}()); 1 > 2 >^ 3 > @@ -255,7 +255,7 @@ sourceFile:../outputdir_module_subfolder/test.ts 1->Emitted(7, 5) Source(5, 1) + SourceIndex(0) 2 >Emitted(7, 14) Source(5, 2) + SourceIndex(0) --- ->>>})(); +>>>}()); 1 > 2 >^ 3 > diff --git a/tests/baselines/reference/project/mapRootRelativePathModuleSubfolderNoOutdir/node/ref/m1.js b/tests/baselines/reference/project/mapRootRelativePathModuleSubfolderNoOutdir/node/ref/m1.js index c9c1fc5a6d1..4423220831b 100644 --- a/tests/baselines/reference/project/mapRootRelativePathModuleSubfolderNoOutdir/node/ref/m1.js +++ b/tests/baselines/reference/project/mapRootRelativePathModuleSubfolderNoOutdir/node/ref/m1.js @@ -4,7 +4,7 @@ var m1_c1 = (function () { function m1_c1() { } return m1_c1; -})(); +}()); exports.m1_c1 = m1_c1; exports.m1_instance1 = new m1_c1(); function m1_f1() { diff --git a/tests/baselines/reference/project/mapRootRelativePathModuleSubfolderSpecifyOutputDirectory/amd/mapRootRelativePathModuleSubfolderSpecifyOutputDirectory.sourcemap.txt b/tests/baselines/reference/project/mapRootRelativePathModuleSubfolderSpecifyOutputDirectory/amd/mapRootRelativePathModuleSubfolderSpecifyOutputDirectory.sourcemap.txt index 857d197acb5..9c72e15b36d 100644 --- a/tests/baselines/reference/project/mapRootRelativePathModuleSubfolderSpecifyOutputDirectory/amd/mapRootRelativePathModuleSubfolderSpecifyOutputDirectory.sourcemap.txt +++ b/tests/baselines/reference/project/mapRootRelativePathModuleSubfolderSpecifyOutputDirectory/amd/mapRootRelativePathModuleSubfolderSpecifyOutputDirectory.sourcemap.txt @@ -60,7 +60,7 @@ sourceFile:../../outputdir_module_subfolder/ref/m1.ts 1->Emitted(7, 9) Source(4, 1) + SourceIndex(0) 2 >Emitted(7, 21) Source(4, 2) + SourceIndex(0) --- ->>> })(); +>>> }()); 1 >^^^^ 2 > ^ 3 > @@ -234,7 +234,7 @@ sourceFile:../outputdir_module_subfolder/test.ts 1->Emitted(7, 9) Source(5, 1) + SourceIndex(0) 2 >Emitted(7, 18) Source(5, 2) + SourceIndex(0) --- ->>> })(); +>>> }()); 1 >^^^^ 2 > ^ 3 > diff --git a/tests/baselines/reference/project/mapRootRelativePathModuleSubfolderSpecifyOutputDirectory/amd/outdir/simple/ref/m1.js b/tests/baselines/reference/project/mapRootRelativePathModuleSubfolderSpecifyOutputDirectory/amd/outdir/simple/ref/m1.js index 769504a9af8..447f2cb756d 100644 --- a/tests/baselines/reference/project/mapRootRelativePathModuleSubfolderSpecifyOutputDirectory/amd/outdir/simple/ref/m1.js +++ b/tests/baselines/reference/project/mapRootRelativePathModuleSubfolderSpecifyOutputDirectory/amd/outdir/simple/ref/m1.js @@ -5,7 +5,7 @@ define(["require", "exports"], function (require, exports) { function m1_c1() { } return m1_c1; - })(); + }()); exports.m1_c1 = m1_c1; exports.m1_instance1 = new m1_c1(); function m1_f1() { diff --git a/tests/baselines/reference/project/mapRootRelativePathModuleSubfolderSpecifyOutputDirectory/node/mapRootRelativePathModuleSubfolderSpecifyOutputDirectory.sourcemap.txt b/tests/baselines/reference/project/mapRootRelativePathModuleSubfolderSpecifyOutputDirectory/node/mapRootRelativePathModuleSubfolderSpecifyOutputDirectory.sourcemap.txt index 925c9368edd..d694c5e237b 100644 --- a/tests/baselines/reference/project/mapRootRelativePathModuleSubfolderSpecifyOutputDirectory/node/mapRootRelativePathModuleSubfolderSpecifyOutputDirectory.sourcemap.txt +++ b/tests/baselines/reference/project/mapRootRelativePathModuleSubfolderSpecifyOutputDirectory/node/mapRootRelativePathModuleSubfolderSpecifyOutputDirectory.sourcemap.txt @@ -59,7 +59,7 @@ sourceFile:../../outputdir_module_subfolder/ref/m1.ts 1->Emitted(6, 5) Source(4, 1) + SourceIndex(0) 2 >Emitted(6, 17) Source(4, 2) + SourceIndex(0) --- ->>>})(); +>>>}()); 1 > 2 >^ 3 > @@ -255,7 +255,7 @@ sourceFile:../outputdir_module_subfolder/test.ts 1->Emitted(7, 5) Source(5, 1) + SourceIndex(0) 2 >Emitted(7, 14) Source(5, 2) + SourceIndex(0) --- ->>>})(); +>>>}()); 1 > 2 >^ 3 > diff --git a/tests/baselines/reference/project/mapRootRelativePathModuleSubfolderSpecifyOutputDirectory/node/outdir/simple/ref/m1.js b/tests/baselines/reference/project/mapRootRelativePathModuleSubfolderSpecifyOutputDirectory/node/outdir/simple/ref/m1.js index 34294f368ff..b4b9b2dc7e0 100644 --- a/tests/baselines/reference/project/mapRootRelativePathModuleSubfolderSpecifyOutputDirectory/node/outdir/simple/ref/m1.js +++ b/tests/baselines/reference/project/mapRootRelativePathModuleSubfolderSpecifyOutputDirectory/node/outdir/simple/ref/m1.js @@ -4,7 +4,7 @@ var m1_c1 = (function () { function m1_c1() { } return m1_c1; -})(); +}()); exports.m1_c1 = m1_c1; exports.m1_instance1 = new m1_c1(); function m1_f1() { diff --git a/tests/baselines/reference/project/mapRootRelativePathModuleSubfolderSpecifyOutputFile/amd/bin/test.js b/tests/baselines/reference/project/mapRootRelativePathModuleSubfolderSpecifyOutputFile/amd/bin/test.js index 88f1db4f33e..23442cdbfa6 100644 --- a/tests/baselines/reference/project/mapRootRelativePathModuleSubfolderSpecifyOutputFile/amd/bin/test.js +++ b/tests/baselines/reference/project/mapRootRelativePathModuleSubfolderSpecifyOutputFile/amd/bin/test.js @@ -5,7 +5,7 @@ define("ref/m1", ["require", "exports"], function (require, exports) { function m1_c1() { } return m1_c1; - })(); + }()); exports.m1_c1 = m1_c1; exports.m1_instance1 = new m1_c1(); function m1_f1() { @@ -20,7 +20,7 @@ define("test", ["require", "exports", "ref/m1"], function (require, exports, m1) function c1() { } return c1; - })(); + }()); exports.c1 = c1; exports.instance1 = new c1(); function f1() { diff --git a/tests/baselines/reference/project/mapRootRelativePathModuleSubfolderSpecifyOutputFile/amd/mapRootRelativePathModuleSubfolderSpecifyOutputFile.sourcemap.txt b/tests/baselines/reference/project/mapRootRelativePathModuleSubfolderSpecifyOutputFile/amd/mapRootRelativePathModuleSubfolderSpecifyOutputFile.sourcemap.txt index 2bff7cdbda9..1fcadcb6c3d 100644 --- a/tests/baselines/reference/project/mapRootRelativePathModuleSubfolderSpecifyOutputFile/amd/mapRootRelativePathModuleSubfolderSpecifyOutputFile.sourcemap.txt +++ b/tests/baselines/reference/project/mapRootRelativePathModuleSubfolderSpecifyOutputFile/amd/mapRootRelativePathModuleSubfolderSpecifyOutputFile.sourcemap.txt @@ -60,7 +60,7 @@ sourceFile:../outputdir_module_subfolder/ref/m1.ts 1->Emitted(7, 9) Source(4, 1) + SourceIndex(0) 2 >Emitted(7, 21) Source(4, 2) + SourceIndex(0) --- ->>> })(); +>>> }()); 1 >^^^^ 2 > ^ 3 > @@ -228,7 +228,7 @@ sourceFile:../outputdir_module_subfolder/test.ts 1->Emitted(22, 9) Source(5, 1) + SourceIndex(1) 2 >Emitted(22, 18) Source(5, 2) + SourceIndex(1) --- ->>> })(); +>>> }()); 1 >^^^^ 2 > ^ 3 > diff --git a/tests/baselines/reference/project/mapRootRelativePathMultifolderNoOutdir/amd/mapRootRelativePathMultifolderNoOutdir.sourcemap.txt b/tests/baselines/reference/project/mapRootRelativePathMultifolderNoOutdir/amd/mapRootRelativePathMultifolderNoOutdir.sourcemap.txt index e5bf488f3d0..5d88f4ea1e9 100644 --- a/tests/baselines/reference/project/mapRootRelativePathMultifolderNoOutdir/amd/mapRootRelativePathMultifolderNoOutdir.sourcemap.txt +++ b/tests/baselines/reference/project/mapRootRelativePathMultifolderNoOutdir/amd/mapRootRelativePathMultifolderNoOutdir.sourcemap.txt @@ -61,7 +61,7 @@ sourceFile:../../../projects/outputdir_multifolder/ref/m1.ts 1->Emitted(5, 5) Source(4, 1) + SourceIndex(0) 2 >Emitted(5, 17) Source(4, 2) + SourceIndex(0) --- ->>>})(); +>>>}()); 1 > 2 >^ 3 > @@ -204,7 +204,7 @@ sourceFile:../../projects/outputdir_multifolder_ref/m2.ts 1->Emitted(5, 5) Source(4, 1) + SourceIndex(0) 2 >Emitted(5, 17) Source(4, 2) + SourceIndex(0) --- ->>>})(); +>>>}()); 1 > 2 >^ 3 > @@ -366,7 +366,7 @@ sourceFile:../../projects/outputdir_multifolder/test.ts 1->Emitted(7, 5) Source(6, 1) + SourceIndex(0) 2 >Emitted(7, 14) Source(6, 2) + SourceIndex(0) --- ->>>})(); +>>>}()); 1 > 2 >^ 3 > diff --git a/tests/baselines/reference/project/mapRootRelativePathMultifolderNoOutdir/amd/ref/m1.js b/tests/baselines/reference/project/mapRootRelativePathMultifolderNoOutdir/amd/ref/m1.js index 2b547787de6..48efad1d91c 100644 --- a/tests/baselines/reference/project/mapRootRelativePathMultifolderNoOutdir/amd/ref/m1.js +++ b/tests/baselines/reference/project/mapRootRelativePathMultifolderNoOutdir/amd/ref/m1.js @@ -3,7 +3,7 @@ var m1_c1 = (function () { function m1_c1() { } return m1_c1; -})(); +}()); var m1_instance1 = new m1_c1(); function m1_f1() { return m1_instance1; diff --git a/tests/baselines/reference/project/mapRootRelativePathMultifolderNoOutdir/node/mapRootRelativePathMultifolderNoOutdir.sourcemap.txt b/tests/baselines/reference/project/mapRootRelativePathMultifolderNoOutdir/node/mapRootRelativePathMultifolderNoOutdir.sourcemap.txt index e5bf488f3d0..5d88f4ea1e9 100644 --- a/tests/baselines/reference/project/mapRootRelativePathMultifolderNoOutdir/node/mapRootRelativePathMultifolderNoOutdir.sourcemap.txt +++ b/tests/baselines/reference/project/mapRootRelativePathMultifolderNoOutdir/node/mapRootRelativePathMultifolderNoOutdir.sourcemap.txt @@ -61,7 +61,7 @@ sourceFile:../../../projects/outputdir_multifolder/ref/m1.ts 1->Emitted(5, 5) Source(4, 1) + SourceIndex(0) 2 >Emitted(5, 17) Source(4, 2) + SourceIndex(0) --- ->>>})(); +>>>}()); 1 > 2 >^ 3 > @@ -204,7 +204,7 @@ sourceFile:../../projects/outputdir_multifolder_ref/m2.ts 1->Emitted(5, 5) Source(4, 1) + SourceIndex(0) 2 >Emitted(5, 17) Source(4, 2) + SourceIndex(0) --- ->>>})(); +>>>}()); 1 > 2 >^ 3 > @@ -366,7 +366,7 @@ sourceFile:../../projects/outputdir_multifolder/test.ts 1->Emitted(7, 5) Source(6, 1) + SourceIndex(0) 2 >Emitted(7, 14) Source(6, 2) + SourceIndex(0) --- ->>>})(); +>>>}()); 1 > 2 >^ 3 > diff --git a/tests/baselines/reference/project/mapRootRelativePathMultifolderNoOutdir/node/ref/m1.js b/tests/baselines/reference/project/mapRootRelativePathMultifolderNoOutdir/node/ref/m1.js index 2b547787de6..48efad1d91c 100644 --- a/tests/baselines/reference/project/mapRootRelativePathMultifolderNoOutdir/node/ref/m1.js +++ b/tests/baselines/reference/project/mapRootRelativePathMultifolderNoOutdir/node/ref/m1.js @@ -3,7 +3,7 @@ var m1_c1 = (function () { function m1_c1() { } return m1_c1; -})(); +}()); var m1_instance1 = new m1_c1(); function m1_f1() { return m1_instance1; diff --git a/tests/baselines/reference/project/mapRootRelativePathMultifolderSpecifyOutputDirectory/amd/mapRootRelativePathMultifolderSpecifyOutputDirectory.sourcemap.txt b/tests/baselines/reference/project/mapRootRelativePathMultifolderSpecifyOutputDirectory/amd/mapRootRelativePathMultifolderSpecifyOutputDirectory.sourcemap.txt index ea4571b517c..8864cb3a00b 100644 --- a/tests/baselines/reference/project/mapRootRelativePathMultifolderSpecifyOutputDirectory/amd/mapRootRelativePathMultifolderSpecifyOutputDirectory.sourcemap.txt +++ b/tests/baselines/reference/project/mapRootRelativePathMultifolderSpecifyOutputDirectory/amd/mapRootRelativePathMultifolderSpecifyOutputDirectory.sourcemap.txt @@ -61,7 +61,7 @@ sourceFile:../../../projects/outputdir_multifolder/ref/m1.ts 1->Emitted(5, 5) Source(4, 1) + SourceIndex(0) 2 >Emitted(5, 17) Source(4, 2) + SourceIndex(0) --- ->>>})(); +>>>}()); 1 > 2 >^ 3 > @@ -204,7 +204,7 @@ sourceFile:../../projects/outputdir_multifolder_ref/m2.ts 1->Emitted(5, 5) Source(4, 1) + SourceIndex(0) 2 >Emitted(5, 17) Source(4, 2) + SourceIndex(0) --- ->>>})(); +>>>}()); 1 > 2 >^ 3 > @@ -366,7 +366,7 @@ sourceFile:../../projects/outputdir_multifolder/test.ts 1->Emitted(7, 5) Source(6, 1) + SourceIndex(0) 2 >Emitted(7, 14) Source(6, 2) + SourceIndex(0) --- ->>>})(); +>>>}()); 1 > 2 >^ 3 > diff --git a/tests/baselines/reference/project/mapRootRelativePathMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_multifolder/ref/m1.js b/tests/baselines/reference/project/mapRootRelativePathMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_multifolder/ref/m1.js index a135e4b0278..490ac31736b 100644 --- a/tests/baselines/reference/project/mapRootRelativePathMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_multifolder/ref/m1.js +++ b/tests/baselines/reference/project/mapRootRelativePathMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_multifolder/ref/m1.js @@ -3,7 +3,7 @@ var m1_c1 = (function () { function m1_c1() { } return m1_c1; -})(); +}()); var m1_instance1 = new m1_c1(); function m1_f1() { return m1_instance1; diff --git a/tests/baselines/reference/project/mapRootRelativePathMultifolderSpecifyOutputDirectory/node/mapRootRelativePathMultifolderSpecifyOutputDirectory.sourcemap.txt b/tests/baselines/reference/project/mapRootRelativePathMultifolderSpecifyOutputDirectory/node/mapRootRelativePathMultifolderSpecifyOutputDirectory.sourcemap.txt index ea4571b517c..8864cb3a00b 100644 --- a/tests/baselines/reference/project/mapRootRelativePathMultifolderSpecifyOutputDirectory/node/mapRootRelativePathMultifolderSpecifyOutputDirectory.sourcemap.txt +++ b/tests/baselines/reference/project/mapRootRelativePathMultifolderSpecifyOutputDirectory/node/mapRootRelativePathMultifolderSpecifyOutputDirectory.sourcemap.txt @@ -61,7 +61,7 @@ sourceFile:../../../projects/outputdir_multifolder/ref/m1.ts 1->Emitted(5, 5) Source(4, 1) + SourceIndex(0) 2 >Emitted(5, 17) Source(4, 2) + SourceIndex(0) --- ->>>})(); +>>>}()); 1 > 2 >^ 3 > @@ -204,7 +204,7 @@ sourceFile:../../projects/outputdir_multifolder_ref/m2.ts 1->Emitted(5, 5) Source(4, 1) + SourceIndex(0) 2 >Emitted(5, 17) Source(4, 2) + SourceIndex(0) --- ->>>})(); +>>>}()); 1 > 2 >^ 3 > @@ -366,7 +366,7 @@ sourceFile:../../projects/outputdir_multifolder/test.ts 1->Emitted(7, 5) Source(6, 1) + SourceIndex(0) 2 >Emitted(7, 14) Source(6, 2) + SourceIndex(0) --- ->>>})(); +>>>}()); 1 > 2 >^ 3 > diff --git a/tests/baselines/reference/project/mapRootRelativePathMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_multifolder/ref/m1.js b/tests/baselines/reference/project/mapRootRelativePathMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_multifolder/ref/m1.js index a135e4b0278..490ac31736b 100644 --- a/tests/baselines/reference/project/mapRootRelativePathMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_multifolder/ref/m1.js +++ b/tests/baselines/reference/project/mapRootRelativePathMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_multifolder/ref/m1.js @@ -3,7 +3,7 @@ var m1_c1 = (function () { function m1_c1() { } return m1_c1; -})(); +}()); var m1_instance1 = new m1_c1(); function m1_f1() { return m1_instance1; diff --git a/tests/baselines/reference/project/mapRootRelativePathMultifolderSpecifyOutputFile/amd/bin/test.js b/tests/baselines/reference/project/mapRootRelativePathMultifolderSpecifyOutputFile/amd/bin/test.js index acd2d113c02..52c907e93a8 100644 --- a/tests/baselines/reference/project/mapRootRelativePathMultifolderSpecifyOutputFile/amd/bin/test.js +++ b/tests/baselines/reference/project/mapRootRelativePathMultifolderSpecifyOutputFile/amd/bin/test.js @@ -3,7 +3,7 @@ var m1_c1 = (function () { function m1_c1() { } return m1_c1; -})(); +}()); var m1_instance1 = new m1_c1(); function m1_f1() { return m1_instance1; @@ -13,7 +13,7 @@ var m2_c1 = (function () { function m2_c1() { } return m2_c1; -})(); +}()); var m2_instance1 = new m2_c1(); function m2_f1() { return m2_instance1; @@ -25,7 +25,7 @@ var c1 = (function () { function c1() { } return c1; -})(); +}()); var instance1 = new c1(); function f1() { return instance1; diff --git a/tests/baselines/reference/project/mapRootRelativePathMultifolderSpecifyOutputFile/amd/mapRootRelativePathMultifolderSpecifyOutputFile.sourcemap.txt b/tests/baselines/reference/project/mapRootRelativePathMultifolderSpecifyOutputFile/amd/mapRootRelativePathMultifolderSpecifyOutputFile.sourcemap.txt index ec7a51000b4..b59dd72c617 100644 --- a/tests/baselines/reference/project/mapRootRelativePathMultifolderSpecifyOutputFile/amd/mapRootRelativePathMultifolderSpecifyOutputFile.sourcemap.txt +++ b/tests/baselines/reference/project/mapRootRelativePathMultifolderSpecifyOutputFile/amd/mapRootRelativePathMultifolderSpecifyOutputFile.sourcemap.txt @@ -61,7 +61,7 @@ sourceFile:../projects/outputdir_multifolder/ref/m1.ts 1->Emitted(5, 5) Source(4, 1) + SourceIndex(0) 2 >Emitted(5, 17) Source(4, 2) + SourceIndex(0) --- ->>>})(); +>>>}()); 1 > 2 >^ 3 > @@ -198,7 +198,7 @@ sourceFile:../projects/outputdir_multifolder_ref/m2.ts 1->Emitted(15, 5) Source(4, 1) + SourceIndex(1) 2 >Emitted(15, 17) Source(4, 2) + SourceIndex(1) --- ->>>})(); +>>>}()); 1 > 2 >^ 3 > @@ -354,7 +354,7 @@ sourceFile:../projects/outputdir_multifolder/test.ts 1->Emitted(27, 5) Source(6, 1) + SourceIndex(2) 2 >Emitted(27, 14) Source(6, 2) + SourceIndex(2) --- ->>>})(); +>>>}()); 1 > 2 >^ 3 > diff --git a/tests/baselines/reference/project/mapRootRelativePathMultifolderSpecifyOutputFile/node/bin/test.js b/tests/baselines/reference/project/mapRootRelativePathMultifolderSpecifyOutputFile/node/bin/test.js index acd2d113c02..52c907e93a8 100644 --- a/tests/baselines/reference/project/mapRootRelativePathMultifolderSpecifyOutputFile/node/bin/test.js +++ b/tests/baselines/reference/project/mapRootRelativePathMultifolderSpecifyOutputFile/node/bin/test.js @@ -3,7 +3,7 @@ var m1_c1 = (function () { function m1_c1() { } return m1_c1; -})(); +}()); var m1_instance1 = new m1_c1(); function m1_f1() { return m1_instance1; @@ -13,7 +13,7 @@ var m2_c1 = (function () { function m2_c1() { } return m2_c1; -})(); +}()); var m2_instance1 = new m2_c1(); function m2_f1() { return m2_instance1; @@ -25,7 +25,7 @@ var c1 = (function () { function c1() { } return c1; -})(); +}()); var instance1 = new c1(); function f1() { return instance1; diff --git a/tests/baselines/reference/project/mapRootRelativePathMultifolderSpecifyOutputFile/node/mapRootRelativePathMultifolderSpecifyOutputFile.sourcemap.txt b/tests/baselines/reference/project/mapRootRelativePathMultifolderSpecifyOutputFile/node/mapRootRelativePathMultifolderSpecifyOutputFile.sourcemap.txt index ec7a51000b4..b59dd72c617 100644 --- a/tests/baselines/reference/project/mapRootRelativePathMultifolderSpecifyOutputFile/node/mapRootRelativePathMultifolderSpecifyOutputFile.sourcemap.txt +++ b/tests/baselines/reference/project/mapRootRelativePathMultifolderSpecifyOutputFile/node/mapRootRelativePathMultifolderSpecifyOutputFile.sourcemap.txt @@ -61,7 +61,7 @@ sourceFile:../projects/outputdir_multifolder/ref/m1.ts 1->Emitted(5, 5) Source(4, 1) + SourceIndex(0) 2 >Emitted(5, 17) Source(4, 2) + SourceIndex(0) --- ->>>})(); +>>>}()); 1 > 2 >^ 3 > @@ -198,7 +198,7 @@ sourceFile:../projects/outputdir_multifolder_ref/m2.ts 1->Emitted(15, 5) Source(4, 1) + SourceIndex(1) 2 >Emitted(15, 17) Source(4, 2) + SourceIndex(1) --- ->>>})(); +>>>}()); 1 > 2 >^ 3 > @@ -354,7 +354,7 @@ sourceFile:../projects/outputdir_multifolder/test.ts 1->Emitted(27, 5) Source(6, 1) + SourceIndex(2) 2 >Emitted(27, 14) Source(6, 2) + SourceIndex(2) --- ->>>})(); +>>>}()); 1 > 2 >^ 3 > diff --git a/tests/baselines/reference/project/mapRootRelativePathSimpleNoOutdir/amd/m1.js b/tests/baselines/reference/project/mapRootRelativePathSimpleNoOutdir/amd/m1.js index 517ed8f6492..027237fe764 100644 --- a/tests/baselines/reference/project/mapRootRelativePathSimpleNoOutdir/amd/m1.js +++ b/tests/baselines/reference/project/mapRootRelativePathSimpleNoOutdir/amd/m1.js @@ -3,7 +3,7 @@ var m1_c1 = (function () { function m1_c1() { } return m1_c1; -})(); +}()); var m1_instance1 = new m1_c1(); function m1_f1() { return m1_instance1; diff --git a/tests/baselines/reference/project/mapRootRelativePathSimpleNoOutdir/amd/mapRootRelativePathSimpleNoOutdir.sourcemap.txt b/tests/baselines/reference/project/mapRootRelativePathSimpleNoOutdir/amd/mapRootRelativePathSimpleNoOutdir.sourcemap.txt index 7c6f2c2513d..7c35498a07a 100644 --- a/tests/baselines/reference/project/mapRootRelativePathSimpleNoOutdir/amd/mapRootRelativePathSimpleNoOutdir.sourcemap.txt +++ b/tests/baselines/reference/project/mapRootRelativePathSimpleNoOutdir/amd/mapRootRelativePathSimpleNoOutdir.sourcemap.txt @@ -61,7 +61,7 @@ sourceFile:../outputdir_simple/m1.ts 1->Emitted(5, 5) Source(4, 1) + SourceIndex(0) 2 >Emitted(5, 17) Source(4, 2) + SourceIndex(0) --- ->>>})(); +>>>}()); 1 > 2 >^ 3 > @@ -213,7 +213,7 @@ sourceFile:../outputdir_simple/test.ts 1->Emitted(6, 5) Source(5, 1) + SourceIndex(0) 2 >Emitted(6, 14) Source(5, 2) + SourceIndex(0) --- ->>>})(); +>>>}()); 1 > 2 >^ 3 > diff --git a/tests/baselines/reference/project/mapRootRelativePathSimpleNoOutdir/node/m1.js b/tests/baselines/reference/project/mapRootRelativePathSimpleNoOutdir/node/m1.js index 517ed8f6492..027237fe764 100644 --- a/tests/baselines/reference/project/mapRootRelativePathSimpleNoOutdir/node/m1.js +++ b/tests/baselines/reference/project/mapRootRelativePathSimpleNoOutdir/node/m1.js @@ -3,7 +3,7 @@ var m1_c1 = (function () { function m1_c1() { } return m1_c1; -})(); +}()); var m1_instance1 = new m1_c1(); function m1_f1() { return m1_instance1; diff --git a/tests/baselines/reference/project/mapRootRelativePathSimpleNoOutdir/node/mapRootRelativePathSimpleNoOutdir.sourcemap.txt b/tests/baselines/reference/project/mapRootRelativePathSimpleNoOutdir/node/mapRootRelativePathSimpleNoOutdir.sourcemap.txt index 7c6f2c2513d..7c35498a07a 100644 --- a/tests/baselines/reference/project/mapRootRelativePathSimpleNoOutdir/node/mapRootRelativePathSimpleNoOutdir.sourcemap.txt +++ b/tests/baselines/reference/project/mapRootRelativePathSimpleNoOutdir/node/mapRootRelativePathSimpleNoOutdir.sourcemap.txt @@ -61,7 +61,7 @@ sourceFile:../outputdir_simple/m1.ts 1->Emitted(5, 5) Source(4, 1) + SourceIndex(0) 2 >Emitted(5, 17) Source(4, 2) + SourceIndex(0) --- ->>>})(); +>>>}()); 1 > 2 >^ 3 > @@ -213,7 +213,7 @@ sourceFile:../outputdir_simple/test.ts 1->Emitted(6, 5) Source(5, 1) + SourceIndex(0) 2 >Emitted(6, 14) Source(5, 2) + SourceIndex(0) --- ->>>})(); +>>>}()); 1 > 2 >^ 3 > diff --git a/tests/baselines/reference/project/mapRootRelativePathSimpleSpecifyOutputDirectory/amd/mapRootRelativePathSimpleSpecifyOutputDirectory.sourcemap.txt b/tests/baselines/reference/project/mapRootRelativePathSimpleSpecifyOutputDirectory/amd/mapRootRelativePathSimpleSpecifyOutputDirectory.sourcemap.txt index 9b5cee44e88..37598978973 100644 --- a/tests/baselines/reference/project/mapRootRelativePathSimpleSpecifyOutputDirectory/amd/mapRootRelativePathSimpleSpecifyOutputDirectory.sourcemap.txt +++ b/tests/baselines/reference/project/mapRootRelativePathSimpleSpecifyOutputDirectory/amd/mapRootRelativePathSimpleSpecifyOutputDirectory.sourcemap.txt @@ -61,7 +61,7 @@ sourceFile:../outputdir_simple/m1.ts 1->Emitted(5, 5) Source(4, 1) + SourceIndex(0) 2 >Emitted(5, 17) Source(4, 2) + SourceIndex(0) --- ->>>})(); +>>>}()); 1 > 2 >^ 3 > @@ -213,7 +213,7 @@ sourceFile:../outputdir_simple/test.ts 1->Emitted(6, 5) Source(5, 1) + SourceIndex(0) 2 >Emitted(6, 14) Source(5, 2) + SourceIndex(0) --- ->>>})(); +>>>}()); 1 > 2 >^ 3 > diff --git a/tests/baselines/reference/project/mapRootRelativePathSimpleSpecifyOutputDirectory/amd/outdir/simple/m1.js b/tests/baselines/reference/project/mapRootRelativePathSimpleSpecifyOutputDirectory/amd/outdir/simple/m1.js index 41150949e29..9f57dc40bbb 100644 --- a/tests/baselines/reference/project/mapRootRelativePathSimpleSpecifyOutputDirectory/amd/outdir/simple/m1.js +++ b/tests/baselines/reference/project/mapRootRelativePathSimpleSpecifyOutputDirectory/amd/outdir/simple/m1.js @@ -3,7 +3,7 @@ var m1_c1 = (function () { function m1_c1() { } return m1_c1; -})(); +}()); var m1_instance1 = new m1_c1(); function m1_f1() { return m1_instance1; diff --git a/tests/baselines/reference/project/mapRootRelativePathSimpleSpecifyOutputDirectory/node/mapRootRelativePathSimpleSpecifyOutputDirectory.sourcemap.txt b/tests/baselines/reference/project/mapRootRelativePathSimpleSpecifyOutputDirectory/node/mapRootRelativePathSimpleSpecifyOutputDirectory.sourcemap.txt index 9b5cee44e88..37598978973 100644 --- a/tests/baselines/reference/project/mapRootRelativePathSimpleSpecifyOutputDirectory/node/mapRootRelativePathSimpleSpecifyOutputDirectory.sourcemap.txt +++ b/tests/baselines/reference/project/mapRootRelativePathSimpleSpecifyOutputDirectory/node/mapRootRelativePathSimpleSpecifyOutputDirectory.sourcemap.txt @@ -61,7 +61,7 @@ sourceFile:../outputdir_simple/m1.ts 1->Emitted(5, 5) Source(4, 1) + SourceIndex(0) 2 >Emitted(5, 17) Source(4, 2) + SourceIndex(0) --- ->>>})(); +>>>}()); 1 > 2 >^ 3 > @@ -213,7 +213,7 @@ sourceFile:../outputdir_simple/test.ts 1->Emitted(6, 5) Source(5, 1) + SourceIndex(0) 2 >Emitted(6, 14) Source(5, 2) + SourceIndex(0) --- ->>>})(); +>>>}()); 1 > 2 >^ 3 > diff --git a/tests/baselines/reference/project/mapRootRelativePathSimpleSpecifyOutputDirectory/node/outdir/simple/m1.js b/tests/baselines/reference/project/mapRootRelativePathSimpleSpecifyOutputDirectory/node/outdir/simple/m1.js index 41150949e29..9f57dc40bbb 100644 --- a/tests/baselines/reference/project/mapRootRelativePathSimpleSpecifyOutputDirectory/node/outdir/simple/m1.js +++ b/tests/baselines/reference/project/mapRootRelativePathSimpleSpecifyOutputDirectory/node/outdir/simple/m1.js @@ -3,7 +3,7 @@ var m1_c1 = (function () { function m1_c1() { } return m1_c1; -})(); +}()); var m1_instance1 = new m1_c1(); function m1_f1() { return m1_instance1; diff --git a/tests/baselines/reference/project/mapRootRelativePathSimpleSpecifyOutputFile/amd/bin/test.js b/tests/baselines/reference/project/mapRootRelativePathSimpleSpecifyOutputFile/amd/bin/test.js index 9d6f9d2bb0d..9210e2c4fca 100644 --- a/tests/baselines/reference/project/mapRootRelativePathSimpleSpecifyOutputFile/amd/bin/test.js +++ b/tests/baselines/reference/project/mapRootRelativePathSimpleSpecifyOutputFile/amd/bin/test.js @@ -3,7 +3,7 @@ var m1_c1 = (function () { function m1_c1() { } return m1_c1; -})(); +}()); var m1_instance1 = new m1_c1(); function m1_f1() { return m1_instance1; @@ -14,7 +14,7 @@ var c1 = (function () { function c1() { } return c1; -})(); +}()); var instance1 = new c1(); function f1() { return instance1; diff --git a/tests/baselines/reference/project/mapRootRelativePathSimpleSpecifyOutputFile/amd/mapRootRelativePathSimpleSpecifyOutputFile.sourcemap.txt b/tests/baselines/reference/project/mapRootRelativePathSimpleSpecifyOutputFile/amd/mapRootRelativePathSimpleSpecifyOutputFile.sourcemap.txt index cdfe8381ab4..50d88c5b21e 100644 --- a/tests/baselines/reference/project/mapRootRelativePathSimpleSpecifyOutputFile/amd/mapRootRelativePathSimpleSpecifyOutputFile.sourcemap.txt +++ b/tests/baselines/reference/project/mapRootRelativePathSimpleSpecifyOutputFile/amd/mapRootRelativePathSimpleSpecifyOutputFile.sourcemap.txt @@ -61,7 +61,7 @@ sourceFile:../outputdir_simple/m1.ts 1->Emitted(5, 5) Source(4, 1) + SourceIndex(0) 2 >Emitted(5, 17) Source(4, 2) + SourceIndex(0) --- ->>>})(); +>>>}()); 1 > 2 >^ 3 > @@ -207,7 +207,7 @@ sourceFile:../outputdir_simple/test.ts 1->Emitted(16, 5) Source(5, 1) + SourceIndex(1) 2 >Emitted(16, 14) Source(5, 2) + SourceIndex(1) --- ->>>})(); +>>>}()); 1 > 2 >^ 3 > diff --git a/tests/baselines/reference/project/mapRootRelativePathSimpleSpecifyOutputFile/node/bin/test.js b/tests/baselines/reference/project/mapRootRelativePathSimpleSpecifyOutputFile/node/bin/test.js index 9d6f9d2bb0d..9210e2c4fca 100644 --- a/tests/baselines/reference/project/mapRootRelativePathSimpleSpecifyOutputFile/node/bin/test.js +++ b/tests/baselines/reference/project/mapRootRelativePathSimpleSpecifyOutputFile/node/bin/test.js @@ -3,7 +3,7 @@ var m1_c1 = (function () { function m1_c1() { } return m1_c1; -})(); +}()); var m1_instance1 = new m1_c1(); function m1_f1() { return m1_instance1; @@ -14,7 +14,7 @@ var c1 = (function () { function c1() { } return c1; -})(); +}()); var instance1 = new c1(); function f1() { return instance1; diff --git a/tests/baselines/reference/project/mapRootRelativePathSimpleSpecifyOutputFile/node/mapRootRelativePathSimpleSpecifyOutputFile.sourcemap.txt b/tests/baselines/reference/project/mapRootRelativePathSimpleSpecifyOutputFile/node/mapRootRelativePathSimpleSpecifyOutputFile.sourcemap.txt index cdfe8381ab4..50d88c5b21e 100644 --- a/tests/baselines/reference/project/mapRootRelativePathSimpleSpecifyOutputFile/node/mapRootRelativePathSimpleSpecifyOutputFile.sourcemap.txt +++ b/tests/baselines/reference/project/mapRootRelativePathSimpleSpecifyOutputFile/node/mapRootRelativePathSimpleSpecifyOutputFile.sourcemap.txt @@ -61,7 +61,7 @@ sourceFile:../outputdir_simple/m1.ts 1->Emitted(5, 5) Source(4, 1) + SourceIndex(0) 2 >Emitted(5, 17) Source(4, 2) + SourceIndex(0) --- ->>>})(); +>>>}()); 1 > 2 >^ 3 > @@ -207,7 +207,7 @@ sourceFile:../outputdir_simple/test.ts 1->Emitted(16, 5) Source(5, 1) + SourceIndex(1) 2 >Emitted(16, 14) Source(5, 2) + SourceIndex(1) --- ->>>})(); +>>>}()); 1 > 2 >^ 3 > diff --git a/tests/baselines/reference/project/mapRootRelativePathSingleFileNoOutdir/amd/mapRootRelativePathSingleFileNoOutdir.sourcemap.txt b/tests/baselines/reference/project/mapRootRelativePathSingleFileNoOutdir/amd/mapRootRelativePathSingleFileNoOutdir.sourcemap.txt index 3c5a58c134c..a283a5bc003 100644 --- a/tests/baselines/reference/project/mapRootRelativePathSingleFileNoOutdir/amd/mapRootRelativePathSingleFileNoOutdir.sourcemap.txt +++ b/tests/baselines/reference/project/mapRootRelativePathSingleFileNoOutdir/amd/mapRootRelativePathSingleFileNoOutdir.sourcemap.txt @@ -61,7 +61,7 @@ sourceFile:../outputdir_singleFile/test.ts 1->Emitted(5, 5) Source(4, 1) + SourceIndex(0) 2 >Emitted(5, 14) Source(4, 2) + SourceIndex(0) --- ->>>})(); +>>>}()); 1 > 2 >^ 3 > diff --git a/tests/baselines/reference/project/mapRootRelativePathSingleFileNoOutdir/amd/test.js b/tests/baselines/reference/project/mapRootRelativePathSingleFileNoOutdir/amd/test.js index 39ea4830920..6888a1e428f 100644 --- a/tests/baselines/reference/project/mapRootRelativePathSingleFileNoOutdir/amd/test.js +++ b/tests/baselines/reference/project/mapRootRelativePathSingleFileNoOutdir/amd/test.js @@ -3,7 +3,7 @@ var c1 = (function () { function c1() { } return c1; -})(); +}()); var instance1 = new c1(); function f1() { return instance1; diff --git a/tests/baselines/reference/project/mapRootRelativePathSingleFileNoOutdir/node/mapRootRelativePathSingleFileNoOutdir.sourcemap.txt b/tests/baselines/reference/project/mapRootRelativePathSingleFileNoOutdir/node/mapRootRelativePathSingleFileNoOutdir.sourcemap.txt index 3c5a58c134c..a283a5bc003 100644 --- a/tests/baselines/reference/project/mapRootRelativePathSingleFileNoOutdir/node/mapRootRelativePathSingleFileNoOutdir.sourcemap.txt +++ b/tests/baselines/reference/project/mapRootRelativePathSingleFileNoOutdir/node/mapRootRelativePathSingleFileNoOutdir.sourcemap.txt @@ -61,7 +61,7 @@ sourceFile:../outputdir_singleFile/test.ts 1->Emitted(5, 5) Source(4, 1) + SourceIndex(0) 2 >Emitted(5, 14) Source(4, 2) + SourceIndex(0) --- ->>>})(); +>>>}()); 1 > 2 >^ 3 > diff --git a/tests/baselines/reference/project/mapRootRelativePathSingleFileNoOutdir/node/test.js b/tests/baselines/reference/project/mapRootRelativePathSingleFileNoOutdir/node/test.js index 39ea4830920..6888a1e428f 100644 --- a/tests/baselines/reference/project/mapRootRelativePathSingleFileNoOutdir/node/test.js +++ b/tests/baselines/reference/project/mapRootRelativePathSingleFileNoOutdir/node/test.js @@ -3,7 +3,7 @@ var c1 = (function () { function c1() { } return c1; -})(); +}()); var instance1 = new c1(); function f1() { return instance1; diff --git a/tests/baselines/reference/project/mapRootRelativePathSingleFileSpecifyOutputDirectory/amd/mapRootRelativePathSingleFileSpecifyOutputDirectory.sourcemap.txt b/tests/baselines/reference/project/mapRootRelativePathSingleFileSpecifyOutputDirectory/amd/mapRootRelativePathSingleFileSpecifyOutputDirectory.sourcemap.txt index 1234777c9c1..ac697b960ff 100644 --- a/tests/baselines/reference/project/mapRootRelativePathSingleFileSpecifyOutputDirectory/amd/mapRootRelativePathSingleFileSpecifyOutputDirectory.sourcemap.txt +++ b/tests/baselines/reference/project/mapRootRelativePathSingleFileSpecifyOutputDirectory/amd/mapRootRelativePathSingleFileSpecifyOutputDirectory.sourcemap.txt @@ -61,7 +61,7 @@ sourceFile:../outputdir_singleFile/test.ts 1->Emitted(5, 5) Source(4, 1) + SourceIndex(0) 2 >Emitted(5, 14) Source(4, 2) + SourceIndex(0) --- ->>>})(); +>>>}()); 1 > 2 >^ 3 > diff --git a/tests/baselines/reference/project/mapRootRelativePathSingleFileSpecifyOutputDirectory/amd/outdir/simple/test.js b/tests/baselines/reference/project/mapRootRelativePathSingleFileSpecifyOutputDirectory/amd/outdir/simple/test.js index ca051a06fbf..2b699a8260f 100644 --- a/tests/baselines/reference/project/mapRootRelativePathSingleFileSpecifyOutputDirectory/amd/outdir/simple/test.js +++ b/tests/baselines/reference/project/mapRootRelativePathSingleFileSpecifyOutputDirectory/amd/outdir/simple/test.js @@ -3,7 +3,7 @@ var c1 = (function () { function c1() { } return c1; -})(); +}()); var instance1 = new c1(); function f1() { return instance1; diff --git a/tests/baselines/reference/project/mapRootRelativePathSingleFileSpecifyOutputDirectory/node/mapRootRelativePathSingleFileSpecifyOutputDirectory.sourcemap.txt b/tests/baselines/reference/project/mapRootRelativePathSingleFileSpecifyOutputDirectory/node/mapRootRelativePathSingleFileSpecifyOutputDirectory.sourcemap.txt index 1234777c9c1..ac697b960ff 100644 --- a/tests/baselines/reference/project/mapRootRelativePathSingleFileSpecifyOutputDirectory/node/mapRootRelativePathSingleFileSpecifyOutputDirectory.sourcemap.txt +++ b/tests/baselines/reference/project/mapRootRelativePathSingleFileSpecifyOutputDirectory/node/mapRootRelativePathSingleFileSpecifyOutputDirectory.sourcemap.txt @@ -61,7 +61,7 @@ sourceFile:../outputdir_singleFile/test.ts 1->Emitted(5, 5) Source(4, 1) + SourceIndex(0) 2 >Emitted(5, 14) Source(4, 2) + SourceIndex(0) --- ->>>})(); +>>>}()); 1 > 2 >^ 3 > diff --git a/tests/baselines/reference/project/mapRootRelativePathSingleFileSpecifyOutputDirectory/node/outdir/simple/test.js b/tests/baselines/reference/project/mapRootRelativePathSingleFileSpecifyOutputDirectory/node/outdir/simple/test.js index ca051a06fbf..2b699a8260f 100644 --- a/tests/baselines/reference/project/mapRootRelativePathSingleFileSpecifyOutputDirectory/node/outdir/simple/test.js +++ b/tests/baselines/reference/project/mapRootRelativePathSingleFileSpecifyOutputDirectory/node/outdir/simple/test.js @@ -3,7 +3,7 @@ var c1 = (function () { function c1() { } return c1; -})(); +}()); var instance1 = new c1(); function f1() { return instance1; diff --git a/tests/baselines/reference/project/mapRootRelativePathSingleFileSpecifyOutputFile/amd/bin/test.js b/tests/baselines/reference/project/mapRootRelativePathSingleFileSpecifyOutputFile/amd/bin/test.js index f57e937148e..426a747ed22 100644 --- a/tests/baselines/reference/project/mapRootRelativePathSingleFileSpecifyOutputFile/amd/bin/test.js +++ b/tests/baselines/reference/project/mapRootRelativePathSingleFileSpecifyOutputFile/amd/bin/test.js @@ -3,7 +3,7 @@ var c1 = (function () { function c1() { } return c1; -})(); +}()); var instance1 = new c1(); function f1() { return instance1; diff --git a/tests/baselines/reference/project/mapRootRelativePathSingleFileSpecifyOutputFile/amd/mapRootRelativePathSingleFileSpecifyOutputFile.sourcemap.txt b/tests/baselines/reference/project/mapRootRelativePathSingleFileSpecifyOutputFile/amd/mapRootRelativePathSingleFileSpecifyOutputFile.sourcemap.txt index 13278d30331..4960a310df0 100644 --- a/tests/baselines/reference/project/mapRootRelativePathSingleFileSpecifyOutputFile/amd/mapRootRelativePathSingleFileSpecifyOutputFile.sourcemap.txt +++ b/tests/baselines/reference/project/mapRootRelativePathSingleFileSpecifyOutputFile/amd/mapRootRelativePathSingleFileSpecifyOutputFile.sourcemap.txt @@ -61,7 +61,7 @@ sourceFile:../outputdir_singleFile/test.ts 1->Emitted(5, 5) Source(4, 1) + SourceIndex(0) 2 >Emitted(5, 14) Source(4, 2) + SourceIndex(0) --- ->>>})(); +>>>}()); 1 > 2 >^ 3 > diff --git a/tests/baselines/reference/project/mapRootRelativePathSingleFileSpecifyOutputFile/node/bin/test.js b/tests/baselines/reference/project/mapRootRelativePathSingleFileSpecifyOutputFile/node/bin/test.js index f57e937148e..426a747ed22 100644 --- a/tests/baselines/reference/project/mapRootRelativePathSingleFileSpecifyOutputFile/node/bin/test.js +++ b/tests/baselines/reference/project/mapRootRelativePathSingleFileSpecifyOutputFile/node/bin/test.js @@ -3,7 +3,7 @@ var c1 = (function () { function c1() { } return c1; -})(); +}()); var instance1 = new c1(); function f1() { return instance1; diff --git a/tests/baselines/reference/project/mapRootRelativePathSingleFileSpecifyOutputFile/node/mapRootRelativePathSingleFileSpecifyOutputFile.sourcemap.txt b/tests/baselines/reference/project/mapRootRelativePathSingleFileSpecifyOutputFile/node/mapRootRelativePathSingleFileSpecifyOutputFile.sourcemap.txt index 13278d30331..4960a310df0 100644 --- a/tests/baselines/reference/project/mapRootRelativePathSingleFileSpecifyOutputFile/node/mapRootRelativePathSingleFileSpecifyOutputFile.sourcemap.txt +++ b/tests/baselines/reference/project/mapRootRelativePathSingleFileSpecifyOutputFile/node/mapRootRelativePathSingleFileSpecifyOutputFile.sourcemap.txt @@ -61,7 +61,7 @@ sourceFile:../outputdir_singleFile/test.ts 1->Emitted(5, 5) Source(4, 1) + SourceIndex(0) 2 >Emitted(5, 14) Source(4, 2) + SourceIndex(0) --- ->>>})(); +>>>}()); 1 > 2 >^ 3 > diff --git a/tests/baselines/reference/project/mapRootRelativePathSubfolderNoOutdir/amd/mapRootRelativePathSubfolderNoOutdir.sourcemap.txt b/tests/baselines/reference/project/mapRootRelativePathSubfolderNoOutdir/amd/mapRootRelativePathSubfolderNoOutdir.sourcemap.txt index ce2229723a3..b3d5b6d2062 100644 --- a/tests/baselines/reference/project/mapRootRelativePathSubfolderNoOutdir/amd/mapRootRelativePathSubfolderNoOutdir.sourcemap.txt +++ b/tests/baselines/reference/project/mapRootRelativePathSubfolderNoOutdir/amd/mapRootRelativePathSubfolderNoOutdir.sourcemap.txt @@ -61,7 +61,7 @@ sourceFile:../../outputdir_subfolder/ref/m1.ts 1->Emitted(5, 5) Source(4, 1) + SourceIndex(0) 2 >Emitted(5, 17) Source(4, 2) + SourceIndex(0) --- ->>>})(); +>>>}()); 1 > 2 >^ 3 > @@ -213,7 +213,7 @@ sourceFile:../outputdir_subfolder/test.ts 1->Emitted(6, 5) Source(5, 1) + SourceIndex(0) 2 >Emitted(6, 14) Source(5, 2) + SourceIndex(0) --- ->>>})(); +>>>}()); 1 > 2 >^ 3 > diff --git a/tests/baselines/reference/project/mapRootRelativePathSubfolderNoOutdir/amd/ref/m1.js b/tests/baselines/reference/project/mapRootRelativePathSubfolderNoOutdir/amd/ref/m1.js index 1317ac6574e..e0e2af2b862 100644 --- a/tests/baselines/reference/project/mapRootRelativePathSubfolderNoOutdir/amd/ref/m1.js +++ b/tests/baselines/reference/project/mapRootRelativePathSubfolderNoOutdir/amd/ref/m1.js @@ -3,7 +3,7 @@ var m1_c1 = (function () { function m1_c1() { } return m1_c1; -})(); +}()); var m1_instance1 = new m1_c1(); function m1_f1() { return m1_instance1; diff --git a/tests/baselines/reference/project/mapRootRelativePathSubfolderNoOutdir/node/mapRootRelativePathSubfolderNoOutdir.sourcemap.txt b/tests/baselines/reference/project/mapRootRelativePathSubfolderNoOutdir/node/mapRootRelativePathSubfolderNoOutdir.sourcemap.txt index ce2229723a3..b3d5b6d2062 100644 --- a/tests/baselines/reference/project/mapRootRelativePathSubfolderNoOutdir/node/mapRootRelativePathSubfolderNoOutdir.sourcemap.txt +++ b/tests/baselines/reference/project/mapRootRelativePathSubfolderNoOutdir/node/mapRootRelativePathSubfolderNoOutdir.sourcemap.txt @@ -61,7 +61,7 @@ sourceFile:../../outputdir_subfolder/ref/m1.ts 1->Emitted(5, 5) Source(4, 1) + SourceIndex(0) 2 >Emitted(5, 17) Source(4, 2) + SourceIndex(0) --- ->>>})(); +>>>}()); 1 > 2 >^ 3 > @@ -213,7 +213,7 @@ sourceFile:../outputdir_subfolder/test.ts 1->Emitted(6, 5) Source(5, 1) + SourceIndex(0) 2 >Emitted(6, 14) Source(5, 2) + SourceIndex(0) --- ->>>})(); +>>>}()); 1 > 2 >^ 3 > diff --git a/tests/baselines/reference/project/mapRootRelativePathSubfolderNoOutdir/node/ref/m1.js b/tests/baselines/reference/project/mapRootRelativePathSubfolderNoOutdir/node/ref/m1.js index 1317ac6574e..e0e2af2b862 100644 --- a/tests/baselines/reference/project/mapRootRelativePathSubfolderNoOutdir/node/ref/m1.js +++ b/tests/baselines/reference/project/mapRootRelativePathSubfolderNoOutdir/node/ref/m1.js @@ -3,7 +3,7 @@ var m1_c1 = (function () { function m1_c1() { } return m1_c1; -})(); +}()); var m1_instance1 = new m1_c1(); function m1_f1() { return m1_instance1; diff --git a/tests/baselines/reference/project/mapRootRelativePathSubfolderSpecifyOutputDirectory/amd/mapRootRelativePathSubfolderSpecifyOutputDirectory.sourcemap.txt b/tests/baselines/reference/project/mapRootRelativePathSubfolderSpecifyOutputDirectory/amd/mapRootRelativePathSubfolderSpecifyOutputDirectory.sourcemap.txt index 0e558e67ec2..c41e06ccfe4 100644 --- a/tests/baselines/reference/project/mapRootRelativePathSubfolderSpecifyOutputDirectory/amd/mapRootRelativePathSubfolderSpecifyOutputDirectory.sourcemap.txt +++ b/tests/baselines/reference/project/mapRootRelativePathSubfolderSpecifyOutputDirectory/amd/mapRootRelativePathSubfolderSpecifyOutputDirectory.sourcemap.txt @@ -61,7 +61,7 @@ sourceFile:../../outputdir_subfolder/ref/m1.ts 1->Emitted(5, 5) Source(4, 1) + SourceIndex(0) 2 >Emitted(5, 17) Source(4, 2) + SourceIndex(0) --- ->>>})(); +>>>}()); 1 > 2 >^ 3 > @@ -213,7 +213,7 @@ sourceFile:../outputdir_subfolder/test.ts 1->Emitted(6, 5) Source(5, 1) + SourceIndex(0) 2 >Emitted(6, 14) Source(5, 2) + SourceIndex(0) --- ->>>})(); +>>>}()); 1 > 2 >^ 3 > diff --git a/tests/baselines/reference/project/mapRootRelativePathSubfolderSpecifyOutputDirectory/amd/outdir/simple/ref/m1.js b/tests/baselines/reference/project/mapRootRelativePathSubfolderSpecifyOutputDirectory/amd/outdir/simple/ref/m1.js index 33cf31f7700..e6670e7a300 100644 --- a/tests/baselines/reference/project/mapRootRelativePathSubfolderSpecifyOutputDirectory/amd/outdir/simple/ref/m1.js +++ b/tests/baselines/reference/project/mapRootRelativePathSubfolderSpecifyOutputDirectory/amd/outdir/simple/ref/m1.js @@ -3,7 +3,7 @@ var m1_c1 = (function () { function m1_c1() { } return m1_c1; -})(); +}()); var m1_instance1 = new m1_c1(); function m1_f1() { return m1_instance1; diff --git a/tests/baselines/reference/project/mapRootRelativePathSubfolderSpecifyOutputDirectory/node/mapRootRelativePathSubfolderSpecifyOutputDirectory.sourcemap.txt b/tests/baselines/reference/project/mapRootRelativePathSubfolderSpecifyOutputDirectory/node/mapRootRelativePathSubfolderSpecifyOutputDirectory.sourcemap.txt index 0e558e67ec2..c41e06ccfe4 100644 --- a/tests/baselines/reference/project/mapRootRelativePathSubfolderSpecifyOutputDirectory/node/mapRootRelativePathSubfolderSpecifyOutputDirectory.sourcemap.txt +++ b/tests/baselines/reference/project/mapRootRelativePathSubfolderSpecifyOutputDirectory/node/mapRootRelativePathSubfolderSpecifyOutputDirectory.sourcemap.txt @@ -61,7 +61,7 @@ sourceFile:../../outputdir_subfolder/ref/m1.ts 1->Emitted(5, 5) Source(4, 1) + SourceIndex(0) 2 >Emitted(5, 17) Source(4, 2) + SourceIndex(0) --- ->>>})(); +>>>}()); 1 > 2 >^ 3 > @@ -213,7 +213,7 @@ sourceFile:../outputdir_subfolder/test.ts 1->Emitted(6, 5) Source(5, 1) + SourceIndex(0) 2 >Emitted(6, 14) Source(5, 2) + SourceIndex(0) --- ->>>})(); +>>>}()); 1 > 2 >^ 3 > diff --git a/tests/baselines/reference/project/mapRootRelativePathSubfolderSpecifyOutputDirectory/node/outdir/simple/ref/m1.js b/tests/baselines/reference/project/mapRootRelativePathSubfolderSpecifyOutputDirectory/node/outdir/simple/ref/m1.js index 33cf31f7700..e6670e7a300 100644 --- a/tests/baselines/reference/project/mapRootRelativePathSubfolderSpecifyOutputDirectory/node/outdir/simple/ref/m1.js +++ b/tests/baselines/reference/project/mapRootRelativePathSubfolderSpecifyOutputDirectory/node/outdir/simple/ref/m1.js @@ -3,7 +3,7 @@ var m1_c1 = (function () { function m1_c1() { } return m1_c1; -})(); +}()); var m1_instance1 = new m1_c1(); function m1_f1() { return m1_instance1; diff --git a/tests/baselines/reference/project/mapRootRelativePathSubfolderSpecifyOutputFile/amd/bin/test.js b/tests/baselines/reference/project/mapRootRelativePathSubfolderSpecifyOutputFile/amd/bin/test.js index a85935632dd..30156e6cbcb 100644 --- a/tests/baselines/reference/project/mapRootRelativePathSubfolderSpecifyOutputFile/amd/bin/test.js +++ b/tests/baselines/reference/project/mapRootRelativePathSubfolderSpecifyOutputFile/amd/bin/test.js @@ -3,7 +3,7 @@ var m1_c1 = (function () { function m1_c1() { } return m1_c1; -})(); +}()); var m1_instance1 = new m1_c1(); function m1_f1() { return m1_instance1; @@ -14,7 +14,7 @@ var c1 = (function () { function c1() { } return c1; -})(); +}()); var instance1 = new c1(); function f1() { return instance1; diff --git a/tests/baselines/reference/project/mapRootRelativePathSubfolderSpecifyOutputFile/amd/mapRootRelativePathSubfolderSpecifyOutputFile.sourcemap.txt b/tests/baselines/reference/project/mapRootRelativePathSubfolderSpecifyOutputFile/amd/mapRootRelativePathSubfolderSpecifyOutputFile.sourcemap.txt index 673c6572b56..079730ccaea 100644 --- a/tests/baselines/reference/project/mapRootRelativePathSubfolderSpecifyOutputFile/amd/mapRootRelativePathSubfolderSpecifyOutputFile.sourcemap.txt +++ b/tests/baselines/reference/project/mapRootRelativePathSubfolderSpecifyOutputFile/amd/mapRootRelativePathSubfolderSpecifyOutputFile.sourcemap.txt @@ -61,7 +61,7 @@ sourceFile:../outputdir_subfolder/ref/m1.ts 1->Emitted(5, 5) Source(4, 1) + SourceIndex(0) 2 >Emitted(5, 17) Source(4, 2) + SourceIndex(0) --- ->>>})(); +>>>}()); 1 > 2 >^ 3 > @@ -207,7 +207,7 @@ sourceFile:../outputdir_subfolder/test.ts 1->Emitted(16, 5) Source(5, 1) + SourceIndex(1) 2 >Emitted(16, 14) Source(5, 2) + SourceIndex(1) --- ->>>})(); +>>>}()); 1 > 2 >^ 3 > diff --git a/tests/baselines/reference/project/mapRootRelativePathSubfolderSpecifyOutputFile/node/bin/test.js b/tests/baselines/reference/project/mapRootRelativePathSubfolderSpecifyOutputFile/node/bin/test.js index a85935632dd..30156e6cbcb 100644 --- a/tests/baselines/reference/project/mapRootRelativePathSubfolderSpecifyOutputFile/node/bin/test.js +++ b/tests/baselines/reference/project/mapRootRelativePathSubfolderSpecifyOutputFile/node/bin/test.js @@ -3,7 +3,7 @@ var m1_c1 = (function () { function m1_c1() { } return m1_c1; -})(); +}()); var m1_instance1 = new m1_c1(); function m1_f1() { return m1_instance1; @@ -14,7 +14,7 @@ var c1 = (function () { function c1() { } return c1; -})(); +}()); var instance1 = new c1(); function f1() { return instance1; diff --git a/tests/baselines/reference/project/mapRootRelativePathSubfolderSpecifyOutputFile/node/mapRootRelativePathSubfolderSpecifyOutputFile.sourcemap.txt b/tests/baselines/reference/project/mapRootRelativePathSubfolderSpecifyOutputFile/node/mapRootRelativePathSubfolderSpecifyOutputFile.sourcemap.txt index 673c6572b56..079730ccaea 100644 --- a/tests/baselines/reference/project/mapRootRelativePathSubfolderSpecifyOutputFile/node/mapRootRelativePathSubfolderSpecifyOutputFile.sourcemap.txt +++ b/tests/baselines/reference/project/mapRootRelativePathSubfolderSpecifyOutputFile/node/mapRootRelativePathSubfolderSpecifyOutputFile.sourcemap.txt @@ -61,7 +61,7 @@ sourceFile:../outputdir_subfolder/ref/m1.ts 1->Emitted(5, 5) Source(4, 1) + SourceIndex(0) 2 >Emitted(5, 17) Source(4, 2) + SourceIndex(0) --- ->>>})(); +>>>}()); 1 > 2 >^ 3 > @@ -207,7 +207,7 @@ sourceFile:../outputdir_subfolder/test.ts 1->Emitted(16, 5) Source(5, 1) + SourceIndex(1) 2 >Emitted(16, 14) Source(5, 2) + SourceIndex(1) --- ->>>})(); +>>>}()); 1 > 2 >^ 3 > diff --git a/tests/baselines/reference/project/maprootUrlMixedSubfolderNoOutdir/amd/maprootUrlMixedSubfolderNoOutdir.sourcemap.txt b/tests/baselines/reference/project/maprootUrlMixedSubfolderNoOutdir/amd/maprootUrlMixedSubfolderNoOutdir.sourcemap.txt index a01426e8cd6..dbfd0344358 100644 --- a/tests/baselines/reference/project/maprootUrlMixedSubfolderNoOutdir/amd/maprootUrlMixedSubfolderNoOutdir.sourcemap.txt +++ b/tests/baselines/reference/project/maprootUrlMixedSubfolderNoOutdir/amd/maprootUrlMixedSubfolderNoOutdir.sourcemap.txt @@ -61,7 +61,7 @@ sourceFile:file:///tests/cases/projects/outputdir_mixed_subfolder/ref/m1.ts 1->Emitted(5, 5) Source(4, 1) + SourceIndex(0) 2 >Emitted(5, 17) Source(4, 2) + SourceIndex(0) --- ->>>})(); +>>>}()); 1 > 2 >^ 3 > @@ -203,7 +203,7 @@ sourceFile:file:///tests/cases/projects/outputdir_mixed_subfolder/ref/m2.ts 1->Emitted(7, 9) Source(4, 1) + SourceIndex(0) 2 >Emitted(7, 21) Source(4, 2) + SourceIndex(0) --- ->>> })(); +>>> }()); 1 >^^^^ 2 > ^ 3 > @@ -396,7 +396,7 @@ sourceFile:file:///tests/cases/projects/outputdir_mixed_subfolder/test.ts 1->Emitted(7, 5) Source(6, 1) + SourceIndex(0) 2 >Emitted(7, 14) Source(6, 2) + SourceIndex(0) --- ->>>})(); +>>>}()); 1 > 2 >^ 3 > diff --git a/tests/baselines/reference/project/maprootUrlMixedSubfolderNoOutdir/amd/ref/m1.js b/tests/baselines/reference/project/maprootUrlMixedSubfolderNoOutdir/amd/ref/m1.js index f01a67c7277..ac9c9fc5839 100644 --- a/tests/baselines/reference/project/maprootUrlMixedSubfolderNoOutdir/amd/ref/m1.js +++ b/tests/baselines/reference/project/maprootUrlMixedSubfolderNoOutdir/amd/ref/m1.js @@ -3,7 +3,7 @@ var m1_c1 = (function () { function m1_c1() { } return m1_c1; -})(); +}()); var m1_instance1 = new m1_c1(); function m1_f1() { return m1_instance1; diff --git a/tests/baselines/reference/project/maprootUrlMixedSubfolderNoOutdir/node/maprootUrlMixedSubfolderNoOutdir.sourcemap.txt b/tests/baselines/reference/project/maprootUrlMixedSubfolderNoOutdir/node/maprootUrlMixedSubfolderNoOutdir.sourcemap.txt index 096356e3054..442540b1d3b 100644 --- a/tests/baselines/reference/project/maprootUrlMixedSubfolderNoOutdir/node/maprootUrlMixedSubfolderNoOutdir.sourcemap.txt +++ b/tests/baselines/reference/project/maprootUrlMixedSubfolderNoOutdir/node/maprootUrlMixedSubfolderNoOutdir.sourcemap.txt @@ -61,7 +61,7 @@ sourceFile:file:///tests/cases/projects/outputdir_mixed_subfolder/ref/m1.ts 1->Emitted(5, 5) Source(4, 1) + SourceIndex(0) 2 >Emitted(5, 17) Source(4, 2) + SourceIndex(0) --- ->>>})(); +>>>}()); 1 > 2 >^ 3 > @@ -202,7 +202,7 @@ sourceFile:file:///tests/cases/projects/outputdir_mixed_subfolder/ref/m2.ts 1->Emitted(6, 5) Source(4, 1) + SourceIndex(0) 2 >Emitted(6, 17) Source(4, 2) + SourceIndex(0) --- ->>>})(); +>>>}()); 1 > 2 >^ 3 > @@ -395,7 +395,7 @@ sourceFile:file:///tests/cases/projects/outputdir_mixed_subfolder/test.ts 1->Emitted(7, 5) Source(6, 1) + SourceIndex(0) 2 >Emitted(7, 14) Source(6, 2) + SourceIndex(0) --- ->>>})(); +>>>}()); 1 > 2 >^ 3 > diff --git a/tests/baselines/reference/project/maprootUrlMixedSubfolderNoOutdir/node/ref/m1.js b/tests/baselines/reference/project/maprootUrlMixedSubfolderNoOutdir/node/ref/m1.js index f01a67c7277..ac9c9fc5839 100644 --- a/tests/baselines/reference/project/maprootUrlMixedSubfolderNoOutdir/node/ref/m1.js +++ b/tests/baselines/reference/project/maprootUrlMixedSubfolderNoOutdir/node/ref/m1.js @@ -3,7 +3,7 @@ var m1_c1 = (function () { function m1_c1() { } return m1_c1; -})(); +}()); var m1_instance1 = new m1_c1(); function m1_f1() { return m1_instance1; diff --git a/tests/baselines/reference/project/maprootUrlMixedSubfolderSpecifyOutputDirectory/amd/maprootUrlMixedSubfolderSpecifyOutputDirectory.sourcemap.txt b/tests/baselines/reference/project/maprootUrlMixedSubfolderSpecifyOutputDirectory/amd/maprootUrlMixedSubfolderSpecifyOutputDirectory.sourcemap.txt index d4e3fde027e..fe156c8ba30 100644 --- a/tests/baselines/reference/project/maprootUrlMixedSubfolderSpecifyOutputDirectory/amd/maprootUrlMixedSubfolderSpecifyOutputDirectory.sourcemap.txt +++ b/tests/baselines/reference/project/maprootUrlMixedSubfolderSpecifyOutputDirectory/amd/maprootUrlMixedSubfolderSpecifyOutputDirectory.sourcemap.txt @@ -61,7 +61,7 @@ sourceFile:file:///tests/cases/projects/outputdir_mixed_subfolder/ref/m1.ts 1->Emitted(5, 5) Source(4, 1) + SourceIndex(0) 2 >Emitted(5, 17) Source(4, 2) + SourceIndex(0) --- ->>>})(); +>>>}()); 1 > 2 >^ 3 > @@ -203,7 +203,7 @@ sourceFile:file:///tests/cases/projects/outputdir_mixed_subfolder/ref/m2.ts 1->Emitted(7, 9) Source(4, 1) + SourceIndex(0) 2 >Emitted(7, 21) Source(4, 2) + SourceIndex(0) --- ->>> })(); +>>> }()); 1 >^^^^ 2 > ^ 3 > @@ -396,7 +396,7 @@ sourceFile:file:///tests/cases/projects/outputdir_mixed_subfolder/test.ts 1->Emitted(7, 5) Source(6, 1) + SourceIndex(0) 2 >Emitted(7, 14) Source(6, 2) + SourceIndex(0) --- ->>>})(); +>>>}()); 1 > 2 >^ 3 > diff --git a/tests/baselines/reference/project/maprootUrlMixedSubfolderSpecifyOutputDirectory/amd/outdir/simple/ref/m1.js b/tests/baselines/reference/project/maprootUrlMixedSubfolderSpecifyOutputDirectory/amd/outdir/simple/ref/m1.js index f01a67c7277..ac9c9fc5839 100644 --- a/tests/baselines/reference/project/maprootUrlMixedSubfolderSpecifyOutputDirectory/amd/outdir/simple/ref/m1.js +++ b/tests/baselines/reference/project/maprootUrlMixedSubfolderSpecifyOutputDirectory/amd/outdir/simple/ref/m1.js @@ -3,7 +3,7 @@ var m1_c1 = (function () { function m1_c1() { } return m1_c1; -})(); +}()); var m1_instance1 = new m1_c1(); function m1_f1() { return m1_instance1; diff --git a/tests/baselines/reference/project/maprootUrlMixedSubfolderSpecifyOutputDirectory/node/maprootUrlMixedSubfolderSpecifyOutputDirectory.sourcemap.txt b/tests/baselines/reference/project/maprootUrlMixedSubfolderSpecifyOutputDirectory/node/maprootUrlMixedSubfolderSpecifyOutputDirectory.sourcemap.txt index 058484f80f4..f586a84e5e6 100644 --- a/tests/baselines/reference/project/maprootUrlMixedSubfolderSpecifyOutputDirectory/node/maprootUrlMixedSubfolderSpecifyOutputDirectory.sourcemap.txt +++ b/tests/baselines/reference/project/maprootUrlMixedSubfolderSpecifyOutputDirectory/node/maprootUrlMixedSubfolderSpecifyOutputDirectory.sourcemap.txt @@ -61,7 +61,7 @@ sourceFile:file:///tests/cases/projects/outputdir_mixed_subfolder/ref/m1.ts 1->Emitted(5, 5) Source(4, 1) + SourceIndex(0) 2 >Emitted(5, 17) Source(4, 2) + SourceIndex(0) --- ->>>})(); +>>>}()); 1 > 2 >^ 3 > @@ -202,7 +202,7 @@ sourceFile:file:///tests/cases/projects/outputdir_mixed_subfolder/ref/m2.ts 1->Emitted(6, 5) Source(4, 1) + SourceIndex(0) 2 >Emitted(6, 17) Source(4, 2) + SourceIndex(0) --- ->>>})(); +>>>}()); 1 > 2 >^ 3 > @@ -395,7 +395,7 @@ sourceFile:file:///tests/cases/projects/outputdir_mixed_subfolder/test.ts 1->Emitted(7, 5) Source(6, 1) + SourceIndex(0) 2 >Emitted(7, 14) Source(6, 2) + SourceIndex(0) --- ->>>})(); +>>>}()); 1 > 2 >^ 3 > diff --git a/tests/baselines/reference/project/maprootUrlMixedSubfolderSpecifyOutputDirectory/node/outdir/simple/ref/m1.js b/tests/baselines/reference/project/maprootUrlMixedSubfolderSpecifyOutputDirectory/node/outdir/simple/ref/m1.js index f01a67c7277..ac9c9fc5839 100644 --- a/tests/baselines/reference/project/maprootUrlMixedSubfolderSpecifyOutputDirectory/node/outdir/simple/ref/m1.js +++ b/tests/baselines/reference/project/maprootUrlMixedSubfolderSpecifyOutputDirectory/node/outdir/simple/ref/m1.js @@ -3,7 +3,7 @@ var m1_c1 = (function () { function m1_c1() { } return m1_c1; -})(); +}()); var m1_instance1 = new m1_c1(); function m1_f1() { return m1_instance1; diff --git a/tests/baselines/reference/project/maprootUrlMixedSubfolderSpecifyOutputFile/amd/bin/test.js b/tests/baselines/reference/project/maprootUrlMixedSubfolderSpecifyOutputFile/amd/bin/test.js index 03d1c2fc750..b1f7d5f7329 100644 --- a/tests/baselines/reference/project/maprootUrlMixedSubfolderSpecifyOutputFile/amd/bin/test.js +++ b/tests/baselines/reference/project/maprootUrlMixedSubfolderSpecifyOutputFile/amd/bin/test.js @@ -3,7 +3,7 @@ var m1_c1 = (function () { function m1_c1() { } return m1_c1; -})(); +}()); var m1_instance1 = new m1_c1(); function m1_f1() { return m1_instance1; @@ -15,7 +15,7 @@ define("ref/m2", ["require", "exports"], function (require, exports) { function m2_c1() { } return m2_c1; - })(); + }()); exports.m2_c1 = m2_c1; exports.m2_instance1 = new m2_c1(); function m2_f1() { @@ -30,7 +30,7 @@ var c1 = (function () { function c1() { } return c1; -})(); +}()); var instance1 = new c1(); function f1() { return instance1; diff --git a/tests/baselines/reference/project/maprootUrlMixedSubfolderSpecifyOutputFile/amd/maprootUrlMixedSubfolderSpecifyOutputFile.sourcemap.txt b/tests/baselines/reference/project/maprootUrlMixedSubfolderSpecifyOutputFile/amd/maprootUrlMixedSubfolderSpecifyOutputFile.sourcemap.txt index d347c1a16a5..364a5ead57e 100644 --- a/tests/baselines/reference/project/maprootUrlMixedSubfolderSpecifyOutputFile/amd/maprootUrlMixedSubfolderSpecifyOutputFile.sourcemap.txt +++ b/tests/baselines/reference/project/maprootUrlMixedSubfolderSpecifyOutputFile/amd/maprootUrlMixedSubfolderSpecifyOutputFile.sourcemap.txt @@ -61,7 +61,7 @@ sourceFile:file:///tests/cases/projects/outputdir_mixed_subfolder/ref/m1.ts 1->Emitted(5, 5) Source(4, 1) + SourceIndex(0) 2 >Emitted(5, 17) Source(4, 2) + SourceIndex(0) --- ->>>})(); +>>>}()); 1 > 2 >^ 3 > @@ -197,7 +197,7 @@ sourceFile:file:///tests/cases/projects/outputdir_mixed_subfolder/ref/m2.ts 1->Emitted(17, 9) Source(4, 1) + SourceIndex(1) 2 >Emitted(17, 21) Source(4, 2) + SourceIndex(1) --- ->>> })(); +>>> }()); 1 >^^^^ 2 > ^ 3 > @@ -384,7 +384,7 @@ sourceFile:file:///tests/cases/projects/outputdir_mixed_subfolder/test.ts 1->Emitted(32, 5) Source(6, 1) + SourceIndex(2) 2 >Emitted(32, 14) Source(6, 2) + SourceIndex(2) --- ->>>})(); +>>>}()); 1 > 2 >^ 3 > diff --git a/tests/baselines/reference/project/maprootUrlMixedSubfolderSpecifyOutputFile/node/bin/test.js b/tests/baselines/reference/project/maprootUrlMixedSubfolderSpecifyOutputFile/node/bin/test.js index af0071d7e46..ec3309b3b18 100644 --- a/tests/baselines/reference/project/maprootUrlMixedSubfolderSpecifyOutputFile/node/bin/test.js +++ b/tests/baselines/reference/project/maprootUrlMixedSubfolderSpecifyOutputFile/node/bin/test.js @@ -3,7 +3,7 @@ var m1_c1 = (function () { function m1_c1() { } return m1_c1; -})(); +}()); var m1_instance1 = new m1_c1(); function m1_f1() { return m1_instance1; @@ -15,7 +15,7 @@ var c1 = (function () { function c1() { } return c1; -})(); +}()); var instance1 = new c1(); function f1() { return instance1; diff --git a/tests/baselines/reference/project/maprootUrlMixedSubfolderSpecifyOutputFile/node/maprootUrlMixedSubfolderSpecifyOutputFile.sourcemap.txt b/tests/baselines/reference/project/maprootUrlMixedSubfolderSpecifyOutputFile/node/maprootUrlMixedSubfolderSpecifyOutputFile.sourcemap.txt index d4e651c5bc0..01e66a8b573 100644 --- a/tests/baselines/reference/project/maprootUrlMixedSubfolderSpecifyOutputFile/node/maprootUrlMixedSubfolderSpecifyOutputFile.sourcemap.txt +++ b/tests/baselines/reference/project/maprootUrlMixedSubfolderSpecifyOutputFile/node/maprootUrlMixedSubfolderSpecifyOutputFile.sourcemap.txt @@ -61,7 +61,7 @@ sourceFile:file:///tests/cases/projects/outputdir_mixed_subfolder/ref/m1.ts 1->Emitted(5, 5) Source(4, 1) + SourceIndex(0) 2 >Emitted(5, 17) Source(4, 2) + SourceIndex(0) --- ->>>})(); +>>>}()); 1 > 2 >^ 3 > @@ -217,7 +217,7 @@ sourceFile:file:///tests/cases/projects/outputdir_mixed_subfolder/test.ts 1->Emitted(17, 5) Source(6, 1) + SourceIndex(2) 2 >Emitted(17, 14) Source(6, 2) + SourceIndex(2) --- ->>>})(); +>>>}()); 1 > 2 >^ 3 > diff --git a/tests/baselines/reference/project/maprootUrlMixedSubfolderSpecifyOutputFileAndOutputDirectory/amd/bin/outAndOutDirFile.js b/tests/baselines/reference/project/maprootUrlMixedSubfolderSpecifyOutputFileAndOutputDirectory/amd/bin/outAndOutDirFile.js index 04fd25336f1..2cf202bd871 100644 --- a/tests/baselines/reference/project/maprootUrlMixedSubfolderSpecifyOutputFileAndOutputDirectory/amd/bin/outAndOutDirFile.js +++ b/tests/baselines/reference/project/maprootUrlMixedSubfolderSpecifyOutputFileAndOutputDirectory/amd/bin/outAndOutDirFile.js @@ -3,7 +3,7 @@ var m1_c1 = (function () { function m1_c1() { } return m1_c1; -})(); +}()); var m1_instance1 = new m1_c1(); function m1_f1() { return m1_instance1; @@ -15,7 +15,7 @@ define("ref/m2", ["require", "exports"], function (require, exports) { function m2_c1() { } return m2_c1; - })(); + }()); exports.m2_c1 = m2_c1; exports.m2_instance1 = new m2_c1(); function m2_f1() { @@ -30,7 +30,7 @@ var c1 = (function () { function c1() { } return c1; -})(); +}()); var instance1 = new c1(); function f1() { return instance1; diff --git a/tests/baselines/reference/project/maprootUrlMixedSubfolderSpecifyOutputFileAndOutputDirectory/amd/maprootUrlMixedSubfolderSpecifyOutputFileAndOutputDirectory.sourcemap.txt b/tests/baselines/reference/project/maprootUrlMixedSubfolderSpecifyOutputFileAndOutputDirectory/amd/maprootUrlMixedSubfolderSpecifyOutputFileAndOutputDirectory.sourcemap.txt index 0452361c2de..a1c569ca056 100644 --- a/tests/baselines/reference/project/maprootUrlMixedSubfolderSpecifyOutputFileAndOutputDirectory/amd/maprootUrlMixedSubfolderSpecifyOutputFileAndOutputDirectory.sourcemap.txt +++ b/tests/baselines/reference/project/maprootUrlMixedSubfolderSpecifyOutputFileAndOutputDirectory/amd/maprootUrlMixedSubfolderSpecifyOutputFileAndOutputDirectory.sourcemap.txt @@ -61,7 +61,7 @@ sourceFile:file:///tests/cases/projects/outputdir_mixed_subfolder/ref/m1.ts 1->Emitted(5, 5) Source(4, 1) + SourceIndex(0) 2 >Emitted(5, 17) Source(4, 2) + SourceIndex(0) --- ->>>})(); +>>>}()); 1 > 2 >^ 3 > @@ -197,7 +197,7 @@ sourceFile:file:///tests/cases/projects/outputdir_mixed_subfolder/ref/m2.ts 1->Emitted(17, 9) Source(4, 1) + SourceIndex(1) 2 >Emitted(17, 21) Source(4, 2) + SourceIndex(1) --- ->>> })(); +>>> }()); 1 >^^^^ 2 > ^ 3 > @@ -384,7 +384,7 @@ sourceFile:file:///tests/cases/projects/outputdir_mixed_subfolder/test.ts 1->Emitted(32, 5) Source(6, 1) + SourceIndex(2) 2 >Emitted(32, 14) Source(6, 2) + SourceIndex(2) --- ->>>})(); +>>>}()); 1 > 2 >^ 3 > diff --git a/tests/baselines/reference/project/maprootUrlMixedSubfolderSpecifyOutputFileAndOutputDirectory/node/bin/outAndOutDirFile.js b/tests/baselines/reference/project/maprootUrlMixedSubfolderSpecifyOutputFileAndOutputDirectory/node/bin/outAndOutDirFile.js index 2ebe138ffda..3e51021ce9b 100644 --- a/tests/baselines/reference/project/maprootUrlMixedSubfolderSpecifyOutputFileAndOutputDirectory/node/bin/outAndOutDirFile.js +++ b/tests/baselines/reference/project/maprootUrlMixedSubfolderSpecifyOutputFileAndOutputDirectory/node/bin/outAndOutDirFile.js @@ -3,7 +3,7 @@ var m1_c1 = (function () { function m1_c1() { } return m1_c1; -})(); +}()); var m1_instance1 = new m1_c1(); function m1_f1() { return m1_instance1; @@ -15,7 +15,7 @@ var c1 = (function () { function c1() { } return c1; -})(); +}()); var instance1 = new c1(); function f1() { return instance1; diff --git a/tests/baselines/reference/project/maprootUrlMixedSubfolderSpecifyOutputFileAndOutputDirectory/node/maprootUrlMixedSubfolderSpecifyOutputFileAndOutputDirectory.sourcemap.txt b/tests/baselines/reference/project/maprootUrlMixedSubfolderSpecifyOutputFileAndOutputDirectory/node/maprootUrlMixedSubfolderSpecifyOutputFileAndOutputDirectory.sourcemap.txt index b659a6c11c5..18f7ae479e2 100644 --- a/tests/baselines/reference/project/maprootUrlMixedSubfolderSpecifyOutputFileAndOutputDirectory/node/maprootUrlMixedSubfolderSpecifyOutputFileAndOutputDirectory.sourcemap.txt +++ b/tests/baselines/reference/project/maprootUrlMixedSubfolderSpecifyOutputFileAndOutputDirectory/node/maprootUrlMixedSubfolderSpecifyOutputFileAndOutputDirectory.sourcemap.txt @@ -61,7 +61,7 @@ sourceFile:file:///tests/cases/projects/outputdir_mixed_subfolder/ref/m1.ts 1->Emitted(5, 5) Source(4, 1) + SourceIndex(0) 2 >Emitted(5, 17) Source(4, 2) + SourceIndex(0) --- ->>>})(); +>>>}()); 1 > 2 >^ 3 > @@ -217,7 +217,7 @@ sourceFile:file:///tests/cases/projects/outputdir_mixed_subfolder/test.ts 1->Emitted(17, 5) Source(6, 1) + SourceIndex(2) 2 >Emitted(17, 14) Source(6, 2) + SourceIndex(2) --- ->>>})(); +>>>}()); 1 > 2 >^ 3 > diff --git a/tests/baselines/reference/project/maprootUrlModuleMultifolderNoOutdir/amd/maprootUrlModuleMultifolderNoOutdir.sourcemap.txt b/tests/baselines/reference/project/maprootUrlModuleMultifolderNoOutdir/amd/maprootUrlModuleMultifolderNoOutdir.sourcemap.txt index 2a3f8d78e94..71d04d54105 100644 --- a/tests/baselines/reference/project/maprootUrlModuleMultifolderNoOutdir/amd/maprootUrlModuleMultifolderNoOutdir.sourcemap.txt +++ b/tests/baselines/reference/project/maprootUrlModuleMultifolderNoOutdir/amd/maprootUrlModuleMultifolderNoOutdir.sourcemap.txt @@ -60,7 +60,7 @@ sourceFile:file:///tests/cases/projects/outputdir_module_multifolder/ref/m1.ts 1->Emitted(7, 9) Source(4, 1) + SourceIndex(0) 2 >Emitted(7, 21) Source(4, 2) + SourceIndex(0) --- ->>> })(); +>>> }()); 1 >^^^^ 2 > ^ 3 > @@ -233,7 +233,7 @@ sourceFile:file:///tests/cases/projects/outputdir_module_multifolder_ref/m2.ts 1->Emitted(7, 9) Source(4, 1) + SourceIndex(0) 2 >Emitted(7, 21) Source(4, 2) + SourceIndex(0) --- ->>> })(); +>>> }()); 1 >^^^^ 2 > ^ 3 > @@ -408,7 +408,7 @@ sourceFile:file:///tests/cases/projects/outputdir_module_multifolder/test.ts 1->Emitted(7, 9) Source(6, 1) + SourceIndex(0) 2 >Emitted(7, 18) Source(6, 2) + SourceIndex(0) --- ->>> })(); +>>> }()); 1 >^^^^ 2 > ^ 3 > diff --git a/tests/baselines/reference/project/maprootUrlModuleMultifolderNoOutdir/amd/ref/m1.js b/tests/baselines/reference/project/maprootUrlModuleMultifolderNoOutdir/amd/ref/m1.js index 0014eb3163c..2141ed5cbb8 100644 --- a/tests/baselines/reference/project/maprootUrlModuleMultifolderNoOutdir/amd/ref/m1.js +++ b/tests/baselines/reference/project/maprootUrlModuleMultifolderNoOutdir/amd/ref/m1.js @@ -5,7 +5,7 @@ define(["require", "exports"], function (require, exports) { function m1_c1() { } return m1_c1; - })(); + }()); exports.m1_c1 = m1_c1; exports.m1_instance1 = new m1_c1(); function m1_f1() { diff --git a/tests/baselines/reference/project/maprootUrlModuleMultifolderNoOutdir/node/maprootUrlModuleMultifolderNoOutdir.sourcemap.txt b/tests/baselines/reference/project/maprootUrlModuleMultifolderNoOutdir/node/maprootUrlModuleMultifolderNoOutdir.sourcemap.txt index 69e712ee56d..b30960959e0 100644 --- a/tests/baselines/reference/project/maprootUrlModuleMultifolderNoOutdir/node/maprootUrlModuleMultifolderNoOutdir.sourcemap.txt +++ b/tests/baselines/reference/project/maprootUrlModuleMultifolderNoOutdir/node/maprootUrlModuleMultifolderNoOutdir.sourcemap.txt @@ -59,7 +59,7 @@ sourceFile:file:///tests/cases/projects/outputdir_module_multifolder/ref/m1.ts 1->Emitted(6, 5) Source(4, 1) + SourceIndex(0) 2 >Emitted(6, 17) Source(4, 2) + SourceIndex(0) --- ->>>})(); +>>>}()); 1 > 2 >^ 3 > @@ -231,7 +231,7 @@ sourceFile:file:///tests/cases/projects/outputdir_module_multifolder_ref/m2.ts 1->Emitted(6, 5) Source(4, 1) + SourceIndex(0) 2 >Emitted(6, 17) Source(4, 2) + SourceIndex(0) --- ->>>})(); +>>>}()); 1 > 2 >^ 3 > @@ -452,7 +452,7 @@ sourceFile:file:///tests/cases/projects/outputdir_module_multifolder/test.ts 1->Emitted(8, 5) Source(6, 1) + SourceIndex(0) 2 >Emitted(8, 14) Source(6, 2) + SourceIndex(0) --- ->>>})(); +>>>}()); 1 > 2 >^ 3 > diff --git a/tests/baselines/reference/project/maprootUrlModuleMultifolderNoOutdir/node/ref/m1.js b/tests/baselines/reference/project/maprootUrlModuleMultifolderNoOutdir/node/ref/m1.js index e50be801bbf..651782fa421 100644 --- a/tests/baselines/reference/project/maprootUrlModuleMultifolderNoOutdir/node/ref/m1.js +++ b/tests/baselines/reference/project/maprootUrlModuleMultifolderNoOutdir/node/ref/m1.js @@ -4,7 +4,7 @@ var m1_c1 = (function () { function m1_c1() { } return m1_c1; -})(); +}()); exports.m1_c1 = m1_c1; exports.m1_instance1 = new m1_c1(); function m1_f1() { diff --git a/tests/baselines/reference/project/maprootUrlModuleMultifolderSpecifyOutputDirectory/amd/maprootUrlModuleMultifolderSpecifyOutputDirectory.sourcemap.txt b/tests/baselines/reference/project/maprootUrlModuleMultifolderSpecifyOutputDirectory/amd/maprootUrlModuleMultifolderSpecifyOutputDirectory.sourcemap.txt index 84dce11dc01..15e3b5d99f3 100644 --- a/tests/baselines/reference/project/maprootUrlModuleMultifolderSpecifyOutputDirectory/amd/maprootUrlModuleMultifolderSpecifyOutputDirectory.sourcemap.txt +++ b/tests/baselines/reference/project/maprootUrlModuleMultifolderSpecifyOutputDirectory/amd/maprootUrlModuleMultifolderSpecifyOutputDirectory.sourcemap.txt @@ -60,7 +60,7 @@ sourceFile:file:///tests/cases/projects/outputdir_module_multifolder/ref/m1.ts 1->Emitted(7, 9) Source(4, 1) + SourceIndex(0) 2 >Emitted(7, 21) Source(4, 2) + SourceIndex(0) --- ->>> })(); +>>> }()); 1 >^^^^ 2 > ^ 3 > @@ -233,7 +233,7 @@ sourceFile:file:///tests/cases/projects/outputdir_module_multifolder_ref/m2.ts 1->Emitted(7, 9) Source(4, 1) + SourceIndex(0) 2 >Emitted(7, 21) Source(4, 2) + SourceIndex(0) --- ->>> })(); +>>> }()); 1 >^^^^ 2 > ^ 3 > @@ -408,7 +408,7 @@ sourceFile:file:///tests/cases/projects/outputdir_module_multifolder/test.ts 1->Emitted(7, 9) Source(6, 1) + SourceIndex(0) 2 >Emitted(7, 18) Source(6, 2) + SourceIndex(0) --- ->>> })(); +>>> }()); 1 >^^^^ 2 > ^ 3 > diff --git a/tests/baselines/reference/project/maprootUrlModuleMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_module_multifolder/ref/m1.js b/tests/baselines/reference/project/maprootUrlModuleMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_module_multifolder/ref/m1.js index 0014eb3163c..2141ed5cbb8 100644 --- a/tests/baselines/reference/project/maprootUrlModuleMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_module_multifolder/ref/m1.js +++ b/tests/baselines/reference/project/maprootUrlModuleMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_module_multifolder/ref/m1.js @@ -5,7 +5,7 @@ define(["require", "exports"], function (require, exports) { function m1_c1() { } return m1_c1; - })(); + }()); exports.m1_c1 = m1_c1; exports.m1_instance1 = new m1_c1(); function m1_f1() { diff --git a/tests/baselines/reference/project/maprootUrlModuleMultifolderSpecifyOutputDirectory/node/maprootUrlModuleMultifolderSpecifyOutputDirectory.sourcemap.txt b/tests/baselines/reference/project/maprootUrlModuleMultifolderSpecifyOutputDirectory/node/maprootUrlModuleMultifolderSpecifyOutputDirectory.sourcemap.txt index dcf1fb70a43..87c6c9341d1 100644 --- a/tests/baselines/reference/project/maprootUrlModuleMultifolderSpecifyOutputDirectory/node/maprootUrlModuleMultifolderSpecifyOutputDirectory.sourcemap.txt +++ b/tests/baselines/reference/project/maprootUrlModuleMultifolderSpecifyOutputDirectory/node/maprootUrlModuleMultifolderSpecifyOutputDirectory.sourcemap.txt @@ -59,7 +59,7 @@ sourceFile:file:///tests/cases/projects/outputdir_module_multifolder/ref/m1.ts 1->Emitted(6, 5) Source(4, 1) + SourceIndex(0) 2 >Emitted(6, 17) Source(4, 2) + SourceIndex(0) --- ->>>})(); +>>>}()); 1 > 2 >^ 3 > @@ -231,7 +231,7 @@ sourceFile:file:///tests/cases/projects/outputdir_module_multifolder_ref/m2.ts 1->Emitted(6, 5) Source(4, 1) + SourceIndex(0) 2 >Emitted(6, 17) Source(4, 2) + SourceIndex(0) --- ->>>})(); +>>>}()); 1 > 2 >^ 3 > @@ -452,7 +452,7 @@ sourceFile:file:///tests/cases/projects/outputdir_module_multifolder/test.ts 1->Emitted(8, 5) Source(6, 1) + SourceIndex(0) 2 >Emitted(8, 14) Source(6, 2) + SourceIndex(0) --- ->>>})(); +>>>}()); 1 > 2 >^ 3 > diff --git a/tests/baselines/reference/project/maprootUrlModuleMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_module_multifolder/ref/m1.js b/tests/baselines/reference/project/maprootUrlModuleMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_module_multifolder/ref/m1.js index e50be801bbf..651782fa421 100644 --- a/tests/baselines/reference/project/maprootUrlModuleMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_module_multifolder/ref/m1.js +++ b/tests/baselines/reference/project/maprootUrlModuleMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_module_multifolder/ref/m1.js @@ -4,7 +4,7 @@ var m1_c1 = (function () { function m1_c1() { } return m1_c1; -})(); +}()); exports.m1_c1 = m1_c1; exports.m1_instance1 = new m1_c1(); function m1_f1() { diff --git a/tests/baselines/reference/project/maprootUrlModuleMultifolderSpecifyOutputFile/amd/bin/test.js b/tests/baselines/reference/project/maprootUrlModuleMultifolderSpecifyOutputFile/amd/bin/test.js index a31b4d772ec..99da107dfa8 100644 --- a/tests/baselines/reference/project/maprootUrlModuleMultifolderSpecifyOutputFile/amd/bin/test.js +++ b/tests/baselines/reference/project/maprootUrlModuleMultifolderSpecifyOutputFile/amd/bin/test.js @@ -5,7 +5,7 @@ define("outputdir_module_multifolder/ref/m1", ["require", "exports"], function ( function m1_c1() { } return m1_c1; - })(); + }()); exports.m1_c1 = m1_c1; exports.m1_instance1 = new m1_c1(); function m1_f1() { @@ -20,7 +20,7 @@ define("outputdir_module_multifolder_ref/m2", ["require", "exports"], function ( function m2_c1() { } return m2_c1; - })(); + }()); exports.m2_c1 = m2_c1; exports.m2_instance1 = new m2_c1(); function m2_f1() { @@ -35,7 +35,7 @@ define("outputdir_module_multifolder/test", ["require", "exports", "outputdir_mo function c1() { } return c1; - })(); + }()); exports.c1 = c1; exports.instance1 = new c1(); function f1() { diff --git a/tests/baselines/reference/project/maprootUrlModuleMultifolderSpecifyOutputFile/amd/maprootUrlModuleMultifolderSpecifyOutputFile.sourcemap.txt b/tests/baselines/reference/project/maprootUrlModuleMultifolderSpecifyOutputFile/amd/maprootUrlModuleMultifolderSpecifyOutputFile.sourcemap.txt index 829640b7bb1..c6dd4570b29 100644 --- a/tests/baselines/reference/project/maprootUrlModuleMultifolderSpecifyOutputFile/amd/maprootUrlModuleMultifolderSpecifyOutputFile.sourcemap.txt +++ b/tests/baselines/reference/project/maprootUrlModuleMultifolderSpecifyOutputFile/amd/maprootUrlModuleMultifolderSpecifyOutputFile.sourcemap.txt @@ -60,7 +60,7 @@ sourceFile:file:///tests/cases/projects/outputdir_module_multifolder/ref/m1.ts 1->Emitted(7, 9) Source(4, 1) + SourceIndex(0) 2 >Emitted(7, 21) Source(4, 2) + SourceIndex(0) --- ->>> })(); +>>> }()); 1 >^^^^ 2 > ^ 3 > @@ -227,7 +227,7 @@ sourceFile:file:///tests/cases/projects/outputdir_module_multifolder_ref/m2.ts 1->Emitted(22, 9) Source(4, 1) + SourceIndex(1) 2 >Emitted(22, 21) Source(4, 2) + SourceIndex(1) --- ->>> })(); +>>> }()); 1 >^^^^ 2 > ^ 3 > @@ -396,7 +396,7 @@ sourceFile:file:///tests/cases/projects/outputdir_module_multifolder/test.ts 1->Emitted(37, 9) Source(6, 1) + SourceIndex(2) 2 >Emitted(37, 18) Source(6, 2) + SourceIndex(2) --- ->>> })(); +>>> }()); 1 >^^^^ 2 > ^ 3 > diff --git a/tests/baselines/reference/project/maprootUrlModuleSimpleNoOutdir/amd/m1.js b/tests/baselines/reference/project/maprootUrlModuleSimpleNoOutdir/amd/m1.js index b2136c5cb5e..b85ad9ab5b1 100644 --- a/tests/baselines/reference/project/maprootUrlModuleSimpleNoOutdir/amd/m1.js +++ b/tests/baselines/reference/project/maprootUrlModuleSimpleNoOutdir/amd/m1.js @@ -5,7 +5,7 @@ define(["require", "exports"], function (require, exports) { function m1_c1() { } return m1_c1; - })(); + }()); exports.m1_c1 = m1_c1; exports.m1_instance1 = new m1_c1(); function m1_f1() { diff --git a/tests/baselines/reference/project/maprootUrlModuleSimpleNoOutdir/amd/maprootUrlModuleSimpleNoOutdir.sourcemap.txt b/tests/baselines/reference/project/maprootUrlModuleSimpleNoOutdir/amd/maprootUrlModuleSimpleNoOutdir.sourcemap.txt index 7d729a5661f..e61a7e39edf 100644 --- a/tests/baselines/reference/project/maprootUrlModuleSimpleNoOutdir/amd/maprootUrlModuleSimpleNoOutdir.sourcemap.txt +++ b/tests/baselines/reference/project/maprootUrlModuleSimpleNoOutdir/amd/maprootUrlModuleSimpleNoOutdir.sourcemap.txt @@ -60,7 +60,7 @@ sourceFile:file:///tests/cases/projects/outputdir_module_simple/m1.ts 1->Emitted(7, 9) Source(4, 1) + SourceIndex(0) 2 >Emitted(7, 21) Source(4, 2) + SourceIndex(0) --- ->>> })(); +>>> }()); 1 >^^^^ 2 > ^ 3 > @@ -234,7 +234,7 @@ sourceFile:file:///tests/cases/projects/outputdir_module_simple/test.ts 1->Emitted(7, 9) Source(5, 1) + SourceIndex(0) 2 >Emitted(7, 18) Source(5, 2) + SourceIndex(0) --- ->>> })(); +>>> }()); 1 >^^^^ 2 > ^ 3 > diff --git a/tests/baselines/reference/project/maprootUrlModuleSimpleNoOutdir/node/m1.js b/tests/baselines/reference/project/maprootUrlModuleSimpleNoOutdir/node/m1.js index c8cf74001a8..9e79b0167c6 100644 --- a/tests/baselines/reference/project/maprootUrlModuleSimpleNoOutdir/node/m1.js +++ b/tests/baselines/reference/project/maprootUrlModuleSimpleNoOutdir/node/m1.js @@ -4,7 +4,7 @@ var m1_c1 = (function () { function m1_c1() { } return m1_c1; -})(); +}()); exports.m1_c1 = m1_c1; exports.m1_instance1 = new m1_c1(); function m1_f1() { diff --git a/tests/baselines/reference/project/maprootUrlModuleSimpleNoOutdir/node/maprootUrlModuleSimpleNoOutdir.sourcemap.txt b/tests/baselines/reference/project/maprootUrlModuleSimpleNoOutdir/node/maprootUrlModuleSimpleNoOutdir.sourcemap.txt index f9261589ad0..7b3b27278b2 100644 --- a/tests/baselines/reference/project/maprootUrlModuleSimpleNoOutdir/node/maprootUrlModuleSimpleNoOutdir.sourcemap.txt +++ b/tests/baselines/reference/project/maprootUrlModuleSimpleNoOutdir/node/maprootUrlModuleSimpleNoOutdir.sourcemap.txt @@ -59,7 +59,7 @@ sourceFile:file:///tests/cases/projects/outputdir_module_simple/m1.ts 1->Emitted(6, 5) Source(4, 1) + SourceIndex(0) 2 >Emitted(6, 17) Source(4, 2) + SourceIndex(0) --- ->>>})(); +>>>}()); 1 > 2 >^ 3 > @@ -255,7 +255,7 @@ sourceFile:file:///tests/cases/projects/outputdir_module_simple/test.ts 1->Emitted(7, 5) Source(5, 1) + SourceIndex(0) 2 >Emitted(7, 14) Source(5, 2) + SourceIndex(0) --- ->>>})(); +>>>}()); 1 > 2 >^ 3 > diff --git a/tests/baselines/reference/project/maprootUrlModuleSimpleSpecifyOutputDirectory/amd/maprootUrlModuleSimpleSpecifyOutputDirectory.sourcemap.txt b/tests/baselines/reference/project/maprootUrlModuleSimpleSpecifyOutputDirectory/amd/maprootUrlModuleSimpleSpecifyOutputDirectory.sourcemap.txt index a02c48506ef..b47d83c6920 100644 --- a/tests/baselines/reference/project/maprootUrlModuleSimpleSpecifyOutputDirectory/amd/maprootUrlModuleSimpleSpecifyOutputDirectory.sourcemap.txt +++ b/tests/baselines/reference/project/maprootUrlModuleSimpleSpecifyOutputDirectory/amd/maprootUrlModuleSimpleSpecifyOutputDirectory.sourcemap.txt @@ -60,7 +60,7 @@ sourceFile:file:///tests/cases/projects/outputdir_module_simple/m1.ts 1->Emitted(7, 9) Source(4, 1) + SourceIndex(0) 2 >Emitted(7, 21) Source(4, 2) + SourceIndex(0) --- ->>> })(); +>>> }()); 1 >^^^^ 2 > ^ 3 > @@ -234,7 +234,7 @@ sourceFile:file:///tests/cases/projects/outputdir_module_simple/test.ts 1->Emitted(7, 9) Source(5, 1) + SourceIndex(0) 2 >Emitted(7, 18) Source(5, 2) + SourceIndex(0) --- ->>> })(); +>>> }()); 1 >^^^^ 2 > ^ 3 > diff --git a/tests/baselines/reference/project/maprootUrlModuleSimpleSpecifyOutputDirectory/amd/outdir/simple/m1.js b/tests/baselines/reference/project/maprootUrlModuleSimpleSpecifyOutputDirectory/amd/outdir/simple/m1.js index b2136c5cb5e..b85ad9ab5b1 100644 --- a/tests/baselines/reference/project/maprootUrlModuleSimpleSpecifyOutputDirectory/amd/outdir/simple/m1.js +++ b/tests/baselines/reference/project/maprootUrlModuleSimpleSpecifyOutputDirectory/amd/outdir/simple/m1.js @@ -5,7 +5,7 @@ define(["require", "exports"], function (require, exports) { function m1_c1() { } return m1_c1; - })(); + }()); exports.m1_c1 = m1_c1; exports.m1_instance1 = new m1_c1(); function m1_f1() { diff --git a/tests/baselines/reference/project/maprootUrlModuleSimpleSpecifyOutputDirectory/node/maprootUrlModuleSimpleSpecifyOutputDirectory.sourcemap.txt b/tests/baselines/reference/project/maprootUrlModuleSimpleSpecifyOutputDirectory/node/maprootUrlModuleSimpleSpecifyOutputDirectory.sourcemap.txt index 5109b2e31b0..bc75a6972d5 100644 --- a/tests/baselines/reference/project/maprootUrlModuleSimpleSpecifyOutputDirectory/node/maprootUrlModuleSimpleSpecifyOutputDirectory.sourcemap.txt +++ b/tests/baselines/reference/project/maprootUrlModuleSimpleSpecifyOutputDirectory/node/maprootUrlModuleSimpleSpecifyOutputDirectory.sourcemap.txt @@ -59,7 +59,7 @@ sourceFile:file:///tests/cases/projects/outputdir_module_simple/m1.ts 1->Emitted(6, 5) Source(4, 1) + SourceIndex(0) 2 >Emitted(6, 17) Source(4, 2) + SourceIndex(0) --- ->>>})(); +>>>}()); 1 > 2 >^ 3 > @@ -255,7 +255,7 @@ sourceFile:file:///tests/cases/projects/outputdir_module_simple/test.ts 1->Emitted(7, 5) Source(5, 1) + SourceIndex(0) 2 >Emitted(7, 14) Source(5, 2) + SourceIndex(0) --- ->>>})(); +>>>}()); 1 > 2 >^ 3 > diff --git a/tests/baselines/reference/project/maprootUrlModuleSimpleSpecifyOutputDirectory/node/outdir/simple/m1.js b/tests/baselines/reference/project/maprootUrlModuleSimpleSpecifyOutputDirectory/node/outdir/simple/m1.js index c8cf74001a8..9e79b0167c6 100644 --- a/tests/baselines/reference/project/maprootUrlModuleSimpleSpecifyOutputDirectory/node/outdir/simple/m1.js +++ b/tests/baselines/reference/project/maprootUrlModuleSimpleSpecifyOutputDirectory/node/outdir/simple/m1.js @@ -4,7 +4,7 @@ var m1_c1 = (function () { function m1_c1() { } return m1_c1; -})(); +}()); exports.m1_c1 = m1_c1; exports.m1_instance1 = new m1_c1(); function m1_f1() { diff --git a/tests/baselines/reference/project/maprootUrlModuleSimpleSpecifyOutputFile/amd/bin/test.js b/tests/baselines/reference/project/maprootUrlModuleSimpleSpecifyOutputFile/amd/bin/test.js index b04aa2d4d46..4b21632bd6c 100644 --- a/tests/baselines/reference/project/maprootUrlModuleSimpleSpecifyOutputFile/amd/bin/test.js +++ b/tests/baselines/reference/project/maprootUrlModuleSimpleSpecifyOutputFile/amd/bin/test.js @@ -5,7 +5,7 @@ define("m1", ["require", "exports"], function (require, exports) { function m1_c1() { } return m1_c1; - })(); + }()); exports.m1_c1 = m1_c1; exports.m1_instance1 = new m1_c1(); function m1_f1() { @@ -20,7 +20,7 @@ define("test", ["require", "exports", "m1"], function (require, exports, m1) { function c1() { } return c1; - })(); + }()); exports.c1 = c1; exports.instance1 = new c1(); function f1() { diff --git a/tests/baselines/reference/project/maprootUrlModuleSimpleSpecifyOutputFile/amd/maprootUrlModuleSimpleSpecifyOutputFile.sourcemap.txt b/tests/baselines/reference/project/maprootUrlModuleSimpleSpecifyOutputFile/amd/maprootUrlModuleSimpleSpecifyOutputFile.sourcemap.txt index e45cacab12a..a571162721b 100644 --- a/tests/baselines/reference/project/maprootUrlModuleSimpleSpecifyOutputFile/amd/maprootUrlModuleSimpleSpecifyOutputFile.sourcemap.txt +++ b/tests/baselines/reference/project/maprootUrlModuleSimpleSpecifyOutputFile/amd/maprootUrlModuleSimpleSpecifyOutputFile.sourcemap.txt @@ -60,7 +60,7 @@ sourceFile:file:///tests/cases/projects/outputdir_module_simple/m1.ts 1->Emitted(7, 9) Source(4, 1) + SourceIndex(0) 2 >Emitted(7, 21) Source(4, 2) + SourceIndex(0) --- ->>> })(); +>>> }()); 1 >^^^^ 2 > ^ 3 > @@ -228,7 +228,7 @@ sourceFile:file:///tests/cases/projects/outputdir_module_simple/test.ts 1->Emitted(22, 9) Source(5, 1) + SourceIndex(1) 2 >Emitted(22, 18) Source(5, 2) + SourceIndex(1) --- ->>> })(); +>>> }()); 1 >^^^^ 2 > ^ 3 > diff --git a/tests/baselines/reference/project/maprootUrlModuleSubfolderNoOutdir/amd/maprootUrlModuleSubfolderNoOutdir.sourcemap.txt b/tests/baselines/reference/project/maprootUrlModuleSubfolderNoOutdir/amd/maprootUrlModuleSubfolderNoOutdir.sourcemap.txt index 1808b29753f..6af7d974bc4 100644 --- a/tests/baselines/reference/project/maprootUrlModuleSubfolderNoOutdir/amd/maprootUrlModuleSubfolderNoOutdir.sourcemap.txt +++ b/tests/baselines/reference/project/maprootUrlModuleSubfolderNoOutdir/amd/maprootUrlModuleSubfolderNoOutdir.sourcemap.txt @@ -60,7 +60,7 @@ sourceFile:file:///tests/cases/projects/outputdir_module_subfolder/ref/m1.ts 1->Emitted(7, 9) Source(4, 1) + SourceIndex(0) 2 >Emitted(7, 21) Source(4, 2) + SourceIndex(0) --- ->>> })(); +>>> }()); 1 >^^^^ 2 > ^ 3 > @@ -234,7 +234,7 @@ sourceFile:file:///tests/cases/projects/outputdir_module_subfolder/test.ts 1->Emitted(7, 9) Source(5, 1) + SourceIndex(0) 2 >Emitted(7, 18) Source(5, 2) + SourceIndex(0) --- ->>> })(); +>>> }()); 1 >^^^^ 2 > ^ 3 > diff --git a/tests/baselines/reference/project/maprootUrlModuleSubfolderNoOutdir/amd/ref/m1.js b/tests/baselines/reference/project/maprootUrlModuleSubfolderNoOutdir/amd/ref/m1.js index 1819603381c..c3d36f22356 100644 --- a/tests/baselines/reference/project/maprootUrlModuleSubfolderNoOutdir/amd/ref/m1.js +++ b/tests/baselines/reference/project/maprootUrlModuleSubfolderNoOutdir/amd/ref/m1.js @@ -5,7 +5,7 @@ define(["require", "exports"], function (require, exports) { function m1_c1() { } return m1_c1; - })(); + }()); exports.m1_c1 = m1_c1; exports.m1_instance1 = new m1_c1(); function m1_f1() { diff --git a/tests/baselines/reference/project/maprootUrlModuleSubfolderNoOutdir/node/maprootUrlModuleSubfolderNoOutdir.sourcemap.txt b/tests/baselines/reference/project/maprootUrlModuleSubfolderNoOutdir/node/maprootUrlModuleSubfolderNoOutdir.sourcemap.txt index 340b73f57bb..9b43f0d35d0 100644 --- a/tests/baselines/reference/project/maprootUrlModuleSubfolderNoOutdir/node/maprootUrlModuleSubfolderNoOutdir.sourcemap.txt +++ b/tests/baselines/reference/project/maprootUrlModuleSubfolderNoOutdir/node/maprootUrlModuleSubfolderNoOutdir.sourcemap.txt @@ -59,7 +59,7 @@ sourceFile:file:///tests/cases/projects/outputdir_module_subfolder/ref/m1.ts 1->Emitted(6, 5) Source(4, 1) + SourceIndex(0) 2 >Emitted(6, 17) Source(4, 2) + SourceIndex(0) --- ->>>})(); +>>>}()); 1 > 2 >^ 3 > @@ -255,7 +255,7 @@ sourceFile:file:///tests/cases/projects/outputdir_module_subfolder/test.ts 1->Emitted(7, 5) Source(5, 1) + SourceIndex(0) 2 >Emitted(7, 14) Source(5, 2) + SourceIndex(0) --- ->>>})(); +>>>}()); 1 > 2 >^ 3 > diff --git a/tests/baselines/reference/project/maprootUrlModuleSubfolderNoOutdir/node/ref/m1.js b/tests/baselines/reference/project/maprootUrlModuleSubfolderNoOutdir/node/ref/m1.js index b594cf79eb2..8fe6d174601 100644 --- a/tests/baselines/reference/project/maprootUrlModuleSubfolderNoOutdir/node/ref/m1.js +++ b/tests/baselines/reference/project/maprootUrlModuleSubfolderNoOutdir/node/ref/m1.js @@ -4,7 +4,7 @@ var m1_c1 = (function () { function m1_c1() { } return m1_c1; -})(); +}()); exports.m1_c1 = m1_c1; exports.m1_instance1 = new m1_c1(); function m1_f1() { diff --git a/tests/baselines/reference/project/maprootUrlModuleSubfolderSpecifyOutputDirectory/amd/maprootUrlModuleSubfolderSpecifyOutputDirectory.sourcemap.txt b/tests/baselines/reference/project/maprootUrlModuleSubfolderSpecifyOutputDirectory/amd/maprootUrlModuleSubfolderSpecifyOutputDirectory.sourcemap.txt index f26dc1e03bf..80882be8d58 100644 --- a/tests/baselines/reference/project/maprootUrlModuleSubfolderSpecifyOutputDirectory/amd/maprootUrlModuleSubfolderSpecifyOutputDirectory.sourcemap.txt +++ b/tests/baselines/reference/project/maprootUrlModuleSubfolderSpecifyOutputDirectory/amd/maprootUrlModuleSubfolderSpecifyOutputDirectory.sourcemap.txt @@ -60,7 +60,7 @@ sourceFile:file:///tests/cases/projects/outputdir_module_subfolder/ref/m1.ts 1->Emitted(7, 9) Source(4, 1) + SourceIndex(0) 2 >Emitted(7, 21) Source(4, 2) + SourceIndex(0) --- ->>> })(); +>>> }()); 1 >^^^^ 2 > ^ 3 > @@ -234,7 +234,7 @@ sourceFile:file:///tests/cases/projects/outputdir_module_subfolder/test.ts 1->Emitted(7, 9) Source(5, 1) + SourceIndex(0) 2 >Emitted(7, 18) Source(5, 2) + SourceIndex(0) --- ->>> })(); +>>> }()); 1 >^^^^ 2 > ^ 3 > diff --git a/tests/baselines/reference/project/maprootUrlModuleSubfolderSpecifyOutputDirectory/amd/outdir/simple/ref/m1.js b/tests/baselines/reference/project/maprootUrlModuleSubfolderSpecifyOutputDirectory/amd/outdir/simple/ref/m1.js index 1819603381c..c3d36f22356 100644 --- a/tests/baselines/reference/project/maprootUrlModuleSubfolderSpecifyOutputDirectory/amd/outdir/simple/ref/m1.js +++ b/tests/baselines/reference/project/maprootUrlModuleSubfolderSpecifyOutputDirectory/amd/outdir/simple/ref/m1.js @@ -5,7 +5,7 @@ define(["require", "exports"], function (require, exports) { function m1_c1() { } return m1_c1; - })(); + }()); exports.m1_c1 = m1_c1; exports.m1_instance1 = new m1_c1(); function m1_f1() { diff --git a/tests/baselines/reference/project/maprootUrlModuleSubfolderSpecifyOutputDirectory/node/maprootUrlModuleSubfolderSpecifyOutputDirectory.sourcemap.txt b/tests/baselines/reference/project/maprootUrlModuleSubfolderSpecifyOutputDirectory/node/maprootUrlModuleSubfolderSpecifyOutputDirectory.sourcemap.txt index 4e4cb8a0cbb..ba8c64ade19 100644 --- a/tests/baselines/reference/project/maprootUrlModuleSubfolderSpecifyOutputDirectory/node/maprootUrlModuleSubfolderSpecifyOutputDirectory.sourcemap.txt +++ b/tests/baselines/reference/project/maprootUrlModuleSubfolderSpecifyOutputDirectory/node/maprootUrlModuleSubfolderSpecifyOutputDirectory.sourcemap.txt @@ -59,7 +59,7 @@ sourceFile:file:///tests/cases/projects/outputdir_module_subfolder/ref/m1.ts 1->Emitted(6, 5) Source(4, 1) + SourceIndex(0) 2 >Emitted(6, 17) Source(4, 2) + SourceIndex(0) --- ->>>})(); +>>>}()); 1 > 2 >^ 3 > @@ -255,7 +255,7 @@ sourceFile:file:///tests/cases/projects/outputdir_module_subfolder/test.ts 1->Emitted(7, 5) Source(5, 1) + SourceIndex(0) 2 >Emitted(7, 14) Source(5, 2) + SourceIndex(0) --- ->>>})(); +>>>}()); 1 > 2 >^ 3 > diff --git a/tests/baselines/reference/project/maprootUrlModuleSubfolderSpecifyOutputDirectory/node/outdir/simple/ref/m1.js b/tests/baselines/reference/project/maprootUrlModuleSubfolderSpecifyOutputDirectory/node/outdir/simple/ref/m1.js index b594cf79eb2..8fe6d174601 100644 --- a/tests/baselines/reference/project/maprootUrlModuleSubfolderSpecifyOutputDirectory/node/outdir/simple/ref/m1.js +++ b/tests/baselines/reference/project/maprootUrlModuleSubfolderSpecifyOutputDirectory/node/outdir/simple/ref/m1.js @@ -4,7 +4,7 @@ var m1_c1 = (function () { function m1_c1() { } return m1_c1; -})(); +}()); exports.m1_c1 = m1_c1; exports.m1_instance1 = new m1_c1(); function m1_f1() { diff --git a/tests/baselines/reference/project/maprootUrlModuleSubfolderSpecifyOutputFile/amd/bin/test.js b/tests/baselines/reference/project/maprootUrlModuleSubfolderSpecifyOutputFile/amd/bin/test.js index 37aaeb4ecda..a58fc69531f 100644 --- a/tests/baselines/reference/project/maprootUrlModuleSubfolderSpecifyOutputFile/amd/bin/test.js +++ b/tests/baselines/reference/project/maprootUrlModuleSubfolderSpecifyOutputFile/amd/bin/test.js @@ -5,7 +5,7 @@ define("ref/m1", ["require", "exports"], function (require, exports) { function m1_c1() { } return m1_c1; - })(); + }()); exports.m1_c1 = m1_c1; exports.m1_instance1 = new m1_c1(); function m1_f1() { @@ -20,7 +20,7 @@ define("test", ["require", "exports", "ref/m1"], function (require, exports, m1) function c1() { } return c1; - })(); + }()); exports.c1 = c1; exports.instance1 = new c1(); function f1() { diff --git a/tests/baselines/reference/project/maprootUrlModuleSubfolderSpecifyOutputFile/amd/maprootUrlModuleSubfolderSpecifyOutputFile.sourcemap.txt b/tests/baselines/reference/project/maprootUrlModuleSubfolderSpecifyOutputFile/amd/maprootUrlModuleSubfolderSpecifyOutputFile.sourcemap.txt index 5df60cdb06a..084f7eb3bf0 100644 --- a/tests/baselines/reference/project/maprootUrlModuleSubfolderSpecifyOutputFile/amd/maprootUrlModuleSubfolderSpecifyOutputFile.sourcemap.txt +++ b/tests/baselines/reference/project/maprootUrlModuleSubfolderSpecifyOutputFile/amd/maprootUrlModuleSubfolderSpecifyOutputFile.sourcemap.txt @@ -60,7 +60,7 @@ sourceFile:file:///tests/cases/projects/outputdir_module_subfolder/ref/m1.ts 1->Emitted(7, 9) Source(4, 1) + SourceIndex(0) 2 >Emitted(7, 21) Source(4, 2) + SourceIndex(0) --- ->>> })(); +>>> }()); 1 >^^^^ 2 > ^ 3 > @@ -228,7 +228,7 @@ sourceFile:file:///tests/cases/projects/outputdir_module_subfolder/test.ts 1->Emitted(22, 9) Source(5, 1) + SourceIndex(1) 2 >Emitted(22, 18) Source(5, 2) + SourceIndex(1) --- ->>> })(); +>>> }()); 1 >^^^^ 2 > ^ 3 > diff --git a/tests/baselines/reference/project/maprootUrlMultifolderNoOutdir/amd/maprootUrlMultifolderNoOutdir.sourcemap.txt b/tests/baselines/reference/project/maprootUrlMultifolderNoOutdir/amd/maprootUrlMultifolderNoOutdir.sourcemap.txt index 570fdc70519..ad9f973f729 100644 --- a/tests/baselines/reference/project/maprootUrlMultifolderNoOutdir/amd/maprootUrlMultifolderNoOutdir.sourcemap.txt +++ b/tests/baselines/reference/project/maprootUrlMultifolderNoOutdir/amd/maprootUrlMultifolderNoOutdir.sourcemap.txt @@ -61,7 +61,7 @@ sourceFile:file:///tests/cases/projects/outputdir_multifolder/ref/m1.ts 1->Emitted(5, 5) Source(4, 1) + SourceIndex(0) 2 >Emitted(5, 17) Source(4, 2) + SourceIndex(0) --- ->>>})(); +>>>}()); 1 > 2 >^ 3 > @@ -204,7 +204,7 @@ sourceFile:file:///tests/cases/projects/outputdir_multifolder_ref/m2.ts 1->Emitted(5, 5) Source(4, 1) + SourceIndex(0) 2 >Emitted(5, 17) Source(4, 2) + SourceIndex(0) --- ->>>})(); +>>>}()); 1 > 2 >^ 3 > @@ -366,7 +366,7 @@ sourceFile:file:///tests/cases/projects/outputdir_multifolder/test.ts 1->Emitted(7, 5) Source(6, 1) + SourceIndex(0) 2 >Emitted(7, 14) Source(6, 2) + SourceIndex(0) --- ->>>})(); +>>>}()); 1 > 2 >^ 3 > diff --git a/tests/baselines/reference/project/maprootUrlMultifolderNoOutdir/amd/ref/m1.js b/tests/baselines/reference/project/maprootUrlMultifolderNoOutdir/amd/ref/m1.js index da8ac1cb063..cf896426681 100644 --- a/tests/baselines/reference/project/maprootUrlMultifolderNoOutdir/amd/ref/m1.js +++ b/tests/baselines/reference/project/maprootUrlMultifolderNoOutdir/amd/ref/m1.js @@ -3,7 +3,7 @@ var m1_c1 = (function () { function m1_c1() { } return m1_c1; -})(); +}()); var m1_instance1 = new m1_c1(); function m1_f1() { return m1_instance1; diff --git a/tests/baselines/reference/project/maprootUrlMultifolderNoOutdir/node/maprootUrlMultifolderNoOutdir.sourcemap.txt b/tests/baselines/reference/project/maprootUrlMultifolderNoOutdir/node/maprootUrlMultifolderNoOutdir.sourcemap.txt index 570fdc70519..ad9f973f729 100644 --- a/tests/baselines/reference/project/maprootUrlMultifolderNoOutdir/node/maprootUrlMultifolderNoOutdir.sourcemap.txt +++ b/tests/baselines/reference/project/maprootUrlMultifolderNoOutdir/node/maprootUrlMultifolderNoOutdir.sourcemap.txt @@ -61,7 +61,7 @@ sourceFile:file:///tests/cases/projects/outputdir_multifolder/ref/m1.ts 1->Emitted(5, 5) Source(4, 1) + SourceIndex(0) 2 >Emitted(5, 17) Source(4, 2) + SourceIndex(0) --- ->>>})(); +>>>}()); 1 > 2 >^ 3 > @@ -204,7 +204,7 @@ sourceFile:file:///tests/cases/projects/outputdir_multifolder_ref/m2.ts 1->Emitted(5, 5) Source(4, 1) + SourceIndex(0) 2 >Emitted(5, 17) Source(4, 2) + SourceIndex(0) --- ->>>})(); +>>>}()); 1 > 2 >^ 3 > @@ -366,7 +366,7 @@ sourceFile:file:///tests/cases/projects/outputdir_multifolder/test.ts 1->Emitted(7, 5) Source(6, 1) + SourceIndex(0) 2 >Emitted(7, 14) Source(6, 2) + SourceIndex(0) --- ->>>})(); +>>>}()); 1 > 2 >^ 3 > diff --git a/tests/baselines/reference/project/maprootUrlMultifolderNoOutdir/node/ref/m1.js b/tests/baselines/reference/project/maprootUrlMultifolderNoOutdir/node/ref/m1.js index da8ac1cb063..cf896426681 100644 --- a/tests/baselines/reference/project/maprootUrlMultifolderNoOutdir/node/ref/m1.js +++ b/tests/baselines/reference/project/maprootUrlMultifolderNoOutdir/node/ref/m1.js @@ -3,7 +3,7 @@ var m1_c1 = (function () { function m1_c1() { } return m1_c1; -})(); +}()); var m1_instance1 = new m1_c1(); function m1_f1() { return m1_instance1; diff --git a/tests/baselines/reference/project/maprootUrlMultifolderSpecifyOutputDirectory/amd/maprootUrlMultifolderSpecifyOutputDirectory.sourcemap.txt b/tests/baselines/reference/project/maprootUrlMultifolderSpecifyOutputDirectory/amd/maprootUrlMultifolderSpecifyOutputDirectory.sourcemap.txt index 5d6bc0ed042..c75dab52c24 100644 --- a/tests/baselines/reference/project/maprootUrlMultifolderSpecifyOutputDirectory/amd/maprootUrlMultifolderSpecifyOutputDirectory.sourcemap.txt +++ b/tests/baselines/reference/project/maprootUrlMultifolderSpecifyOutputDirectory/amd/maprootUrlMultifolderSpecifyOutputDirectory.sourcemap.txt @@ -61,7 +61,7 @@ sourceFile:file:///tests/cases/projects/outputdir_multifolder/ref/m1.ts 1->Emitted(5, 5) Source(4, 1) + SourceIndex(0) 2 >Emitted(5, 17) Source(4, 2) + SourceIndex(0) --- ->>>})(); +>>>}()); 1 > 2 >^ 3 > @@ -204,7 +204,7 @@ sourceFile:file:///tests/cases/projects/outputdir_multifolder_ref/m2.ts 1->Emitted(5, 5) Source(4, 1) + SourceIndex(0) 2 >Emitted(5, 17) Source(4, 2) + SourceIndex(0) --- ->>>})(); +>>>}()); 1 > 2 >^ 3 > @@ -366,7 +366,7 @@ sourceFile:file:///tests/cases/projects/outputdir_multifolder/test.ts 1->Emitted(7, 5) Source(6, 1) + SourceIndex(0) 2 >Emitted(7, 14) Source(6, 2) + SourceIndex(0) --- ->>>})(); +>>>}()); 1 > 2 >^ 3 > diff --git a/tests/baselines/reference/project/maprootUrlMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_multifolder/ref/m1.js b/tests/baselines/reference/project/maprootUrlMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_multifolder/ref/m1.js index da8ac1cb063..cf896426681 100644 --- a/tests/baselines/reference/project/maprootUrlMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_multifolder/ref/m1.js +++ b/tests/baselines/reference/project/maprootUrlMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_multifolder/ref/m1.js @@ -3,7 +3,7 @@ var m1_c1 = (function () { function m1_c1() { } return m1_c1; -})(); +}()); var m1_instance1 = new m1_c1(); function m1_f1() { return m1_instance1; diff --git a/tests/baselines/reference/project/maprootUrlMultifolderSpecifyOutputDirectory/node/maprootUrlMultifolderSpecifyOutputDirectory.sourcemap.txt b/tests/baselines/reference/project/maprootUrlMultifolderSpecifyOutputDirectory/node/maprootUrlMultifolderSpecifyOutputDirectory.sourcemap.txt index 5d6bc0ed042..c75dab52c24 100644 --- a/tests/baselines/reference/project/maprootUrlMultifolderSpecifyOutputDirectory/node/maprootUrlMultifolderSpecifyOutputDirectory.sourcemap.txt +++ b/tests/baselines/reference/project/maprootUrlMultifolderSpecifyOutputDirectory/node/maprootUrlMultifolderSpecifyOutputDirectory.sourcemap.txt @@ -61,7 +61,7 @@ sourceFile:file:///tests/cases/projects/outputdir_multifolder/ref/m1.ts 1->Emitted(5, 5) Source(4, 1) + SourceIndex(0) 2 >Emitted(5, 17) Source(4, 2) + SourceIndex(0) --- ->>>})(); +>>>}()); 1 > 2 >^ 3 > @@ -204,7 +204,7 @@ sourceFile:file:///tests/cases/projects/outputdir_multifolder_ref/m2.ts 1->Emitted(5, 5) Source(4, 1) + SourceIndex(0) 2 >Emitted(5, 17) Source(4, 2) + SourceIndex(0) --- ->>>})(); +>>>}()); 1 > 2 >^ 3 > @@ -366,7 +366,7 @@ sourceFile:file:///tests/cases/projects/outputdir_multifolder/test.ts 1->Emitted(7, 5) Source(6, 1) + SourceIndex(0) 2 >Emitted(7, 14) Source(6, 2) + SourceIndex(0) --- ->>>})(); +>>>}()); 1 > 2 >^ 3 > diff --git a/tests/baselines/reference/project/maprootUrlMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_multifolder/ref/m1.js b/tests/baselines/reference/project/maprootUrlMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_multifolder/ref/m1.js index da8ac1cb063..cf896426681 100644 --- a/tests/baselines/reference/project/maprootUrlMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_multifolder/ref/m1.js +++ b/tests/baselines/reference/project/maprootUrlMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_multifolder/ref/m1.js @@ -3,7 +3,7 @@ var m1_c1 = (function () { function m1_c1() { } return m1_c1; -})(); +}()); var m1_instance1 = new m1_c1(); function m1_f1() { return m1_instance1; diff --git a/tests/baselines/reference/project/maprootUrlMultifolderSpecifyOutputFile/amd/bin/test.js b/tests/baselines/reference/project/maprootUrlMultifolderSpecifyOutputFile/amd/bin/test.js index b5641a2b2bd..51bd53679fa 100644 --- a/tests/baselines/reference/project/maprootUrlMultifolderSpecifyOutputFile/amd/bin/test.js +++ b/tests/baselines/reference/project/maprootUrlMultifolderSpecifyOutputFile/amd/bin/test.js @@ -3,7 +3,7 @@ var m1_c1 = (function () { function m1_c1() { } return m1_c1; -})(); +}()); var m1_instance1 = new m1_c1(); function m1_f1() { return m1_instance1; @@ -13,7 +13,7 @@ var m2_c1 = (function () { function m2_c1() { } return m2_c1; -})(); +}()); var m2_instance1 = new m2_c1(); function m2_f1() { return m2_instance1; @@ -25,7 +25,7 @@ var c1 = (function () { function c1() { } return c1; -})(); +}()); var instance1 = new c1(); function f1() { return instance1; diff --git a/tests/baselines/reference/project/maprootUrlMultifolderSpecifyOutputFile/amd/maprootUrlMultifolderSpecifyOutputFile.sourcemap.txt b/tests/baselines/reference/project/maprootUrlMultifolderSpecifyOutputFile/amd/maprootUrlMultifolderSpecifyOutputFile.sourcemap.txt index 36b0d16d1aa..3a2f01dd5e4 100644 --- a/tests/baselines/reference/project/maprootUrlMultifolderSpecifyOutputFile/amd/maprootUrlMultifolderSpecifyOutputFile.sourcemap.txt +++ b/tests/baselines/reference/project/maprootUrlMultifolderSpecifyOutputFile/amd/maprootUrlMultifolderSpecifyOutputFile.sourcemap.txt @@ -61,7 +61,7 @@ sourceFile:file:///tests/cases/projects/outputdir_multifolder/ref/m1.ts 1->Emitted(5, 5) Source(4, 1) + SourceIndex(0) 2 >Emitted(5, 17) Source(4, 2) + SourceIndex(0) --- ->>>})(); +>>>}()); 1 > 2 >^ 3 > @@ -198,7 +198,7 @@ sourceFile:file:///tests/cases/projects/outputdir_multifolder_ref/m2.ts 1->Emitted(15, 5) Source(4, 1) + SourceIndex(1) 2 >Emitted(15, 17) Source(4, 2) + SourceIndex(1) --- ->>>})(); +>>>}()); 1 > 2 >^ 3 > @@ -354,7 +354,7 @@ sourceFile:file:///tests/cases/projects/outputdir_multifolder/test.ts 1->Emitted(27, 5) Source(6, 1) + SourceIndex(2) 2 >Emitted(27, 14) Source(6, 2) + SourceIndex(2) --- ->>>})(); +>>>}()); 1 > 2 >^ 3 > diff --git a/tests/baselines/reference/project/maprootUrlMultifolderSpecifyOutputFile/node/bin/test.js b/tests/baselines/reference/project/maprootUrlMultifolderSpecifyOutputFile/node/bin/test.js index b5641a2b2bd..51bd53679fa 100644 --- a/tests/baselines/reference/project/maprootUrlMultifolderSpecifyOutputFile/node/bin/test.js +++ b/tests/baselines/reference/project/maprootUrlMultifolderSpecifyOutputFile/node/bin/test.js @@ -3,7 +3,7 @@ var m1_c1 = (function () { function m1_c1() { } return m1_c1; -})(); +}()); var m1_instance1 = new m1_c1(); function m1_f1() { return m1_instance1; @@ -13,7 +13,7 @@ var m2_c1 = (function () { function m2_c1() { } return m2_c1; -})(); +}()); var m2_instance1 = new m2_c1(); function m2_f1() { return m2_instance1; @@ -25,7 +25,7 @@ var c1 = (function () { function c1() { } return c1; -})(); +}()); var instance1 = new c1(); function f1() { return instance1; diff --git a/tests/baselines/reference/project/maprootUrlMultifolderSpecifyOutputFile/node/maprootUrlMultifolderSpecifyOutputFile.sourcemap.txt b/tests/baselines/reference/project/maprootUrlMultifolderSpecifyOutputFile/node/maprootUrlMultifolderSpecifyOutputFile.sourcemap.txt index 36b0d16d1aa..3a2f01dd5e4 100644 --- a/tests/baselines/reference/project/maprootUrlMultifolderSpecifyOutputFile/node/maprootUrlMultifolderSpecifyOutputFile.sourcemap.txt +++ b/tests/baselines/reference/project/maprootUrlMultifolderSpecifyOutputFile/node/maprootUrlMultifolderSpecifyOutputFile.sourcemap.txt @@ -61,7 +61,7 @@ sourceFile:file:///tests/cases/projects/outputdir_multifolder/ref/m1.ts 1->Emitted(5, 5) Source(4, 1) + SourceIndex(0) 2 >Emitted(5, 17) Source(4, 2) + SourceIndex(0) --- ->>>})(); +>>>}()); 1 > 2 >^ 3 > @@ -198,7 +198,7 @@ sourceFile:file:///tests/cases/projects/outputdir_multifolder_ref/m2.ts 1->Emitted(15, 5) Source(4, 1) + SourceIndex(1) 2 >Emitted(15, 17) Source(4, 2) + SourceIndex(1) --- ->>>})(); +>>>}()); 1 > 2 >^ 3 > @@ -354,7 +354,7 @@ sourceFile:file:///tests/cases/projects/outputdir_multifolder/test.ts 1->Emitted(27, 5) Source(6, 1) + SourceIndex(2) 2 >Emitted(27, 14) Source(6, 2) + SourceIndex(2) --- ->>>})(); +>>>}()); 1 > 2 >^ 3 > diff --git a/tests/baselines/reference/project/maprootUrlSimpleNoOutdir/amd/m1.js b/tests/baselines/reference/project/maprootUrlSimpleNoOutdir/amd/m1.js index 24b75dc1a7e..9f5ca0320c9 100644 --- a/tests/baselines/reference/project/maprootUrlSimpleNoOutdir/amd/m1.js +++ b/tests/baselines/reference/project/maprootUrlSimpleNoOutdir/amd/m1.js @@ -3,7 +3,7 @@ var m1_c1 = (function () { function m1_c1() { } return m1_c1; -})(); +}()); var m1_instance1 = new m1_c1(); function m1_f1() { return m1_instance1; diff --git a/tests/baselines/reference/project/maprootUrlSimpleNoOutdir/amd/maprootUrlSimpleNoOutdir.sourcemap.txt b/tests/baselines/reference/project/maprootUrlSimpleNoOutdir/amd/maprootUrlSimpleNoOutdir.sourcemap.txt index 9da8ea4abed..52784c4e840 100644 --- a/tests/baselines/reference/project/maprootUrlSimpleNoOutdir/amd/maprootUrlSimpleNoOutdir.sourcemap.txt +++ b/tests/baselines/reference/project/maprootUrlSimpleNoOutdir/amd/maprootUrlSimpleNoOutdir.sourcemap.txt @@ -61,7 +61,7 @@ sourceFile:file:///tests/cases/projects/outputdir_simple/m1.ts 1->Emitted(5, 5) Source(4, 1) + SourceIndex(0) 2 >Emitted(5, 17) Source(4, 2) + SourceIndex(0) --- ->>>})(); +>>>}()); 1 > 2 >^ 3 > @@ -213,7 +213,7 @@ sourceFile:file:///tests/cases/projects/outputdir_simple/test.ts 1->Emitted(6, 5) Source(5, 1) + SourceIndex(0) 2 >Emitted(6, 14) Source(5, 2) + SourceIndex(0) --- ->>>})(); +>>>}()); 1 > 2 >^ 3 > diff --git a/tests/baselines/reference/project/maprootUrlSimpleNoOutdir/node/m1.js b/tests/baselines/reference/project/maprootUrlSimpleNoOutdir/node/m1.js index 24b75dc1a7e..9f5ca0320c9 100644 --- a/tests/baselines/reference/project/maprootUrlSimpleNoOutdir/node/m1.js +++ b/tests/baselines/reference/project/maprootUrlSimpleNoOutdir/node/m1.js @@ -3,7 +3,7 @@ var m1_c1 = (function () { function m1_c1() { } return m1_c1; -})(); +}()); var m1_instance1 = new m1_c1(); function m1_f1() { return m1_instance1; diff --git a/tests/baselines/reference/project/maprootUrlSimpleNoOutdir/node/maprootUrlSimpleNoOutdir.sourcemap.txt b/tests/baselines/reference/project/maprootUrlSimpleNoOutdir/node/maprootUrlSimpleNoOutdir.sourcemap.txt index 9da8ea4abed..52784c4e840 100644 --- a/tests/baselines/reference/project/maprootUrlSimpleNoOutdir/node/maprootUrlSimpleNoOutdir.sourcemap.txt +++ b/tests/baselines/reference/project/maprootUrlSimpleNoOutdir/node/maprootUrlSimpleNoOutdir.sourcemap.txt @@ -61,7 +61,7 @@ sourceFile:file:///tests/cases/projects/outputdir_simple/m1.ts 1->Emitted(5, 5) Source(4, 1) + SourceIndex(0) 2 >Emitted(5, 17) Source(4, 2) + SourceIndex(0) --- ->>>})(); +>>>}()); 1 > 2 >^ 3 > @@ -213,7 +213,7 @@ sourceFile:file:///tests/cases/projects/outputdir_simple/test.ts 1->Emitted(6, 5) Source(5, 1) + SourceIndex(0) 2 >Emitted(6, 14) Source(5, 2) + SourceIndex(0) --- ->>>})(); +>>>}()); 1 > 2 >^ 3 > diff --git a/tests/baselines/reference/project/maprootUrlSimpleSpecifyOutputDirectory/amd/maprootUrlSimpleSpecifyOutputDirectory.sourcemap.txt b/tests/baselines/reference/project/maprootUrlSimpleSpecifyOutputDirectory/amd/maprootUrlSimpleSpecifyOutputDirectory.sourcemap.txt index 17c7f707a84..ab1c1686d84 100644 --- a/tests/baselines/reference/project/maprootUrlSimpleSpecifyOutputDirectory/amd/maprootUrlSimpleSpecifyOutputDirectory.sourcemap.txt +++ b/tests/baselines/reference/project/maprootUrlSimpleSpecifyOutputDirectory/amd/maprootUrlSimpleSpecifyOutputDirectory.sourcemap.txt @@ -61,7 +61,7 @@ sourceFile:file:///tests/cases/projects/outputdir_simple/m1.ts 1->Emitted(5, 5) Source(4, 1) + SourceIndex(0) 2 >Emitted(5, 17) Source(4, 2) + SourceIndex(0) --- ->>>})(); +>>>}()); 1 > 2 >^ 3 > @@ -213,7 +213,7 @@ sourceFile:file:///tests/cases/projects/outputdir_simple/test.ts 1->Emitted(6, 5) Source(5, 1) + SourceIndex(0) 2 >Emitted(6, 14) Source(5, 2) + SourceIndex(0) --- ->>>})(); +>>>}()); 1 > 2 >^ 3 > diff --git a/tests/baselines/reference/project/maprootUrlSimpleSpecifyOutputDirectory/amd/outdir/simple/m1.js b/tests/baselines/reference/project/maprootUrlSimpleSpecifyOutputDirectory/amd/outdir/simple/m1.js index 24b75dc1a7e..9f5ca0320c9 100644 --- a/tests/baselines/reference/project/maprootUrlSimpleSpecifyOutputDirectory/amd/outdir/simple/m1.js +++ b/tests/baselines/reference/project/maprootUrlSimpleSpecifyOutputDirectory/amd/outdir/simple/m1.js @@ -3,7 +3,7 @@ var m1_c1 = (function () { function m1_c1() { } return m1_c1; -})(); +}()); var m1_instance1 = new m1_c1(); function m1_f1() { return m1_instance1; diff --git a/tests/baselines/reference/project/maprootUrlSimpleSpecifyOutputDirectory/node/maprootUrlSimpleSpecifyOutputDirectory.sourcemap.txt b/tests/baselines/reference/project/maprootUrlSimpleSpecifyOutputDirectory/node/maprootUrlSimpleSpecifyOutputDirectory.sourcemap.txt index 17c7f707a84..ab1c1686d84 100644 --- a/tests/baselines/reference/project/maprootUrlSimpleSpecifyOutputDirectory/node/maprootUrlSimpleSpecifyOutputDirectory.sourcemap.txt +++ b/tests/baselines/reference/project/maprootUrlSimpleSpecifyOutputDirectory/node/maprootUrlSimpleSpecifyOutputDirectory.sourcemap.txt @@ -61,7 +61,7 @@ sourceFile:file:///tests/cases/projects/outputdir_simple/m1.ts 1->Emitted(5, 5) Source(4, 1) + SourceIndex(0) 2 >Emitted(5, 17) Source(4, 2) + SourceIndex(0) --- ->>>})(); +>>>}()); 1 > 2 >^ 3 > @@ -213,7 +213,7 @@ sourceFile:file:///tests/cases/projects/outputdir_simple/test.ts 1->Emitted(6, 5) Source(5, 1) + SourceIndex(0) 2 >Emitted(6, 14) Source(5, 2) + SourceIndex(0) --- ->>>})(); +>>>}()); 1 > 2 >^ 3 > diff --git a/tests/baselines/reference/project/maprootUrlSimpleSpecifyOutputDirectory/node/outdir/simple/m1.js b/tests/baselines/reference/project/maprootUrlSimpleSpecifyOutputDirectory/node/outdir/simple/m1.js index 24b75dc1a7e..9f5ca0320c9 100644 --- a/tests/baselines/reference/project/maprootUrlSimpleSpecifyOutputDirectory/node/outdir/simple/m1.js +++ b/tests/baselines/reference/project/maprootUrlSimpleSpecifyOutputDirectory/node/outdir/simple/m1.js @@ -3,7 +3,7 @@ var m1_c1 = (function () { function m1_c1() { } return m1_c1; -})(); +}()); var m1_instance1 = new m1_c1(); function m1_f1() { return m1_instance1; diff --git a/tests/baselines/reference/project/maprootUrlSimpleSpecifyOutputFile/amd/bin/test.js b/tests/baselines/reference/project/maprootUrlSimpleSpecifyOutputFile/amd/bin/test.js index 869f4f5971a..2a35fde20dc 100644 --- a/tests/baselines/reference/project/maprootUrlSimpleSpecifyOutputFile/amd/bin/test.js +++ b/tests/baselines/reference/project/maprootUrlSimpleSpecifyOutputFile/amd/bin/test.js @@ -3,7 +3,7 @@ var m1_c1 = (function () { function m1_c1() { } return m1_c1; -})(); +}()); var m1_instance1 = new m1_c1(); function m1_f1() { return m1_instance1; @@ -14,7 +14,7 @@ var c1 = (function () { function c1() { } return c1; -})(); +}()); var instance1 = new c1(); function f1() { return instance1; diff --git a/tests/baselines/reference/project/maprootUrlSimpleSpecifyOutputFile/amd/maprootUrlSimpleSpecifyOutputFile.sourcemap.txt b/tests/baselines/reference/project/maprootUrlSimpleSpecifyOutputFile/amd/maprootUrlSimpleSpecifyOutputFile.sourcemap.txt index 100a3db76a5..4bc337647db 100644 --- a/tests/baselines/reference/project/maprootUrlSimpleSpecifyOutputFile/amd/maprootUrlSimpleSpecifyOutputFile.sourcemap.txt +++ b/tests/baselines/reference/project/maprootUrlSimpleSpecifyOutputFile/amd/maprootUrlSimpleSpecifyOutputFile.sourcemap.txt @@ -61,7 +61,7 @@ sourceFile:file:///tests/cases/projects/outputdir_simple/m1.ts 1->Emitted(5, 5) Source(4, 1) + SourceIndex(0) 2 >Emitted(5, 17) Source(4, 2) + SourceIndex(0) --- ->>>})(); +>>>}()); 1 > 2 >^ 3 > @@ -207,7 +207,7 @@ sourceFile:file:///tests/cases/projects/outputdir_simple/test.ts 1->Emitted(16, 5) Source(5, 1) + SourceIndex(1) 2 >Emitted(16, 14) Source(5, 2) + SourceIndex(1) --- ->>>})(); +>>>}()); 1 > 2 >^ 3 > diff --git a/tests/baselines/reference/project/maprootUrlSimpleSpecifyOutputFile/node/bin/test.js b/tests/baselines/reference/project/maprootUrlSimpleSpecifyOutputFile/node/bin/test.js index 869f4f5971a..2a35fde20dc 100644 --- a/tests/baselines/reference/project/maprootUrlSimpleSpecifyOutputFile/node/bin/test.js +++ b/tests/baselines/reference/project/maprootUrlSimpleSpecifyOutputFile/node/bin/test.js @@ -3,7 +3,7 @@ var m1_c1 = (function () { function m1_c1() { } return m1_c1; -})(); +}()); var m1_instance1 = new m1_c1(); function m1_f1() { return m1_instance1; @@ -14,7 +14,7 @@ var c1 = (function () { function c1() { } return c1; -})(); +}()); var instance1 = new c1(); function f1() { return instance1; diff --git a/tests/baselines/reference/project/maprootUrlSimpleSpecifyOutputFile/node/maprootUrlSimpleSpecifyOutputFile.sourcemap.txt b/tests/baselines/reference/project/maprootUrlSimpleSpecifyOutputFile/node/maprootUrlSimpleSpecifyOutputFile.sourcemap.txt index 100a3db76a5..4bc337647db 100644 --- a/tests/baselines/reference/project/maprootUrlSimpleSpecifyOutputFile/node/maprootUrlSimpleSpecifyOutputFile.sourcemap.txt +++ b/tests/baselines/reference/project/maprootUrlSimpleSpecifyOutputFile/node/maprootUrlSimpleSpecifyOutputFile.sourcemap.txt @@ -61,7 +61,7 @@ sourceFile:file:///tests/cases/projects/outputdir_simple/m1.ts 1->Emitted(5, 5) Source(4, 1) + SourceIndex(0) 2 >Emitted(5, 17) Source(4, 2) + SourceIndex(0) --- ->>>})(); +>>>}()); 1 > 2 >^ 3 > @@ -207,7 +207,7 @@ sourceFile:file:///tests/cases/projects/outputdir_simple/test.ts 1->Emitted(16, 5) Source(5, 1) + SourceIndex(1) 2 >Emitted(16, 14) Source(5, 2) + SourceIndex(1) --- ->>>})(); +>>>}()); 1 > 2 >^ 3 > diff --git a/tests/baselines/reference/project/maprootUrlSingleFileNoOutdir/amd/maprootUrlSingleFileNoOutdir.sourcemap.txt b/tests/baselines/reference/project/maprootUrlSingleFileNoOutdir/amd/maprootUrlSingleFileNoOutdir.sourcemap.txt index 169448dbcc2..f1c0f5ef4c7 100644 --- a/tests/baselines/reference/project/maprootUrlSingleFileNoOutdir/amd/maprootUrlSingleFileNoOutdir.sourcemap.txt +++ b/tests/baselines/reference/project/maprootUrlSingleFileNoOutdir/amd/maprootUrlSingleFileNoOutdir.sourcemap.txt @@ -61,7 +61,7 @@ sourceFile:file:///tests/cases/projects/outputdir_singleFile/test.ts 1->Emitted(5, 5) Source(4, 1) + SourceIndex(0) 2 >Emitted(5, 14) Source(4, 2) + SourceIndex(0) --- ->>>})(); +>>>}()); 1 > 2 >^ 3 > diff --git a/tests/baselines/reference/project/maprootUrlSingleFileNoOutdir/amd/test.js b/tests/baselines/reference/project/maprootUrlSingleFileNoOutdir/amd/test.js index bc0f3007e6a..73eb738e590 100644 --- a/tests/baselines/reference/project/maprootUrlSingleFileNoOutdir/amd/test.js +++ b/tests/baselines/reference/project/maprootUrlSingleFileNoOutdir/amd/test.js @@ -3,7 +3,7 @@ var c1 = (function () { function c1() { } return c1; -})(); +}()); var instance1 = new c1(); function f1() { return instance1; diff --git a/tests/baselines/reference/project/maprootUrlSingleFileNoOutdir/node/maprootUrlSingleFileNoOutdir.sourcemap.txt b/tests/baselines/reference/project/maprootUrlSingleFileNoOutdir/node/maprootUrlSingleFileNoOutdir.sourcemap.txt index 169448dbcc2..f1c0f5ef4c7 100644 --- a/tests/baselines/reference/project/maprootUrlSingleFileNoOutdir/node/maprootUrlSingleFileNoOutdir.sourcemap.txt +++ b/tests/baselines/reference/project/maprootUrlSingleFileNoOutdir/node/maprootUrlSingleFileNoOutdir.sourcemap.txt @@ -61,7 +61,7 @@ sourceFile:file:///tests/cases/projects/outputdir_singleFile/test.ts 1->Emitted(5, 5) Source(4, 1) + SourceIndex(0) 2 >Emitted(5, 14) Source(4, 2) + SourceIndex(0) --- ->>>})(); +>>>}()); 1 > 2 >^ 3 > diff --git a/tests/baselines/reference/project/maprootUrlSingleFileNoOutdir/node/test.js b/tests/baselines/reference/project/maprootUrlSingleFileNoOutdir/node/test.js index bc0f3007e6a..73eb738e590 100644 --- a/tests/baselines/reference/project/maprootUrlSingleFileNoOutdir/node/test.js +++ b/tests/baselines/reference/project/maprootUrlSingleFileNoOutdir/node/test.js @@ -3,7 +3,7 @@ var c1 = (function () { function c1() { } return c1; -})(); +}()); var instance1 = new c1(); function f1() { return instance1; diff --git a/tests/baselines/reference/project/maprootUrlSingleFileSpecifyOutputDirectory/amd/maprootUrlSingleFileSpecifyOutputDirectory.sourcemap.txt b/tests/baselines/reference/project/maprootUrlSingleFileSpecifyOutputDirectory/amd/maprootUrlSingleFileSpecifyOutputDirectory.sourcemap.txt index 92a8de1c606..62e13fc2153 100644 --- a/tests/baselines/reference/project/maprootUrlSingleFileSpecifyOutputDirectory/amd/maprootUrlSingleFileSpecifyOutputDirectory.sourcemap.txt +++ b/tests/baselines/reference/project/maprootUrlSingleFileSpecifyOutputDirectory/amd/maprootUrlSingleFileSpecifyOutputDirectory.sourcemap.txt @@ -61,7 +61,7 @@ sourceFile:file:///tests/cases/projects/outputdir_singleFile/test.ts 1->Emitted(5, 5) Source(4, 1) + SourceIndex(0) 2 >Emitted(5, 14) Source(4, 2) + SourceIndex(0) --- ->>>})(); +>>>}()); 1 > 2 >^ 3 > diff --git a/tests/baselines/reference/project/maprootUrlSingleFileSpecifyOutputDirectory/amd/outdir/simple/test.js b/tests/baselines/reference/project/maprootUrlSingleFileSpecifyOutputDirectory/amd/outdir/simple/test.js index bc0f3007e6a..73eb738e590 100644 --- a/tests/baselines/reference/project/maprootUrlSingleFileSpecifyOutputDirectory/amd/outdir/simple/test.js +++ b/tests/baselines/reference/project/maprootUrlSingleFileSpecifyOutputDirectory/amd/outdir/simple/test.js @@ -3,7 +3,7 @@ var c1 = (function () { function c1() { } return c1; -})(); +}()); var instance1 = new c1(); function f1() { return instance1; diff --git a/tests/baselines/reference/project/maprootUrlSingleFileSpecifyOutputDirectory/node/maprootUrlSingleFileSpecifyOutputDirectory.sourcemap.txt b/tests/baselines/reference/project/maprootUrlSingleFileSpecifyOutputDirectory/node/maprootUrlSingleFileSpecifyOutputDirectory.sourcemap.txt index 92a8de1c606..62e13fc2153 100644 --- a/tests/baselines/reference/project/maprootUrlSingleFileSpecifyOutputDirectory/node/maprootUrlSingleFileSpecifyOutputDirectory.sourcemap.txt +++ b/tests/baselines/reference/project/maprootUrlSingleFileSpecifyOutputDirectory/node/maprootUrlSingleFileSpecifyOutputDirectory.sourcemap.txt @@ -61,7 +61,7 @@ sourceFile:file:///tests/cases/projects/outputdir_singleFile/test.ts 1->Emitted(5, 5) Source(4, 1) + SourceIndex(0) 2 >Emitted(5, 14) Source(4, 2) + SourceIndex(0) --- ->>>})(); +>>>}()); 1 > 2 >^ 3 > diff --git a/tests/baselines/reference/project/maprootUrlSingleFileSpecifyOutputDirectory/node/outdir/simple/test.js b/tests/baselines/reference/project/maprootUrlSingleFileSpecifyOutputDirectory/node/outdir/simple/test.js index bc0f3007e6a..73eb738e590 100644 --- a/tests/baselines/reference/project/maprootUrlSingleFileSpecifyOutputDirectory/node/outdir/simple/test.js +++ b/tests/baselines/reference/project/maprootUrlSingleFileSpecifyOutputDirectory/node/outdir/simple/test.js @@ -3,7 +3,7 @@ var c1 = (function () { function c1() { } return c1; -})(); +}()); var instance1 = new c1(); function f1() { return instance1; diff --git a/tests/baselines/reference/project/maprootUrlSingleFileSpecifyOutputFile/amd/bin/test.js b/tests/baselines/reference/project/maprootUrlSingleFileSpecifyOutputFile/amd/bin/test.js index bc0f3007e6a..73eb738e590 100644 --- a/tests/baselines/reference/project/maprootUrlSingleFileSpecifyOutputFile/amd/bin/test.js +++ b/tests/baselines/reference/project/maprootUrlSingleFileSpecifyOutputFile/amd/bin/test.js @@ -3,7 +3,7 @@ var c1 = (function () { function c1() { } return c1; -})(); +}()); var instance1 = new c1(); function f1() { return instance1; diff --git a/tests/baselines/reference/project/maprootUrlSingleFileSpecifyOutputFile/amd/maprootUrlSingleFileSpecifyOutputFile.sourcemap.txt b/tests/baselines/reference/project/maprootUrlSingleFileSpecifyOutputFile/amd/maprootUrlSingleFileSpecifyOutputFile.sourcemap.txt index b894437e623..d731ec71ca2 100644 --- a/tests/baselines/reference/project/maprootUrlSingleFileSpecifyOutputFile/amd/maprootUrlSingleFileSpecifyOutputFile.sourcemap.txt +++ b/tests/baselines/reference/project/maprootUrlSingleFileSpecifyOutputFile/amd/maprootUrlSingleFileSpecifyOutputFile.sourcemap.txt @@ -61,7 +61,7 @@ sourceFile:file:///tests/cases/projects/outputdir_singleFile/test.ts 1->Emitted(5, 5) Source(4, 1) + SourceIndex(0) 2 >Emitted(5, 14) Source(4, 2) + SourceIndex(0) --- ->>>})(); +>>>}()); 1 > 2 >^ 3 > diff --git a/tests/baselines/reference/project/maprootUrlSingleFileSpecifyOutputFile/node/bin/test.js b/tests/baselines/reference/project/maprootUrlSingleFileSpecifyOutputFile/node/bin/test.js index bc0f3007e6a..73eb738e590 100644 --- a/tests/baselines/reference/project/maprootUrlSingleFileSpecifyOutputFile/node/bin/test.js +++ b/tests/baselines/reference/project/maprootUrlSingleFileSpecifyOutputFile/node/bin/test.js @@ -3,7 +3,7 @@ var c1 = (function () { function c1() { } return c1; -})(); +}()); var instance1 = new c1(); function f1() { return instance1; diff --git a/tests/baselines/reference/project/maprootUrlSingleFileSpecifyOutputFile/node/maprootUrlSingleFileSpecifyOutputFile.sourcemap.txt b/tests/baselines/reference/project/maprootUrlSingleFileSpecifyOutputFile/node/maprootUrlSingleFileSpecifyOutputFile.sourcemap.txt index b894437e623..d731ec71ca2 100644 --- a/tests/baselines/reference/project/maprootUrlSingleFileSpecifyOutputFile/node/maprootUrlSingleFileSpecifyOutputFile.sourcemap.txt +++ b/tests/baselines/reference/project/maprootUrlSingleFileSpecifyOutputFile/node/maprootUrlSingleFileSpecifyOutputFile.sourcemap.txt @@ -61,7 +61,7 @@ sourceFile:file:///tests/cases/projects/outputdir_singleFile/test.ts 1->Emitted(5, 5) Source(4, 1) + SourceIndex(0) 2 >Emitted(5, 14) Source(4, 2) + SourceIndex(0) --- ->>>})(); +>>>}()); 1 > 2 >^ 3 > diff --git a/tests/baselines/reference/project/maprootUrlSubfolderNoOutdir/amd/maprootUrlSubfolderNoOutdir.sourcemap.txt b/tests/baselines/reference/project/maprootUrlSubfolderNoOutdir/amd/maprootUrlSubfolderNoOutdir.sourcemap.txt index aa943fface2..17e2a4ed7a2 100644 --- a/tests/baselines/reference/project/maprootUrlSubfolderNoOutdir/amd/maprootUrlSubfolderNoOutdir.sourcemap.txt +++ b/tests/baselines/reference/project/maprootUrlSubfolderNoOutdir/amd/maprootUrlSubfolderNoOutdir.sourcemap.txt @@ -61,7 +61,7 @@ sourceFile:file:///tests/cases/projects/outputdir_subfolder/ref/m1.ts 1->Emitted(5, 5) Source(4, 1) + SourceIndex(0) 2 >Emitted(5, 17) Source(4, 2) + SourceIndex(0) --- ->>>})(); +>>>}()); 1 > 2 >^ 3 > @@ -213,7 +213,7 @@ sourceFile:file:///tests/cases/projects/outputdir_subfolder/test.ts 1->Emitted(6, 5) Source(5, 1) + SourceIndex(0) 2 >Emitted(6, 14) Source(5, 2) + SourceIndex(0) --- ->>>})(); +>>>}()); 1 > 2 >^ 3 > diff --git a/tests/baselines/reference/project/maprootUrlSubfolderNoOutdir/amd/ref/m1.js b/tests/baselines/reference/project/maprootUrlSubfolderNoOutdir/amd/ref/m1.js index f01a67c7277..ac9c9fc5839 100644 --- a/tests/baselines/reference/project/maprootUrlSubfolderNoOutdir/amd/ref/m1.js +++ b/tests/baselines/reference/project/maprootUrlSubfolderNoOutdir/amd/ref/m1.js @@ -3,7 +3,7 @@ var m1_c1 = (function () { function m1_c1() { } return m1_c1; -})(); +}()); var m1_instance1 = new m1_c1(); function m1_f1() { return m1_instance1; diff --git a/tests/baselines/reference/project/maprootUrlSubfolderNoOutdir/node/maprootUrlSubfolderNoOutdir.sourcemap.txt b/tests/baselines/reference/project/maprootUrlSubfolderNoOutdir/node/maprootUrlSubfolderNoOutdir.sourcemap.txt index aa943fface2..17e2a4ed7a2 100644 --- a/tests/baselines/reference/project/maprootUrlSubfolderNoOutdir/node/maprootUrlSubfolderNoOutdir.sourcemap.txt +++ b/tests/baselines/reference/project/maprootUrlSubfolderNoOutdir/node/maprootUrlSubfolderNoOutdir.sourcemap.txt @@ -61,7 +61,7 @@ sourceFile:file:///tests/cases/projects/outputdir_subfolder/ref/m1.ts 1->Emitted(5, 5) Source(4, 1) + SourceIndex(0) 2 >Emitted(5, 17) Source(4, 2) + SourceIndex(0) --- ->>>})(); +>>>}()); 1 > 2 >^ 3 > @@ -213,7 +213,7 @@ sourceFile:file:///tests/cases/projects/outputdir_subfolder/test.ts 1->Emitted(6, 5) Source(5, 1) + SourceIndex(0) 2 >Emitted(6, 14) Source(5, 2) + SourceIndex(0) --- ->>>})(); +>>>}()); 1 > 2 >^ 3 > diff --git a/tests/baselines/reference/project/maprootUrlSubfolderNoOutdir/node/ref/m1.js b/tests/baselines/reference/project/maprootUrlSubfolderNoOutdir/node/ref/m1.js index f01a67c7277..ac9c9fc5839 100644 --- a/tests/baselines/reference/project/maprootUrlSubfolderNoOutdir/node/ref/m1.js +++ b/tests/baselines/reference/project/maprootUrlSubfolderNoOutdir/node/ref/m1.js @@ -3,7 +3,7 @@ var m1_c1 = (function () { function m1_c1() { } return m1_c1; -})(); +}()); var m1_instance1 = new m1_c1(); function m1_f1() { return m1_instance1; diff --git a/tests/baselines/reference/project/maprootUrlSubfolderSpecifyOutputDirectory/amd/maprootUrlSubfolderSpecifyOutputDirectory.sourcemap.txt b/tests/baselines/reference/project/maprootUrlSubfolderSpecifyOutputDirectory/amd/maprootUrlSubfolderSpecifyOutputDirectory.sourcemap.txt index f3b69f5c9d2..c9a20be7073 100644 --- a/tests/baselines/reference/project/maprootUrlSubfolderSpecifyOutputDirectory/amd/maprootUrlSubfolderSpecifyOutputDirectory.sourcemap.txt +++ b/tests/baselines/reference/project/maprootUrlSubfolderSpecifyOutputDirectory/amd/maprootUrlSubfolderSpecifyOutputDirectory.sourcemap.txt @@ -61,7 +61,7 @@ sourceFile:file:///tests/cases/projects/outputdir_subfolder/ref/m1.ts 1->Emitted(5, 5) Source(4, 1) + SourceIndex(0) 2 >Emitted(5, 17) Source(4, 2) + SourceIndex(0) --- ->>>})(); +>>>}()); 1 > 2 >^ 3 > @@ -213,7 +213,7 @@ sourceFile:file:///tests/cases/projects/outputdir_subfolder/test.ts 1->Emitted(6, 5) Source(5, 1) + SourceIndex(0) 2 >Emitted(6, 14) Source(5, 2) + SourceIndex(0) --- ->>>})(); +>>>}()); 1 > 2 >^ 3 > diff --git a/tests/baselines/reference/project/maprootUrlSubfolderSpecifyOutputDirectory/amd/outdir/simple/ref/m1.js b/tests/baselines/reference/project/maprootUrlSubfolderSpecifyOutputDirectory/amd/outdir/simple/ref/m1.js index f01a67c7277..ac9c9fc5839 100644 --- a/tests/baselines/reference/project/maprootUrlSubfolderSpecifyOutputDirectory/amd/outdir/simple/ref/m1.js +++ b/tests/baselines/reference/project/maprootUrlSubfolderSpecifyOutputDirectory/amd/outdir/simple/ref/m1.js @@ -3,7 +3,7 @@ var m1_c1 = (function () { function m1_c1() { } return m1_c1; -})(); +}()); var m1_instance1 = new m1_c1(); function m1_f1() { return m1_instance1; diff --git a/tests/baselines/reference/project/maprootUrlSubfolderSpecifyOutputDirectory/node/maprootUrlSubfolderSpecifyOutputDirectory.sourcemap.txt b/tests/baselines/reference/project/maprootUrlSubfolderSpecifyOutputDirectory/node/maprootUrlSubfolderSpecifyOutputDirectory.sourcemap.txt index f3b69f5c9d2..c9a20be7073 100644 --- a/tests/baselines/reference/project/maprootUrlSubfolderSpecifyOutputDirectory/node/maprootUrlSubfolderSpecifyOutputDirectory.sourcemap.txt +++ b/tests/baselines/reference/project/maprootUrlSubfolderSpecifyOutputDirectory/node/maprootUrlSubfolderSpecifyOutputDirectory.sourcemap.txt @@ -61,7 +61,7 @@ sourceFile:file:///tests/cases/projects/outputdir_subfolder/ref/m1.ts 1->Emitted(5, 5) Source(4, 1) + SourceIndex(0) 2 >Emitted(5, 17) Source(4, 2) + SourceIndex(0) --- ->>>})(); +>>>}()); 1 > 2 >^ 3 > @@ -213,7 +213,7 @@ sourceFile:file:///tests/cases/projects/outputdir_subfolder/test.ts 1->Emitted(6, 5) Source(5, 1) + SourceIndex(0) 2 >Emitted(6, 14) Source(5, 2) + SourceIndex(0) --- ->>>})(); +>>>}()); 1 > 2 >^ 3 > diff --git a/tests/baselines/reference/project/maprootUrlSubfolderSpecifyOutputDirectory/node/outdir/simple/ref/m1.js b/tests/baselines/reference/project/maprootUrlSubfolderSpecifyOutputDirectory/node/outdir/simple/ref/m1.js index f01a67c7277..ac9c9fc5839 100644 --- a/tests/baselines/reference/project/maprootUrlSubfolderSpecifyOutputDirectory/node/outdir/simple/ref/m1.js +++ b/tests/baselines/reference/project/maprootUrlSubfolderSpecifyOutputDirectory/node/outdir/simple/ref/m1.js @@ -3,7 +3,7 @@ var m1_c1 = (function () { function m1_c1() { } return m1_c1; -})(); +}()); var m1_instance1 = new m1_c1(); function m1_f1() { return m1_instance1; diff --git a/tests/baselines/reference/project/maprootUrlSubfolderSpecifyOutputFile/amd/bin/test.js b/tests/baselines/reference/project/maprootUrlSubfolderSpecifyOutputFile/amd/bin/test.js index 632070dbd64..4b9e91859bf 100644 --- a/tests/baselines/reference/project/maprootUrlSubfolderSpecifyOutputFile/amd/bin/test.js +++ b/tests/baselines/reference/project/maprootUrlSubfolderSpecifyOutputFile/amd/bin/test.js @@ -3,7 +3,7 @@ var m1_c1 = (function () { function m1_c1() { } return m1_c1; -})(); +}()); var m1_instance1 = new m1_c1(); function m1_f1() { return m1_instance1; @@ -14,7 +14,7 @@ var c1 = (function () { function c1() { } return c1; -})(); +}()); var instance1 = new c1(); function f1() { return instance1; diff --git a/tests/baselines/reference/project/maprootUrlSubfolderSpecifyOutputFile/amd/maprootUrlSubfolderSpecifyOutputFile.sourcemap.txt b/tests/baselines/reference/project/maprootUrlSubfolderSpecifyOutputFile/amd/maprootUrlSubfolderSpecifyOutputFile.sourcemap.txt index 15d09ffdb89..4df5a29dcd8 100644 --- a/tests/baselines/reference/project/maprootUrlSubfolderSpecifyOutputFile/amd/maprootUrlSubfolderSpecifyOutputFile.sourcemap.txt +++ b/tests/baselines/reference/project/maprootUrlSubfolderSpecifyOutputFile/amd/maprootUrlSubfolderSpecifyOutputFile.sourcemap.txt @@ -61,7 +61,7 @@ sourceFile:file:///tests/cases/projects/outputdir_subfolder/ref/m1.ts 1->Emitted(5, 5) Source(4, 1) + SourceIndex(0) 2 >Emitted(5, 17) Source(4, 2) + SourceIndex(0) --- ->>>})(); +>>>}()); 1 > 2 >^ 3 > @@ -207,7 +207,7 @@ sourceFile:file:///tests/cases/projects/outputdir_subfolder/test.ts 1->Emitted(16, 5) Source(5, 1) + SourceIndex(1) 2 >Emitted(16, 14) Source(5, 2) + SourceIndex(1) --- ->>>})(); +>>>}()); 1 > 2 >^ 3 > diff --git a/tests/baselines/reference/project/maprootUrlSubfolderSpecifyOutputFile/node/bin/test.js b/tests/baselines/reference/project/maprootUrlSubfolderSpecifyOutputFile/node/bin/test.js index 632070dbd64..4b9e91859bf 100644 --- a/tests/baselines/reference/project/maprootUrlSubfolderSpecifyOutputFile/node/bin/test.js +++ b/tests/baselines/reference/project/maprootUrlSubfolderSpecifyOutputFile/node/bin/test.js @@ -3,7 +3,7 @@ var m1_c1 = (function () { function m1_c1() { } return m1_c1; -})(); +}()); var m1_instance1 = new m1_c1(); function m1_f1() { return m1_instance1; @@ -14,7 +14,7 @@ var c1 = (function () { function c1() { } return c1; -})(); +}()); var instance1 = new c1(); function f1() { return instance1; diff --git a/tests/baselines/reference/project/maprootUrlSubfolderSpecifyOutputFile/node/maprootUrlSubfolderSpecifyOutputFile.sourcemap.txt b/tests/baselines/reference/project/maprootUrlSubfolderSpecifyOutputFile/node/maprootUrlSubfolderSpecifyOutputFile.sourcemap.txt index 15d09ffdb89..4df5a29dcd8 100644 --- a/tests/baselines/reference/project/maprootUrlSubfolderSpecifyOutputFile/node/maprootUrlSubfolderSpecifyOutputFile.sourcemap.txt +++ b/tests/baselines/reference/project/maprootUrlSubfolderSpecifyOutputFile/node/maprootUrlSubfolderSpecifyOutputFile.sourcemap.txt @@ -61,7 +61,7 @@ sourceFile:file:///tests/cases/projects/outputdir_subfolder/ref/m1.ts 1->Emitted(5, 5) Source(4, 1) + SourceIndex(0) 2 >Emitted(5, 17) Source(4, 2) + SourceIndex(0) --- ->>>})(); +>>>}()); 1 > 2 >^ 3 > @@ -207,7 +207,7 @@ sourceFile:file:///tests/cases/projects/outputdir_subfolder/test.ts 1->Emitted(16, 5) Source(5, 1) + SourceIndex(1) 2 >Emitted(16, 14) Source(5, 2) + SourceIndex(1) --- ->>>})(); +>>>}()); 1 > 2 >^ 3 > diff --git a/tests/baselines/reference/project/maprootUrlsourcerootUrlMixedSubfolderNoOutdir/amd/maprootUrlsourcerootUrlMixedSubfolderNoOutdir.sourcemap.txt b/tests/baselines/reference/project/maprootUrlsourcerootUrlMixedSubfolderNoOutdir/amd/maprootUrlsourcerootUrlMixedSubfolderNoOutdir.sourcemap.txt index b3f1a48628d..bc8f23fea5c 100644 --- a/tests/baselines/reference/project/maprootUrlsourcerootUrlMixedSubfolderNoOutdir/amd/maprootUrlsourcerootUrlMixedSubfolderNoOutdir.sourcemap.txt +++ b/tests/baselines/reference/project/maprootUrlsourcerootUrlMixedSubfolderNoOutdir/amd/maprootUrlsourcerootUrlMixedSubfolderNoOutdir.sourcemap.txt @@ -61,7 +61,7 @@ sourceFile:ref/m1.ts 1->Emitted(5, 5) Source(4, 1) + SourceIndex(0) 2 >Emitted(5, 17) Source(4, 2) + SourceIndex(0) --- ->>>})(); +>>>}()); 1 > 2 >^ 3 > @@ -203,7 +203,7 @@ sourceFile:ref/m2.ts 1->Emitted(7, 9) Source(4, 1) + SourceIndex(0) 2 >Emitted(7, 21) Source(4, 2) + SourceIndex(0) --- ->>> })(); +>>> }()); 1 >^^^^ 2 > ^ 3 > @@ -396,7 +396,7 @@ sourceFile:test.ts 1->Emitted(7, 5) Source(6, 1) + SourceIndex(0) 2 >Emitted(7, 14) Source(6, 2) + SourceIndex(0) --- ->>>})(); +>>>}()); 1 > 2 >^ 3 > diff --git a/tests/baselines/reference/project/maprootUrlsourcerootUrlMixedSubfolderNoOutdir/amd/ref/m1.js b/tests/baselines/reference/project/maprootUrlsourcerootUrlMixedSubfolderNoOutdir/amd/ref/m1.js index f01a67c7277..ac9c9fc5839 100644 --- a/tests/baselines/reference/project/maprootUrlsourcerootUrlMixedSubfolderNoOutdir/amd/ref/m1.js +++ b/tests/baselines/reference/project/maprootUrlsourcerootUrlMixedSubfolderNoOutdir/amd/ref/m1.js @@ -3,7 +3,7 @@ var m1_c1 = (function () { function m1_c1() { } return m1_c1; -})(); +}()); var m1_instance1 = new m1_c1(); function m1_f1() { return m1_instance1; diff --git a/tests/baselines/reference/project/maprootUrlsourcerootUrlMixedSubfolderNoOutdir/node/maprootUrlsourcerootUrlMixedSubfolderNoOutdir.sourcemap.txt b/tests/baselines/reference/project/maprootUrlsourcerootUrlMixedSubfolderNoOutdir/node/maprootUrlsourcerootUrlMixedSubfolderNoOutdir.sourcemap.txt index 682c0afa6f0..e5fd32b0435 100644 --- a/tests/baselines/reference/project/maprootUrlsourcerootUrlMixedSubfolderNoOutdir/node/maprootUrlsourcerootUrlMixedSubfolderNoOutdir.sourcemap.txt +++ b/tests/baselines/reference/project/maprootUrlsourcerootUrlMixedSubfolderNoOutdir/node/maprootUrlsourcerootUrlMixedSubfolderNoOutdir.sourcemap.txt @@ -61,7 +61,7 @@ sourceFile:ref/m1.ts 1->Emitted(5, 5) Source(4, 1) + SourceIndex(0) 2 >Emitted(5, 17) Source(4, 2) + SourceIndex(0) --- ->>>})(); +>>>}()); 1 > 2 >^ 3 > @@ -202,7 +202,7 @@ sourceFile:ref/m2.ts 1->Emitted(6, 5) Source(4, 1) + SourceIndex(0) 2 >Emitted(6, 17) Source(4, 2) + SourceIndex(0) --- ->>>})(); +>>>}()); 1 > 2 >^ 3 > @@ -395,7 +395,7 @@ sourceFile:test.ts 1->Emitted(7, 5) Source(6, 1) + SourceIndex(0) 2 >Emitted(7, 14) Source(6, 2) + SourceIndex(0) --- ->>>})(); +>>>}()); 1 > 2 >^ 3 > diff --git a/tests/baselines/reference/project/maprootUrlsourcerootUrlMixedSubfolderNoOutdir/node/ref/m1.js b/tests/baselines/reference/project/maprootUrlsourcerootUrlMixedSubfolderNoOutdir/node/ref/m1.js index f01a67c7277..ac9c9fc5839 100644 --- a/tests/baselines/reference/project/maprootUrlsourcerootUrlMixedSubfolderNoOutdir/node/ref/m1.js +++ b/tests/baselines/reference/project/maprootUrlsourcerootUrlMixedSubfolderNoOutdir/node/ref/m1.js @@ -3,7 +3,7 @@ var m1_c1 = (function () { function m1_c1() { } return m1_c1; -})(); +}()); var m1_instance1 = new m1_c1(); function m1_f1() { return m1_instance1; diff --git a/tests/baselines/reference/project/maprootUrlsourcerootUrlMixedSubfolderSpecifyOutputDirectory/amd/maprootUrlsourcerootUrlMixedSubfolderSpecifyOutputDirectory.sourcemap.txt b/tests/baselines/reference/project/maprootUrlsourcerootUrlMixedSubfolderSpecifyOutputDirectory/amd/maprootUrlsourcerootUrlMixedSubfolderSpecifyOutputDirectory.sourcemap.txt index 3a8848af7cd..bf37aa3d93e 100644 --- a/tests/baselines/reference/project/maprootUrlsourcerootUrlMixedSubfolderSpecifyOutputDirectory/amd/maprootUrlsourcerootUrlMixedSubfolderSpecifyOutputDirectory.sourcemap.txt +++ b/tests/baselines/reference/project/maprootUrlsourcerootUrlMixedSubfolderSpecifyOutputDirectory/amd/maprootUrlsourcerootUrlMixedSubfolderSpecifyOutputDirectory.sourcemap.txt @@ -61,7 +61,7 @@ sourceFile:ref/m1.ts 1->Emitted(5, 5) Source(4, 1) + SourceIndex(0) 2 >Emitted(5, 17) Source(4, 2) + SourceIndex(0) --- ->>>})(); +>>>}()); 1 > 2 >^ 3 > @@ -203,7 +203,7 @@ sourceFile:ref/m2.ts 1->Emitted(7, 9) Source(4, 1) + SourceIndex(0) 2 >Emitted(7, 21) Source(4, 2) + SourceIndex(0) --- ->>> })(); +>>> }()); 1 >^^^^ 2 > ^ 3 > @@ -396,7 +396,7 @@ sourceFile:test.ts 1->Emitted(7, 5) Source(6, 1) + SourceIndex(0) 2 >Emitted(7, 14) Source(6, 2) + SourceIndex(0) --- ->>>})(); +>>>}()); 1 > 2 >^ 3 > diff --git a/tests/baselines/reference/project/maprootUrlsourcerootUrlMixedSubfolderSpecifyOutputDirectory/amd/outdir/simple/ref/m1.js b/tests/baselines/reference/project/maprootUrlsourcerootUrlMixedSubfolderSpecifyOutputDirectory/amd/outdir/simple/ref/m1.js index f01a67c7277..ac9c9fc5839 100644 --- a/tests/baselines/reference/project/maprootUrlsourcerootUrlMixedSubfolderSpecifyOutputDirectory/amd/outdir/simple/ref/m1.js +++ b/tests/baselines/reference/project/maprootUrlsourcerootUrlMixedSubfolderSpecifyOutputDirectory/amd/outdir/simple/ref/m1.js @@ -3,7 +3,7 @@ var m1_c1 = (function () { function m1_c1() { } return m1_c1; -})(); +}()); var m1_instance1 = new m1_c1(); function m1_f1() { return m1_instance1; diff --git a/tests/baselines/reference/project/maprootUrlsourcerootUrlMixedSubfolderSpecifyOutputDirectory/node/maprootUrlsourcerootUrlMixedSubfolderSpecifyOutputDirectory.sourcemap.txt b/tests/baselines/reference/project/maprootUrlsourcerootUrlMixedSubfolderSpecifyOutputDirectory/node/maprootUrlsourcerootUrlMixedSubfolderSpecifyOutputDirectory.sourcemap.txt index 9e9c45bb2a2..9cfe0389ad8 100644 --- a/tests/baselines/reference/project/maprootUrlsourcerootUrlMixedSubfolderSpecifyOutputDirectory/node/maprootUrlsourcerootUrlMixedSubfolderSpecifyOutputDirectory.sourcemap.txt +++ b/tests/baselines/reference/project/maprootUrlsourcerootUrlMixedSubfolderSpecifyOutputDirectory/node/maprootUrlsourcerootUrlMixedSubfolderSpecifyOutputDirectory.sourcemap.txt @@ -61,7 +61,7 @@ sourceFile:ref/m1.ts 1->Emitted(5, 5) Source(4, 1) + SourceIndex(0) 2 >Emitted(5, 17) Source(4, 2) + SourceIndex(0) --- ->>>})(); +>>>}()); 1 > 2 >^ 3 > @@ -202,7 +202,7 @@ sourceFile:ref/m2.ts 1->Emitted(6, 5) Source(4, 1) + SourceIndex(0) 2 >Emitted(6, 17) Source(4, 2) + SourceIndex(0) --- ->>>})(); +>>>}()); 1 > 2 >^ 3 > @@ -395,7 +395,7 @@ sourceFile:test.ts 1->Emitted(7, 5) Source(6, 1) + SourceIndex(0) 2 >Emitted(7, 14) Source(6, 2) + SourceIndex(0) --- ->>>})(); +>>>}()); 1 > 2 >^ 3 > diff --git a/tests/baselines/reference/project/maprootUrlsourcerootUrlMixedSubfolderSpecifyOutputDirectory/node/outdir/simple/ref/m1.js b/tests/baselines/reference/project/maprootUrlsourcerootUrlMixedSubfolderSpecifyOutputDirectory/node/outdir/simple/ref/m1.js index f01a67c7277..ac9c9fc5839 100644 --- a/tests/baselines/reference/project/maprootUrlsourcerootUrlMixedSubfolderSpecifyOutputDirectory/node/outdir/simple/ref/m1.js +++ b/tests/baselines/reference/project/maprootUrlsourcerootUrlMixedSubfolderSpecifyOutputDirectory/node/outdir/simple/ref/m1.js @@ -3,7 +3,7 @@ var m1_c1 = (function () { function m1_c1() { } return m1_c1; -})(); +}()); var m1_instance1 = new m1_c1(); function m1_f1() { return m1_instance1; diff --git a/tests/baselines/reference/project/maprootUrlsourcerootUrlMixedSubfolderSpecifyOutputFile/amd/bin/test.js b/tests/baselines/reference/project/maprootUrlsourcerootUrlMixedSubfolderSpecifyOutputFile/amd/bin/test.js index 03d1c2fc750..b1f7d5f7329 100644 --- a/tests/baselines/reference/project/maprootUrlsourcerootUrlMixedSubfolderSpecifyOutputFile/amd/bin/test.js +++ b/tests/baselines/reference/project/maprootUrlsourcerootUrlMixedSubfolderSpecifyOutputFile/amd/bin/test.js @@ -3,7 +3,7 @@ var m1_c1 = (function () { function m1_c1() { } return m1_c1; -})(); +}()); var m1_instance1 = new m1_c1(); function m1_f1() { return m1_instance1; @@ -15,7 +15,7 @@ define("ref/m2", ["require", "exports"], function (require, exports) { function m2_c1() { } return m2_c1; - })(); + }()); exports.m2_c1 = m2_c1; exports.m2_instance1 = new m2_c1(); function m2_f1() { @@ -30,7 +30,7 @@ var c1 = (function () { function c1() { } return c1; -})(); +}()); var instance1 = new c1(); function f1() { return instance1; diff --git a/tests/baselines/reference/project/maprootUrlsourcerootUrlMixedSubfolderSpecifyOutputFile/amd/maprootUrlsourcerootUrlMixedSubfolderSpecifyOutputFile.sourcemap.txt b/tests/baselines/reference/project/maprootUrlsourcerootUrlMixedSubfolderSpecifyOutputFile/amd/maprootUrlsourcerootUrlMixedSubfolderSpecifyOutputFile.sourcemap.txt index d3c8d277b99..3f458619441 100644 --- a/tests/baselines/reference/project/maprootUrlsourcerootUrlMixedSubfolderSpecifyOutputFile/amd/maprootUrlsourcerootUrlMixedSubfolderSpecifyOutputFile.sourcemap.txt +++ b/tests/baselines/reference/project/maprootUrlsourcerootUrlMixedSubfolderSpecifyOutputFile/amd/maprootUrlsourcerootUrlMixedSubfolderSpecifyOutputFile.sourcemap.txt @@ -61,7 +61,7 @@ sourceFile:ref/m1.ts 1->Emitted(5, 5) Source(4, 1) + SourceIndex(0) 2 >Emitted(5, 17) Source(4, 2) + SourceIndex(0) --- ->>>})(); +>>>}()); 1 > 2 >^ 3 > @@ -197,7 +197,7 @@ sourceFile:ref/m2.ts 1->Emitted(17, 9) Source(4, 1) + SourceIndex(1) 2 >Emitted(17, 21) Source(4, 2) + SourceIndex(1) --- ->>> })(); +>>> }()); 1 >^^^^ 2 > ^ 3 > @@ -384,7 +384,7 @@ sourceFile:test.ts 1->Emitted(32, 5) Source(6, 1) + SourceIndex(2) 2 >Emitted(32, 14) Source(6, 2) + SourceIndex(2) --- ->>>})(); +>>>}()); 1 > 2 >^ 3 > diff --git a/tests/baselines/reference/project/maprootUrlsourcerootUrlMixedSubfolderSpecifyOutputFile/node/bin/test.js b/tests/baselines/reference/project/maprootUrlsourcerootUrlMixedSubfolderSpecifyOutputFile/node/bin/test.js index af0071d7e46..ec3309b3b18 100644 --- a/tests/baselines/reference/project/maprootUrlsourcerootUrlMixedSubfolderSpecifyOutputFile/node/bin/test.js +++ b/tests/baselines/reference/project/maprootUrlsourcerootUrlMixedSubfolderSpecifyOutputFile/node/bin/test.js @@ -3,7 +3,7 @@ var m1_c1 = (function () { function m1_c1() { } return m1_c1; -})(); +}()); var m1_instance1 = new m1_c1(); function m1_f1() { return m1_instance1; @@ -15,7 +15,7 @@ var c1 = (function () { function c1() { } return c1; -})(); +}()); var instance1 = new c1(); function f1() { return instance1; diff --git a/tests/baselines/reference/project/maprootUrlsourcerootUrlMixedSubfolderSpecifyOutputFile/node/maprootUrlsourcerootUrlMixedSubfolderSpecifyOutputFile.sourcemap.txt b/tests/baselines/reference/project/maprootUrlsourcerootUrlMixedSubfolderSpecifyOutputFile/node/maprootUrlsourcerootUrlMixedSubfolderSpecifyOutputFile.sourcemap.txt index 726cc1f8f73..800d3c15dbe 100644 --- a/tests/baselines/reference/project/maprootUrlsourcerootUrlMixedSubfolderSpecifyOutputFile/node/maprootUrlsourcerootUrlMixedSubfolderSpecifyOutputFile.sourcemap.txt +++ b/tests/baselines/reference/project/maprootUrlsourcerootUrlMixedSubfolderSpecifyOutputFile/node/maprootUrlsourcerootUrlMixedSubfolderSpecifyOutputFile.sourcemap.txt @@ -61,7 +61,7 @@ sourceFile:ref/m1.ts 1->Emitted(5, 5) Source(4, 1) + SourceIndex(0) 2 >Emitted(5, 17) Source(4, 2) + SourceIndex(0) --- ->>>})(); +>>>}()); 1 > 2 >^ 3 > @@ -217,7 +217,7 @@ sourceFile:test.ts 1->Emitted(17, 5) Source(6, 1) + SourceIndex(2) 2 >Emitted(17, 14) Source(6, 2) + SourceIndex(2) --- ->>>})(); +>>>}()); 1 > 2 >^ 3 > diff --git a/tests/baselines/reference/project/maprootUrlsourcerootUrlMixedSubfolderSpecifyOutputFileAndOutputDirectory/amd/bin/outAndOutDirFile.js b/tests/baselines/reference/project/maprootUrlsourcerootUrlMixedSubfolderSpecifyOutputFileAndOutputDirectory/amd/bin/outAndOutDirFile.js index 04fd25336f1..2cf202bd871 100644 --- a/tests/baselines/reference/project/maprootUrlsourcerootUrlMixedSubfolderSpecifyOutputFileAndOutputDirectory/amd/bin/outAndOutDirFile.js +++ b/tests/baselines/reference/project/maprootUrlsourcerootUrlMixedSubfolderSpecifyOutputFileAndOutputDirectory/amd/bin/outAndOutDirFile.js @@ -3,7 +3,7 @@ var m1_c1 = (function () { function m1_c1() { } return m1_c1; -})(); +}()); var m1_instance1 = new m1_c1(); function m1_f1() { return m1_instance1; @@ -15,7 +15,7 @@ define("ref/m2", ["require", "exports"], function (require, exports) { function m2_c1() { } return m2_c1; - })(); + }()); exports.m2_c1 = m2_c1; exports.m2_instance1 = new m2_c1(); function m2_f1() { @@ -30,7 +30,7 @@ var c1 = (function () { function c1() { } return c1; -})(); +}()); var instance1 = new c1(); function f1() { return instance1; diff --git a/tests/baselines/reference/project/maprootUrlsourcerootUrlMixedSubfolderSpecifyOutputFileAndOutputDirectory/amd/maprootUrlsourcerootUrlMixedSubfolderSpecifyOutputFileAndOutputDirectory.sourcemap.txt b/tests/baselines/reference/project/maprootUrlsourcerootUrlMixedSubfolderSpecifyOutputFileAndOutputDirectory/amd/maprootUrlsourcerootUrlMixedSubfolderSpecifyOutputFileAndOutputDirectory.sourcemap.txt index 689a2a79281..580e372ac3b 100644 --- a/tests/baselines/reference/project/maprootUrlsourcerootUrlMixedSubfolderSpecifyOutputFileAndOutputDirectory/amd/maprootUrlsourcerootUrlMixedSubfolderSpecifyOutputFileAndOutputDirectory.sourcemap.txt +++ b/tests/baselines/reference/project/maprootUrlsourcerootUrlMixedSubfolderSpecifyOutputFileAndOutputDirectory/amd/maprootUrlsourcerootUrlMixedSubfolderSpecifyOutputFileAndOutputDirectory.sourcemap.txt @@ -61,7 +61,7 @@ sourceFile:ref/m1.ts 1->Emitted(5, 5) Source(4, 1) + SourceIndex(0) 2 >Emitted(5, 17) Source(4, 2) + SourceIndex(0) --- ->>>})(); +>>>}()); 1 > 2 >^ 3 > @@ -197,7 +197,7 @@ sourceFile:ref/m2.ts 1->Emitted(17, 9) Source(4, 1) + SourceIndex(1) 2 >Emitted(17, 21) Source(4, 2) + SourceIndex(1) --- ->>> })(); +>>> }()); 1 >^^^^ 2 > ^ 3 > @@ -384,7 +384,7 @@ sourceFile:test.ts 1->Emitted(32, 5) Source(6, 1) + SourceIndex(2) 2 >Emitted(32, 14) Source(6, 2) + SourceIndex(2) --- ->>>})(); +>>>}()); 1 > 2 >^ 3 > diff --git a/tests/baselines/reference/project/maprootUrlsourcerootUrlMixedSubfolderSpecifyOutputFileAndOutputDirectory/node/bin/outAndOutDirFile.js b/tests/baselines/reference/project/maprootUrlsourcerootUrlMixedSubfolderSpecifyOutputFileAndOutputDirectory/node/bin/outAndOutDirFile.js index 2ebe138ffda..3e51021ce9b 100644 --- a/tests/baselines/reference/project/maprootUrlsourcerootUrlMixedSubfolderSpecifyOutputFileAndOutputDirectory/node/bin/outAndOutDirFile.js +++ b/tests/baselines/reference/project/maprootUrlsourcerootUrlMixedSubfolderSpecifyOutputFileAndOutputDirectory/node/bin/outAndOutDirFile.js @@ -3,7 +3,7 @@ var m1_c1 = (function () { function m1_c1() { } return m1_c1; -})(); +}()); var m1_instance1 = new m1_c1(); function m1_f1() { return m1_instance1; @@ -15,7 +15,7 @@ var c1 = (function () { function c1() { } return c1; -})(); +}()); var instance1 = new c1(); function f1() { return instance1; diff --git a/tests/baselines/reference/project/maprootUrlsourcerootUrlMixedSubfolderSpecifyOutputFileAndOutputDirectory/node/maprootUrlsourcerootUrlMixedSubfolderSpecifyOutputFileAndOutputDirectory.sourcemap.txt b/tests/baselines/reference/project/maprootUrlsourcerootUrlMixedSubfolderSpecifyOutputFileAndOutputDirectory/node/maprootUrlsourcerootUrlMixedSubfolderSpecifyOutputFileAndOutputDirectory.sourcemap.txt index 5d181532322..68c732520a1 100644 --- a/tests/baselines/reference/project/maprootUrlsourcerootUrlMixedSubfolderSpecifyOutputFileAndOutputDirectory/node/maprootUrlsourcerootUrlMixedSubfolderSpecifyOutputFileAndOutputDirectory.sourcemap.txt +++ b/tests/baselines/reference/project/maprootUrlsourcerootUrlMixedSubfolderSpecifyOutputFileAndOutputDirectory/node/maprootUrlsourcerootUrlMixedSubfolderSpecifyOutputFileAndOutputDirectory.sourcemap.txt @@ -61,7 +61,7 @@ sourceFile:ref/m1.ts 1->Emitted(5, 5) Source(4, 1) + SourceIndex(0) 2 >Emitted(5, 17) Source(4, 2) + SourceIndex(0) --- ->>>})(); +>>>}()); 1 > 2 >^ 3 > @@ -217,7 +217,7 @@ sourceFile:test.ts 1->Emitted(17, 5) Source(6, 1) + SourceIndex(2) 2 >Emitted(17, 14) Source(6, 2) + SourceIndex(2) --- ->>>})(); +>>>}()); 1 > 2 >^ 3 > diff --git a/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleMultifolderNoOutdir/amd/maprootUrlsourcerootUrlModuleMultifolderNoOutdir.sourcemap.txt b/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleMultifolderNoOutdir/amd/maprootUrlsourcerootUrlModuleMultifolderNoOutdir.sourcemap.txt index 492b858eaf4..c170dad96cc 100644 --- a/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleMultifolderNoOutdir/amd/maprootUrlsourcerootUrlModuleMultifolderNoOutdir.sourcemap.txt +++ b/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleMultifolderNoOutdir/amd/maprootUrlsourcerootUrlModuleMultifolderNoOutdir.sourcemap.txt @@ -60,7 +60,7 @@ sourceFile:outputdir_module_multifolder/ref/m1.ts 1->Emitted(7, 9) Source(4, 1) + SourceIndex(0) 2 >Emitted(7, 21) Source(4, 2) + SourceIndex(0) --- ->>> })(); +>>> }()); 1 >^^^^ 2 > ^ 3 > @@ -233,7 +233,7 @@ sourceFile:outputdir_module_multifolder_ref/m2.ts 1->Emitted(7, 9) Source(4, 1) + SourceIndex(0) 2 >Emitted(7, 21) Source(4, 2) + SourceIndex(0) --- ->>> })(); +>>> }()); 1 >^^^^ 2 > ^ 3 > @@ -408,7 +408,7 @@ sourceFile:outputdir_module_multifolder/test.ts 1->Emitted(7, 9) Source(6, 1) + SourceIndex(0) 2 >Emitted(7, 18) Source(6, 2) + SourceIndex(0) --- ->>> })(); +>>> }()); 1 >^^^^ 2 > ^ 3 > diff --git a/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleMultifolderNoOutdir/amd/ref/m1.js b/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleMultifolderNoOutdir/amd/ref/m1.js index 0014eb3163c..2141ed5cbb8 100644 --- a/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleMultifolderNoOutdir/amd/ref/m1.js +++ b/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleMultifolderNoOutdir/amd/ref/m1.js @@ -5,7 +5,7 @@ define(["require", "exports"], function (require, exports) { function m1_c1() { } return m1_c1; - })(); + }()); exports.m1_c1 = m1_c1; exports.m1_instance1 = new m1_c1(); function m1_f1() { diff --git a/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleMultifolderNoOutdir/node/maprootUrlsourcerootUrlModuleMultifolderNoOutdir.sourcemap.txt b/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleMultifolderNoOutdir/node/maprootUrlsourcerootUrlModuleMultifolderNoOutdir.sourcemap.txt index ad8ab94e30d..21398ede2af 100644 --- a/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleMultifolderNoOutdir/node/maprootUrlsourcerootUrlModuleMultifolderNoOutdir.sourcemap.txt +++ b/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleMultifolderNoOutdir/node/maprootUrlsourcerootUrlModuleMultifolderNoOutdir.sourcemap.txt @@ -59,7 +59,7 @@ sourceFile:outputdir_module_multifolder/ref/m1.ts 1->Emitted(6, 5) Source(4, 1) + SourceIndex(0) 2 >Emitted(6, 17) Source(4, 2) + SourceIndex(0) --- ->>>})(); +>>>}()); 1 > 2 >^ 3 > @@ -231,7 +231,7 @@ sourceFile:outputdir_module_multifolder_ref/m2.ts 1->Emitted(6, 5) Source(4, 1) + SourceIndex(0) 2 >Emitted(6, 17) Source(4, 2) + SourceIndex(0) --- ->>>})(); +>>>}()); 1 > 2 >^ 3 > @@ -452,7 +452,7 @@ sourceFile:outputdir_module_multifolder/test.ts 1->Emitted(8, 5) Source(6, 1) + SourceIndex(0) 2 >Emitted(8, 14) Source(6, 2) + SourceIndex(0) --- ->>>})(); +>>>}()); 1 > 2 >^ 3 > diff --git a/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleMultifolderNoOutdir/node/ref/m1.js b/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleMultifolderNoOutdir/node/ref/m1.js index e50be801bbf..651782fa421 100644 --- a/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleMultifolderNoOutdir/node/ref/m1.js +++ b/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleMultifolderNoOutdir/node/ref/m1.js @@ -4,7 +4,7 @@ var m1_c1 = (function () { function m1_c1() { } return m1_c1; -})(); +}()); exports.m1_c1 = m1_c1; exports.m1_instance1 = new m1_c1(); function m1_f1() { diff --git a/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleMultifolderSpecifyOutputDirectory/amd/maprootUrlsourcerootUrlModuleMultifolderSpecifyOutputDirectory.sourcemap.txt b/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleMultifolderSpecifyOutputDirectory/amd/maprootUrlsourcerootUrlModuleMultifolderSpecifyOutputDirectory.sourcemap.txt index 83f02e725b4..7b857161a31 100644 --- a/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleMultifolderSpecifyOutputDirectory/amd/maprootUrlsourcerootUrlModuleMultifolderSpecifyOutputDirectory.sourcemap.txt +++ b/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleMultifolderSpecifyOutputDirectory/amd/maprootUrlsourcerootUrlModuleMultifolderSpecifyOutputDirectory.sourcemap.txt @@ -60,7 +60,7 @@ sourceFile:outputdir_module_multifolder/ref/m1.ts 1->Emitted(7, 9) Source(4, 1) + SourceIndex(0) 2 >Emitted(7, 21) Source(4, 2) + SourceIndex(0) --- ->>> })(); +>>> }()); 1 >^^^^ 2 > ^ 3 > @@ -233,7 +233,7 @@ sourceFile:outputdir_module_multifolder_ref/m2.ts 1->Emitted(7, 9) Source(4, 1) + SourceIndex(0) 2 >Emitted(7, 21) Source(4, 2) + SourceIndex(0) --- ->>> })(); +>>> }()); 1 >^^^^ 2 > ^ 3 > @@ -408,7 +408,7 @@ sourceFile:outputdir_module_multifolder/test.ts 1->Emitted(7, 9) Source(6, 1) + SourceIndex(0) 2 >Emitted(7, 18) Source(6, 2) + SourceIndex(0) --- ->>> })(); +>>> }()); 1 >^^^^ 2 > ^ 3 > diff --git a/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_module_multifolder/ref/m1.js b/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_module_multifolder/ref/m1.js index 0014eb3163c..2141ed5cbb8 100644 --- a/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_module_multifolder/ref/m1.js +++ b/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_module_multifolder/ref/m1.js @@ -5,7 +5,7 @@ define(["require", "exports"], function (require, exports) { function m1_c1() { } return m1_c1; - })(); + }()); exports.m1_c1 = m1_c1; exports.m1_instance1 = new m1_c1(); function m1_f1() { diff --git a/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleMultifolderSpecifyOutputDirectory/node/maprootUrlsourcerootUrlModuleMultifolderSpecifyOutputDirectory.sourcemap.txt b/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleMultifolderSpecifyOutputDirectory/node/maprootUrlsourcerootUrlModuleMultifolderSpecifyOutputDirectory.sourcemap.txt index db5a07b077d..4b01b1f5ad6 100644 --- a/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleMultifolderSpecifyOutputDirectory/node/maprootUrlsourcerootUrlModuleMultifolderSpecifyOutputDirectory.sourcemap.txt +++ b/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleMultifolderSpecifyOutputDirectory/node/maprootUrlsourcerootUrlModuleMultifolderSpecifyOutputDirectory.sourcemap.txt @@ -59,7 +59,7 @@ sourceFile:outputdir_module_multifolder/ref/m1.ts 1->Emitted(6, 5) Source(4, 1) + SourceIndex(0) 2 >Emitted(6, 17) Source(4, 2) + SourceIndex(0) --- ->>>})(); +>>>}()); 1 > 2 >^ 3 > @@ -231,7 +231,7 @@ sourceFile:outputdir_module_multifolder_ref/m2.ts 1->Emitted(6, 5) Source(4, 1) + SourceIndex(0) 2 >Emitted(6, 17) Source(4, 2) + SourceIndex(0) --- ->>>})(); +>>>}()); 1 > 2 >^ 3 > @@ -452,7 +452,7 @@ sourceFile:outputdir_module_multifolder/test.ts 1->Emitted(8, 5) Source(6, 1) + SourceIndex(0) 2 >Emitted(8, 14) Source(6, 2) + SourceIndex(0) --- ->>>})(); +>>>}()); 1 > 2 >^ 3 > diff --git a/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_module_multifolder/ref/m1.js b/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_module_multifolder/ref/m1.js index e50be801bbf..651782fa421 100644 --- a/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_module_multifolder/ref/m1.js +++ b/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_module_multifolder/ref/m1.js @@ -4,7 +4,7 @@ var m1_c1 = (function () { function m1_c1() { } return m1_c1; -})(); +}()); exports.m1_c1 = m1_c1; exports.m1_instance1 = new m1_c1(); function m1_f1() { diff --git a/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleMultifolderSpecifyOutputFile/amd/bin/test.js b/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleMultifolderSpecifyOutputFile/amd/bin/test.js index a31b4d772ec..99da107dfa8 100644 --- a/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleMultifolderSpecifyOutputFile/amd/bin/test.js +++ b/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleMultifolderSpecifyOutputFile/amd/bin/test.js @@ -5,7 +5,7 @@ define("outputdir_module_multifolder/ref/m1", ["require", "exports"], function ( function m1_c1() { } return m1_c1; - })(); + }()); exports.m1_c1 = m1_c1; exports.m1_instance1 = new m1_c1(); function m1_f1() { @@ -20,7 +20,7 @@ define("outputdir_module_multifolder_ref/m2", ["require", "exports"], function ( function m2_c1() { } return m2_c1; - })(); + }()); exports.m2_c1 = m2_c1; exports.m2_instance1 = new m2_c1(); function m2_f1() { @@ -35,7 +35,7 @@ define("outputdir_module_multifolder/test", ["require", "exports", "outputdir_mo function c1() { } return c1; - })(); + }()); exports.c1 = c1; exports.instance1 = new c1(); function f1() { diff --git a/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleMultifolderSpecifyOutputFile/amd/maprootUrlsourcerootUrlModuleMultifolderSpecifyOutputFile.sourcemap.txt b/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleMultifolderSpecifyOutputFile/amd/maprootUrlsourcerootUrlModuleMultifolderSpecifyOutputFile.sourcemap.txt index c3f681d3691..dd28288d8e0 100644 --- a/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleMultifolderSpecifyOutputFile/amd/maprootUrlsourcerootUrlModuleMultifolderSpecifyOutputFile.sourcemap.txt +++ b/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleMultifolderSpecifyOutputFile/amd/maprootUrlsourcerootUrlModuleMultifolderSpecifyOutputFile.sourcemap.txt @@ -60,7 +60,7 @@ sourceFile:outputdir_module_multifolder/ref/m1.ts 1->Emitted(7, 9) Source(4, 1) + SourceIndex(0) 2 >Emitted(7, 21) Source(4, 2) + SourceIndex(0) --- ->>> })(); +>>> }()); 1 >^^^^ 2 > ^ 3 > @@ -227,7 +227,7 @@ sourceFile:outputdir_module_multifolder_ref/m2.ts 1->Emitted(22, 9) Source(4, 1) + SourceIndex(1) 2 >Emitted(22, 21) Source(4, 2) + SourceIndex(1) --- ->>> })(); +>>> }()); 1 >^^^^ 2 > ^ 3 > @@ -396,7 +396,7 @@ sourceFile:outputdir_module_multifolder/test.ts 1->Emitted(37, 9) Source(6, 1) + SourceIndex(2) 2 >Emitted(37, 18) Source(6, 2) + SourceIndex(2) --- ->>> })(); +>>> }()); 1 >^^^^ 2 > ^ 3 > diff --git a/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSimpleNoOutdir/amd/m1.js b/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSimpleNoOutdir/amd/m1.js index b2136c5cb5e..b85ad9ab5b1 100644 --- a/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSimpleNoOutdir/amd/m1.js +++ b/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSimpleNoOutdir/amd/m1.js @@ -5,7 +5,7 @@ define(["require", "exports"], function (require, exports) { function m1_c1() { } return m1_c1; - })(); + }()); exports.m1_c1 = m1_c1; exports.m1_instance1 = new m1_c1(); function m1_f1() { diff --git a/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSimpleNoOutdir/amd/maprootUrlsourcerootUrlModuleSimpleNoOutdir.sourcemap.txt b/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSimpleNoOutdir/amd/maprootUrlsourcerootUrlModuleSimpleNoOutdir.sourcemap.txt index a7a2092c9cd..d3608640de2 100644 --- a/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSimpleNoOutdir/amd/maprootUrlsourcerootUrlModuleSimpleNoOutdir.sourcemap.txt +++ b/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSimpleNoOutdir/amd/maprootUrlsourcerootUrlModuleSimpleNoOutdir.sourcemap.txt @@ -60,7 +60,7 @@ sourceFile:m1.ts 1->Emitted(7, 9) Source(4, 1) + SourceIndex(0) 2 >Emitted(7, 21) Source(4, 2) + SourceIndex(0) --- ->>> })(); +>>> }()); 1 >^^^^ 2 > ^ 3 > @@ -234,7 +234,7 @@ sourceFile:test.ts 1->Emitted(7, 9) Source(5, 1) + SourceIndex(0) 2 >Emitted(7, 18) Source(5, 2) + SourceIndex(0) --- ->>> })(); +>>> }()); 1 >^^^^ 2 > ^ 3 > diff --git a/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSimpleNoOutdir/node/m1.js b/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSimpleNoOutdir/node/m1.js index c8cf74001a8..9e79b0167c6 100644 --- a/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSimpleNoOutdir/node/m1.js +++ b/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSimpleNoOutdir/node/m1.js @@ -4,7 +4,7 @@ var m1_c1 = (function () { function m1_c1() { } return m1_c1; -})(); +}()); exports.m1_c1 = m1_c1; exports.m1_instance1 = new m1_c1(); function m1_f1() { diff --git a/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSimpleNoOutdir/node/maprootUrlsourcerootUrlModuleSimpleNoOutdir.sourcemap.txt b/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSimpleNoOutdir/node/maprootUrlsourcerootUrlModuleSimpleNoOutdir.sourcemap.txt index 15a6a8bd07c..8fa7e43f3d4 100644 --- a/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSimpleNoOutdir/node/maprootUrlsourcerootUrlModuleSimpleNoOutdir.sourcemap.txt +++ b/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSimpleNoOutdir/node/maprootUrlsourcerootUrlModuleSimpleNoOutdir.sourcemap.txt @@ -59,7 +59,7 @@ sourceFile:m1.ts 1->Emitted(6, 5) Source(4, 1) + SourceIndex(0) 2 >Emitted(6, 17) Source(4, 2) + SourceIndex(0) --- ->>>})(); +>>>}()); 1 > 2 >^ 3 > @@ -255,7 +255,7 @@ sourceFile:test.ts 1->Emitted(7, 5) Source(5, 1) + SourceIndex(0) 2 >Emitted(7, 14) Source(5, 2) + SourceIndex(0) --- ->>>})(); +>>>}()); 1 > 2 >^ 3 > diff --git a/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSimpleSpecifyOutputDirectory/amd/maprootUrlsourcerootUrlModuleSimpleSpecifyOutputDirectory.sourcemap.txt b/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSimpleSpecifyOutputDirectory/amd/maprootUrlsourcerootUrlModuleSimpleSpecifyOutputDirectory.sourcemap.txt index 4c6f3cd3d13..dca2248f649 100644 --- a/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSimpleSpecifyOutputDirectory/amd/maprootUrlsourcerootUrlModuleSimpleSpecifyOutputDirectory.sourcemap.txt +++ b/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSimpleSpecifyOutputDirectory/amd/maprootUrlsourcerootUrlModuleSimpleSpecifyOutputDirectory.sourcemap.txt @@ -60,7 +60,7 @@ sourceFile:m1.ts 1->Emitted(7, 9) Source(4, 1) + SourceIndex(0) 2 >Emitted(7, 21) Source(4, 2) + SourceIndex(0) --- ->>> })(); +>>> }()); 1 >^^^^ 2 > ^ 3 > @@ -234,7 +234,7 @@ sourceFile:test.ts 1->Emitted(7, 9) Source(5, 1) + SourceIndex(0) 2 >Emitted(7, 18) Source(5, 2) + SourceIndex(0) --- ->>> })(); +>>> }()); 1 >^^^^ 2 > ^ 3 > diff --git a/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSimpleSpecifyOutputDirectory/amd/outdir/simple/m1.js b/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSimpleSpecifyOutputDirectory/amd/outdir/simple/m1.js index b2136c5cb5e..b85ad9ab5b1 100644 --- a/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSimpleSpecifyOutputDirectory/amd/outdir/simple/m1.js +++ b/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSimpleSpecifyOutputDirectory/amd/outdir/simple/m1.js @@ -5,7 +5,7 @@ define(["require", "exports"], function (require, exports) { function m1_c1() { } return m1_c1; - })(); + }()); exports.m1_c1 = m1_c1; exports.m1_instance1 = new m1_c1(); function m1_f1() { diff --git a/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSimpleSpecifyOutputDirectory/node/maprootUrlsourcerootUrlModuleSimpleSpecifyOutputDirectory.sourcemap.txt b/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSimpleSpecifyOutputDirectory/node/maprootUrlsourcerootUrlModuleSimpleSpecifyOutputDirectory.sourcemap.txt index b593c1d166b..02c7fe0328c 100644 --- a/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSimpleSpecifyOutputDirectory/node/maprootUrlsourcerootUrlModuleSimpleSpecifyOutputDirectory.sourcemap.txt +++ b/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSimpleSpecifyOutputDirectory/node/maprootUrlsourcerootUrlModuleSimpleSpecifyOutputDirectory.sourcemap.txt @@ -59,7 +59,7 @@ sourceFile:m1.ts 1->Emitted(6, 5) Source(4, 1) + SourceIndex(0) 2 >Emitted(6, 17) Source(4, 2) + SourceIndex(0) --- ->>>})(); +>>>}()); 1 > 2 >^ 3 > @@ -255,7 +255,7 @@ sourceFile:test.ts 1->Emitted(7, 5) Source(5, 1) + SourceIndex(0) 2 >Emitted(7, 14) Source(5, 2) + SourceIndex(0) --- ->>>})(); +>>>}()); 1 > 2 >^ 3 > diff --git a/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSimpleSpecifyOutputDirectory/node/outdir/simple/m1.js b/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSimpleSpecifyOutputDirectory/node/outdir/simple/m1.js index c8cf74001a8..9e79b0167c6 100644 --- a/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSimpleSpecifyOutputDirectory/node/outdir/simple/m1.js +++ b/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSimpleSpecifyOutputDirectory/node/outdir/simple/m1.js @@ -4,7 +4,7 @@ var m1_c1 = (function () { function m1_c1() { } return m1_c1; -})(); +}()); exports.m1_c1 = m1_c1; exports.m1_instance1 = new m1_c1(); function m1_f1() { diff --git a/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSimpleSpecifyOutputFile/amd/bin/test.js b/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSimpleSpecifyOutputFile/amd/bin/test.js index b04aa2d4d46..4b21632bd6c 100644 --- a/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSimpleSpecifyOutputFile/amd/bin/test.js +++ b/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSimpleSpecifyOutputFile/amd/bin/test.js @@ -5,7 +5,7 @@ define("m1", ["require", "exports"], function (require, exports) { function m1_c1() { } return m1_c1; - })(); + }()); exports.m1_c1 = m1_c1; exports.m1_instance1 = new m1_c1(); function m1_f1() { @@ -20,7 +20,7 @@ define("test", ["require", "exports", "m1"], function (require, exports, m1) { function c1() { } return c1; - })(); + }()); exports.c1 = c1; exports.instance1 = new c1(); function f1() { diff --git a/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSimpleSpecifyOutputFile/amd/maprootUrlsourcerootUrlModuleSimpleSpecifyOutputFile.sourcemap.txt b/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSimpleSpecifyOutputFile/amd/maprootUrlsourcerootUrlModuleSimpleSpecifyOutputFile.sourcemap.txt index 61463651296..fec4c012c2b 100644 --- a/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSimpleSpecifyOutputFile/amd/maprootUrlsourcerootUrlModuleSimpleSpecifyOutputFile.sourcemap.txt +++ b/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSimpleSpecifyOutputFile/amd/maprootUrlsourcerootUrlModuleSimpleSpecifyOutputFile.sourcemap.txt @@ -60,7 +60,7 @@ sourceFile:m1.ts 1->Emitted(7, 9) Source(4, 1) + SourceIndex(0) 2 >Emitted(7, 21) Source(4, 2) + SourceIndex(0) --- ->>> })(); +>>> }()); 1 >^^^^ 2 > ^ 3 > @@ -228,7 +228,7 @@ sourceFile:test.ts 1->Emitted(22, 9) Source(5, 1) + SourceIndex(1) 2 >Emitted(22, 18) Source(5, 2) + SourceIndex(1) --- ->>> })(); +>>> }()); 1 >^^^^ 2 > ^ 3 > diff --git a/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSubfolderNoOutdir/amd/maprootUrlsourcerootUrlModuleSubfolderNoOutdir.sourcemap.txt b/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSubfolderNoOutdir/amd/maprootUrlsourcerootUrlModuleSubfolderNoOutdir.sourcemap.txt index fd93b49350e..6f0d5455099 100644 --- a/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSubfolderNoOutdir/amd/maprootUrlsourcerootUrlModuleSubfolderNoOutdir.sourcemap.txt +++ b/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSubfolderNoOutdir/amd/maprootUrlsourcerootUrlModuleSubfolderNoOutdir.sourcemap.txt @@ -60,7 +60,7 @@ sourceFile:ref/m1.ts 1->Emitted(7, 9) Source(4, 1) + SourceIndex(0) 2 >Emitted(7, 21) Source(4, 2) + SourceIndex(0) --- ->>> })(); +>>> }()); 1 >^^^^ 2 > ^ 3 > @@ -234,7 +234,7 @@ sourceFile:test.ts 1->Emitted(7, 9) Source(5, 1) + SourceIndex(0) 2 >Emitted(7, 18) Source(5, 2) + SourceIndex(0) --- ->>> })(); +>>> }()); 1 >^^^^ 2 > ^ 3 > diff --git a/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSubfolderNoOutdir/amd/ref/m1.js b/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSubfolderNoOutdir/amd/ref/m1.js index 1819603381c..c3d36f22356 100644 --- a/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSubfolderNoOutdir/amd/ref/m1.js +++ b/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSubfolderNoOutdir/amd/ref/m1.js @@ -5,7 +5,7 @@ define(["require", "exports"], function (require, exports) { function m1_c1() { } return m1_c1; - })(); + }()); exports.m1_c1 = m1_c1; exports.m1_instance1 = new m1_c1(); function m1_f1() { diff --git a/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSubfolderNoOutdir/node/maprootUrlsourcerootUrlModuleSubfolderNoOutdir.sourcemap.txt b/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSubfolderNoOutdir/node/maprootUrlsourcerootUrlModuleSubfolderNoOutdir.sourcemap.txt index abc32308f88..48628ba399b 100644 --- a/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSubfolderNoOutdir/node/maprootUrlsourcerootUrlModuleSubfolderNoOutdir.sourcemap.txt +++ b/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSubfolderNoOutdir/node/maprootUrlsourcerootUrlModuleSubfolderNoOutdir.sourcemap.txt @@ -59,7 +59,7 @@ sourceFile:ref/m1.ts 1->Emitted(6, 5) Source(4, 1) + SourceIndex(0) 2 >Emitted(6, 17) Source(4, 2) + SourceIndex(0) --- ->>>})(); +>>>}()); 1 > 2 >^ 3 > @@ -255,7 +255,7 @@ sourceFile:test.ts 1->Emitted(7, 5) Source(5, 1) + SourceIndex(0) 2 >Emitted(7, 14) Source(5, 2) + SourceIndex(0) --- ->>>})(); +>>>}()); 1 > 2 >^ 3 > diff --git a/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSubfolderNoOutdir/node/ref/m1.js b/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSubfolderNoOutdir/node/ref/m1.js index b594cf79eb2..8fe6d174601 100644 --- a/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSubfolderNoOutdir/node/ref/m1.js +++ b/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSubfolderNoOutdir/node/ref/m1.js @@ -4,7 +4,7 @@ var m1_c1 = (function () { function m1_c1() { } return m1_c1; -})(); +}()); exports.m1_c1 = m1_c1; exports.m1_instance1 = new m1_c1(); function m1_f1() { diff --git a/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSubfolderSpecifyOutputDirectory/amd/maprootUrlsourcerootUrlModuleSubfolderSpecifyOutputDirectory.sourcemap.txt b/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSubfolderSpecifyOutputDirectory/amd/maprootUrlsourcerootUrlModuleSubfolderSpecifyOutputDirectory.sourcemap.txt index 2772b70cfbe..cd2a9a86995 100644 --- a/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSubfolderSpecifyOutputDirectory/amd/maprootUrlsourcerootUrlModuleSubfolderSpecifyOutputDirectory.sourcemap.txt +++ b/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSubfolderSpecifyOutputDirectory/amd/maprootUrlsourcerootUrlModuleSubfolderSpecifyOutputDirectory.sourcemap.txt @@ -60,7 +60,7 @@ sourceFile:ref/m1.ts 1->Emitted(7, 9) Source(4, 1) + SourceIndex(0) 2 >Emitted(7, 21) Source(4, 2) + SourceIndex(0) --- ->>> })(); +>>> }()); 1 >^^^^ 2 > ^ 3 > @@ -234,7 +234,7 @@ sourceFile:test.ts 1->Emitted(7, 9) Source(5, 1) + SourceIndex(0) 2 >Emitted(7, 18) Source(5, 2) + SourceIndex(0) --- ->>> })(); +>>> }()); 1 >^^^^ 2 > ^ 3 > diff --git a/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSubfolderSpecifyOutputDirectory/amd/outdir/simple/ref/m1.js b/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSubfolderSpecifyOutputDirectory/amd/outdir/simple/ref/m1.js index 1819603381c..c3d36f22356 100644 --- a/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSubfolderSpecifyOutputDirectory/amd/outdir/simple/ref/m1.js +++ b/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSubfolderSpecifyOutputDirectory/amd/outdir/simple/ref/m1.js @@ -5,7 +5,7 @@ define(["require", "exports"], function (require, exports) { function m1_c1() { } return m1_c1; - })(); + }()); exports.m1_c1 = m1_c1; exports.m1_instance1 = new m1_c1(); function m1_f1() { diff --git a/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSubfolderSpecifyOutputDirectory/node/maprootUrlsourcerootUrlModuleSubfolderSpecifyOutputDirectory.sourcemap.txt b/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSubfolderSpecifyOutputDirectory/node/maprootUrlsourcerootUrlModuleSubfolderSpecifyOutputDirectory.sourcemap.txt index beaf54a04de..0572281f779 100644 --- a/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSubfolderSpecifyOutputDirectory/node/maprootUrlsourcerootUrlModuleSubfolderSpecifyOutputDirectory.sourcemap.txt +++ b/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSubfolderSpecifyOutputDirectory/node/maprootUrlsourcerootUrlModuleSubfolderSpecifyOutputDirectory.sourcemap.txt @@ -59,7 +59,7 @@ sourceFile:ref/m1.ts 1->Emitted(6, 5) Source(4, 1) + SourceIndex(0) 2 >Emitted(6, 17) Source(4, 2) + SourceIndex(0) --- ->>>})(); +>>>}()); 1 > 2 >^ 3 > @@ -255,7 +255,7 @@ sourceFile:test.ts 1->Emitted(7, 5) Source(5, 1) + SourceIndex(0) 2 >Emitted(7, 14) Source(5, 2) + SourceIndex(0) --- ->>>})(); +>>>}()); 1 > 2 >^ 3 > diff --git a/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSubfolderSpecifyOutputDirectory/node/outdir/simple/ref/m1.js b/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSubfolderSpecifyOutputDirectory/node/outdir/simple/ref/m1.js index b594cf79eb2..8fe6d174601 100644 --- a/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSubfolderSpecifyOutputDirectory/node/outdir/simple/ref/m1.js +++ b/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSubfolderSpecifyOutputDirectory/node/outdir/simple/ref/m1.js @@ -4,7 +4,7 @@ var m1_c1 = (function () { function m1_c1() { } return m1_c1; -})(); +}()); exports.m1_c1 = m1_c1; exports.m1_instance1 = new m1_c1(); function m1_f1() { diff --git a/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSubfolderSpecifyOutputFile/amd/bin/test.js b/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSubfolderSpecifyOutputFile/amd/bin/test.js index 37aaeb4ecda..a58fc69531f 100644 --- a/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSubfolderSpecifyOutputFile/amd/bin/test.js +++ b/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSubfolderSpecifyOutputFile/amd/bin/test.js @@ -5,7 +5,7 @@ define("ref/m1", ["require", "exports"], function (require, exports) { function m1_c1() { } return m1_c1; - })(); + }()); exports.m1_c1 = m1_c1; exports.m1_instance1 = new m1_c1(); function m1_f1() { @@ -20,7 +20,7 @@ define("test", ["require", "exports", "ref/m1"], function (require, exports, m1) function c1() { } return c1; - })(); + }()); exports.c1 = c1; exports.instance1 = new c1(); function f1() { diff --git a/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSubfolderSpecifyOutputFile/amd/maprootUrlsourcerootUrlModuleSubfolderSpecifyOutputFile.sourcemap.txt b/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSubfolderSpecifyOutputFile/amd/maprootUrlsourcerootUrlModuleSubfolderSpecifyOutputFile.sourcemap.txt index 2117db2d0b0..e720aaa9215 100644 --- a/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSubfolderSpecifyOutputFile/amd/maprootUrlsourcerootUrlModuleSubfolderSpecifyOutputFile.sourcemap.txt +++ b/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSubfolderSpecifyOutputFile/amd/maprootUrlsourcerootUrlModuleSubfolderSpecifyOutputFile.sourcemap.txt @@ -60,7 +60,7 @@ sourceFile:ref/m1.ts 1->Emitted(7, 9) Source(4, 1) + SourceIndex(0) 2 >Emitted(7, 21) Source(4, 2) + SourceIndex(0) --- ->>> })(); +>>> }()); 1 >^^^^ 2 > ^ 3 > @@ -228,7 +228,7 @@ sourceFile:test.ts 1->Emitted(22, 9) Source(5, 1) + SourceIndex(1) 2 >Emitted(22, 18) Source(5, 2) + SourceIndex(1) --- ->>> })(); +>>> }()); 1 >^^^^ 2 > ^ 3 > diff --git a/tests/baselines/reference/project/maprootUrlsourcerootUrlMultifolderNoOutdir/amd/maprootUrlsourcerootUrlMultifolderNoOutdir.sourcemap.txt b/tests/baselines/reference/project/maprootUrlsourcerootUrlMultifolderNoOutdir/amd/maprootUrlsourcerootUrlMultifolderNoOutdir.sourcemap.txt index ffce1098df6..e470a39f235 100644 --- a/tests/baselines/reference/project/maprootUrlsourcerootUrlMultifolderNoOutdir/amd/maprootUrlsourcerootUrlMultifolderNoOutdir.sourcemap.txt +++ b/tests/baselines/reference/project/maprootUrlsourcerootUrlMultifolderNoOutdir/amd/maprootUrlsourcerootUrlMultifolderNoOutdir.sourcemap.txt @@ -61,7 +61,7 @@ sourceFile:outputdir_multifolder/ref/m1.ts 1->Emitted(5, 5) Source(4, 1) + SourceIndex(0) 2 >Emitted(5, 17) Source(4, 2) + SourceIndex(0) --- ->>>})(); +>>>}()); 1 > 2 >^ 3 > @@ -204,7 +204,7 @@ sourceFile:outputdir_multifolder_ref/m2.ts 1->Emitted(5, 5) Source(4, 1) + SourceIndex(0) 2 >Emitted(5, 17) Source(4, 2) + SourceIndex(0) --- ->>>})(); +>>>}()); 1 > 2 >^ 3 > @@ -366,7 +366,7 @@ sourceFile:outputdir_multifolder/test.ts 1->Emitted(7, 5) Source(6, 1) + SourceIndex(0) 2 >Emitted(7, 14) Source(6, 2) + SourceIndex(0) --- ->>>})(); +>>>}()); 1 > 2 >^ 3 > diff --git a/tests/baselines/reference/project/maprootUrlsourcerootUrlMultifolderNoOutdir/amd/ref/m1.js b/tests/baselines/reference/project/maprootUrlsourcerootUrlMultifolderNoOutdir/amd/ref/m1.js index da8ac1cb063..cf896426681 100644 --- a/tests/baselines/reference/project/maprootUrlsourcerootUrlMultifolderNoOutdir/amd/ref/m1.js +++ b/tests/baselines/reference/project/maprootUrlsourcerootUrlMultifolderNoOutdir/amd/ref/m1.js @@ -3,7 +3,7 @@ var m1_c1 = (function () { function m1_c1() { } return m1_c1; -})(); +}()); var m1_instance1 = new m1_c1(); function m1_f1() { return m1_instance1; diff --git a/tests/baselines/reference/project/maprootUrlsourcerootUrlMultifolderNoOutdir/node/maprootUrlsourcerootUrlMultifolderNoOutdir.sourcemap.txt b/tests/baselines/reference/project/maprootUrlsourcerootUrlMultifolderNoOutdir/node/maprootUrlsourcerootUrlMultifolderNoOutdir.sourcemap.txt index ffce1098df6..e470a39f235 100644 --- a/tests/baselines/reference/project/maprootUrlsourcerootUrlMultifolderNoOutdir/node/maprootUrlsourcerootUrlMultifolderNoOutdir.sourcemap.txt +++ b/tests/baselines/reference/project/maprootUrlsourcerootUrlMultifolderNoOutdir/node/maprootUrlsourcerootUrlMultifolderNoOutdir.sourcemap.txt @@ -61,7 +61,7 @@ sourceFile:outputdir_multifolder/ref/m1.ts 1->Emitted(5, 5) Source(4, 1) + SourceIndex(0) 2 >Emitted(5, 17) Source(4, 2) + SourceIndex(0) --- ->>>})(); +>>>}()); 1 > 2 >^ 3 > @@ -204,7 +204,7 @@ sourceFile:outputdir_multifolder_ref/m2.ts 1->Emitted(5, 5) Source(4, 1) + SourceIndex(0) 2 >Emitted(5, 17) Source(4, 2) + SourceIndex(0) --- ->>>})(); +>>>}()); 1 > 2 >^ 3 > @@ -366,7 +366,7 @@ sourceFile:outputdir_multifolder/test.ts 1->Emitted(7, 5) Source(6, 1) + SourceIndex(0) 2 >Emitted(7, 14) Source(6, 2) + SourceIndex(0) --- ->>>})(); +>>>}()); 1 > 2 >^ 3 > diff --git a/tests/baselines/reference/project/maprootUrlsourcerootUrlMultifolderNoOutdir/node/ref/m1.js b/tests/baselines/reference/project/maprootUrlsourcerootUrlMultifolderNoOutdir/node/ref/m1.js index da8ac1cb063..cf896426681 100644 --- a/tests/baselines/reference/project/maprootUrlsourcerootUrlMultifolderNoOutdir/node/ref/m1.js +++ b/tests/baselines/reference/project/maprootUrlsourcerootUrlMultifolderNoOutdir/node/ref/m1.js @@ -3,7 +3,7 @@ var m1_c1 = (function () { function m1_c1() { } return m1_c1; -})(); +}()); var m1_instance1 = new m1_c1(); function m1_f1() { return m1_instance1; diff --git a/tests/baselines/reference/project/maprootUrlsourcerootUrlMultifolderSpecifyOutputDirectory/amd/maprootUrlsourcerootUrlMultifolderSpecifyOutputDirectory.sourcemap.txt b/tests/baselines/reference/project/maprootUrlsourcerootUrlMultifolderSpecifyOutputDirectory/amd/maprootUrlsourcerootUrlMultifolderSpecifyOutputDirectory.sourcemap.txt index 3e7b4d1b21b..a1c7bf50c47 100644 --- a/tests/baselines/reference/project/maprootUrlsourcerootUrlMultifolderSpecifyOutputDirectory/amd/maprootUrlsourcerootUrlMultifolderSpecifyOutputDirectory.sourcemap.txt +++ b/tests/baselines/reference/project/maprootUrlsourcerootUrlMultifolderSpecifyOutputDirectory/amd/maprootUrlsourcerootUrlMultifolderSpecifyOutputDirectory.sourcemap.txt @@ -61,7 +61,7 @@ sourceFile:outputdir_multifolder/ref/m1.ts 1->Emitted(5, 5) Source(4, 1) + SourceIndex(0) 2 >Emitted(5, 17) Source(4, 2) + SourceIndex(0) --- ->>>})(); +>>>}()); 1 > 2 >^ 3 > @@ -204,7 +204,7 @@ sourceFile:outputdir_multifolder_ref/m2.ts 1->Emitted(5, 5) Source(4, 1) + SourceIndex(0) 2 >Emitted(5, 17) Source(4, 2) + SourceIndex(0) --- ->>>})(); +>>>}()); 1 > 2 >^ 3 > @@ -366,7 +366,7 @@ sourceFile:outputdir_multifolder/test.ts 1->Emitted(7, 5) Source(6, 1) + SourceIndex(0) 2 >Emitted(7, 14) Source(6, 2) + SourceIndex(0) --- ->>>})(); +>>>}()); 1 > 2 >^ 3 > diff --git a/tests/baselines/reference/project/maprootUrlsourcerootUrlMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_multifolder/ref/m1.js b/tests/baselines/reference/project/maprootUrlsourcerootUrlMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_multifolder/ref/m1.js index da8ac1cb063..cf896426681 100644 --- a/tests/baselines/reference/project/maprootUrlsourcerootUrlMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_multifolder/ref/m1.js +++ b/tests/baselines/reference/project/maprootUrlsourcerootUrlMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_multifolder/ref/m1.js @@ -3,7 +3,7 @@ var m1_c1 = (function () { function m1_c1() { } return m1_c1; -})(); +}()); var m1_instance1 = new m1_c1(); function m1_f1() { return m1_instance1; diff --git a/tests/baselines/reference/project/maprootUrlsourcerootUrlMultifolderSpecifyOutputDirectory/node/maprootUrlsourcerootUrlMultifolderSpecifyOutputDirectory.sourcemap.txt b/tests/baselines/reference/project/maprootUrlsourcerootUrlMultifolderSpecifyOutputDirectory/node/maprootUrlsourcerootUrlMultifolderSpecifyOutputDirectory.sourcemap.txt index 3e7b4d1b21b..a1c7bf50c47 100644 --- a/tests/baselines/reference/project/maprootUrlsourcerootUrlMultifolderSpecifyOutputDirectory/node/maprootUrlsourcerootUrlMultifolderSpecifyOutputDirectory.sourcemap.txt +++ b/tests/baselines/reference/project/maprootUrlsourcerootUrlMultifolderSpecifyOutputDirectory/node/maprootUrlsourcerootUrlMultifolderSpecifyOutputDirectory.sourcemap.txt @@ -61,7 +61,7 @@ sourceFile:outputdir_multifolder/ref/m1.ts 1->Emitted(5, 5) Source(4, 1) + SourceIndex(0) 2 >Emitted(5, 17) Source(4, 2) + SourceIndex(0) --- ->>>})(); +>>>}()); 1 > 2 >^ 3 > @@ -204,7 +204,7 @@ sourceFile:outputdir_multifolder_ref/m2.ts 1->Emitted(5, 5) Source(4, 1) + SourceIndex(0) 2 >Emitted(5, 17) Source(4, 2) + SourceIndex(0) --- ->>>})(); +>>>}()); 1 > 2 >^ 3 > @@ -366,7 +366,7 @@ sourceFile:outputdir_multifolder/test.ts 1->Emitted(7, 5) Source(6, 1) + SourceIndex(0) 2 >Emitted(7, 14) Source(6, 2) + SourceIndex(0) --- ->>>})(); +>>>}()); 1 > 2 >^ 3 > diff --git a/tests/baselines/reference/project/maprootUrlsourcerootUrlMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_multifolder/ref/m1.js b/tests/baselines/reference/project/maprootUrlsourcerootUrlMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_multifolder/ref/m1.js index da8ac1cb063..cf896426681 100644 --- a/tests/baselines/reference/project/maprootUrlsourcerootUrlMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_multifolder/ref/m1.js +++ b/tests/baselines/reference/project/maprootUrlsourcerootUrlMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_multifolder/ref/m1.js @@ -3,7 +3,7 @@ var m1_c1 = (function () { function m1_c1() { } return m1_c1; -})(); +}()); var m1_instance1 = new m1_c1(); function m1_f1() { return m1_instance1; diff --git a/tests/baselines/reference/project/maprootUrlsourcerootUrlMultifolderSpecifyOutputFile/amd/bin/test.js b/tests/baselines/reference/project/maprootUrlsourcerootUrlMultifolderSpecifyOutputFile/amd/bin/test.js index b5641a2b2bd..51bd53679fa 100644 --- a/tests/baselines/reference/project/maprootUrlsourcerootUrlMultifolderSpecifyOutputFile/amd/bin/test.js +++ b/tests/baselines/reference/project/maprootUrlsourcerootUrlMultifolderSpecifyOutputFile/amd/bin/test.js @@ -3,7 +3,7 @@ var m1_c1 = (function () { function m1_c1() { } return m1_c1; -})(); +}()); var m1_instance1 = new m1_c1(); function m1_f1() { return m1_instance1; @@ -13,7 +13,7 @@ var m2_c1 = (function () { function m2_c1() { } return m2_c1; -})(); +}()); var m2_instance1 = new m2_c1(); function m2_f1() { return m2_instance1; @@ -25,7 +25,7 @@ var c1 = (function () { function c1() { } return c1; -})(); +}()); var instance1 = new c1(); function f1() { return instance1; diff --git a/tests/baselines/reference/project/maprootUrlsourcerootUrlMultifolderSpecifyOutputFile/amd/maprootUrlsourcerootUrlMultifolderSpecifyOutputFile.sourcemap.txt b/tests/baselines/reference/project/maprootUrlsourcerootUrlMultifolderSpecifyOutputFile/amd/maprootUrlsourcerootUrlMultifolderSpecifyOutputFile.sourcemap.txt index 278bdb65bfc..5e3fe895b88 100644 --- a/tests/baselines/reference/project/maprootUrlsourcerootUrlMultifolderSpecifyOutputFile/amd/maprootUrlsourcerootUrlMultifolderSpecifyOutputFile.sourcemap.txt +++ b/tests/baselines/reference/project/maprootUrlsourcerootUrlMultifolderSpecifyOutputFile/amd/maprootUrlsourcerootUrlMultifolderSpecifyOutputFile.sourcemap.txt @@ -61,7 +61,7 @@ sourceFile:outputdir_multifolder/ref/m1.ts 1->Emitted(5, 5) Source(4, 1) + SourceIndex(0) 2 >Emitted(5, 17) Source(4, 2) + SourceIndex(0) --- ->>>})(); +>>>}()); 1 > 2 >^ 3 > @@ -198,7 +198,7 @@ sourceFile:outputdir_multifolder_ref/m2.ts 1->Emitted(15, 5) Source(4, 1) + SourceIndex(1) 2 >Emitted(15, 17) Source(4, 2) + SourceIndex(1) --- ->>>})(); +>>>}()); 1 > 2 >^ 3 > @@ -354,7 +354,7 @@ sourceFile:outputdir_multifolder/test.ts 1->Emitted(27, 5) Source(6, 1) + SourceIndex(2) 2 >Emitted(27, 14) Source(6, 2) + SourceIndex(2) --- ->>>})(); +>>>}()); 1 > 2 >^ 3 > diff --git a/tests/baselines/reference/project/maprootUrlsourcerootUrlMultifolderSpecifyOutputFile/node/bin/test.js b/tests/baselines/reference/project/maprootUrlsourcerootUrlMultifolderSpecifyOutputFile/node/bin/test.js index b5641a2b2bd..51bd53679fa 100644 --- a/tests/baselines/reference/project/maprootUrlsourcerootUrlMultifolderSpecifyOutputFile/node/bin/test.js +++ b/tests/baselines/reference/project/maprootUrlsourcerootUrlMultifolderSpecifyOutputFile/node/bin/test.js @@ -3,7 +3,7 @@ var m1_c1 = (function () { function m1_c1() { } return m1_c1; -})(); +}()); var m1_instance1 = new m1_c1(); function m1_f1() { return m1_instance1; @@ -13,7 +13,7 @@ var m2_c1 = (function () { function m2_c1() { } return m2_c1; -})(); +}()); var m2_instance1 = new m2_c1(); function m2_f1() { return m2_instance1; @@ -25,7 +25,7 @@ var c1 = (function () { function c1() { } return c1; -})(); +}()); var instance1 = new c1(); function f1() { return instance1; diff --git a/tests/baselines/reference/project/maprootUrlsourcerootUrlMultifolderSpecifyOutputFile/node/maprootUrlsourcerootUrlMultifolderSpecifyOutputFile.sourcemap.txt b/tests/baselines/reference/project/maprootUrlsourcerootUrlMultifolderSpecifyOutputFile/node/maprootUrlsourcerootUrlMultifolderSpecifyOutputFile.sourcemap.txt index 278bdb65bfc..5e3fe895b88 100644 --- a/tests/baselines/reference/project/maprootUrlsourcerootUrlMultifolderSpecifyOutputFile/node/maprootUrlsourcerootUrlMultifolderSpecifyOutputFile.sourcemap.txt +++ b/tests/baselines/reference/project/maprootUrlsourcerootUrlMultifolderSpecifyOutputFile/node/maprootUrlsourcerootUrlMultifolderSpecifyOutputFile.sourcemap.txt @@ -61,7 +61,7 @@ sourceFile:outputdir_multifolder/ref/m1.ts 1->Emitted(5, 5) Source(4, 1) + SourceIndex(0) 2 >Emitted(5, 17) Source(4, 2) + SourceIndex(0) --- ->>>})(); +>>>}()); 1 > 2 >^ 3 > @@ -198,7 +198,7 @@ sourceFile:outputdir_multifolder_ref/m2.ts 1->Emitted(15, 5) Source(4, 1) + SourceIndex(1) 2 >Emitted(15, 17) Source(4, 2) + SourceIndex(1) --- ->>>})(); +>>>}()); 1 > 2 >^ 3 > @@ -354,7 +354,7 @@ sourceFile:outputdir_multifolder/test.ts 1->Emitted(27, 5) Source(6, 1) + SourceIndex(2) 2 >Emitted(27, 14) Source(6, 2) + SourceIndex(2) --- ->>>})(); +>>>}()); 1 > 2 >^ 3 > diff --git a/tests/baselines/reference/project/maprootUrlsourcerootUrlSimpleNoOutdir/amd/m1.js b/tests/baselines/reference/project/maprootUrlsourcerootUrlSimpleNoOutdir/amd/m1.js index 24b75dc1a7e..9f5ca0320c9 100644 --- a/tests/baselines/reference/project/maprootUrlsourcerootUrlSimpleNoOutdir/amd/m1.js +++ b/tests/baselines/reference/project/maprootUrlsourcerootUrlSimpleNoOutdir/amd/m1.js @@ -3,7 +3,7 @@ var m1_c1 = (function () { function m1_c1() { } return m1_c1; -})(); +}()); var m1_instance1 = new m1_c1(); function m1_f1() { return m1_instance1; diff --git a/tests/baselines/reference/project/maprootUrlsourcerootUrlSimpleNoOutdir/amd/maprootUrlsourcerootUrlSimpleNoOutdir.sourcemap.txt b/tests/baselines/reference/project/maprootUrlsourcerootUrlSimpleNoOutdir/amd/maprootUrlsourcerootUrlSimpleNoOutdir.sourcemap.txt index 7f41d242983..b1ce5150ad1 100644 --- a/tests/baselines/reference/project/maprootUrlsourcerootUrlSimpleNoOutdir/amd/maprootUrlsourcerootUrlSimpleNoOutdir.sourcemap.txt +++ b/tests/baselines/reference/project/maprootUrlsourcerootUrlSimpleNoOutdir/amd/maprootUrlsourcerootUrlSimpleNoOutdir.sourcemap.txt @@ -61,7 +61,7 @@ sourceFile:m1.ts 1->Emitted(5, 5) Source(4, 1) + SourceIndex(0) 2 >Emitted(5, 17) Source(4, 2) + SourceIndex(0) --- ->>>})(); +>>>}()); 1 > 2 >^ 3 > @@ -213,7 +213,7 @@ sourceFile:test.ts 1->Emitted(6, 5) Source(5, 1) + SourceIndex(0) 2 >Emitted(6, 14) Source(5, 2) + SourceIndex(0) --- ->>>})(); +>>>}()); 1 > 2 >^ 3 > diff --git a/tests/baselines/reference/project/maprootUrlsourcerootUrlSimpleNoOutdir/node/m1.js b/tests/baselines/reference/project/maprootUrlsourcerootUrlSimpleNoOutdir/node/m1.js index 24b75dc1a7e..9f5ca0320c9 100644 --- a/tests/baselines/reference/project/maprootUrlsourcerootUrlSimpleNoOutdir/node/m1.js +++ b/tests/baselines/reference/project/maprootUrlsourcerootUrlSimpleNoOutdir/node/m1.js @@ -3,7 +3,7 @@ var m1_c1 = (function () { function m1_c1() { } return m1_c1; -})(); +}()); var m1_instance1 = new m1_c1(); function m1_f1() { return m1_instance1; diff --git a/tests/baselines/reference/project/maprootUrlsourcerootUrlSimpleNoOutdir/node/maprootUrlsourcerootUrlSimpleNoOutdir.sourcemap.txt b/tests/baselines/reference/project/maprootUrlsourcerootUrlSimpleNoOutdir/node/maprootUrlsourcerootUrlSimpleNoOutdir.sourcemap.txt index 7f41d242983..b1ce5150ad1 100644 --- a/tests/baselines/reference/project/maprootUrlsourcerootUrlSimpleNoOutdir/node/maprootUrlsourcerootUrlSimpleNoOutdir.sourcemap.txt +++ b/tests/baselines/reference/project/maprootUrlsourcerootUrlSimpleNoOutdir/node/maprootUrlsourcerootUrlSimpleNoOutdir.sourcemap.txt @@ -61,7 +61,7 @@ sourceFile:m1.ts 1->Emitted(5, 5) Source(4, 1) + SourceIndex(0) 2 >Emitted(5, 17) Source(4, 2) + SourceIndex(0) --- ->>>})(); +>>>}()); 1 > 2 >^ 3 > @@ -213,7 +213,7 @@ sourceFile:test.ts 1->Emitted(6, 5) Source(5, 1) + SourceIndex(0) 2 >Emitted(6, 14) Source(5, 2) + SourceIndex(0) --- ->>>})(); +>>>}()); 1 > 2 >^ 3 > diff --git a/tests/baselines/reference/project/maprootUrlsourcerootUrlSimpleSpecifyOutputDirectory/amd/maprootUrlsourcerootUrlSimpleSpecifyOutputDirectory.sourcemap.txt b/tests/baselines/reference/project/maprootUrlsourcerootUrlSimpleSpecifyOutputDirectory/amd/maprootUrlsourcerootUrlSimpleSpecifyOutputDirectory.sourcemap.txt index ef44bbeae90..7b17d980416 100644 --- a/tests/baselines/reference/project/maprootUrlsourcerootUrlSimpleSpecifyOutputDirectory/amd/maprootUrlsourcerootUrlSimpleSpecifyOutputDirectory.sourcemap.txt +++ b/tests/baselines/reference/project/maprootUrlsourcerootUrlSimpleSpecifyOutputDirectory/amd/maprootUrlsourcerootUrlSimpleSpecifyOutputDirectory.sourcemap.txt @@ -61,7 +61,7 @@ sourceFile:m1.ts 1->Emitted(5, 5) Source(4, 1) + SourceIndex(0) 2 >Emitted(5, 17) Source(4, 2) + SourceIndex(0) --- ->>>})(); +>>>}()); 1 > 2 >^ 3 > @@ -213,7 +213,7 @@ sourceFile:test.ts 1->Emitted(6, 5) Source(5, 1) + SourceIndex(0) 2 >Emitted(6, 14) Source(5, 2) + SourceIndex(0) --- ->>>})(); +>>>}()); 1 > 2 >^ 3 > diff --git a/tests/baselines/reference/project/maprootUrlsourcerootUrlSimpleSpecifyOutputDirectory/amd/outdir/simple/m1.js b/tests/baselines/reference/project/maprootUrlsourcerootUrlSimpleSpecifyOutputDirectory/amd/outdir/simple/m1.js index 24b75dc1a7e..9f5ca0320c9 100644 --- a/tests/baselines/reference/project/maprootUrlsourcerootUrlSimpleSpecifyOutputDirectory/amd/outdir/simple/m1.js +++ b/tests/baselines/reference/project/maprootUrlsourcerootUrlSimpleSpecifyOutputDirectory/amd/outdir/simple/m1.js @@ -3,7 +3,7 @@ var m1_c1 = (function () { function m1_c1() { } return m1_c1; -})(); +}()); var m1_instance1 = new m1_c1(); function m1_f1() { return m1_instance1; diff --git a/tests/baselines/reference/project/maprootUrlsourcerootUrlSimpleSpecifyOutputDirectory/node/maprootUrlsourcerootUrlSimpleSpecifyOutputDirectory.sourcemap.txt b/tests/baselines/reference/project/maprootUrlsourcerootUrlSimpleSpecifyOutputDirectory/node/maprootUrlsourcerootUrlSimpleSpecifyOutputDirectory.sourcemap.txt index ef44bbeae90..7b17d980416 100644 --- a/tests/baselines/reference/project/maprootUrlsourcerootUrlSimpleSpecifyOutputDirectory/node/maprootUrlsourcerootUrlSimpleSpecifyOutputDirectory.sourcemap.txt +++ b/tests/baselines/reference/project/maprootUrlsourcerootUrlSimpleSpecifyOutputDirectory/node/maprootUrlsourcerootUrlSimpleSpecifyOutputDirectory.sourcemap.txt @@ -61,7 +61,7 @@ sourceFile:m1.ts 1->Emitted(5, 5) Source(4, 1) + SourceIndex(0) 2 >Emitted(5, 17) Source(4, 2) + SourceIndex(0) --- ->>>})(); +>>>}()); 1 > 2 >^ 3 > @@ -213,7 +213,7 @@ sourceFile:test.ts 1->Emitted(6, 5) Source(5, 1) + SourceIndex(0) 2 >Emitted(6, 14) Source(5, 2) + SourceIndex(0) --- ->>>})(); +>>>}()); 1 > 2 >^ 3 > diff --git a/tests/baselines/reference/project/maprootUrlsourcerootUrlSimpleSpecifyOutputDirectory/node/outdir/simple/m1.js b/tests/baselines/reference/project/maprootUrlsourcerootUrlSimpleSpecifyOutputDirectory/node/outdir/simple/m1.js index 24b75dc1a7e..9f5ca0320c9 100644 --- a/tests/baselines/reference/project/maprootUrlsourcerootUrlSimpleSpecifyOutputDirectory/node/outdir/simple/m1.js +++ b/tests/baselines/reference/project/maprootUrlsourcerootUrlSimpleSpecifyOutputDirectory/node/outdir/simple/m1.js @@ -3,7 +3,7 @@ var m1_c1 = (function () { function m1_c1() { } return m1_c1; -})(); +}()); var m1_instance1 = new m1_c1(); function m1_f1() { return m1_instance1; diff --git a/tests/baselines/reference/project/maprootUrlsourcerootUrlSimpleSpecifyOutputFile/amd/bin/test.js b/tests/baselines/reference/project/maprootUrlsourcerootUrlSimpleSpecifyOutputFile/amd/bin/test.js index 869f4f5971a..2a35fde20dc 100644 --- a/tests/baselines/reference/project/maprootUrlsourcerootUrlSimpleSpecifyOutputFile/amd/bin/test.js +++ b/tests/baselines/reference/project/maprootUrlsourcerootUrlSimpleSpecifyOutputFile/amd/bin/test.js @@ -3,7 +3,7 @@ var m1_c1 = (function () { function m1_c1() { } return m1_c1; -})(); +}()); var m1_instance1 = new m1_c1(); function m1_f1() { return m1_instance1; @@ -14,7 +14,7 @@ var c1 = (function () { function c1() { } return c1; -})(); +}()); var instance1 = new c1(); function f1() { return instance1; diff --git a/tests/baselines/reference/project/maprootUrlsourcerootUrlSimpleSpecifyOutputFile/amd/maprootUrlsourcerootUrlSimpleSpecifyOutputFile.sourcemap.txt b/tests/baselines/reference/project/maprootUrlsourcerootUrlSimpleSpecifyOutputFile/amd/maprootUrlsourcerootUrlSimpleSpecifyOutputFile.sourcemap.txt index 72fc2569609..23ba392bf3a 100644 --- a/tests/baselines/reference/project/maprootUrlsourcerootUrlSimpleSpecifyOutputFile/amd/maprootUrlsourcerootUrlSimpleSpecifyOutputFile.sourcemap.txt +++ b/tests/baselines/reference/project/maprootUrlsourcerootUrlSimpleSpecifyOutputFile/amd/maprootUrlsourcerootUrlSimpleSpecifyOutputFile.sourcemap.txt @@ -61,7 +61,7 @@ sourceFile:m1.ts 1->Emitted(5, 5) Source(4, 1) + SourceIndex(0) 2 >Emitted(5, 17) Source(4, 2) + SourceIndex(0) --- ->>>})(); +>>>}()); 1 > 2 >^ 3 > @@ -207,7 +207,7 @@ sourceFile:test.ts 1->Emitted(16, 5) Source(5, 1) + SourceIndex(1) 2 >Emitted(16, 14) Source(5, 2) + SourceIndex(1) --- ->>>})(); +>>>}()); 1 > 2 >^ 3 > diff --git a/tests/baselines/reference/project/maprootUrlsourcerootUrlSimpleSpecifyOutputFile/node/bin/test.js b/tests/baselines/reference/project/maprootUrlsourcerootUrlSimpleSpecifyOutputFile/node/bin/test.js index 869f4f5971a..2a35fde20dc 100644 --- a/tests/baselines/reference/project/maprootUrlsourcerootUrlSimpleSpecifyOutputFile/node/bin/test.js +++ b/tests/baselines/reference/project/maprootUrlsourcerootUrlSimpleSpecifyOutputFile/node/bin/test.js @@ -3,7 +3,7 @@ var m1_c1 = (function () { function m1_c1() { } return m1_c1; -})(); +}()); var m1_instance1 = new m1_c1(); function m1_f1() { return m1_instance1; @@ -14,7 +14,7 @@ var c1 = (function () { function c1() { } return c1; -})(); +}()); var instance1 = new c1(); function f1() { return instance1; diff --git a/tests/baselines/reference/project/maprootUrlsourcerootUrlSimpleSpecifyOutputFile/node/maprootUrlsourcerootUrlSimpleSpecifyOutputFile.sourcemap.txt b/tests/baselines/reference/project/maprootUrlsourcerootUrlSimpleSpecifyOutputFile/node/maprootUrlsourcerootUrlSimpleSpecifyOutputFile.sourcemap.txt index 72fc2569609..23ba392bf3a 100644 --- a/tests/baselines/reference/project/maprootUrlsourcerootUrlSimpleSpecifyOutputFile/node/maprootUrlsourcerootUrlSimpleSpecifyOutputFile.sourcemap.txt +++ b/tests/baselines/reference/project/maprootUrlsourcerootUrlSimpleSpecifyOutputFile/node/maprootUrlsourcerootUrlSimpleSpecifyOutputFile.sourcemap.txt @@ -61,7 +61,7 @@ sourceFile:m1.ts 1->Emitted(5, 5) Source(4, 1) + SourceIndex(0) 2 >Emitted(5, 17) Source(4, 2) + SourceIndex(0) --- ->>>})(); +>>>}()); 1 > 2 >^ 3 > @@ -207,7 +207,7 @@ sourceFile:test.ts 1->Emitted(16, 5) Source(5, 1) + SourceIndex(1) 2 >Emitted(16, 14) Source(5, 2) + SourceIndex(1) --- ->>>})(); +>>>}()); 1 > 2 >^ 3 > diff --git a/tests/baselines/reference/project/maprootUrlsourcerootUrlSingleFileNoOutdir/amd/maprootUrlsourcerootUrlSingleFileNoOutdir.sourcemap.txt b/tests/baselines/reference/project/maprootUrlsourcerootUrlSingleFileNoOutdir/amd/maprootUrlsourcerootUrlSingleFileNoOutdir.sourcemap.txt index 5abd520cdae..c39a0fba501 100644 --- a/tests/baselines/reference/project/maprootUrlsourcerootUrlSingleFileNoOutdir/amd/maprootUrlsourcerootUrlSingleFileNoOutdir.sourcemap.txt +++ b/tests/baselines/reference/project/maprootUrlsourcerootUrlSingleFileNoOutdir/amd/maprootUrlsourcerootUrlSingleFileNoOutdir.sourcemap.txt @@ -61,7 +61,7 @@ sourceFile:test.ts 1->Emitted(5, 5) Source(4, 1) + SourceIndex(0) 2 >Emitted(5, 14) Source(4, 2) + SourceIndex(0) --- ->>>})(); +>>>}()); 1 > 2 >^ 3 > diff --git a/tests/baselines/reference/project/maprootUrlsourcerootUrlSingleFileNoOutdir/amd/test.js b/tests/baselines/reference/project/maprootUrlsourcerootUrlSingleFileNoOutdir/amd/test.js index bc0f3007e6a..73eb738e590 100644 --- a/tests/baselines/reference/project/maprootUrlsourcerootUrlSingleFileNoOutdir/amd/test.js +++ b/tests/baselines/reference/project/maprootUrlsourcerootUrlSingleFileNoOutdir/amd/test.js @@ -3,7 +3,7 @@ var c1 = (function () { function c1() { } return c1; -})(); +}()); var instance1 = new c1(); function f1() { return instance1; diff --git a/tests/baselines/reference/project/maprootUrlsourcerootUrlSingleFileNoOutdir/node/maprootUrlsourcerootUrlSingleFileNoOutdir.sourcemap.txt b/tests/baselines/reference/project/maprootUrlsourcerootUrlSingleFileNoOutdir/node/maprootUrlsourcerootUrlSingleFileNoOutdir.sourcemap.txt index 5abd520cdae..c39a0fba501 100644 --- a/tests/baselines/reference/project/maprootUrlsourcerootUrlSingleFileNoOutdir/node/maprootUrlsourcerootUrlSingleFileNoOutdir.sourcemap.txt +++ b/tests/baselines/reference/project/maprootUrlsourcerootUrlSingleFileNoOutdir/node/maprootUrlsourcerootUrlSingleFileNoOutdir.sourcemap.txt @@ -61,7 +61,7 @@ sourceFile:test.ts 1->Emitted(5, 5) Source(4, 1) + SourceIndex(0) 2 >Emitted(5, 14) Source(4, 2) + SourceIndex(0) --- ->>>})(); +>>>}()); 1 > 2 >^ 3 > diff --git a/tests/baselines/reference/project/maprootUrlsourcerootUrlSingleFileNoOutdir/node/test.js b/tests/baselines/reference/project/maprootUrlsourcerootUrlSingleFileNoOutdir/node/test.js index bc0f3007e6a..73eb738e590 100644 --- a/tests/baselines/reference/project/maprootUrlsourcerootUrlSingleFileNoOutdir/node/test.js +++ b/tests/baselines/reference/project/maprootUrlsourcerootUrlSingleFileNoOutdir/node/test.js @@ -3,7 +3,7 @@ var c1 = (function () { function c1() { } return c1; -})(); +}()); var instance1 = new c1(); function f1() { return instance1; diff --git a/tests/baselines/reference/project/maprootUrlsourcerootUrlSingleFileSpecifyOutputDirectory/amd/maprootUrlsourcerootUrlSingleFileSpecifyOutputDirectory.sourcemap.txt b/tests/baselines/reference/project/maprootUrlsourcerootUrlSingleFileSpecifyOutputDirectory/amd/maprootUrlsourcerootUrlSingleFileSpecifyOutputDirectory.sourcemap.txt index df39c21af9e..e04f1bbe9c7 100644 --- a/tests/baselines/reference/project/maprootUrlsourcerootUrlSingleFileSpecifyOutputDirectory/amd/maprootUrlsourcerootUrlSingleFileSpecifyOutputDirectory.sourcemap.txt +++ b/tests/baselines/reference/project/maprootUrlsourcerootUrlSingleFileSpecifyOutputDirectory/amd/maprootUrlsourcerootUrlSingleFileSpecifyOutputDirectory.sourcemap.txt @@ -61,7 +61,7 @@ sourceFile:test.ts 1->Emitted(5, 5) Source(4, 1) + SourceIndex(0) 2 >Emitted(5, 14) Source(4, 2) + SourceIndex(0) --- ->>>})(); +>>>}()); 1 > 2 >^ 3 > diff --git a/tests/baselines/reference/project/maprootUrlsourcerootUrlSingleFileSpecifyOutputDirectory/amd/outdir/simple/test.js b/tests/baselines/reference/project/maprootUrlsourcerootUrlSingleFileSpecifyOutputDirectory/amd/outdir/simple/test.js index bc0f3007e6a..73eb738e590 100644 --- a/tests/baselines/reference/project/maprootUrlsourcerootUrlSingleFileSpecifyOutputDirectory/amd/outdir/simple/test.js +++ b/tests/baselines/reference/project/maprootUrlsourcerootUrlSingleFileSpecifyOutputDirectory/amd/outdir/simple/test.js @@ -3,7 +3,7 @@ var c1 = (function () { function c1() { } return c1; -})(); +}()); var instance1 = new c1(); function f1() { return instance1; diff --git a/tests/baselines/reference/project/maprootUrlsourcerootUrlSingleFileSpecifyOutputDirectory/node/maprootUrlsourcerootUrlSingleFileSpecifyOutputDirectory.sourcemap.txt b/tests/baselines/reference/project/maprootUrlsourcerootUrlSingleFileSpecifyOutputDirectory/node/maprootUrlsourcerootUrlSingleFileSpecifyOutputDirectory.sourcemap.txt index df39c21af9e..e04f1bbe9c7 100644 --- a/tests/baselines/reference/project/maprootUrlsourcerootUrlSingleFileSpecifyOutputDirectory/node/maprootUrlsourcerootUrlSingleFileSpecifyOutputDirectory.sourcemap.txt +++ b/tests/baselines/reference/project/maprootUrlsourcerootUrlSingleFileSpecifyOutputDirectory/node/maprootUrlsourcerootUrlSingleFileSpecifyOutputDirectory.sourcemap.txt @@ -61,7 +61,7 @@ sourceFile:test.ts 1->Emitted(5, 5) Source(4, 1) + SourceIndex(0) 2 >Emitted(5, 14) Source(4, 2) + SourceIndex(0) --- ->>>})(); +>>>}()); 1 > 2 >^ 3 > diff --git a/tests/baselines/reference/project/maprootUrlsourcerootUrlSingleFileSpecifyOutputDirectory/node/outdir/simple/test.js b/tests/baselines/reference/project/maprootUrlsourcerootUrlSingleFileSpecifyOutputDirectory/node/outdir/simple/test.js index bc0f3007e6a..73eb738e590 100644 --- a/tests/baselines/reference/project/maprootUrlsourcerootUrlSingleFileSpecifyOutputDirectory/node/outdir/simple/test.js +++ b/tests/baselines/reference/project/maprootUrlsourcerootUrlSingleFileSpecifyOutputDirectory/node/outdir/simple/test.js @@ -3,7 +3,7 @@ var c1 = (function () { function c1() { } return c1; -})(); +}()); var instance1 = new c1(); function f1() { return instance1; diff --git a/tests/baselines/reference/project/maprootUrlsourcerootUrlSingleFileSpecifyOutputFile/amd/bin/test.js b/tests/baselines/reference/project/maprootUrlsourcerootUrlSingleFileSpecifyOutputFile/amd/bin/test.js index bc0f3007e6a..73eb738e590 100644 --- a/tests/baselines/reference/project/maprootUrlsourcerootUrlSingleFileSpecifyOutputFile/amd/bin/test.js +++ b/tests/baselines/reference/project/maprootUrlsourcerootUrlSingleFileSpecifyOutputFile/amd/bin/test.js @@ -3,7 +3,7 @@ var c1 = (function () { function c1() { } return c1; -})(); +}()); var instance1 = new c1(); function f1() { return instance1; diff --git a/tests/baselines/reference/project/maprootUrlsourcerootUrlSingleFileSpecifyOutputFile/amd/maprootUrlsourcerootUrlSingleFileSpecifyOutputFile.sourcemap.txt b/tests/baselines/reference/project/maprootUrlsourcerootUrlSingleFileSpecifyOutputFile/amd/maprootUrlsourcerootUrlSingleFileSpecifyOutputFile.sourcemap.txt index a3604df7a9d..7e18311cc3d 100644 --- a/tests/baselines/reference/project/maprootUrlsourcerootUrlSingleFileSpecifyOutputFile/amd/maprootUrlsourcerootUrlSingleFileSpecifyOutputFile.sourcemap.txt +++ b/tests/baselines/reference/project/maprootUrlsourcerootUrlSingleFileSpecifyOutputFile/amd/maprootUrlsourcerootUrlSingleFileSpecifyOutputFile.sourcemap.txt @@ -61,7 +61,7 @@ sourceFile:test.ts 1->Emitted(5, 5) Source(4, 1) + SourceIndex(0) 2 >Emitted(5, 14) Source(4, 2) + SourceIndex(0) --- ->>>})(); +>>>}()); 1 > 2 >^ 3 > diff --git a/tests/baselines/reference/project/maprootUrlsourcerootUrlSingleFileSpecifyOutputFile/node/bin/test.js b/tests/baselines/reference/project/maprootUrlsourcerootUrlSingleFileSpecifyOutputFile/node/bin/test.js index bc0f3007e6a..73eb738e590 100644 --- a/tests/baselines/reference/project/maprootUrlsourcerootUrlSingleFileSpecifyOutputFile/node/bin/test.js +++ b/tests/baselines/reference/project/maprootUrlsourcerootUrlSingleFileSpecifyOutputFile/node/bin/test.js @@ -3,7 +3,7 @@ var c1 = (function () { function c1() { } return c1; -})(); +}()); var instance1 = new c1(); function f1() { return instance1; diff --git a/tests/baselines/reference/project/maprootUrlsourcerootUrlSingleFileSpecifyOutputFile/node/maprootUrlsourcerootUrlSingleFileSpecifyOutputFile.sourcemap.txt b/tests/baselines/reference/project/maprootUrlsourcerootUrlSingleFileSpecifyOutputFile/node/maprootUrlsourcerootUrlSingleFileSpecifyOutputFile.sourcemap.txt index a3604df7a9d..7e18311cc3d 100644 --- a/tests/baselines/reference/project/maprootUrlsourcerootUrlSingleFileSpecifyOutputFile/node/maprootUrlsourcerootUrlSingleFileSpecifyOutputFile.sourcemap.txt +++ b/tests/baselines/reference/project/maprootUrlsourcerootUrlSingleFileSpecifyOutputFile/node/maprootUrlsourcerootUrlSingleFileSpecifyOutputFile.sourcemap.txt @@ -61,7 +61,7 @@ sourceFile:test.ts 1->Emitted(5, 5) Source(4, 1) + SourceIndex(0) 2 >Emitted(5, 14) Source(4, 2) + SourceIndex(0) --- ->>>})(); +>>>}()); 1 > 2 >^ 3 > diff --git a/tests/baselines/reference/project/maprootUrlsourcerootUrlSubfolderNoOutdir/amd/maprootUrlsourcerootUrlSubfolderNoOutdir.sourcemap.txt b/tests/baselines/reference/project/maprootUrlsourcerootUrlSubfolderNoOutdir/amd/maprootUrlsourcerootUrlSubfolderNoOutdir.sourcemap.txt index e909fa2b9d9..9391f8b0649 100644 --- a/tests/baselines/reference/project/maprootUrlsourcerootUrlSubfolderNoOutdir/amd/maprootUrlsourcerootUrlSubfolderNoOutdir.sourcemap.txt +++ b/tests/baselines/reference/project/maprootUrlsourcerootUrlSubfolderNoOutdir/amd/maprootUrlsourcerootUrlSubfolderNoOutdir.sourcemap.txt @@ -61,7 +61,7 @@ sourceFile:ref/m1.ts 1->Emitted(5, 5) Source(4, 1) + SourceIndex(0) 2 >Emitted(5, 17) Source(4, 2) + SourceIndex(0) --- ->>>})(); +>>>}()); 1 > 2 >^ 3 > @@ -213,7 +213,7 @@ sourceFile:test.ts 1->Emitted(6, 5) Source(5, 1) + SourceIndex(0) 2 >Emitted(6, 14) Source(5, 2) + SourceIndex(0) --- ->>>})(); +>>>}()); 1 > 2 >^ 3 > diff --git a/tests/baselines/reference/project/maprootUrlsourcerootUrlSubfolderNoOutdir/amd/ref/m1.js b/tests/baselines/reference/project/maprootUrlsourcerootUrlSubfolderNoOutdir/amd/ref/m1.js index f01a67c7277..ac9c9fc5839 100644 --- a/tests/baselines/reference/project/maprootUrlsourcerootUrlSubfolderNoOutdir/amd/ref/m1.js +++ b/tests/baselines/reference/project/maprootUrlsourcerootUrlSubfolderNoOutdir/amd/ref/m1.js @@ -3,7 +3,7 @@ var m1_c1 = (function () { function m1_c1() { } return m1_c1; -})(); +}()); var m1_instance1 = new m1_c1(); function m1_f1() { return m1_instance1; diff --git a/tests/baselines/reference/project/maprootUrlsourcerootUrlSubfolderNoOutdir/node/maprootUrlsourcerootUrlSubfolderNoOutdir.sourcemap.txt b/tests/baselines/reference/project/maprootUrlsourcerootUrlSubfolderNoOutdir/node/maprootUrlsourcerootUrlSubfolderNoOutdir.sourcemap.txt index e909fa2b9d9..9391f8b0649 100644 --- a/tests/baselines/reference/project/maprootUrlsourcerootUrlSubfolderNoOutdir/node/maprootUrlsourcerootUrlSubfolderNoOutdir.sourcemap.txt +++ b/tests/baselines/reference/project/maprootUrlsourcerootUrlSubfolderNoOutdir/node/maprootUrlsourcerootUrlSubfolderNoOutdir.sourcemap.txt @@ -61,7 +61,7 @@ sourceFile:ref/m1.ts 1->Emitted(5, 5) Source(4, 1) + SourceIndex(0) 2 >Emitted(5, 17) Source(4, 2) + SourceIndex(0) --- ->>>})(); +>>>}()); 1 > 2 >^ 3 > @@ -213,7 +213,7 @@ sourceFile:test.ts 1->Emitted(6, 5) Source(5, 1) + SourceIndex(0) 2 >Emitted(6, 14) Source(5, 2) + SourceIndex(0) --- ->>>})(); +>>>}()); 1 > 2 >^ 3 > diff --git a/tests/baselines/reference/project/maprootUrlsourcerootUrlSubfolderNoOutdir/node/ref/m1.js b/tests/baselines/reference/project/maprootUrlsourcerootUrlSubfolderNoOutdir/node/ref/m1.js index f01a67c7277..ac9c9fc5839 100644 --- a/tests/baselines/reference/project/maprootUrlsourcerootUrlSubfolderNoOutdir/node/ref/m1.js +++ b/tests/baselines/reference/project/maprootUrlsourcerootUrlSubfolderNoOutdir/node/ref/m1.js @@ -3,7 +3,7 @@ var m1_c1 = (function () { function m1_c1() { } return m1_c1; -})(); +}()); var m1_instance1 = new m1_c1(); function m1_f1() { return m1_instance1; diff --git a/tests/baselines/reference/project/maprootUrlsourcerootUrlSubfolderSpecifyOutputDirectory/amd/maprootUrlsourcerootUrlSubfolderSpecifyOutputDirectory.sourcemap.txt b/tests/baselines/reference/project/maprootUrlsourcerootUrlSubfolderSpecifyOutputDirectory/amd/maprootUrlsourcerootUrlSubfolderSpecifyOutputDirectory.sourcemap.txt index 8d48c91668d..c5760f4bd67 100644 --- a/tests/baselines/reference/project/maprootUrlsourcerootUrlSubfolderSpecifyOutputDirectory/amd/maprootUrlsourcerootUrlSubfolderSpecifyOutputDirectory.sourcemap.txt +++ b/tests/baselines/reference/project/maprootUrlsourcerootUrlSubfolderSpecifyOutputDirectory/amd/maprootUrlsourcerootUrlSubfolderSpecifyOutputDirectory.sourcemap.txt @@ -61,7 +61,7 @@ sourceFile:ref/m1.ts 1->Emitted(5, 5) Source(4, 1) + SourceIndex(0) 2 >Emitted(5, 17) Source(4, 2) + SourceIndex(0) --- ->>>})(); +>>>}()); 1 > 2 >^ 3 > @@ -213,7 +213,7 @@ sourceFile:test.ts 1->Emitted(6, 5) Source(5, 1) + SourceIndex(0) 2 >Emitted(6, 14) Source(5, 2) + SourceIndex(0) --- ->>>})(); +>>>}()); 1 > 2 >^ 3 > diff --git a/tests/baselines/reference/project/maprootUrlsourcerootUrlSubfolderSpecifyOutputDirectory/amd/outdir/simple/ref/m1.js b/tests/baselines/reference/project/maprootUrlsourcerootUrlSubfolderSpecifyOutputDirectory/amd/outdir/simple/ref/m1.js index f01a67c7277..ac9c9fc5839 100644 --- a/tests/baselines/reference/project/maprootUrlsourcerootUrlSubfolderSpecifyOutputDirectory/amd/outdir/simple/ref/m1.js +++ b/tests/baselines/reference/project/maprootUrlsourcerootUrlSubfolderSpecifyOutputDirectory/amd/outdir/simple/ref/m1.js @@ -3,7 +3,7 @@ var m1_c1 = (function () { function m1_c1() { } return m1_c1; -})(); +}()); var m1_instance1 = new m1_c1(); function m1_f1() { return m1_instance1; diff --git a/tests/baselines/reference/project/maprootUrlsourcerootUrlSubfolderSpecifyOutputDirectory/node/maprootUrlsourcerootUrlSubfolderSpecifyOutputDirectory.sourcemap.txt b/tests/baselines/reference/project/maprootUrlsourcerootUrlSubfolderSpecifyOutputDirectory/node/maprootUrlsourcerootUrlSubfolderSpecifyOutputDirectory.sourcemap.txt index 8d48c91668d..c5760f4bd67 100644 --- a/tests/baselines/reference/project/maprootUrlsourcerootUrlSubfolderSpecifyOutputDirectory/node/maprootUrlsourcerootUrlSubfolderSpecifyOutputDirectory.sourcemap.txt +++ b/tests/baselines/reference/project/maprootUrlsourcerootUrlSubfolderSpecifyOutputDirectory/node/maprootUrlsourcerootUrlSubfolderSpecifyOutputDirectory.sourcemap.txt @@ -61,7 +61,7 @@ sourceFile:ref/m1.ts 1->Emitted(5, 5) Source(4, 1) + SourceIndex(0) 2 >Emitted(5, 17) Source(4, 2) + SourceIndex(0) --- ->>>})(); +>>>}()); 1 > 2 >^ 3 > @@ -213,7 +213,7 @@ sourceFile:test.ts 1->Emitted(6, 5) Source(5, 1) + SourceIndex(0) 2 >Emitted(6, 14) Source(5, 2) + SourceIndex(0) --- ->>>})(); +>>>}()); 1 > 2 >^ 3 > diff --git a/tests/baselines/reference/project/maprootUrlsourcerootUrlSubfolderSpecifyOutputDirectory/node/outdir/simple/ref/m1.js b/tests/baselines/reference/project/maprootUrlsourcerootUrlSubfolderSpecifyOutputDirectory/node/outdir/simple/ref/m1.js index f01a67c7277..ac9c9fc5839 100644 --- a/tests/baselines/reference/project/maprootUrlsourcerootUrlSubfolderSpecifyOutputDirectory/node/outdir/simple/ref/m1.js +++ b/tests/baselines/reference/project/maprootUrlsourcerootUrlSubfolderSpecifyOutputDirectory/node/outdir/simple/ref/m1.js @@ -3,7 +3,7 @@ var m1_c1 = (function () { function m1_c1() { } return m1_c1; -})(); +}()); var m1_instance1 = new m1_c1(); function m1_f1() { return m1_instance1; diff --git a/tests/baselines/reference/project/maprootUrlsourcerootUrlSubfolderSpecifyOutputFile/amd/bin/test.js b/tests/baselines/reference/project/maprootUrlsourcerootUrlSubfolderSpecifyOutputFile/amd/bin/test.js index 632070dbd64..4b9e91859bf 100644 --- a/tests/baselines/reference/project/maprootUrlsourcerootUrlSubfolderSpecifyOutputFile/amd/bin/test.js +++ b/tests/baselines/reference/project/maprootUrlsourcerootUrlSubfolderSpecifyOutputFile/amd/bin/test.js @@ -3,7 +3,7 @@ var m1_c1 = (function () { function m1_c1() { } return m1_c1; -})(); +}()); var m1_instance1 = new m1_c1(); function m1_f1() { return m1_instance1; @@ -14,7 +14,7 @@ var c1 = (function () { function c1() { } return c1; -})(); +}()); var instance1 = new c1(); function f1() { return instance1; diff --git a/tests/baselines/reference/project/maprootUrlsourcerootUrlSubfolderSpecifyOutputFile/amd/maprootUrlsourcerootUrlSubfolderSpecifyOutputFile.sourcemap.txt b/tests/baselines/reference/project/maprootUrlsourcerootUrlSubfolderSpecifyOutputFile/amd/maprootUrlsourcerootUrlSubfolderSpecifyOutputFile.sourcemap.txt index a3eb3d49a39..86c45fec178 100644 --- a/tests/baselines/reference/project/maprootUrlsourcerootUrlSubfolderSpecifyOutputFile/amd/maprootUrlsourcerootUrlSubfolderSpecifyOutputFile.sourcemap.txt +++ b/tests/baselines/reference/project/maprootUrlsourcerootUrlSubfolderSpecifyOutputFile/amd/maprootUrlsourcerootUrlSubfolderSpecifyOutputFile.sourcemap.txt @@ -61,7 +61,7 @@ sourceFile:ref/m1.ts 1->Emitted(5, 5) Source(4, 1) + SourceIndex(0) 2 >Emitted(5, 17) Source(4, 2) + SourceIndex(0) --- ->>>})(); +>>>}()); 1 > 2 >^ 3 > @@ -207,7 +207,7 @@ sourceFile:test.ts 1->Emitted(16, 5) Source(5, 1) + SourceIndex(1) 2 >Emitted(16, 14) Source(5, 2) + SourceIndex(1) --- ->>>})(); +>>>}()); 1 > 2 >^ 3 > diff --git a/tests/baselines/reference/project/maprootUrlsourcerootUrlSubfolderSpecifyOutputFile/node/bin/test.js b/tests/baselines/reference/project/maprootUrlsourcerootUrlSubfolderSpecifyOutputFile/node/bin/test.js index 632070dbd64..4b9e91859bf 100644 --- a/tests/baselines/reference/project/maprootUrlsourcerootUrlSubfolderSpecifyOutputFile/node/bin/test.js +++ b/tests/baselines/reference/project/maprootUrlsourcerootUrlSubfolderSpecifyOutputFile/node/bin/test.js @@ -3,7 +3,7 @@ var m1_c1 = (function () { function m1_c1() { } return m1_c1; -})(); +}()); var m1_instance1 = new m1_c1(); function m1_f1() { return m1_instance1; @@ -14,7 +14,7 @@ var c1 = (function () { function c1() { } return c1; -})(); +}()); var instance1 = new c1(); function f1() { return instance1; diff --git a/tests/baselines/reference/project/maprootUrlsourcerootUrlSubfolderSpecifyOutputFile/node/maprootUrlsourcerootUrlSubfolderSpecifyOutputFile.sourcemap.txt b/tests/baselines/reference/project/maprootUrlsourcerootUrlSubfolderSpecifyOutputFile/node/maprootUrlsourcerootUrlSubfolderSpecifyOutputFile.sourcemap.txt index a3eb3d49a39..86c45fec178 100644 --- a/tests/baselines/reference/project/maprootUrlsourcerootUrlSubfolderSpecifyOutputFile/node/maprootUrlsourcerootUrlSubfolderSpecifyOutputFile.sourcemap.txt +++ b/tests/baselines/reference/project/maprootUrlsourcerootUrlSubfolderSpecifyOutputFile/node/maprootUrlsourcerootUrlSubfolderSpecifyOutputFile.sourcemap.txt @@ -61,7 +61,7 @@ sourceFile:ref/m1.ts 1->Emitted(5, 5) Source(4, 1) + SourceIndex(0) 2 >Emitted(5, 17) Source(4, 2) + SourceIndex(0) --- ->>>})(); +>>>}()); 1 > 2 >^ 3 > @@ -207,7 +207,7 @@ sourceFile:test.ts 1->Emitted(16, 5) Source(5, 1) + SourceIndex(1) 2 >Emitted(16, 14) Source(5, 2) + SourceIndex(1) --- ->>>})(); +>>>}()); 1 > 2 >^ 3 > diff --git a/tests/baselines/reference/project/outMixedSubfolderNoOutdir/amd/ref/m1.js b/tests/baselines/reference/project/outMixedSubfolderNoOutdir/amd/ref/m1.js index 2a78be9bc07..a9ac9819faa 100644 --- a/tests/baselines/reference/project/outMixedSubfolderNoOutdir/amd/ref/m1.js +++ b/tests/baselines/reference/project/outMixedSubfolderNoOutdir/amd/ref/m1.js @@ -3,7 +3,7 @@ var m1_c1 = (function () { function m1_c1() { } return m1_c1; -})(); +}()); var m1_instance1 = new m1_c1(); function m1_f1() { return m1_instance1; diff --git a/tests/baselines/reference/project/outMixedSubfolderNoOutdir/node/ref/m1.js b/tests/baselines/reference/project/outMixedSubfolderNoOutdir/node/ref/m1.js index 2a78be9bc07..a9ac9819faa 100644 --- a/tests/baselines/reference/project/outMixedSubfolderNoOutdir/node/ref/m1.js +++ b/tests/baselines/reference/project/outMixedSubfolderNoOutdir/node/ref/m1.js @@ -3,7 +3,7 @@ var m1_c1 = (function () { function m1_c1() { } return m1_c1; -})(); +}()); var m1_instance1 = new m1_c1(); function m1_f1() { return m1_instance1; diff --git a/tests/baselines/reference/project/outMixedSubfolderSpecifyOutputDirectory/amd/outdir/simple/ref/m1.js b/tests/baselines/reference/project/outMixedSubfolderSpecifyOutputDirectory/amd/outdir/simple/ref/m1.js index 2a78be9bc07..a9ac9819faa 100644 --- a/tests/baselines/reference/project/outMixedSubfolderSpecifyOutputDirectory/amd/outdir/simple/ref/m1.js +++ b/tests/baselines/reference/project/outMixedSubfolderSpecifyOutputDirectory/amd/outdir/simple/ref/m1.js @@ -3,7 +3,7 @@ var m1_c1 = (function () { function m1_c1() { } return m1_c1; -})(); +}()); var m1_instance1 = new m1_c1(); function m1_f1() { return m1_instance1; diff --git a/tests/baselines/reference/project/outMixedSubfolderSpecifyOutputDirectory/node/outdir/simple/ref/m1.js b/tests/baselines/reference/project/outMixedSubfolderSpecifyOutputDirectory/node/outdir/simple/ref/m1.js index 2a78be9bc07..a9ac9819faa 100644 --- a/tests/baselines/reference/project/outMixedSubfolderSpecifyOutputDirectory/node/outdir/simple/ref/m1.js +++ b/tests/baselines/reference/project/outMixedSubfolderSpecifyOutputDirectory/node/outdir/simple/ref/m1.js @@ -3,7 +3,7 @@ var m1_c1 = (function () { function m1_c1() { } return m1_c1; -})(); +}()); var m1_instance1 = new m1_c1(); function m1_f1() { return m1_instance1; diff --git a/tests/baselines/reference/project/outMixedSubfolderSpecifyOutputFile/amd/bin/test.js b/tests/baselines/reference/project/outMixedSubfolderSpecifyOutputFile/amd/bin/test.js index c7642c55d72..7898180c050 100644 --- a/tests/baselines/reference/project/outMixedSubfolderSpecifyOutputFile/amd/bin/test.js +++ b/tests/baselines/reference/project/outMixedSubfolderSpecifyOutputFile/amd/bin/test.js @@ -3,7 +3,7 @@ var m1_c1 = (function () { function m1_c1() { } return m1_c1; -})(); +}()); var m1_instance1 = new m1_c1(); function m1_f1() { return m1_instance1; @@ -15,7 +15,7 @@ define("ref/m2", ["require", "exports"], function (require, exports) { function m2_c1() { } return m2_c1; - })(); + }()); exports.m2_c1 = m2_c1; exports.m2_instance1 = new m2_c1(); function m2_f1() { @@ -30,7 +30,7 @@ var c1 = (function () { function c1() { } return c1; -})(); +}()); var instance1 = new c1(); function f1() { return instance1; diff --git a/tests/baselines/reference/project/outMixedSubfolderSpecifyOutputFile/node/bin/test.js b/tests/baselines/reference/project/outMixedSubfolderSpecifyOutputFile/node/bin/test.js index ad3b4896eec..d10738c12a6 100644 --- a/tests/baselines/reference/project/outMixedSubfolderSpecifyOutputFile/node/bin/test.js +++ b/tests/baselines/reference/project/outMixedSubfolderSpecifyOutputFile/node/bin/test.js @@ -3,7 +3,7 @@ var m1_c1 = (function () { function m1_c1() { } return m1_c1; -})(); +}()); var m1_instance1 = new m1_c1(); function m1_f1() { return m1_instance1; @@ -15,7 +15,7 @@ var c1 = (function () { function c1() { } return c1; -})(); +}()); var instance1 = new c1(); function f1() { return instance1; diff --git a/tests/baselines/reference/project/outMixedSubfolderSpecifyOutputFileAndOutputDirectory/amd/bin/outAndOutDirFile.js b/tests/baselines/reference/project/outMixedSubfolderSpecifyOutputFileAndOutputDirectory/amd/bin/outAndOutDirFile.js index c7642c55d72..7898180c050 100644 --- a/tests/baselines/reference/project/outMixedSubfolderSpecifyOutputFileAndOutputDirectory/amd/bin/outAndOutDirFile.js +++ b/tests/baselines/reference/project/outMixedSubfolderSpecifyOutputFileAndOutputDirectory/amd/bin/outAndOutDirFile.js @@ -3,7 +3,7 @@ var m1_c1 = (function () { function m1_c1() { } return m1_c1; -})(); +}()); var m1_instance1 = new m1_c1(); function m1_f1() { return m1_instance1; @@ -15,7 +15,7 @@ define("ref/m2", ["require", "exports"], function (require, exports) { function m2_c1() { } return m2_c1; - })(); + }()); exports.m2_c1 = m2_c1; exports.m2_instance1 = new m2_c1(); function m2_f1() { @@ -30,7 +30,7 @@ var c1 = (function () { function c1() { } return c1; -})(); +}()); var instance1 = new c1(); function f1() { return instance1; diff --git a/tests/baselines/reference/project/outMixedSubfolderSpecifyOutputFileAndOutputDirectory/node/bin/outAndOutDirFile.js b/tests/baselines/reference/project/outMixedSubfolderSpecifyOutputFileAndOutputDirectory/node/bin/outAndOutDirFile.js index ad3b4896eec..d10738c12a6 100644 --- a/tests/baselines/reference/project/outMixedSubfolderSpecifyOutputFileAndOutputDirectory/node/bin/outAndOutDirFile.js +++ b/tests/baselines/reference/project/outMixedSubfolderSpecifyOutputFileAndOutputDirectory/node/bin/outAndOutDirFile.js @@ -3,7 +3,7 @@ var m1_c1 = (function () { function m1_c1() { } return m1_c1; -})(); +}()); var m1_instance1 = new m1_c1(); function m1_f1() { return m1_instance1; @@ -15,7 +15,7 @@ var c1 = (function () { function c1() { } return c1; -})(); +}()); var instance1 = new c1(); function f1() { return instance1; diff --git a/tests/baselines/reference/project/outModuleMultifolderNoOutdir/amd/ref/m1.js b/tests/baselines/reference/project/outModuleMultifolderNoOutdir/amd/ref/m1.js index 469ba2c199f..34936dca125 100644 --- a/tests/baselines/reference/project/outModuleMultifolderNoOutdir/amd/ref/m1.js +++ b/tests/baselines/reference/project/outModuleMultifolderNoOutdir/amd/ref/m1.js @@ -5,7 +5,7 @@ define(["require", "exports"], function (require, exports) { function m1_c1() { } return m1_c1; - })(); + }()); exports.m1_c1 = m1_c1; exports.m1_instance1 = new m1_c1(); function m1_f1() { diff --git a/tests/baselines/reference/project/outModuleMultifolderNoOutdir/node/ref/m1.js b/tests/baselines/reference/project/outModuleMultifolderNoOutdir/node/ref/m1.js index 01ed51fe662..5854acba9e2 100644 --- a/tests/baselines/reference/project/outModuleMultifolderNoOutdir/node/ref/m1.js +++ b/tests/baselines/reference/project/outModuleMultifolderNoOutdir/node/ref/m1.js @@ -4,7 +4,7 @@ var m1_c1 = (function () { function m1_c1() { } return m1_c1; -})(); +}()); exports.m1_c1 = m1_c1; exports.m1_instance1 = new m1_c1(); function m1_f1() { diff --git a/tests/baselines/reference/project/outModuleMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_module_multifolder/ref/m1.js b/tests/baselines/reference/project/outModuleMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_module_multifolder/ref/m1.js index 469ba2c199f..34936dca125 100644 --- a/tests/baselines/reference/project/outModuleMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_module_multifolder/ref/m1.js +++ b/tests/baselines/reference/project/outModuleMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_module_multifolder/ref/m1.js @@ -5,7 +5,7 @@ define(["require", "exports"], function (require, exports) { function m1_c1() { } return m1_c1; - })(); + }()); exports.m1_c1 = m1_c1; exports.m1_instance1 = new m1_c1(); function m1_f1() { diff --git a/tests/baselines/reference/project/outModuleMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_module_multifolder/ref/m1.js b/tests/baselines/reference/project/outModuleMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_module_multifolder/ref/m1.js index 01ed51fe662..5854acba9e2 100644 --- a/tests/baselines/reference/project/outModuleMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_module_multifolder/ref/m1.js +++ b/tests/baselines/reference/project/outModuleMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_module_multifolder/ref/m1.js @@ -4,7 +4,7 @@ var m1_c1 = (function () { function m1_c1() { } return m1_c1; -})(); +}()); exports.m1_c1 = m1_c1; exports.m1_instance1 = new m1_c1(); function m1_f1() { diff --git a/tests/baselines/reference/project/outModuleMultifolderSpecifyOutputFile/amd/bin/test.js b/tests/baselines/reference/project/outModuleMultifolderSpecifyOutputFile/amd/bin/test.js index f4180b78739..ea6ae0a3cd7 100644 --- a/tests/baselines/reference/project/outModuleMultifolderSpecifyOutputFile/amd/bin/test.js +++ b/tests/baselines/reference/project/outModuleMultifolderSpecifyOutputFile/amd/bin/test.js @@ -5,7 +5,7 @@ define("outputdir_module_multifolder/ref/m1", ["require", "exports"], function ( function m1_c1() { } return m1_c1; - })(); + }()); exports.m1_c1 = m1_c1; exports.m1_instance1 = new m1_c1(); function m1_f1() { @@ -20,7 +20,7 @@ define("outputdir_module_multifolder_ref/m2", ["require", "exports"], function ( function m2_c1() { } return m2_c1; - })(); + }()); exports.m2_c1 = m2_c1; exports.m2_instance1 = new m2_c1(); function m2_f1() { @@ -35,7 +35,7 @@ define("outputdir_module_multifolder/test", ["require", "exports", "outputdir_mo function c1() { } return c1; - })(); + }()); exports.c1 = c1; exports.instance1 = new c1(); function f1() { diff --git a/tests/baselines/reference/project/outModuleSimpleNoOutdir/amd/m1.js b/tests/baselines/reference/project/outModuleSimpleNoOutdir/amd/m1.js index 469ba2c199f..34936dca125 100644 --- a/tests/baselines/reference/project/outModuleSimpleNoOutdir/amd/m1.js +++ b/tests/baselines/reference/project/outModuleSimpleNoOutdir/amd/m1.js @@ -5,7 +5,7 @@ define(["require", "exports"], function (require, exports) { function m1_c1() { } return m1_c1; - })(); + }()); exports.m1_c1 = m1_c1; exports.m1_instance1 = new m1_c1(); function m1_f1() { diff --git a/tests/baselines/reference/project/outModuleSimpleNoOutdir/node/m1.js b/tests/baselines/reference/project/outModuleSimpleNoOutdir/node/m1.js index 01ed51fe662..5854acba9e2 100644 --- a/tests/baselines/reference/project/outModuleSimpleNoOutdir/node/m1.js +++ b/tests/baselines/reference/project/outModuleSimpleNoOutdir/node/m1.js @@ -4,7 +4,7 @@ var m1_c1 = (function () { function m1_c1() { } return m1_c1; -})(); +}()); exports.m1_c1 = m1_c1; exports.m1_instance1 = new m1_c1(); function m1_f1() { diff --git a/tests/baselines/reference/project/outModuleSimpleSpecifyOutputDirectory/amd/outdir/simple/m1.js b/tests/baselines/reference/project/outModuleSimpleSpecifyOutputDirectory/amd/outdir/simple/m1.js index 469ba2c199f..34936dca125 100644 --- a/tests/baselines/reference/project/outModuleSimpleSpecifyOutputDirectory/amd/outdir/simple/m1.js +++ b/tests/baselines/reference/project/outModuleSimpleSpecifyOutputDirectory/amd/outdir/simple/m1.js @@ -5,7 +5,7 @@ define(["require", "exports"], function (require, exports) { function m1_c1() { } return m1_c1; - })(); + }()); exports.m1_c1 = m1_c1; exports.m1_instance1 = new m1_c1(); function m1_f1() { diff --git a/tests/baselines/reference/project/outModuleSimpleSpecifyOutputDirectory/node/outdir/simple/m1.js b/tests/baselines/reference/project/outModuleSimpleSpecifyOutputDirectory/node/outdir/simple/m1.js index 01ed51fe662..5854acba9e2 100644 --- a/tests/baselines/reference/project/outModuleSimpleSpecifyOutputDirectory/node/outdir/simple/m1.js +++ b/tests/baselines/reference/project/outModuleSimpleSpecifyOutputDirectory/node/outdir/simple/m1.js @@ -4,7 +4,7 @@ var m1_c1 = (function () { function m1_c1() { } return m1_c1; -})(); +}()); exports.m1_c1 = m1_c1; exports.m1_instance1 = new m1_c1(); function m1_f1() { diff --git a/tests/baselines/reference/project/outModuleSimpleSpecifyOutputFile/amd/bin/test.js b/tests/baselines/reference/project/outModuleSimpleSpecifyOutputFile/amd/bin/test.js index 30a7145ab87..04f9d32831e 100644 --- a/tests/baselines/reference/project/outModuleSimpleSpecifyOutputFile/amd/bin/test.js +++ b/tests/baselines/reference/project/outModuleSimpleSpecifyOutputFile/amd/bin/test.js @@ -5,7 +5,7 @@ define("m1", ["require", "exports"], function (require, exports) { function m1_c1() { } return m1_c1; - })(); + }()); exports.m1_c1 = m1_c1; exports.m1_instance1 = new m1_c1(); function m1_f1() { @@ -20,7 +20,7 @@ define("test", ["require", "exports", "m1"], function (require, exports, m1) { function c1() { } return c1; - })(); + }()); exports.c1 = c1; exports.instance1 = new c1(); function f1() { diff --git a/tests/baselines/reference/project/outModuleSubfolderNoOutdir/amd/ref/m1.js b/tests/baselines/reference/project/outModuleSubfolderNoOutdir/amd/ref/m1.js index 469ba2c199f..34936dca125 100644 --- a/tests/baselines/reference/project/outModuleSubfolderNoOutdir/amd/ref/m1.js +++ b/tests/baselines/reference/project/outModuleSubfolderNoOutdir/amd/ref/m1.js @@ -5,7 +5,7 @@ define(["require", "exports"], function (require, exports) { function m1_c1() { } return m1_c1; - })(); + }()); exports.m1_c1 = m1_c1; exports.m1_instance1 = new m1_c1(); function m1_f1() { diff --git a/tests/baselines/reference/project/outModuleSubfolderNoOutdir/node/ref/m1.js b/tests/baselines/reference/project/outModuleSubfolderNoOutdir/node/ref/m1.js index 01ed51fe662..5854acba9e2 100644 --- a/tests/baselines/reference/project/outModuleSubfolderNoOutdir/node/ref/m1.js +++ b/tests/baselines/reference/project/outModuleSubfolderNoOutdir/node/ref/m1.js @@ -4,7 +4,7 @@ var m1_c1 = (function () { function m1_c1() { } return m1_c1; -})(); +}()); exports.m1_c1 = m1_c1; exports.m1_instance1 = new m1_c1(); function m1_f1() { diff --git a/tests/baselines/reference/project/outModuleSubfolderSpecifyOutputDirectory/amd/outdir/simple/ref/m1.js b/tests/baselines/reference/project/outModuleSubfolderSpecifyOutputDirectory/amd/outdir/simple/ref/m1.js index 469ba2c199f..34936dca125 100644 --- a/tests/baselines/reference/project/outModuleSubfolderSpecifyOutputDirectory/amd/outdir/simple/ref/m1.js +++ b/tests/baselines/reference/project/outModuleSubfolderSpecifyOutputDirectory/amd/outdir/simple/ref/m1.js @@ -5,7 +5,7 @@ define(["require", "exports"], function (require, exports) { function m1_c1() { } return m1_c1; - })(); + }()); exports.m1_c1 = m1_c1; exports.m1_instance1 = new m1_c1(); function m1_f1() { diff --git a/tests/baselines/reference/project/outModuleSubfolderSpecifyOutputDirectory/node/outdir/simple/ref/m1.js b/tests/baselines/reference/project/outModuleSubfolderSpecifyOutputDirectory/node/outdir/simple/ref/m1.js index 01ed51fe662..5854acba9e2 100644 --- a/tests/baselines/reference/project/outModuleSubfolderSpecifyOutputDirectory/node/outdir/simple/ref/m1.js +++ b/tests/baselines/reference/project/outModuleSubfolderSpecifyOutputDirectory/node/outdir/simple/ref/m1.js @@ -4,7 +4,7 @@ var m1_c1 = (function () { function m1_c1() { } return m1_c1; -})(); +}()); exports.m1_c1 = m1_c1; exports.m1_instance1 = new m1_c1(); function m1_f1() { diff --git a/tests/baselines/reference/project/outModuleSubfolderSpecifyOutputFile/amd/bin/test.js b/tests/baselines/reference/project/outModuleSubfolderSpecifyOutputFile/amd/bin/test.js index 78afb5215e3..05ee275fc15 100644 --- a/tests/baselines/reference/project/outModuleSubfolderSpecifyOutputFile/amd/bin/test.js +++ b/tests/baselines/reference/project/outModuleSubfolderSpecifyOutputFile/amd/bin/test.js @@ -5,7 +5,7 @@ define("ref/m1", ["require", "exports"], function (require, exports) { function m1_c1() { } return m1_c1; - })(); + }()); exports.m1_c1 = m1_c1; exports.m1_instance1 = new m1_c1(); function m1_f1() { @@ -20,7 +20,7 @@ define("test", ["require", "exports", "ref/m1"], function (require, exports, m1) function c1() { } return c1; - })(); + }()); exports.c1 = c1; exports.instance1 = new c1(); function f1() { diff --git a/tests/baselines/reference/project/outMultifolderNoOutdir/amd/ref/m1.js b/tests/baselines/reference/project/outMultifolderNoOutdir/amd/ref/m1.js index 2a78be9bc07..a9ac9819faa 100644 --- a/tests/baselines/reference/project/outMultifolderNoOutdir/amd/ref/m1.js +++ b/tests/baselines/reference/project/outMultifolderNoOutdir/amd/ref/m1.js @@ -3,7 +3,7 @@ var m1_c1 = (function () { function m1_c1() { } return m1_c1; -})(); +}()); var m1_instance1 = new m1_c1(); function m1_f1() { return m1_instance1; diff --git a/tests/baselines/reference/project/outMultifolderNoOutdir/node/ref/m1.js b/tests/baselines/reference/project/outMultifolderNoOutdir/node/ref/m1.js index 2a78be9bc07..a9ac9819faa 100644 --- a/tests/baselines/reference/project/outMultifolderNoOutdir/node/ref/m1.js +++ b/tests/baselines/reference/project/outMultifolderNoOutdir/node/ref/m1.js @@ -3,7 +3,7 @@ var m1_c1 = (function () { function m1_c1() { } return m1_c1; -})(); +}()); var m1_instance1 = new m1_c1(); function m1_f1() { return m1_instance1; diff --git a/tests/baselines/reference/project/outMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_multifolder/ref/m1.js b/tests/baselines/reference/project/outMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_multifolder/ref/m1.js index 2a78be9bc07..a9ac9819faa 100644 --- a/tests/baselines/reference/project/outMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_multifolder/ref/m1.js +++ b/tests/baselines/reference/project/outMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_multifolder/ref/m1.js @@ -3,7 +3,7 @@ var m1_c1 = (function () { function m1_c1() { } return m1_c1; -})(); +}()); var m1_instance1 = new m1_c1(); function m1_f1() { return m1_instance1; diff --git a/tests/baselines/reference/project/outMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_multifolder/ref/m1.js b/tests/baselines/reference/project/outMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_multifolder/ref/m1.js index 2a78be9bc07..a9ac9819faa 100644 --- a/tests/baselines/reference/project/outMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_multifolder/ref/m1.js +++ b/tests/baselines/reference/project/outMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_multifolder/ref/m1.js @@ -3,7 +3,7 @@ var m1_c1 = (function () { function m1_c1() { } return m1_c1; -})(); +}()); var m1_instance1 = new m1_c1(); function m1_f1() { return m1_instance1; diff --git a/tests/baselines/reference/project/outMultifolderSpecifyOutputFile/amd/bin/test.js b/tests/baselines/reference/project/outMultifolderSpecifyOutputFile/amd/bin/test.js index b6fc6ea83ff..283a721170c 100644 --- a/tests/baselines/reference/project/outMultifolderSpecifyOutputFile/amd/bin/test.js +++ b/tests/baselines/reference/project/outMultifolderSpecifyOutputFile/amd/bin/test.js @@ -3,7 +3,7 @@ var m1_c1 = (function () { function m1_c1() { } return m1_c1; -})(); +}()); var m1_instance1 = new m1_c1(); function m1_f1() { return m1_instance1; @@ -13,7 +13,7 @@ var m2_c1 = (function () { function m2_c1() { } return m2_c1; -})(); +}()); var m2_instance1 = new m2_c1(); function m2_f1() { return m2_instance1; @@ -25,7 +25,7 @@ var c1 = (function () { function c1() { } return c1; -})(); +}()); var instance1 = new c1(); function f1() { return instance1; diff --git a/tests/baselines/reference/project/outMultifolderSpecifyOutputFile/node/bin/test.js b/tests/baselines/reference/project/outMultifolderSpecifyOutputFile/node/bin/test.js index b6fc6ea83ff..283a721170c 100644 --- a/tests/baselines/reference/project/outMultifolderSpecifyOutputFile/node/bin/test.js +++ b/tests/baselines/reference/project/outMultifolderSpecifyOutputFile/node/bin/test.js @@ -3,7 +3,7 @@ var m1_c1 = (function () { function m1_c1() { } return m1_c1; -})(); +}()); var m1_instance1 = new m1_c1(); function m1_f1() { return m1_instance1; @@ -13,7 +13,7 @@ var m2_c1 = (function () { function m2_c1() { } return m2_c1; -})(); +}()); var m2_instance1 = new m2_c1(); function m2_f1() { return m2_instance1; @@ -25,7 +25,7 @@ var c1 = (function () { function c1() { } return c1; -})(); +}()); var instance1 = new c1(); function f1() { return instance1; diff --git a/tests/baselines/reference/project/outSimpleNoOutdir/amd/m1.js b/tests/baselines/reference/project/outSimpleNoOutdir/amd/m1.js index 2a78be9bc07..a9ac9819faa 100644 --- a/tests/baselines/reference/project/outSimpleNoOutdir/amd/m1.js +++ b/tests/baselines/reference/project/outSimpleNoOutdir/amd/m1.js @@ -3,7 +3,7 @@ var m1_c1 = (function () { function m1_c1() { } return m1_c1; -})(); +}()); var m1_instance1 = new m1_c1(); function m1_f1() { return m1_instance1; diff --git a/tests/baselines/reference/project/outSimpleNoOutdir/node/m1.js b/tests/baselines/reference/project/outSimpleNoOutdir/node/m1.js index 2a78be9bc07..a9ac9819faa 100644 --- a/tests/baselines/reference/project/outSimpleNoOutdir/node/m1.js +++ b/tests/baselines/reference/project/outSimpleNoOutdir/node/m1.js @@ -3,7 +3,7 @@ var m1_c1 = (function () { function m1_c1() { } return m1_c1; -})(); +}()); var m1_instance1 = new m1_c1(); function m1_f1() { return m1_instance1; diff --git a/tests/baselines/reference/project/outSimpleSpecifyOutputDirectory/amd/outdir/simple/m1.js b/tests/baselines/reference/project/outSimpleSpecifyOutputDirectory/amd/outdir/simple/m1.js index 2a78be9bc07..a9ac9819faa 100644 --- a/tests/baselines/reference/project/outSimpleSpecifyOutputDirectory/amd/outdir/simple/m1.js +++ b/tests/baselines/reference/project/outSimpleSpecifyOutputDirectory/amd/outdir/simple/m1.js @@ -3,7 +3,7 @@ var m1_c1 = (function () { function m1_c1() { } return m1_c1; -})(); +}()); var m1_instance1 = new m1_c1(); function m1_f1() { return m1_instance1; diff --git a/tests/baselines/reference/project/outSimpleSpecifyOutputDirectory/node/outdir/simple/m1.js b/tests/baselines/reference/project/outSimpleSpecifyOutputDirectory/node/outdir/simple/m1.js index 2a78be9bc07..a9ac9819faa 100644 --- a/tests/baselines/reference/project/outSimpleSpecifyOutputDirectory/node/outdir/simple/m1.js +++ b/tests/baselines/reference/project/outSimpleSpecifyOutputDirectory/node/outdir/simple/m1.js @@ -3,7 +3,7 @@ var m1_c1 = (function () { function m1_c1() { } return m1_c1; -})(); +}()); var m1_instance1 = new m1_c1(); function m1_f1() { return m1_instance1; diff --git a/tests/baselines/reference/project/outSimpleSpecifyOutputFile/amd/bin/test.js b/tests/baselines/reference/project/outSimpleSpecifyOutputFile/amd/bin/test.js index 725379f28cc..d739de3142b 100644 --- a/tests/baselines/reference/project/outSimpleSpecifyOutputFile/amd/bin/test.js +++ b/tests/baselines/reference/project/outSimpleSpecifyOutputFile/amd/bin/test.js @@ -3,7 +3,7 @@ var m1_c1 = (function () { function m1_c1() { } return m1_c1; -})(); +}()); var m1_instance1 = new m1_c1(); function m1_f1() { return m1_instance1; @@ -14,7 +14,7 @@ var c1 = (function () { function c1() { } return c1; -})(); +}()); var instance1 = new c1(); function f1() { return instance1; diff --git a/tests/baselines/reference/project/outSimpleSpecifyOutputFile/node/bin/test.js b/tests/baselines/reference/project/outSimpleSpecifyOutputFile/node/bin/test.js index 725379f28cc..d739de3142b 100644 --- a/tests/baselines/reference/project/outSimpleSpecifyOutputFile/node/bin/test.js +++ b/tests/baselines/reference/project/outSimpleSpecifyOutputFile/node/bin/test.js @@ -3,7 +3,7 @@ var m1_c1 = (function () { function m1_c1() { } return m1_c1; -})(); +}()); var m1_instance1 = new m1_c1(); function m1_f1() { return m1_instance1; @@ -14,7 +14,7 @@ var c1 = (function () { function c1() { } return c1; -})(); +}()); var instance1 = new c1(); function f1() { return instance1; diff --git a/tests/baselines/reference/project/outSingleFileNoOutdir/amd/test.js b/tests/baselines/reference/project/outSingleFileNoOutdir/amd/test.js index ced5641081b..c3f455a08ce 100644 --- a/tests/baselines/reference/project/outSingleFileNoOutdir/amd/test.js +++ b/tests/baselines/reference/project/outSingleFileNoOutdir/amd/test.js @@ -3,7 +3,7 @@ var c1 = (function () { function c1() { } return c1; -})(); +}()); var instance1 = new c1(); function f1() { return instance1; diff --git a/tests/baselines/reference/project/outSingleFileNoOutdir/node/test.js b/tests/baselines/reference/project/outSingleFileNoOutdir/node/test.js index ced5641081b..c3f455a08ce 100644 --- a/tests/baselines/reference/project/outSingleFileNoOutdir/node/test.js +++ b/tests/baselines/reference/project/outSingleFileNoOutdir/node/test.js @@ -3,7 +3,7 @@ var c1 = (function () { function c1() { } return c1; -})(); +}()); var instance1 = new c1(); function f1() { return instance1; diff --git a/tests/baselines/reference/project/outSingleFileSpecifyOutputDirectory/amd/outdir/simple/test.js b/tests/baselines/reference/project/outSingleFileSpecifyOutputDirectory/amd/outdir/simple/test.js index ced5641081b..c3f455a08ce 100644 --- a/tests/baselines/reference/project/outSingleFileSpecifyOutputDirectory/amd/outdir/simple/test.js +++ b/tests/baselines/reference/project/outSingleFileSpecifyOutputDirectory/amd/outdir/simple/test.js @@ -3,7 +3,7 @@ var c1 = (function () { function c1() { } return c1; -})(); +}()); var instance1 = new c1(); function f1() { return instance1; diff --git a/tests/baselines/reference/project/outSingleFileSpecifyOutputDirectory/node/outdir/simple/test.js b/tests/baselines/reference/project/outSingleFileSpecifyOutputDirectory/node/outdir/simple/test.js index ced5641081b..c3f455a08ce 100644 --- a/tests/baselines/reference/project/outSingleFileSpecifyOutputDirectory/node/outdir/simple/test.js +++ b/tests/baselines/reference/project/outSingleFileSpecifyOutputDirectory/node/outdir/simple/test.js @@ -3,7 +3,7 @@ var c1 = (function () { function c1() { } return c1; -})(); +}()); var instance1 = new c1(); function f1() { return instance1; diff --git a/tests/baselines/reference/project/outSingleFileSpecifyOutputFile/amd/bin/test.js b/tests/baselines/reference/project/outSingleFileSpecifyOutputFile/amd/bin/test.js index ced5641081b..c3f455a08ce 100644 --- a/tests/baselines/reference/project/outSingleFileSpecifyOutputFile/amd/bin/test.js +++ b/tests/baselines/reference/project/outSingleFileSpecifyOutputFile/amd/bin/test.js @@ -3,7 +3,7 @@ var c1 = (function () { function c1() { } return c1; -})(); +}()); var instance1 = new c1(); function f1() { return instance1; diff --git a/tests/baselines/reference/project/outSingleFileSpecifyOutputFile/node/bin/test.js b/tests/baselines/reference/project/outSingleFileSpecifyOutputFile/node/bin/test.js index ced5641081b..c3f455a08ce 100644 --- a/tests/baselines/reference/project/outSingleFileSpecifyOutputFile/node/bin/test.js +++ b/tests/baselines/reference/project/outSingleFileSpecifyOutputFile/node/bin/test.js @@ -3,7 +3,7 @@ var c1 = (function () { function c1() { } return c1; -})(); +}()); var instance1 = new c1(); function f1() { return instance1; diff --git a/tests/baselines/reference/project/outSubfolderNoOutdir/amd/ref/m1.js b/tests/baselines/reference/project/outSubfolderNoOutdir/amd/ref/m1.js index 2a78be9bc07..a9ac9819faa 100644 --- a/tests/baselines/reference/project/outSubfolderNoOutdir/amd/ref/m1.js +++ b/tests/baselines/reference/project/outSubfolderNoOutdir/amd/ref/m1.js @@ -3,7 +3,7 @@ var m1_c1 = (function () { function m1_c1() { } return m1_c1; -})(); +}()); var m1_instance1 = new m1_c1(); function m1_f1() { return m1_instance1; diff --git a/tests/baselines/reference/project/outSubfolderNoOutdir/node/ref/m1.js b/tests/baselines/reference/project/outSubfolderNoOutdir/node/ref/m1.js index 2a78be9bc07..a9ac9819faa 100644 --- a/tests/baselines/reference/project/outSubfolderNoOutdir/node/ref/m1.js +++ b/tests/baselines/reference/project/outSubfolderNoOutdir/node/ref/m1.js @@ -3,7 +3,7 @@ var m1_c1 = (function () { function m1_c1() { } return m1_c1; -})(); +}()); var m1_instance1 = new m1_c1(); function m1_f1() { return m1_instance1; diff --git a/tests/baselines/reference/project/outSubfolderSpecifyOutputDirectory/amd/outdir/simple/ref/m1.js b/tests/baselines/reference/project/outSubfolderSpecifyOutputDirectory/amd/outdir/simple/ref/m1.js index 2a78be9bc07..a9ac9819faa 100644 --- a/tests/baselines/reference/project/outSubfolderSpecifyOutputDirectory/amd/outdir/simple/ref/m1.js +++ b/tests/baselines/reference/project/outSubfolderSpecifyOutputDirectory/amd/outdir/simple/ref/m1.js @@ -3,7 +3,7 @@ var m1_c1 = (function () { function m1_c1() { } return m1_c1; -})(); +}()); var m1_instance1 = new m1_c1(); function m1_f1() { return m1_instance1; diff --git a/tests/baselines/reference/project/outSubfolderSpecifyOutputDirectory/node/outdir/simple/ref/m1.js b/tests/baselines/reference/project/outSubfolderSpecifyOutputDirectory/node/outdir/simple/ref/m1.js index 2a78be9bc07..a9ac9819faa 100644 --- a/tests/baselines/reference/project/outSubfolderSpecifyOutputDirectory/node/outdir/simple/ref/m1.js +++ b/tests/baselines/reference/project/outSubfolderSpecifyOutputDirectory/node/outdir/simple/ref/m1.js @@ -3,7 +3,7 @@ var m1_c1 = (function () { function m1_c1() { } return m1_c1; -})(); +}()); var m1_instance1 = new m1_c1(); function m1_f1() { return m1_instance1; diff --git a/tests/baselines/reference/project/outSubfolderSpecifyOutputFile/amd/bin/test.js b/tests/baselines/reference/project/outSubfolderSpecifyOutputFile/amd/bin/test.js index 8b15a01fa01..0e00e79ca1f 100644 --- a/tests/baselines/reference/project/outSubfolderSpecifyOutputFile/amd/bin/test.js +++ b/tests/baselines/reference/project/outSubfolderSpecifyOutputFile/amd/bin/test.js @@ -3,7 +3,7 @@ var m1_c1 = (function () { function m1_c1() { } return m1_c1; -})(); +}()); var m1_instance1 = new m1_c1(); function m1_f1() { return m1_instance1; @@ -14,7 +14,7 @@ var c1 = (function () { function c1() { } return c1; -})(); +}()); var instance1 = new c1(); function f1() { return instance1; diff --git a/tests/baselines/reference/project/outSubfolderSpecifyOutputFile/node/bin/test.js b/tests/baselines/reference/project/outSubfolderSpecifyOutputFile/node/bin/test.js index 8b15a01fa01..0e00e79ca1f 100644 --- a/tests/baselines/reference/project/outSubfolderSpecifyOutputFile/node/bin/test.js +++ b/tests/baselines/reference/project/outSubfolderSpecifyOutputFile/node/bin/test.js @@ -3,7 +3,7 @@ var m1_c1 = (function () { function m1_c1() { } return m1_c1; -})(); +}()); var m1_instance1 = new m1_c1(); function m1_f1() { return m1_instance1; @@ -14,7 +14,7 @@ var c1 = (function () { function c1() { } return c1; -})(); +}()); var instance1 = new c1(); function f1() { return instance1; diff --git a/tests/baselines/reference/project/privacyCheckOnImportedModuleDeclarationsInsideModule/amd/testGlo.js b/tests/baselines/reference/project/privacyCheckOnImportedModuleDeclarationsInsideModule/amd/testGlo.js index bab996e07a4..3b6e407d045 100644 --- a/tests/baselines/reference/project/privacyCheckOnImportedModuleDeclarationsInsideModule/amd/testGlo.js +++ b/tests/baselines/reference/project/privacyCheckOnImportedModuleDeclarationsInsideModule/amd/testGlo.js @@ -17,7 +17,7 @@ var m2; _super.apply(this, arguments); } return class1; - })(m2.mExported.me.class1); + }(m2.mExported.me.class1)); m2.class1 = class1; var c2 = new m2.mExported.me.class1; function f2() { @@ -30,7 +30,7 @@ var m2; _super.apply(this, arguments); } return class2; - })(m2.mExported.me.class1); + }(m2.mExported.me.class1)); m2.c3 = new mNonExported.mne.class1; function f3() { return new mNonExported.mne.class1(); @@ -43,7 +43,7 @@ var m2; _super.apply(this, arguments); } return class3; - })(mNonExported.mne.class1); + }(mNonExported.mne.class1)); m2.class3 = class3; var c4 = new mNonExported.mne.class1; function f4() { @@ -56,5 +56,5 @@ var m2; _super.apply(this, arguments); } return class4; - })(mNonExported.mne.class1); + }(mNonExported.mne.class1)); })(m2 || (m2 = {})); diff --git a/tests/baselines/reference/project/privacyCheckOnImportedModuleDeclarationsInsideModule/node/testGlo.js b/tests/baselines/reference/project/privacyCheckOnImportedModuleDeclarationsInsideModule/node/testGlo.js index bab996e07a4..3b6e407d045 100644 --- a/tests/baselines/reference/project/privacyCheckOnImportedModuleDeclarationsInsideModule/node/testGlo.js +++ b/tests/baselines/reference/project/privacyCheckOnImportedModuleDeclarationsInsideModule/node/testGlo.js @@ -17,7 +17,7 @@ var m2; _super.apply(this, arguments); } return class1; - })(m2.mExported.me.class1); + }(m2.mExported.me.class1)); m2.class1 = class1; var c2 = new m2.mExported.me.class1; function f2() { @@ -30,7 +30,7 @@ var m2; _super.apply(this, arguments); } return class2; - })(m2.mExported.me.class1); + }(m2.mExported.me.class1)); m2.c3 = new mNonExported.mne.class1; function f3() { return new mNonExported.mne.class1(); @@ -43,7 +43,7 @@ var m2; _super.apply(this, arguments); } return class3; - })(mNonExported.mne.class1); + }(mNonExported.mne.class1)); m2.class3 = class3; var c4 = new mNonExported.mne.class1; function f4() { @@ -56,5 +56,5 @@ var m2; _super.apply(this, arguments); } return class4; - })(mNonExported.mne.class1); + }(mNonExported.mne.class1)); })(m2 || (m2 = {})); diff --git a/tests/baselines/reference/project/prologueEmit/amd/out.js b/tests/baselines/reference/project/prologueEmit/amd/out.js index 42313b7ce64..6a07c9a92ca 100644 --- a/tests/baselines/reference/project/prologueEmit/amd/out.js +++ b/tests/baselines/reference/project/prologueEmit/amd/out.js @@ -13,7 +13,7 @@ var m; function base() { } return base; - })(); + }()); m.base = base; var child = (function (_super) { __extends(child, _super); @@ -21,6 +21,6 @@ var m; _super.apply(this, arguments); } return child; - })(base); + }(base)); m.child = child; })(m || (m = {})); diff --git a/tests/baselines/reference/project/prologueEmit/node/out.js b/tests/baselines/reference/project/prologueEmit/node/out.js index 42313b7ce64..6a07c9a92ca 100644 --- a/tests/baselines/reference/project/prologueEmit/node/out.js +++ b/tests/baselines/reference/project/prologueEmit/node/out.js @@ -13,7 +13,7 @@ var m; function base() { } return base; - })(); + }()); m.base = base; var child = (function (_super) { __extends(child, _super); @@ -21,6 +21,6 @@ var m; _super.apply(this, arguments); } return child; - })(base); + }(base)); m.child = child; })(m || (m = {})); diff --git a/tests/baselines/reference/project/quotesInFileAndDirectoryNames/amd/li'b/class'A.js b/tests/baselines/reference/project/quotesInFileAndDirectoryNames/amd/li'b/class'A.js index 115b5fff25f..5b3941738db 100644 --- a/tests/baselines/reference/project/quotesInFileAndDirectoryNames/amd/li'b/class'A.js +++ b/tests/baselines/reference/project/quotesInFileAndDirectoryNames/amd/li'b/class'A.js @@ -5,6 +5,6 @@ var test; } ClassA.prototype.method = function () { }; return ClassA; - })(); + }()); test.ClassA = ClassA; })(test || (test = {})); diff --git a/tests/baselines/reference/project/quotesInFileAndDirectoryNames/node/li'b/class'A.js b/tests/baselines/reference/project/quotesInFileAndDirectoryNames/node/li'b/class'A.js index 115b5fff25f..5b3941738db 100644 --- a/tests/baselines/reference/project/quotesInFileAndDirectoryNames/node/li'b/class'A.js +++ b/tests/baselines/reference/project/quotesInFileAndDirectoryNames/node/li'b/class'A.js @@ -5,6 +5,6 @@ var test; } ClassA.prototype.method = function () { }; return ClassA; - })(); + }()); test.ClassA = ClassA; })(test || (test = {})); diff --git a/tests/baselines/reference/project/referenceResolutionRelativePaths/amd/diskFile0.js b/tests/baselines/reference/project/referenceResolutionRelativePaths/amd/diskFile0.js index ae9742b492f..080f95401b3 100644 --- a/tests/baselines/reference/project/referenceResolutionRelativePaths/amd/diskFile0.js +++ b/tests/baselines/reference/project/referenceResolutionRelativePaths/amd/diskFile0.js @@ -4,4 +4,4 @@ var bar = (function () { function bar() { } return bar; -})(); +}()); diff --git a/tests/baselines/reference/project/referenceResolutionRelativePaths/node/diskFile0.js b/tests/baselines/reference/project/referenceResolutionRelativePaths/node/diskFile0.js index ae9742b492f..080f95401b3 100644 --- a/tests/baselines/reference/project/referenceResolutionRelativePaths/node/diskFile0.js +++ b/tests/baselines/reference/project/referenceResolutionRelativePaths/node/diskFile0.js @@ -4,4 +4,4 @@ var bar = (function () { function bar() { } return bar; -})(); +}()); diff --git a/tests/baselines/reference/project/referenceResolutionRelativePathsFromRootDirectory/amd/bar/bar.js b/tests/baselines/reference/project/referenceResolutionRelativePathsFromRootDirectory/amd/bar/bar.js index ae9742b492f..080f95401b3 100644 --- a/tests/baselines/reference/project/referenceResolutionRelativePathsFromRootDirectory/amd/bar/bar.js +++ b/tests/baselines/reference/project/referenceResolutionRelativePathsFromRootDirectory/amd/bar/bar.js @@ -4,4 +4,4 @@ var bar = (function () { function bar() { } return bar; -})(); +}()); diff --git a/tests/baselines/reference/project/referenceResolutionRelativePathsFromRootDirectory/node/bar/bar.js b/tests/baselines/reference/project/referenceResolutionRelativePathsFromRootDirectory/node/bar/bar.js index ae9742b492f..080f95401b3 100644 --- a/tests/baselines/reference/project/referenceResolutionRelativePathsFromRootDirectory/node/bar/bar.js +++ b/tests/baselines/reference/project/referenceResolutionRelativePathsFromRootDirectory/node/bar/bar.js @@ -4,4 +4,4 @@ var bar = (function () { function bar() { } return bar; -})(); +}()); diff --git a/tests/baselines/reference/project/referenceResolutionRelativePathsNoResolve/amd/foo.js b/tests/baselines/reference/project/referenceResolutionRelativePathsNoResolve/amd/foo.js index 20440d5c62b..4a01207bfce 100644 --- a/tests/baselines/reference/project/referenceResolutionRelativePathsNoResolve/amd/foo.js +++ b/tests/baselines/reference/project/referenceResolutionRelativePathsNoResolve/amd/foo.js @@ -3,4 +3,4 @@ var foo = (function () { function foo() { } return foo; -})(); +}()); diff --git a/tests/baselines/reference/project/referenceResolutionRelativePathsNoResolve/node/foo.js b/tests/baselines/reference/project/referenceResolutionRelativePathsNoResolve/node/foo.js index 20440d5c62b..4a01207bfce 100644 --- a/tests/baselines/reference/project/referenceResolutionRelativePathsNoResolve/node/foo.js +++ b/tests/baselines/reference/project/referenceResolutionRelativePathsNoResolve/node/foo.js @@ -3,4 +3,4 @@ var foo = (function () { function foo() { } return foo; -})(); +}()); diff --git a/tests/baselines/reference/project/referenceResolutionRelativePathsRelativeToRootDirectory/amd/diskFile0.js b/tests/baselines/reference/project/referenceResolutionRelativePathsRelativeToRootDirectory/amd/diskFile0.js index ae9742b492f..080f95401b3 100644 --- a/tests/baselines/reference/project/referenceResolutionRelativePathsRelativeToRootDirectory/amd/diskFile0.js +++ b/tests/baselines/reference/project/referenceResolutionRelativePathsRelativeToRootDirectory/amd/diskFile0.js @@ -4,4 +4,4 @@ var bar = (function () { function bar() { } return bar; -})(); +}()); diff --git a/tests/baselines/reference/project/referenceResolutionRelativePathsRelativeToRootDirectory/node/diskFile0.js b/tests/baselines/reference/project/referenceResolutionRelativePathsRelativeToRootDirectory/node/diskFile0.js index ae9742b492f..080f95401b3 100644 --- a/tests/baselines/reference/project/referenceResolutionRelativePathsRelativeToRootDirectory/node/diskFile0.js +++ b/tests/baselines/reference/project/referenceResolutionRelativePathsRelativeToRootDirectory/node/diskFile0.js @@ -4,4 +4,4 @@ var bar = (function () { function bar() { } return bar; -})(); +}()); diff --git a/tests/baselines/reference/project/referenceResolutionSameFileTwice/amd/test.js b/tests/baselines/reference/project/referenceResolutionSameFileTwice/amd/test.js index c82f04ec515..1d436a9e57b 100644 --- a/tests/baselines/reference/project/referenceResolutionSameFileTwice/amd/test.js +++ b/tests/baselines/reference/project/referenceResolutionSameFileTwice/amd/test.js @@ -2,4 +2,4 @@ var test = (function () { function test() { } return test; -})(); +}()); diff --git a/tests/baselines/reference/project/referenceResolutionSameFileTwice/node/test.js b/tests/baselines/reference/project/referenceResolutionSameFileTwice/node/test.js index c82f04ec515..1d436a9e57b 100644 --- a/tests/baselines/reference/project/referenceResolutionSameFileTwice/node/test.js +++ b/tests/baselines/reference/project/referenceResolutionSameFileTwice/node/test.js @@ -2,4 +2,4 @@ var test = (function () { function test() { } return test; -})(); +}()); diff --git a/tests/baselines/reference/project/referenceResolutionSameFileTwiceNoResolve/amd/test.js b/tests/baselines/reference/project/referenceResolutionSameFileTwiceNoResolve/amd/test.js index c82f04ec515..1d436a9e57b 100644 --- a/tests/baselines/reference/project/referenceResolutionSameFileTwiceNoResolve/amd/test.js +++ b/tests/baselines/reference/project/referenceResolutionSameFileTwiceNoResolve/amd/test.js @@ -2,4 +2,4 @@ var test = (function () { function test() { } return test; -})(); +}()); diff --git a/tests/baselines/reference/project/referenceResolutionSameFileTwiceNoResolve/node/test.js b/tests/baselines/reference/project/referenceResolutionSameFileTwiceNoResolve/node/test.js index c82f04ec515..1d436a9e57b 100644 --- a/tests/baselines/reference/project/referenceResolutionSameFileTwiceNoResolve/node/test.js +++ b/tests/baselines/reference/project/referenceResolutionSameFileTwiceNoResolve/node/test.js @@ -2,4 +2,4 @@ var test = (function () { function test() { } return test; -})(); +}()); diff --git a/tests/baselines/reference/project/rootDirectory/amd/outdir/simple/FolderB/FolderC/fileC.js b/tests/baselines/reference/project/rootDirectory/amd/outdir/simple/FolderB/FolderC/fileC.js index 8840c2117cf..f5e6c21e37c 100644 --- a/tests/baselines/reference/project/rootDirectory/amd/outdir/simple/FolderB/FolderC/fileC.js +++ b/tests/baselines/reference/project/rootDirectory/amd/outdir/simple/FolderB/FolderC/fileC.js @@ -2,5 +2,5 @@ var C = (function () { function C() { } return C; -})(); +}()); //# sourceMappingURL=fileC.js.map \ No newline at end of file diff --git a/tests/baselines/reference/project/rootDirectory/amd/rootDirectory.sourcemap.txt b/tests/baselines/reference/project/rootDirectory/amd/rootDirectory.sourcemap.txt index 4ef619780a6..73cf17e69f8 100644 --- a/tests/baselines/reference/project/rootDirectory/amd/rootDirectory.sourcemap.txt +++ b/tests/baselines/reference/project/rootDirectory/amd/rootDirectory.sourcemap.txt @@ -38,7 +38,7 @@ sourceFile:../../../../FolderA/FolderB/FolderC/fileC.ts 1->Emitted(4, 5) Source(2, 1) + SourceIndex(0) 2 >Emitted(4, 13) Source(2, 2) + SourceIndex(0) --- ->>>})(); +>>>}()); 1 > 2 >^ 3 > @@ -104,7 +104,7 @@ sourceFile:../../../FolderA/FolderB/fileB.ts 1->Emitted(5, 5) Source(4, 1) + SourceIndex(0) 2 >Emitted(5, 13) Source(4, 2) + SourceIndex(0) --- ->>>})(); +>>>}()); 1 > 2 >^ 3 > diff --git a/tests/baselines/reference/project/rootDirectory/node/outdir/simple/FolderB/FolderC/fileC.js b/tests/baselines/reference/project/rootDirectory/node/outdir/simple/FolderB/FolderC/fileC.js index 8840c2117cf..f5e6c21e37c 100644 --- a/tests/baselines/reference/project/rootDirectory/node/outdir/simple/FolderB/FolderC/fileC.js +++ b/tests/baselines/reference/project/rootDirectory/node/outdir/simple/FolderB/FolderC/fileC.js @@ -2,5 +2,5 @@ var C = (function () { function C() { } return C; -})(); +}()); //# sourceMappingURL=fileC.js.map \ No newline at end of file diff --git a/tests/baselines/reference/project/rootDirectory/node/rootDirectory.sourcemap.txt b/tests/baselines/reference/project/rootDirectory/node/rootDirectory.sourcemap.txt index 4ef619780a6..73cf17e69f8 100644 --- a/tests/baselines/reference/project/rootDirectory/node/rootDirectory.sourcemap.txt +++ b/tests/baselines/reference/project/rootDirectory/node/rootDirectory.sourcemap.txt @@ -38,7 +38,7 @@ sourceFile:../../../../FolderA/FolderB/FolderC/fileC.ts 1->Emitted(4, 5) Source(2, 1) + SourceIndex(0) 2 >Emitted(4, 13) Source(2, 2) + SourceIndex(0) --- ->>>})(); +>>>}()); 1 > 2 >^ 3 > @@ -104,7 +104,7 @@ sourceFile:../../../FolderA/FolderB/fileB.ts 1->Emitted(5, 5) Source(4, 1) + SourceIndex(0) 2 >Emitted(5, 13) Source(4, 2) + SourceIndex(0) --- ->>>})(); +>>>}()); 1 > 2 >^ 3 > diff --git a/tests/baselines/reference/project/rootDirectoryErrors/amd/outdir/simple/FolderC/fileC.js b/tests/baselines/reference/project/rootDirectoryErrors/amd/outdir/simple/FolderC/fileC.js index 325ac60ee32..87b76821b97 100644 --- a/tests/baselines/reference/project/rootDirectoryErrors/amd/outdir/simple/FolderC/fileC.js +++ b/tests/baselines/reference/project/rootDirectoryErrors/amd/outdir/simple/FolderC/fileC.js @@ -2,4 +2,4 @@ var C = (function () { function C() { } return C; -})(); +}()); diff --git a/tests/baselines/reference/project/rootDirectoryErrors/node/outdir/simple/FolderC/fileC.js b/tests/baselines/reference/project/rootDirectoryErrors/node/outdir/simple/FolderC/fileC.js index 325ac60ee32..87b76821b97 100644 --- a/tests/baselines/reference/project/rootDirectoryErrors/node/outdir/simple/FolderC/fileC.js +++ b/tests/baselines/reference/project/rootDirectoryErrors/node/outdir/simple/FolderC/fileC.js @@ -2,4 +2,4 @@ var C = (function () { function C() { } return C; -})(); +}()); diff --git a/tests/baselines/reference/project/rootDirectoryWithSourceRoot/amd/outdir/simple/FolderB/FolderC/fileC.js b/tests/baselines/reference/project/rootDirectoryWithSourceRoot/amd/outdir/simple/FolderB/FolderC/fileC.js index 8840c2117cf..f5e6c21e37c 100644 --- a/tests/baselines/reference/project/rootDirectoryWithSourceRoot/amd/outdir/simple/FolderB/FolderC/fileC.js +++ b/tests/baselines/reference/project/rootDirectoryWithSourceRoot/amd/outdir/simple/FolderB/FolderC/fileC.js @@ -2,5 +2,5 @@ var C = (function () { function C() { } return C; -})(); +}()); //# sourceMappingURL=fileC.js.map \ No newline at end of file diff --git a/tests/baselines/reference/project/rootDirectoryWithSourceRoot/amd/rootDirectoryWithSourceRoot.sourcemap.txt b/tests/baselines/reference/project/rootDirectoryWithSourceRoot/amd/rootDirectoryWithSourceRoot.sourcemap.txt index f7312546b9c..633462db829 100644 --- a/tests/baselines/reference/project/rootDirectoryWithSourceRoot/amd/rootDirectoryWithSourceRoot.sourcemap.txt +++ b/tests/baselines/reference/project/rootDirectoryWithSourceRoot/amd/rootDirectoryWithSourceRoot.sourcemap.txt @@ -38,7 +38,7 @@ sourceFile:FolderB/FolderC/fileC.ts 1->Emitted(4, 5) Source(2, 1) + SourceIndex(0) 2 >Emitted(4, 13) Source(2, 2) + SourceIndex(0) --- ->>>})(); +>>>}()); 1 > 2 >^ 3 > @@ -104,7 +104,7 @@ sourceFile:FolderB/fileB.ts 1->Emitted(5, 5) Source(4, 1) + SourceIndex(0) 2 >Emitted(5, 13) Source(4, 2) + SourceIndex(0) --- ->>>})(); +>>>}()); 1 > 2 >^ 3 > diff --git a/tests/baselines/reference/project/rootDirectoryWithSourceRoot/node/outdir/simple/FolderB/FolderC/fileC.js b/tests/baselines/reference/project/rootDirectoryWithSourceRoot/node/outdir/simple/FolderB/FolderC/fileC.js index 8840c2117cf..f5e6c21e37c 100644 --- a/tests/baselines/reference/project/rootDirectoryWithSourceRoot/node/outdir/simple/FolderB/FolderC/fileC.js +++ b/tests/baselines/reference/project/rootDirectoryWithSourceRoot/node/outdir/simple/FolderB/FolderC/fileC.js @@ -2,5 +2,5 @@ var C = (function () { function C() { } return C; -})(); +}()); //# sourceMappingURL=fileC.js.map \ No newline at end of file diff --git a/tests/baselines/reference/project/rootDirectoryWithSourceRoot/node/rootDirectoryWithSourceRoot.sourcemap.txt b/tests/baselines/reference/project/rootDirectoryWithSourceRoot/node/rootDirectoryWithSourceRoot.sourcemap.txt index f7312546b9c..633462db829 100644 --- a/tests/baselines/reference/project/rootDirectoryWithSourceRoot/node/rootDirectoryWithSourceRoot.sourcemap.txt +++ b/tests/baselines/reference/project/rootDirectoryWithSourceRoot/node/rootDirectoryWithSourceRoot.sourcemap.txt @@ -38,7 +38,7 @@ sourceFile:FolderB/FolderC/fileC.ts 1->Emitted(4, 5) Source(2, 1) + SourceIndex(0) 2 >Emitted(4, 13) Source(2, 2) + SourceIndex(0) --- ->>>})(); +>>>}()); 1 > 2 >^ 3 > @@ -104,7 +104,7 @@ sourceFile:FolderB/fileB.ts 1->Emitted(5, 5) Source(4, 1) + SourceIndex(0) 2 >Emitted(5, 13) Source(4, 2) + SourceIndex(0) --- ->>>})(); +>>>}()); 1 > 2 >^ 3 > diff --git a/tests/baselines/reference/project/sourceRootAbsolutePathMixedSubfolderNoOutdir/amd/ref/m1.js b/tests/baselines/reference/project/sourceRootAbsolutePathMixedSubfolderNoOutdir/amd/ref/m1.js index f6b169662c9..b7283f7fd88 100644 --- a/tests/baselines/reference/project/sourceRootAbsolutePathMixedSubfolderNoOutdir/amd/ref/m1.js +++ b/tests/baselines/reference/project/sourceRootAbsolutePathMixedSubfolderNoOutdir/amd/ref/m1.js @@ -3,7 +3,7 @@ var m1_c1 = (function () { function m1_c1() { } return m1_c1; -})(); +}()); var m1_instance1 = new m1_c1(); function m1_f1() { return m1_instance1; diff --git a/tests/baselines/reference/project/sourceRootAbsolutePathMixedSubfolderNoOutdir/amd/sourceRootAbsolutePathMixedSubfolderNoOutdir.sourcemap.txt b/tests/baselines/reference/project/sourceRootAbsolutePathMixedSubfolderNoOutdir/amd/sourceRootAbsolutePathMixedSubfolderNoOutdir.sourcemap.txt index 2e9af21f933..bbf106066ce 100644 --- a/tests/baselines/reference/project/sourceRootAbsolutePathMixedSubfolderNoOutdir/amd/sourceRootAbsolutePathMixedSubfolderNoOutdir.sourcemap.txt +++ b/tests/baselines/reference/project/sourceRootAbsolutePathMixedSubfolderNoOutdir/amd/sourceRootAbsolutePathMixedSubfolderNoOutdir.sourcemap.txt @@ -61,7 +61,7 @@ sourceFile:ref/m1.ts 1->Emitted(5, 5) Source(4, 1) + SourceIndex(0) 2 >Emitted(5, 17) Source(4, 2) + SourceIndex(0) --- ->>>})(); +>>>}()); 1 > 2 >^ 3 > @@ -203,7 +203,7 @@ sourceFile:ref/m2.ts 1->Emitted(7, 9) Source(4, 1) + SourceIndex(0) 2 >Emitted(7, 21) Source(4, 2) + SourceIndex(0) --- ->>> })(); +>>> }()); 1 >^^^^ 2 > ^ 3 > @@ -396,7 +396,7 @@ sourceFile:test.ts 1->Emitted(7, 5) Source(6, 1) + SourceIndex(0) 2 >Emitted(7, 14) Source(6, 2) + SourceIndex(0) --- ->>>})(); +>>>}()); 1 > 2 >^ 3 > diff --git a/tests/baselines/reference/project/sourceRootAbsolutePathMixedSubfolderNoOutdir/node/ref/m1.js b/tests/baselines/reference/project/sourceRootAbsolutePathMixedSubfolderNoOutdir/node/ref/m1.js index f6b169662c9..b7283f7fd88 100644 --- a/tests/baselines/reference/project/sourceRootAbsolutePathMixedSubfolderNoOutdir/node/ref/m1.js +++ b/tests/baselines/reference/project/sourceRootAbsolutePathMixedSubfolderNoOutdir/node/ref/m1.js @@ -3,7 +3,7 @@ var m1_c1 = (function () { function m1_c1() { } return m1_c1; -})(); +}()); var m1_instance1 = new m1_c1(); function m1_f1() { return m1_instance1; diff --git a/tests/baselines/reference/project/sourceRootAbsolutePathMixedSubfolderNoOutdir/node/sourceRootAbsolutePathMixedSubfolderNoOutdir.sourcemap.txt b/tests/baselines/reference/project/sourceRootAbsolutePathMixedSubfolderNoOutdir/node/sourceRootAbsolutePathMixedSubfolderNoOutdir.sourcemap.txt index a0197125a21..2f8982c734b 100644 --- a/tests/baselines/reference/project/sourceRootAbsolutePathMixedSubfolderNoOutdir/node/sourceRootAbsolutePathMixedSubfolderNoOutdir.sourcemap.txt +++ b/tests/baselines/reference/project/sourceRootAbsolutePathMixedSubfolderNoOutdir/node/sourceRootAbsolutePathMixedSubfolderNoOutdir.sourcemap.txt @@ -61,7 +61,7 @@ sourceFile:ref/m1.ts 1->Emitted(5, 5) Source(4, 1) + SourceIndex(0) 2 >Emitted(5, 17) Source(4, 2) + SourceIndex(0) --- ->>>})(); +>>>}()); 1 > 2 >^ 3 > @@ -202,7 +202,7 @@ sourceFile:ref/m2.ts 1->Emitted(6, 5) Source(4, 1) + SourceIndex(0) 2 >Emitted(6, 17) Source(4, 2) + SourceIndex(0) --- ->>>})(); +>>>}()); 1 > 2 >^ 3 > @@ -395,7 +395,7 @@ sourceFile:test.ts 1->Emitted(7, 5) Source(6, 1) + SourceIndex(0) 2 >Emitted(7, 14) Source(6, 2) + SourceIndex(0) --- ->>>})(); +>>>}()); 1 > 2 >^ 3 > diff --git a/tests/baselines/reference/project/sourceRootAbsolutePathMixedSubfolderSpecifyOutputDirectory/amd/outdir/simple/ref/m1.js b/tests/baselines/reference/project/sourceRootAbsolutePathMixedSubfolderSpecifyOutputDirectory/amd/outdir/simple/ref/m1.js index f6b169662c9..b7283f7fd88 100644 --- a/tests/baselines/reference/project/sourceRootAbsolutePathMixedSubfolderSpecifyOutputDirectory/amd/outdir/simple/ref/m1.js +++ b/tests/baselines/reference/project/sourceRootAbsolutePathMixedSubfolderSpecifyOutputDirectory/amd/outdir/simple/ref/m1.js @@ -3,7 +3,7 @@ var m1_c1 = (function () { function m1_c1() { } return m1_c1; -})(); +}()); var m1_instance1 = new m1_c1(); function m1_f1() { return m1_instance1; diff --git a/tests/baselines/reference/project/sourceRootAbsolutePathMixedSubfolderSpecifyOutputDirectory/amd/sourceRootAbsolutePathMixedSubfolderSpecifyOutputDirectory.sourcemap.txt b/tests/baselines/reference/project/sourceRootAbsolutePathMixedSubfolderSpecifyOutputDirectory/amd/sourceRootAbsolutePathMixedSubfolderSpecifyOutputDirectory.sourcemap.txt index 3e718952d13..4850ffcc02c 100644 --- a/tests/baselines/reference/project/sourceRootAbsolutePathMixedSubfolderSpecifyOutputDirectory/amd/sourceRootAbsolutePathMixedSubfolderSpecifyOutputDirectory.sourcemap.txt +++ b/tests/baselines/reference/project/sourceRootAbsolutePathMixedSubfolderSpecifyOutputDirectory/amd/sourceRootAbsolutePathMixedSubfolderSpecifyOutputDirectory.sourcemap.txt @@ -61,7 +61,7 @@ sourceFile:ref/m1.ts 1->Emitted(5, 5) Source(4, 1) + SourceIndex(0) 2 >Emitted(5, 17) Source(4, 2) + SourceIndex(0) --- ->>>})(); +>>>}()); 1 > 2 >^ 3 > @@ -203,7 +203,7 @@ sourceFile:ref/m2.ts 1->Emitted(7, 9) Source(4, 1) + SourceIndex(0) 2 >Emitted(7, 21) Source(4, 2) + SourceIndex(0) --- ->>> })(); +>>> }()); 1 >^^^^ 2 > ^ 3 > @@ -396,7 +396,7 @@ sourceFile:test.ts 1->Emitted(7, 5) Source(6, 1) + SourceIndex(0) 2 >Emitted(7, 14) Source(6, 2) + SourceIndex(0) --- ->>>})(); +>>>}()); 1 > 2 >^ 3 > diff --git a/tests/baselines/reference/project/sourceRootAbsolutePathMixedSubfolderSpecifyOutputDirectory/node/outdir/simple/ref/m1.js b/tests/baselines/reference/project/sourceRootAbsolutePathMixedSubfolderSpecifyOutputDirectory/node/outdir/simple/ref/m1.js index f6b169662c9..b7283f7fd88 100644 --- a/tests/baselines/reference/project/sourceRootAbsolutePathMixedSubfolderSpecifyOutputDirectory/node/outdir/simple/ref/m1.js +++ b/tests/baselines/reference/project/sourceRootAbsolutePathMixedSubfolderSpecifyOutputDirectory/node/outdir/simple/ref/m1.js @@ -3,7 +3,7 @@ var m1_c1 = (function () { function m1_c1() { } return m1_c1; -})(); +}()); var m1_instance1 = new m1_c1(); function m1_f1() { return m1_instance1; diff --git a/tests/baselines/reference/project/sourceRootAbsolutePathMixedSubfolderSpecifyOutputDirectory/node/sourceRootAbsolutePathMixedSubfolderSpecifyOutputDirectory.sourcemap.txt b/tests/baselines/reference/project/sourceRootAbsolutePathMixedSubfolderSpecifyOutputDirectory/node/sourceRootAbsolutePathMixedSubfolderSpecifyOutputDirectory.sourcemap.txt index c904a43bde7..bc0e71c54a8 100644 --- a/tests/baselines/reference/project/sourceRootAbsolutePathMixedSubfolderSpecifyOutputDirectory/node/sourceRootAbsolutePathMixedSubfolderSpecifyOutputDirectory.sourcemap.txt +++ b/tests/baselines/reference/project/sourceRootAbsolutePathMixedSubfolderSpecifyOutputDirectory/node/sourceRootAbsolutePathMixedSubfolderSpecifyOutputDirectory.sourcemap.txt @@ -61,7 +61,7 @@ sourceFile:ref/m1.ts 1->Emitted(5, 5) Source(4, 1) + SourceIndex(0) 2 >Emitted(5, 17) Source(4, 2) + SourceIndex(0) --- ->>>})(); +>>>}()); 1 > 2 >^ 3 > @@ -202,7 +202,7 @@ sourceFile:ref/m2.ts 1->Emitted(6, 5) Source(4, 1) + SourceIndex(0) 2 >Emitted(6, 17) Source(4, 2) + SourceIndex(0) --- ->>>})(); +>>>}()); 1 > 2 >^ 3 > @@ -395,7 +395,7 @@ sourceFile:test.ts 1->Emitted(7, 5) Source(6, 1) + SourceIndex(0) 2 >Emitted(7, 14) Source(6, 2) + SourceIndex(0) --- ->>>})(); +>>>}()); 1 > 2 >^ 3 > diff --git a/tests/baselines/reference/project/sourceRootAbsolutePathMixedSubfolderSpecifyOutputFile/amd/bin/test.js b/tests/baselines/reference/project/sourceRootAbsolutePathMixedSubfolderSpecifyOutputFile/amd/bin/test.js index a480aa83e80..25cfe0fccb5 100644 --- a/tests/baselines/reference/project/sourceRootAbsolutePathMixedSubfolderSpecifyOutputFile/amd/bin/test.js +++ b/tests/baselines/reference/project/sourceRootAbsolutePathMixedSubfolderSpecifyOutputFile/amd/bin/test.js @@ -3,7 +3,7 @@ var m1_c1 = (function () { function m1_c1() { } return m1_c1; -})(); +}()); var m1_instance1 = new m1_c1(); function m1_f1() { return m1_instance1; @@ -15,7 +15,7 @@ define("ref/m2", ["require", "exports"], function (require, exports) { function m2_c1() { } return m2_c1; - })(); + }()); exports.m2_c1 = m2_c1; exports.m2_instance1 = new m2_c1(); function m2_f1() { @@ -30,7 +30,7 @@ var c1 = (function () { function c1() { } return c1; -})(); +}()); var instance1 = new c1(); function f1() { return instance1; diff --git a/tests/baselines/reference/project/sourceRootAbsolutePathMixedSubfolderSpecifyOutputFile/amd/sourceRootAbsolutePathMixedSubfolderSpecifyOutputFile.sourcemap.txt b/tests/baselines/reference/project/sourceRootAbsolutePathMixedSubfolderSpecifyOutputFile/amd/sourceRootAbsolutePathMixedSubfolderSpecifyOutputFile.sourcemap.txt index fdc46e9a054..f56fd16938c 100644 --- a/tests/baselines/reference/project/sourceRootAbsolutePathMixedSubfolderSpecifyOutputFile/amd/sourceRootAbsolutePathMixedSubfolderSpecifyOutputFile.sourcemap.txt +++ b/tests/baselines/reference/project/sourceRootAbsolutePathMixedSubfolderSpecifyOutputFile/amd/sourceRootAbsolutePathMixedSubfolderSpecifyOutputFile.sourcemap.txt @@ -61,7 +61,7 @@ sourceFile:ref/m1.ts 1->Emitted(5, 5) Source(4, 1) + SourceIndex(0) 2 >Emitted(5, 17) Source(4, 2) + SourceIndex(0) --- ->>>})(); +>>>}()); 1 > 2 >^ 3 > @@ -197,7 +197,7 @@ sourceFile:ref/m2.ts 1->Emitted(17, 9) Source(4, 1) + SourceIndex(1) 2 >Emitted(17, 21) Source(4, 2) + SourceIndex(1) --- ->>> })(); +>>> }()); 1 >^^^^ 2 > ^ 3 > @@ -384,7 +384,7 @@ sourceFile:test.ts 1->Emitted(32, 5) Source(6, 1) + SourceIndex(2) 2 >Emitted(32, 14) Source(6, 2) + SourceIndex(2) --- ->>>})(); +>>>}()); 1 > 2 >^ 3 > diff --git a/tests/baselines/reference/project/sourceRootAbsolutePathMixedSubfolderSpecifyOutputFile/node/bin/test.js b/tests/baselines/reference/project/sourceRootAbsolutePathMixedSubfolderSpecifyOutputFile/node/bin/test.js index 5af28cf8560..5d63d624329 100644 --- a/tests/baselines/reference/project/sourceRootAbsolutePathMixedSubfolderSpecifyOutputFile/node/bin/test.js +++ b/tests/baselines/reference/project/sourceRootAbsolutePathMixedSubfolderSpecifyOutputFile/node/bin/test.js @@ -3,7 +3,7 @@ var m1_c1 = (function () { function m1_c1() { } return m1_c1; -})(); +}()); var m1_instance1 = new m1_c1(); function m1_f1() { return m1_instance1; @@ -15,7 +15,7 @@ var c1 = (function () { function c1() { } return c1; -})(); +}()); var instance1 = new c1(); function f1() { return instance1; diff --git a/tests/baselines/reference/project/sourceRootAbsolutePathMixedSubfolderSpecifyOutputFile/node/sourceRootAbsolutePathMixedSubfolderSpecifyOutputFile.sourcemap.txt b/tests/baselines/reference/project/sourceRootAbsolutePathMixedSubfolderSpecifyOutputFile/node/sourceRootAbsolutePathMixedSubfolderSpecifyOutputFile.sourcemap.txt index 841774dd5d8..b8f92c4674f 100644 --- a/tests/baselines/reference/project/sourceRootAbsolutePathMixedSubfolderSpecifyOutputFile/node/sourceRootAbsolutePathMixedSubfolderSpecifyOutputFile.sourcemap.txt +++ b/tests/baselines/reference/project/sourceRootAbsolutePathMixedSubfolderSpecifyOutputFile/node/sourceRootAbsolutePathMixedSubfolderSpecifyOutputFile.sourcemap.txt @@ -61,7 +61,7 @@ sourceFile:ref/m1.ts 1->Emitted(5, 5) Source(4, 1) + SourceIndex(0) 2 >Emitted(5, 17) Source(4, 2) + SourceIndex(0) --- ->>>})(); +>>>}()); 1 > 2 >^ 3 > @@ -217,7 +217,7 @@ sourceFile:test.ts 1->Emitted(17, 5) Source(6, 1) + SourceIndex(2) 2 >Emitted(17, 14) Source(6, 2) + SourceIndex(2) --- ->>>})(); +>>>}()); 1 > 2 >^ 3 > diff --git a/tests/baselines/reference/project/sourceRootAbsolutePathMixedSubfolderSpecifyOutputFileAndOutputDirectory/amd/bin/outAndOutDirFile.js b/tests/baselines/reference/project/sourceRootAbsolutePathMixedSubfolderSpecifyOutputFileAndOutputDirectory/amd/bin/outAndOutDirFile.js index 1ebe03468c7..de21b030c35 100644 --- a/tests/baselines/reference/project/sourceRootAbsolutePathMixedSubfolderSpecifyOutputFileAndOutputDirectory/amd/bin/outAndOutDirFile.js +++ b/tests/baselines/reference/project/sourceRootAbsolutePathMixedSubfolderSpecifyOutputFileAndOutputDirectory/amd/bin/outAndOutDirFile.js @@ -3,7 +3,7 @@ var m1_c1 = (function () { function m1_c1() { } return m1_c1; -})(); +}()); var m1_instance1 = new m1_c1(); function m1_f1() { return m1_instance1; @@ -15,7 +15,7 @@ define("ref/m2", ["require", "exports"], function (require, exports) { function m2_c1() { } return m2_c1; - })(); + }()); exports.m2_c1 = m2_c1; exports.m2_instance1 = new m2_c1(); function m2_f1() { @@ -30,7 +30,7 @@ var c1 = (function () { function c1() { } return c1; -})(); +}()); var instance1 = new c1(); function f1() { return instance1; diff --git a/tests/baselines/reference/project/sourceRootAbsolutePathMixedSubfolderSpecifyOutputFileAndOutputDirectory/amd/sourceRootAbsolutePathMixedSubfolderSpecifyOutputFileAndOutputDirectory.sourcemap.txt b/tests/baselines/reference/project/sourceRootAbsolutePathMixedSubfolderSpecifyOutputFileAndOutputDirectory/amd/sourceRootAbsolutePathMixedSubfolderSpecifyOutputFileAndOutputDirectory.sourcemap.txt index f906a7ec6b4..7bf07c6a514 100644 --- a/tests/baselines/reference/project/sourceRootAbsolutePathMixedSubfolderSpecifyOutputFileAndOutputDirectory/amd/sourceRootAbsolutePathMixedSubfolderSpecifyOutputFileAndOutputDirectory.sourcemap.txt +++ b/tests/baselines/reference/project/sourceRootAbsolutePathMixedSubfolderSpecifyOutputFileAndOutputDirectory/amd/sourceRootAbsolutePathMixedSubfolderSpecifyOutputFileAndOutputDirectory.sourcemap.txt @@ -61,7 +61,7 @@ sourceFile:ref/m1.ts 1->Emitted(5, 5) Source(4, 1) + SourceIndex(0) 2 >Emitted(5, 17) Source(4, 2) + SourceIndex(0) --- ->>>})(); +>>>}()); 1 > 2 >^ 3 > @@ -197,7 +197,7 @@ sourceFile:ref/m2.ts 1->Emitted(17, 9) Source(4, 1) + SourceIndex(1) 2 >Emitted(17, 21) Source(4, 2) + SourceIndex(1) --- ->>> })(); +>>> }()); 1 >^^^^ 2 > ^ 3 > @@ -384,7 +384,7 @@ sourceFile:test.ts 1->Emitted(32, 5) Source(6, 1) + SourceIndex(2) 2 >Emitted(32, 14) Source(6, 2) + SourceIndex(2) --- ->>>})(); +>>>}()); 1 > 2 >^ 3 > diff --git a/tests/baselines/reference/project/sourceRootAbsolutePathMixedSubfolderSpecifyOutputFileAndOutputDirectory/node/bin/outAndOutDirFile.js b/tests/baselines/reference/project/sourceRootAbsolutePathMixedSubfolderSpecifyOutputFileAndOutputDirectory/node/bin/outAndOutDirFile.js index 1750a5975ae..da6a2015143 100644 --- a/tests/baselines/reference/project/sourceRootAbsolutePathMixedSubfolderSpecifyOutputFileAndOutputDirectory/node/bin/outAndOutDirFile.js +++ b/tests/baselines/reference/project/sourceRootAbsolutePathMixedSubfolderSpecifyOutputFileAndOutputDirectory/node/bin/outAndOutDirFile.js @@ -3,7 +3,7 @@ var m1_c1 = (function () { function m1_c1() { } return m1_c1; -})(); +}()); var m1_instance1 = new m1_c1(); function m1_f1() { return m1_instance1; @@ -15,7 +15,7 @@ var c1 = (function () { function c1() { } return c1; -})(); +}()); var instance1 = new c1(); function f1() { return instance1; diff --git a/tests/baselines/reference/project/sourceRootAbsolutePathMixedSubfolderSpecifyOutputFileAndOutputDirectory/node/sourceRootAbsolutePathMixedSubfolderSpecifyOutputFileAndOutputDirectory.sourcemap.txt b/tests/baselines/reference/project/sourceRootAbsolutePathMixedSubfolderSpecifyOutputFileAndOutputDirectory/node/sourceRootAbsolutePathMixedSubfolderSpecifyOutputFileAndOutputDirectory.sourcemap.txt index 4cd16335c50..933fb217fd2 100644 --- a/tests/baselines/reference/project/sourceRootAbsolutePathMixedSubfolderSpecifyOutputFileAndOutputDirectory/node/sourceRootAbsolutePathMixedSubfolderSpecifyOutputFileAndOutputDirectory.sourcemap.txt +++ b/tests/baselines/reference/project/sourceRootAbsolutePathMixedSubfolderSpecifyOutputFileAndOutputDirectory/node/sourceRootAbsolutePathMixedSubfolderSpecifyOutputFileAndOutputDirectory.sourcemap.txt @@ -61,7 +61,7 @@ sourceFile:ref/m1.ts 1->Emitted(5, 5) Source(4, 1) + SourceIndex(0) 2 >Emitted(5, 17) Source(4, 2) + SourceIndex(0) --- ->>>})(); +>>>}()); 1 > 2 >^ 3 > @@ -217,7 +217,7 @@ sourceFile:test.ts 1->Emitted(17, 5) Source(6, 1) + SourceIndex(2) 2 >Emitted(17, 14) Source(6, 2) + SourceIndex(2) --- ->>>})(); +>>>}()); 1 > 2 >^ 3 > diff --git a/tests/baselines/reference/project/sourceRootAbsolutePathModuleMultifolderNoOutdir/amd/ref/m1.js b/tests/baselines/reference/project/sourceRootAbsolutePathModuleMultifolderNoOutdir/amd/ref/m1.js index 25001d63d84..bb59c6fbd90 100644 --- a/tests/baselines/reference/project/sourceRootAbsolutePathModuleMultifolderNoOutdir/amd/ref/m1.js +++ b/tests/baselines/reference/project/sourceRootAbsolutePathModuleMultifolderNoOutdir/amd/ref/m1.js @@ -5,7 +5,7 @@ define(["require", "exports"], function (require, exports) { function m1_c1() { } return m1_c1; - })(); + }()); exports.m1_c1 = m1_c1; exports.m1_instance1 = new m1_c1(); function m1_f1() { diff --git a/tests/baselines/reference/project/sourceRootAbsolutePathModuleMultifolderNoOutdir/amd/sourceRootAbsolutePathModuleMultifolderNoOutdir.sourcemap.txt b/tests/baselines/reference/project/sourceRootAbsolutePathModuleMultifolderNoOutdir/amd/sourceRootAbsolutePathModuleMultifolderNoOutdir.sourcemap.txt index dbd142633aa..4c90a092c72 100644 --- a/tests/baselines/reference/project/sourceRootAbsolutePathModuleMultifolderNoOutdir/amd/sourceRootAbsolutePathModuleMultifolderNoOutdir.sourcemap.txt +++ b/tests/baselines/reference/project/sourceRootAbsolutePathModuleMultifolderNoOutdir/amd/sourceRootAbsolutePathModuleMultifolderNoOutdir.sourcemap.txt @@ -60,7 +60,7 @@ sourceFile:outputdir_module_multifolder/ref/m1.ts 1->Emitted(7, 9) Source(4, 1) + SourceIndex(0) 2 >Emitted(7, 21) Source(4, 2) + SourceIndex(0) --- ->>> })(); +>>> }()); 1 >^^^^ 2 > ^ 3 > @@ -233,7 +233,7 @@ sourceFile:outputdir_module_multifolder_ref/m2.ts 1->Emitted(7, 9) Source(4, 1) + SourceIndex(0) 2 >Emitted(7, 21) Source(4, 2) + SourceIndex(0) --- ->>> })(); +>>> }()); 1 >^^^^ 2 > ^ 3 > @@ -408,7 +408,7 @@ sourceFile:outputdir_module_multifolder/test.ts 1->Emitted(7, 9) Source(6, 1) + SourceIndex(0) 2 >Emitted(7, 18) Source(6, 2) + SourceIndex(0) --- ->>> })(); +>>> }()); 1 >^^^^ 2 > ^ 3 > diff --git a/tests/baselines/reference/project/sourceRootAbsolutePathModuleMultifolderNoOutdir/node/ref/m1.js b/tests/baselines/reference/project/sourceRootAbsolutePathModuleMultifolderNoOutdir/node/ref/m1.js index 3bc07083900..121a089af23 100644 --- a/tests/baselines/reference/project/sourceRootAbsolutePathModuleMultifolderNoOutdir/node/ref/m1.js +++ b/tests/baselines/reference/project/sourceRootAbsolutePathModuleMultifolderNoOutdir/node/ref/m1.js @@ -4,7 +4,7 @@ var m1_c1 = (function () { function m1_c1() { } return m1_c1; -})(); +}()); exports.m1_c1 = m1_c1; exports.m1_instance1 = new m1_c1(); function m1_f1() { diff --git a/tests/baselines/reference/project/sourceRootAbsolutePathModuleMultifolderNoOutdir/node/sourceRootAbsolutePathModuleMultifolderNoOutdir.sourcemap.txt b/tests/baselines/reference/project/sourceRootAbsolutePathModuleMultifolderNoOutdir/node/sourceRootAbsolutePathModuleMultifolderNoOutdir.sourcemap.txt index f7e814da929..ee780cef09b 100644 --- a/tests/baselines/reference/project/sourceRootAbsolutePathModuleMultifolderNoOutdir/node/sourceRootAbsolutePathModuleMultifolderNoOutdir.sourcemap.txt +++ b/tests/baselines/reference/project/sourceRootAbsolutePathModuleMultifolderNoOutdir/node/sourceRootAbsolutePathModuleMultifolderNoOutdir.sourcemap.txt @@ -59,7 +59,7 @@ sourceFile:outputdir_module_multifolder/ref/m1.ts 1->Emitted(6, 5) Source(4, 1) + SourceIndex(0) 2 >Emitted(6, 17) Source(4, 2) + SourceIndex(0) --- ->>>})(); +>>>}()); 1 > 2 >^ 3 > @@ -231,7 +231,7 @@ sourceFile:outputdir_module_multifolder_ref/m2.ts 1->Emitted(6, 5) Source(4, 1) + SourceIndex(0) 2 >Emitted(6, 17) Source(4, 2) + SourceIndex(0) --- ->>>})(); +>>>}()); 1 > 2 >^ 3 > @@ -452,7 +452,7 @@ sourceFile:outputdir_module_multifolder/test.ts 1->Emitted(8, 5) Source(6, 1) + SourceIndex(0) 2 >Emitted(8, 14) Source(6, 2) + SourceIndex(0) --- ->>>})(); +>>>}()); 1 > 2 >^ 3 > diff --git a/tests/baselines/reference/project/sourceRootAbsolutePathModuleMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_module_multifolder/ref/m1.js b/tests/baselines/reference/project/sourceRootAbsolutePathModuleMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_module_multifolder/ref/m1.js index 25001d63d84..bb59c6fbd90 100644 --- a/tests/baselines/reference/project/sourceRootAbsolutePathModuleMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_module_multifolder/ref/m1.js +++ b/tests/baselines/reference/project/sourceRootAbsolutePathModuleMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_module_multifolder/ref/m1.js @@ -5,7 +5,7 @@ define(["require", "exports"], function (require, exports) { function m1_c1() { } return m1_c1; - })(); + }()); exports.m1_c1 = m1_c1; exports.m1_instance1 = new m1_c1(); function m1_f1() { diff --git a/tests/baselines/reference/project/sourceRootAbsolutePathModuleMultifolderSpecifyOutputDirectory/amd/sourceRootAbsolutePathModuleMultifolderSpecifyOutputDirectory.sourcemap.txt b/tests/baselines/reference/project/sourceRootAbsolutePathModuleMultifolderSpecifyOutputDirectory/amd/sourceRootAbsolutePathModuleMultifolderSpecifyOutputDirectory.sourcemap.txt index f028d952086..4a874b3ffde 100644 --- a/tests/baselines/reference/project/sourceRootAbsolutePathModuleMultifolderSpecifyOutputDirectory/amd/sourceRootAbsolutePathModuleMultifolderSpecifyOutputDirectory.sourcemap.txt +++ b/tests/baselines/reference/project/sourceRootAbsolutePathModuleMultifolderSpecifyOutputDirectory/amd/sourceRootAbsolutePathModuleMultifolderSpecifyOutputDirectory.sourcemap.txt @@ -60,7 +60,7 @@ sourceFile:outputdir_module_multifolder/ref/m1.ts 1->Emitted(7, 9) Source(4, 1) + SourceIndex(0) 2 >Emitted(7, 21) Source(4, 2) + SourceIndex(0) --- ->>> })(); +>>> }()); 1 >^^^^ 2 > ^ 3 > @@ -233,7 +233,7 @@ sourceFile:outputdir_module_multifolder_ref/m2.ts 1->Emitted(7, 9) Source(4, 1) + SourceIndex(0) 2 >Emitted(7, 21) Source(4, 2) + SourceIndex(0) --- ->>> })(); +>>> }()); 1 >^^^^ 2 > ^ 3 > @@ -408,7 +408,7 @@ sourceFile:outputdir_module_multifolder/test.ts 1->Emitted(7, 9) Source(6, 1) + SourceIndex(0) 2 >Emitted(7, 18) Source(6, 2) + SourceIndex(0) --- ->>> })(); +>>> }()); 1 >^^^^ 2 > ^ 3 > diff --git a/tests/baselines/reference/project/sourceRootAbsolutePathModuleMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_module_multifolder/ref/m1.js b/tests/baselines/reference/project/sourceRootAbsolutePathModuleMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_module_multifolder/ref/m1.js index 3bc07083900..121a089af23 100644 --- a/tests/baselines/reference/project/sourceRootAbsolutePathModuleMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_module_multifolder/ref/m1.js +++ b/tests/baselines/reference/project/sourceRootAbsolutePathModuleMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_module_multifolder/ref/m1.js @@ -4,7 +4,7 @@ var m1_c1 = (function () { function m1_c1() { } return m1_c1; -})(); +}()); exports.m1_c1 = m1_c1; exports.m1_instance1 = new m1_c1(); function m1_f1() { diff --git a/tests/baselines/reference/project/sourceRootAbsolutePathModuleMultifolderSpecifyOutputDirectory/node/sourceRootAbsolutePathModuleMultifolderSpecifyOutputDirectory.sourcemap.txt b/tests/baselines/reference/project/sourceRootAbsolutePathModuleMultifolderSpecifyOutputDirectory/node/sourceRootAbsolutePathModuleMultifolderSpecifyOutputDirectory.sourcemap.txt index fef086063a4..fe6d3b5b4cc 100644 --- a/tests/baselines/reference/project/sourceRootAbsolutePathModuleMultifolderSpecifyOutputDirectory/node/sourceRootAbsolutePathModuleMultifolderSpecifyOutputDirectory.sourcemap.txt +++ b/tests/baselines/reference/project/sourceRootAbsolutePathModuleMultifolderSpecifyOutputDirectory/node/sourceRootAbsolutePathModuleMultifolderSpecifyOutputDirectory.sourcemap.txt @@ -59,7 +59,7 @@ sourceFile:outputdir_module_multifolder/ref/m1.ts 1->Emitted(6, 5) Source(4, 1) + SourceIndex(0) 2 >Emitted(6, 17) Source(4, 2) + SourceIndex(0) --- ->>>})(); +>>>}()); 1 > 2 >^ 3 > @@ -231,7 +231,7 @@ sourceFile:outputdir_module_multifolder_ref/m2.ts 1->Emitted(6, 5) Source(4, 1) + SourceIndex(0) 2 >Emitted(6, 17) Source(4, 2) + SourceIndex(0) --- ->>>})(); +>>>}()); 1 > 2 >^ 3 > @@ -452,7 +452,7 @@ sourceFile:outputdir_module_multifolder/test.ts 1->Emitted(8, 5) Source(6, 1) + SourceIndex(0) 2 >Emitted(8, 14) Source(6, 2) + SourceIndex(0) --- ->>>})(); +>>>}()); 1 > 2 >^ 3 > diff --git a/tests/baselines/reference/project/sourceRootAbsolutePathModuleMultifolderSpecifyOutputFile/amd/bin/test.js b/tests/baselines/reference/project/sourceRootAbsolutePathModuleMultifolderSpecifyOutputFile/amd/bin/test.js index 5db4d6336f1..37064fb583b 100644 --- a/tests/baselines/reference/project/sourceRootAbsolutePathModuleMultifolderSpecifyOutputFile/amd/bin/test.js +++ b/tests/baselines/reference/project/sourceRootAbsolutePathModuleMultifolderSpecifyOutputFile/amd/bin/test.js @@ -5,7 +5,7 @@ define("outputdir_module_multifolder/ref/m1", ["require", "exports"], function ( function m1_c1() { } return m1_c1; - })(); + }()); exports.m1_c1 = m1_c1; exports.m1_instance1 = new m1_c1(); function m1_f1() { @@ -20,7 +20,7 @@ define("outputdir_module_multifolder_ref/m2", ["require", "exports"], function ( function m2_c1() { } return m2_c1; - })(); + }()); exports.m2_c1 = m2_c1; exports.m2_instance1 = new m2_c1(); function m2_f1() { @@ -35,7 +35,7 @@ define("outputdir_module_multifolder/test", ["require", "exports", "outputdir_mo function c1() { } return c1; - })(); + }()); exports.c1 = c1; exports.instance1 = new c1(); function f1() { diff --git a/tests/baselines/reference/project/sourceRootAbsolutePathModuleMultifolderSpecifyOutputFile/amd/sourceRootAbsolutePathModuleMultifolderSpecifyOutputFile.sourcemap.txt b/tests/baselines/reference/project/sourceRootAbsolutePathModuleMultifolderSpecifyOutputFile/amd/sourceRootAbsolutePathModuleMultifolderSpecifyOutputFile.sourcemap.txt index 116d03e99d1..b0755e21b7e 100644 --- a/tests/baselines/reference/project/sourceRootAbsolutePathModuleMultifolderSpecifyOutputFile/amd/sourceRootAbsolutePathModuleMultifolderSpecifyOutputFile.sourcemap.txt +++ b/tests/baselines/reference/project/sourceRootAbsolutePathModuleMultifolderSpecifyOutputFile/amd/sourceRootAbsolutePathModuleMultifolderSpecifyOutputFile.sourcemap.txt @@ -60,7 +60,7 @@ sourceFile:outputdir_module_multifolder/ref/m1.ts 1->Emitted(7, 9) Source(4, 1) + SourceIndex(0) 2 >Emitted(7, 21) Source(4, 2) + SourceIndex(0) --- ->>> })(); +>>> }()); 1 >^^^^ 2 > ^ 3 > @@ -227,7 +227,7 @@ sourceFile:outputdir_module_multifolder_ref/m2.ts 1->Emitted(22, 9) Source(4, 1) + SourceIndex(1) 2 >Emitted(22, 21) Source(4, 2) + SourceIndex(1) --- ->>> })(); +>>> }()); 1 >^^^^ 2 > ^ 3 > @@ -396,7 +396,7 @@ sourceFile:outputdir_module_multifolder/test.ts 1->Emitted(37, 9) Source(6, 1) + SourceIndex(2) 2 >Emitted(37, 18) Source(6, 2) + SourceIndex(2) --- ->>> })(); +>>> }()); 1 >^^^^ 2 > ^ 3 > diff --git a/tests/baselines/reference/project/sourceRootAbsolutePathModuleSimpleNoOutdir/amd/m1.js b/tests/baselines/reference/project/sourceRootAbsolutePathModuleSimpleNoOutdir/amd/m1.js index 25001d63d84..bb59c6fbd90 100644 --- a/tests/baselines/reference/project/sourceRootAbsolutePathModuleSimpleNoOutdir/amd/m1.js +++ b/tests/baselines/reference/project/sourceRootAbsolutePathModuleSimpleNoOutdir/amd/m1.js @@ -5,7 +5,7 @@ define(["require", "exports"], function (require, exports) { function m1_c1() { } return m1_c1; - })(); + }()); exports.m1_c1 = m1_c1; exports.m1_instance1 = new m1_c1(); function m1_f1() { diff --git a/tests/baselines/reference/project/sourceRootAbsolutePathModuleSimpleNoOutdir/amd/sourceRootAbsolutePathModuleSimpleNoOutdir.sourcemap.txt b/tests/baselines/reference/project/sourceRootAbsolutePathModuleSimpleNoOutdir/amd/sourceRootAbsolutePathModuleSimpleNoOutdir.sourcemap.txt index ed667e35c03..051c81cae40 100644 --- a/tests/baselines/reference/project/sourceRootAbsolutePathModuleSimpleNoOutdir/amd/sourceRootAbsolutePathModuleSimpleNoOutdir.sourcemap.txt +++ b/tests/baselines/reference/project/sourceRootAbsolutePathModuleSimpleNoOutdir/amd/sourceRootAbsolutePathModuleSimpleNoOutdir.sourcemap.txt @@ -60,7 +60,7 @@ sourceFile:m1.ts 1->Emitted(7, 9) Source(4, 1) + SourceIndex(0) 2 >Emitted(7, 21) Source(4, 2) + SourceIndex(0) --- ->>> })(); +>>> }()); 1 >^^^^ 2 > ^ 3 > @@ -234,7 +234,7 @@ sourceFile:test.ts 1->Emitted(7, 9) Source(5, 1) + SourceIndex(0) 2 >Emitted(7, 18) Source(5, 2) + SourceIndex(0) --- ->>> })(); +>>> }()); 1 >^^^^ 2 > ^ 3 > diff --git a/tests/baselines/reference/project/sourceRootAbsolutePathModuleSimpleNoOutdir/node/m1.js b/tests/baselines/reference/project/sourceRootAbsolutePathModuleSimpleNoOutdir/node/m1.js index 3bc07083900..121a089af23 100644 --- a/tests/baselines/reference/project/sourceRootAbsolutePathModuleSimpleNoOutdir/node/m1.js +++ b/tests/baselines/reference/project/sourceRootAbsolutePathModuleSimpleNoOutdir/node/m1.js @@ -4,7 +4,7 @@ var m1_c1 = (function () { function m1_c1() { } return m1_c1; -})(); +}()); exports.m1_c1 = m1_c1; exports.m1_instance1 = new m1_c1(); function m1_f1() { diff --git a/tests/baselines/reference/project/sourceRootAbsolutePathModuleSimpleNoOutdir/node/sourceRootAbsolutePathModuleSimpleNoOutdir.sourcemap.txt b/tests/baselines/reference/project/sourceRootAbsolutePathModuleSimpleNoOutdir/node/sourceRootAbsolutePathModuleSimpleNoOutdir.sourcemap.txt index d48dcb61c68..91b3bdf8910 100644 --- a/tests/baselines/reference/project/sourceRootAbsolutePathModuleSimpleNoOutdir/node/sourceRootAbsolutePathModuleSimpleNoOutdir.sourcemap.txt +++ b/tests/baselines/reference/project/sourceRootAbsolutePathModuleSimpleNoOutdir/node/sourceRootAbsolutePathModuleSimpleNoOutdir.sourcemap.txt @@ -59,7 +59,7 @@ sourceFile:m1.ts 1->Emitted(6, 5) Source(4, 1) + SourceIndex(0) 2 >Emitted(6, 17) Source(4, 2) + SourceIndex(0) --- ->>>})(); +>>>}()); 1 > 2 >^ 3 > @@ -255,7 +255,7 @@ sourceFile:test.ts 1->Emitted(7, 5) Source(5, 1) + SourceIndex(0) 2 >Emitted(7, 14) Source(5, 2) + SourceIndex(0) --- ->>>})(); +>>>}()); 1 > 2 >^ 3 > diff --git a/tests/baselines/reference/project/sourceRootAbsolutePathModuleSimpleSpecifyOutputDirectory/amd/outdir/simple/m1.js b/tests/baselines/reference/project/sourceRootAbsolutePathModuleSimpleSpecifyOutputDirectory/amd/outdir/simple/m1.js index 25001d63d84..bb59c6fbd90 100644 --- a/tests/baselines/reference/project/sourceRootAbsolutePathModuleSimpleSpecifyOutputDirectory/amd/outdir/simple/m1.js +++ b/tests/baselines/reference/project/sourceRootAbsolutePathModuleSimpleSpecifyOutputDirectory/amd/outdir/simple/m1.js @@ -5,7 +5,7 @@ define(["require", "exports"], function (require, exports) { function m1_c1() { } return m1_c1; - })(); + }()); exports.m1_c1 = m1_c1; exports.m1_instance1 = new m1_c1(); function m1_f1() { diff --git a/tests/baselines/reference/project/sourceRootAbsolutePathModuleSimpleSpecifyOutputDirectory/amd/sourceRootAbsolutePathModuleSimpleSpecifyOutputDirectory.sourcemap.txt b/tests/baselines/reference/project/sourceRootAbsolutePathModuleSimpleSpecifyOutputDirectory/amd/sourceRootAbsolutePathModuleSimpleSpecifyOutputDirectory.sourcemap.txt index 937ad4f4647..aabfdcda958 100644 --- a/tests/baselines/reference/project/sourceRootAbsolutePathModuleSimpleSpecifyOutputDirectory/amd/sourceRootAbsolutePathModuleSimpleSpecifyOutputDirectory.sourcemap.txt +++ b/tests/baselines/reference/project/sourceRootAbsolutePathModuleSimpleSpecifyOutputDirectory/amd/sourceRootAbsolutePathModuleSimpleSpecifyOutputDirectory.sourcemap.txt @@ -60,7 +60,7 @@ sourceFile:m1.ts 1->Emitted(7, 9) Source(4, 1) + SourceIndex(0) 2 >Emitted(7, 21) Source(4, 2) + SourceIndex(0) --- ->>> })(); +>>> }()); 1 >^^^^ 2 > ^ 3 > @@ -234,7 +234,7 @@ sourceFile:test.ts 1->Emitted(7, 9) Source(5, 1) + SourceIndex(0) 2 >Emitted(7, 18) Source(5, 2) + SourceIndex(0) --- ->>> })(); +>>> }()); 1 >^^^^ 2 > ^ 3 > diff --git a/tests/baselines/reference/project/sourceRootAbsolutePathModuleSimpleSpecifyOutputDirectory/node/outdir/simple/m1.js b/tests/baselines/reference/project/sourceRootAbsolutePathModuleSimpleSpecifyOutputDirectory/node/outdir/simple/m1.js index 3bc07083900..121a089af23 100644 --- a/tests/baselines/reference/project/sourceRootAbsolutePathModuleSimpleSpecifyOutputDirectory/node/outdir/simple/m1.js +++ b/tests/baselines/reference/project/sourceRootAbsolutePathModuleSimpleSpecifyOutputDirectory/node/outdir/simple/m1.js @@ -4,7 +4,7 @@ var m1_c1 = (function () { function m1_c1() { } return m1_c1; -})(); +}()); exports.m1_c1 = m1_c1; exports.m1_instance1 = new m1_c1(); function m1_f1() { diff --git a/tests/baselines/reference/project/sourceRootAbsolutePathModuleSimpleSpecifyOutputDirectory/node/sourceRootAbsolutePathModuleSimpleSpecifyOutputDirectory.sourcemap.txt b/tests/baselines/reference/project/sourceRootAbsolutePathModuleSimpleSpecifyOutputDirectory/node/sourceRootAbsolutePathModuleSimpleSpecifyOutputDirectory.sourcemap.txt index ef8b955f22f..8fd46afab66 100644 --- a/tests/baselines/reference/project/sourceRootAbsolutePathModuleSimpleSpecifyOutputDirectory/node/sourceRootAbsolutePathModuleSimpleSpecifyOutputDirectory.sourcemap.txt +++ b/tests/baselines/reference/project/sourceRootAbsolutePathModuleSimpleSpecifyOutputDirectory/node/sourceRootAbsolutePathModuleSimpleSpecifyOutputDirectory.sourcemap.txt @@ -59,7 +59,7 @@ sourceFile:m1.ts 1->Emitted(6, 5) Source(4, 1) + SourceIndex(0) 2 >Emitted(6, 17) Source(4, 2) + SourceIndex(0) --- ->>>})(); +>>>}()); 1 > 2 >^ 3 > @@ -255,7 +255,7 @@ sourceFile:test.ts 1->Emitted(7, 5) Source(5, 1) + SourceIndex(0) 2 >Emitted(7, 14) Source(5, 2) + SourceIndex(0) --- ->>>})(); +>>>}()); 1 > 2 >^ 3 > diff --git a/tests/baselines/reference/project/sourceRootAbsolutePathModuleSimpleSpecifyOutputFile/amd/bin/test.js b/tests/baselines/reference/project/sourceRootAbsolutePathModuleSimpleSpecifyOutputFile/amd/bin/test.js index cc73ea698fe..d650b20ae5f 100644 --- a/tests/baselines/reference/project/sourceRootAbsolutePathModuleSimpleSpecifyOutputFile/amd/bin/test.js +++ b/tests/baselines/reference/project/sourceRootAbsolutePathModuleSimpleSpecifyOutputFile/amd/bin/test.js @@ -5,7 +5,7 @@ define("m1", ["require", "exports"], function (require, exports) { function m1_c1() { } return m1_c1; - })(); + }()); exports.m1_c1 = m1_c1; exports.m1_instance1 = new m1_c1(); function m1_f1() { @@ -20,7 +20,7 @@ define("test", ["require", "exports", "m1"], function (require, exports, m1) { function c1() { } return c1; - })(); + }()); exports.c1 = c1; exports.instance1 = new c1(); function f1() { diff --git a/tests/baselines/reference/project/sourceRootAbsolutePathModuleSimpleSpecifyOutputFile/amd/sourceRootAbsolutePathModuleSimpleSpecifyOutputFile.sourcemap.txt b/tests/baselines/reference/project/sourceRootAbsolutePathModuleSimpleSpecifyOutputFile/amd/sourceRootAbsolutePathModuleSimpleSpecifyOutputFile.sourcemap.txt index f4237f8bb9f..eae02f5f5c0 100644 --- a/tests/baselines/reference/project/sourceRootAbsolutePathModuleSimpleSpecifyOutputFile/amd/sourceRootAbsolutePathModuleSimpleSpecifyOutputFile.sourcemap.txt +++ b/tests/baselines/reference/project/sourceRootAbsolutePathModuleSimpleSpecifyOutputFile/amd/sourceRootAbsolutePathModuleSimpleSpecifyOutputFile.sourcemap.txt @@ -60,7 +60,7 @@ sourceFile:m1.ts 1->Emitted(7, 9) Source(4, 1) + SourceIndex(0) 2 >Emitted(7, 21) Source(4, 2) + SourceIndex(0) --- ->>> })(); +>>> }()); 1 >^^^^ 2 > ^ 3 > @@ -228,7 +228,7 @@ sourceFile:test.ts 1->Emitted(22, 9) Source(5, 1) + SourceIndex(1) 2 >Emitted(22, 18) Source(5, 2) + SourceIndex(1) --- ->>> })(); +>>> }()); 1 >^^^^ 2 > ^ 3 > diff --git a/tests/baselines/reference/project/sourceRootAbsolutePathModuleSubfolderNoOutdir/amd/ref/m1.js b/tests/baselines/reference/project/sourceRootAbsolutePathModuleSubfolderNoOutdir/amd/ref/m1.js index 25001d63d84..bb59c6fbd90 100644 --- a/tests/baselines/reference/project/sourceRootAbsolutePathModuleSubfolderNoOutdir/amd/ref/m1.js +++ b/tests/baselines/reference/project/sourceRootAbsolutePathModuleSubfolderNoOutdir/amd/ref/m1.js @@ -5,7 +5,7 @@ define(["require", "exports"], function (require, exports) { function m1_c1() { } return m1_c1; - })(); + }()); exports.m1_c1 = m1_c1; exports.m1_instance1 = new m1_c1(); function m1_f1() { diff --git a/tests/baselines/reference/project/sourceRootAbsolutePathModuleSubfolderNoOutdir/amd/sourceRootAbsolutePathModuleSubfolderNoOutdir.sourcemap.txt b/tests/baselines/reference/project/sourceRootAbsolutePathModuleSubfolderNoOutdir/amd/sourceRootAbsolutePathModuleSubfolderNoOutdir.sourcemap.txt index f4f5f572419..8dc074fd8b7 100644 --- a/tests/baselines/reference/project/sourceRootAbsolutePathModuleSubfolderNoOutdir/amd/sourceRootAbsolutePathModuleSubfolderNoOutdir.sourcemap.txt +++ b/tests/baselines/reference/project/sourceRootAbsolutePathModuleSubfolderNoOutdir/amd/sourceRootAbsolutePathModuleSubfolderNoOutdir.sourcemap.txt @@ -60,7 +60,7 @@ sourceFile:ref/m1.ts 1->Emitted(7, 9) Source(4, 1) + SourceIndex(0) 2 >Emitted(7, 21) Source(4, 2) + SourceIndex(0) --- ->>> })(); +>>> }()); 1 >^^^^ 2 > ^ 3 > @@ -234,7 +234,7 @@ sourceFile:test.ts 1->Emitted(7, 9) Source(5, 1) + SourceIndex(0) 2 >Emitted(7, 18) Source(5, 2) + SourceIndex(0) --- ->>> })(); +>>> }()); 1 >^^^^ 2 > ^ 3 > diff --git a/tests/baselines/reference/project/sourceRootAbsolutePathModuleSubfolderNoOutdir/node/ref/m1.js b/tests/baselines/reference/project/sourceRootAbsolutePathModuleSubfolderNoOutdir/node/ref/m1.js index 3bc07083900..121a089af23 100644 --- a/tests/baselines/reference/project/sourceRootAbsolutePathModuleSubfolderNoOutdir/node/ref/m1.js +++ b/tests/baselines/reference/project/sourceRootAbsolutePathModuleSubfolderNoOutdir/node/ref/m1.js @@ -4,7 +4,7 @@ var m1_c1 = (function () { function m1_c1() { } return m1_c1; -})(); +}()); exports.m1_c1 = m1_c1; exports.m1_instance1 = new m1_c1(); function m1_f1() { diff --git a/tests/baselines/reference/project/sourceRootAbsolutePathModuleSubfolderNoOutdir/node/sourceRootAbsolutePathModuleSubfolderNoOutdir.sourcemap.txt b/tests/baselines/reference/project/sourceRootAbsolutePathModuleSubfolderNoOutdir/node/sourceRootAbsolutePathModuleSubfolderNoOutdir.sourcemap.txt index c71f3ce344a..31c1b28d081 100644 --- a/tests/baselines/reference/project/sourceRootAbsolutePathModuleSubfolderNoOutdir/node/sourceRootAbsolutePathModuleSubfolderNoOutdir.sourcemap.txt +++ b/tests/baselines/reference/project/sourceRootAbsolutePathModuleSubfolderNoOutdir/node/sourceRootAbsolutePathModuleSubfolderNoOutdir.sourcemap.txt @@ -59,7 +59,7 @@ sourceFile:ref/m1.ts 1->Emitted(6, 5) Source(4, 1) + SourceIndex(0) 2 >Emitted(6, 17) Source(4, 2) + SourceIndex(0) --- ->>>})(); +>>>}()); 1 > 2 >^ 3 > @@ -255,7 +255,7 @@ sourceFile:test.ts 1->Emitted(7, 5) Source(5, 1) + SourceIndex(0) 2 >Emitted(7, 14) Source(5, 2) + SourceIndex(0) --- ->>>})(); +>>>}()); 1 > 2 >^ 3 > diff --git a/tests/baselines/reference/project/sourceRootAbsolutePathModuleSubfolderSpecifyOutputDirectory/amd/outdir/simple/ref/m1.js b/tests/baselines/reference/project/sourceRootAbsolutePathModuleSubfolderSpecifyOutputDirectory/amd/outdir/simple/ref/m1.js index 25001d63d84..bb59c6fbd90 100644 --- a/tests/baselines/reference/project/sourceRootAbsolutePathModuleSubfolderSpecifyOutputDirectory/amd/outdir/simple/ref/m1.js +++ b/tests/baselines/reference/project/sourceRootAbsolutePathModuleSubfolderSpecifyOutputDirectory/amd/outdir/simple/ref/m1.js @@ -5,7 +5,7 @@ define(["require", "exports"], function (require, exports) { function m1_c1() { } return m1_c1; - })(); + }()); exports.m1_c1 = m1_c1; exports.m1_instance1 = new m1_c1(); function m1_f1() { diff --git a/tests/baselines/reference/project/sourceRootAbsolutePathModuleSubfolderSpecifyOutputDirectory/amd/sourceRootAbsolutePathModuleSubfolderSpecifyOutputDirectory.sourcemap.txt b/tests/baselines/reference/project/sourceRootAbsolutePathModuleSubfolderSpecifyOutputDirectory/amd/sourceRootAbsolutePathModuleSubfolderSpecifyOutputDirectory.sourcemap.txt index 61718dfae16..72c00cd5f7a 100644 --- a/tests/baselines/reference/project/sourceRootAbsolutePathModuleSubfolderSpecifyOutputDirectory/amd/sourceRootAbsolutePathModuleSubfolderSpecifyOutputDirectory.sourcemap.txt +++ b/tests/baselines/reference/project/sourceRootAbsolutePathModuleSubfolderSpecifyOutputDirectory/amd/sourceRootAbsolutePathModuleSubfolderSpecifyOutputDirectory.sourcemap.txt @@ -60,7 +60,7 @@ sourceFile:ref/m1.ts 1->Emitted(7, 9) Source(4, 1) + SourceIndex(0) 2 >Emitted(7, 21) Source(4, 2) + SourceIndex(0) --- ->>> })(); +>>> }()); 1 >^^^^ 2 > ^ 3 > @@ -234,7 +234,7 @@ sourceFile:test.ts 1->Emitted(7, 9) Source(5, 1) + SourceIndex(0) 2 >Emitted(7, 18) Source(5, 2) + SourceIndex(0) --- ->>> })(); +>>> }()); 1 >^^^^ 2 > ^ 3 > diff --git a/tests/baselines/reference/project/sourceRootAbsolutePathModuleSubfolderSpecifyOutputDirectory/node/outdir/simple/ref/m1.js b/tests/baselines/reference/project/sourceRootAbsolutePathModuleSubfolderSpecifyOutputDirectory/node/outdir/simple/ref/m1.js index 3bc07083900..121a089af23 100644 --- a/tests/baselines/reference/project/sourceRootAbsolutePathModuleSubfolderSpecifyOutputDirectory/node/outdir/simple/ref/m1.js +++ b/tests/baselines/reference/project/sourceRootAbsolutePathModuleSubfolderSpecifyOutputDirectory/node/outdir/simple/ref/m1.js @@ -4,7 +4,7 @@ var m1_c1 = (function () { function m1_c1() { } return m1_c1; -})(); +}()); exports.m1_c1 = m1_c1; exports.m1_instance1 = new m1_c1(); function m1_f1() { diff --git a/tests/baselines/reference/project/sourceRootAbsolutePathModuleSubfolderSpecifyOutputDirectory/node/sourceRootAbsolutePathModuleSubfolderSpecifyOutputDirectory.sourcemap.txt b/tests/baselines/reference/project/sourceRootAbsolutePathModuleSubfolderSpecifyOutputDirectory/node/sourceRootAbsolutePathModuleSubfolderSpecifyOutputDirectory.sourcemap.txt index d267fc18a6b..235470a3907 100644 --- a/tests/baselines/reference/project/sourceRootAbsolutePathModuleSubfolderSpecifyOutputDirectory/node/sourceRootAbsolutePathModuleSubfolderSpecifyOutputDirectory.sourcemap.txt +++ b/tests/baselines/reference/project/sourceRootAbsolutePathModuleSubfolderSpecifyOutputDirectory/node/sourceRootAbsolutePathModuleSubfolderSpecifyOutputDirectory.sourcemap.txt @@ -59,7 +59,7 @@ sourceFile:ref/m1.ts 1->Emitted(6, 5) Source(4, 1) + SourceIndex(0) 2 >Emitted(6, 17) Source(4, 2) + SourceIndex(0) --- ->>>})(); +>>>}()); 1 > 2 >^ 3 > @@ -255,7 +255,7 @@ sourceFile:test.ts 1->Emitted(7, 5) Source(5, 1) + SourceIndex(0) 2 >Emitted(7, 14) Source(5, 2) + SourceIndex(0) --- ->>>})(); +>>>}()); 1 > 2 >^ 3 > diff --git a/tests/baselines/reference/project/sourceRootAbsolutePathModuleSubfolderSpecifyOutputFile/amd/bin/test.js b/tests/baselines/reference/project/sourceRootAbsolutePathModuleSubfolderSpecifyOutputFile/amd/bin/test.js index 93a25f7ef19..f55492f4b49 100644 --- a/tests/baselines/reference/project/sourceRootAbsolutePathModuleSubfolderSpecifyOutputFile/amd/bin/test.js +++ b/tests/baselines/reference/project/sourceRootAbsolutePathModuleSubfolderSpecifyOutputFile/amd/bin/test.js @@ -5,7 +5,7 @@ define("ref/m1", ["require", "exports"], function (require, exports) { function m1_c1() { } return m1_c1; - })(); + }()); exports.m1_c1 = m1_c1; exports.m1_instance1 = new m1_c1(); function m1_f1() { @@ -20,7 +20,7 @@ define("test", ["require", "exports", "ref/m1"], function (require, exports, m1) function c1() { } return c1; - })(); + }()); exports.c1 = c1; exports.instance1 = new c1(); function f1() { diff --git a/tests/baselines/reference/project/sourceRootAbsolutePathModuleSubfolderSpecifyOutputFile/amd/sourceRootAbsolutePathModuleSubfolderSpecifyOutputFile.sourcemap.txt b/tests/baselines/reference/project/sourceRootAbsolutePathModuleSubfolderSpecifyOutputFile/amd/sourceRootAbsolutePathModuleSubfolderSpecifyOutputFile.sourcemap.txt index 3691823f076..4a0e300da47 100644 --- a/tests/baselines/reference/project/sourceRootAbsolutePathModuleSubfolderSpecifyOutputFile/amd/sourceRootAbsolutePathModuleSubfolderSpecifyOutputFile.sourcemap.txt +++ b/tests/baselines/reference/project/sourceRootAbsolutePathModuleSubfolderSpecifyOutputFile/amd/sourceRootAbsolutePathModuleSubfolderSpecifyOutputFile.sourcemap.txt @@ -60,7 +60,7 @@ sourceFile:ref/m1.ts 1->Emitted(7, 9) Source(4, 1) + SourceIndex(0) 2 >Emitted(7, 21) Source(4, 2) + SourceIndex(0) --- ->>> })(); +>>> }()); 1 >^^^^ 2 > ^ 3 > @@ -228,7 +228,7 @@ sourceFile:test.ts 1->Emitted(22, 9) Source(5, 1) + SourceIndex(1) 2 >Emitted(22, 18) Source(5, 2) + SourceIndex(1) --- ->>> })(); +>>> }()); 1 >^^^^ 2 > ^ 3 > diff --git a/tests/baselines/reference/project/sourceRootAbsolutePathMultifolderNoOutdir/amd/ref/m1.js b/tests/baselines/reference/project/sourceRootAbsolutePathMultifolderNoOutdir/amd/ref/m1.js index f6b169662c9..b7283f7fd88 100644 --- a/tests/baselines/reference/project/sourceRootAbsolutePathMultifolderNoOutdir/amd/ref/m1.js +++ b/tests/baselines/reference/project/sourceRootAbsolutePathMultifolderNoOutdir/amd/ref/m1.js @@ -3,7 +3,7 @@ var m1_c1 = (function () { function m1_c1() { } return m1_c1; -})(); +}()); var m1_instance1 = new m1_c1(); function m1_f1() { return m1_instance1; diff --git a/tests/baselines/reference/project/sourceRootAbsolutePathMultifolderNoOutdir/amd/sourceRootAbsolutePathMultifolderNoOutdir.sourcemap.txt b/tests/baselines/reference/project/sourceRootAbsolutePathMultifolderNoOutdir/amd/sourceRootAbsolutePathMultifolderNoOutdir.sourcemap.txt index 43858f6ab7a..837d9525df0 100644 --- a/tests/baselines/reference/project/sourceRootAbsolutePathMultifolderNoOutdir/amd/sourceRootAbsolutePathMultifolderNoOutdir.sourcemap.txt +++ b/tests/baselines/reference/project/sourceRootAbsolutePathMultifolderNoOutdir/amd/sourceRootAbsolutePathMultifolderNoOutdir.sourcemap.txt @@ -61,7 +61,7 @@ sourceFile:outputdir_multifolder/ref/m1.ts 1->Emitted(5, 5) Source(4, 1) + SourceIndex(0) 2 >Emitted(5, 17) Source(4, 2) + SourceIndex(0) --- ->>>})(); +>>>}()); 1 > 2 >^ 3 > @@ -204,7 +204,7 @@ sourceFile:outputdir_multifolder_ref/m2.ts 1->Emitted(5, 5) Source(4, 1) + SourceIndex(0) 2 >Emitted(5, 17) Source(4, 2) + SourceIndex(0) --- ->>>})(); +>>>}()); 1 > 2 >^ 3 > @@ -366,7 +366,7 @@ sourceFile:outputdir_multifolder/test.ts 1->Emitted(7, 5) Source(6, 1) + SourceIndex(0) 2 >Emitted(7, 14) Source(6, 2) + SourceIndex(0) --- ->>>})(); +>>>}()); 1 > 2 >^ 3 > diff --git a/tests/baselines/reference/project/sourceRootAbsolutePathMultifolderNoOutdir/node/ref/m1.js b/tests/baselines/reference/project/sourceRootAbsolutePathMultifolderNoOutdir/node/ref/m1.js index f6b169662c9..b7283f7fd88 100644 --- a/tests/baselines/reference/project/sourceRootAbsolutePathMultifolderNoOutdir/node/ref/m1.js +++ b/tests/baselines/reference/project/sourceRootAbsolutePathMultifolderNoOutdir/node/ref/m1.js @@ -3,7 +3,7 @@ var m1_c1 = (function () { function m1_c1() { } return m1_c1; -})(); +}()); var m1_instance1 = new m1_c1(); function m1_f1() { return m1_instance1; diff --git a/tests/baselines/reference/project/sourceRootAbsolutePathMultifolderNoOutdir/node/sourceRootAbsolutePathMultifolderNoOutdir.sourcemap.txt b/tests/baselines/reference/project/sourceRootAbsolutePathMultifolderNoOutdir/node/sourceRootAbsolutePathMultifolderNoOutdir.sourcemap.txt index 43858f6ab7a..837d9525df0 100644 --- a/tests/baselines/reference/project/sourceRootAbsolutePathMultifolderNoOutdir/node/sourceRootAbsolutePathMultifolderNoOutdir.sourcemap.txt +++ b/tests/baselines/reference/project/sourceRootAbsolutePathMultifolderNoOutdir/node/sourceRootAbsolutePathMultifolderNoOutdir.sourcemap.txt @@ -61,7 +61,7 @@ sourceFile:outputdir_multifolder/ref/m1.ts 1->Emitted(5, 5) Source(4, 1) + SourceIndex(0) 2 >Emitted(5, 17) Source(4, 2) + SourceIndex(0) --- ->>>})(); +>>>}()); 1 > 2 >^ 3 > @@ -204,7 +204,7 @@ sourceFile:outputdir_multifolder_ref/m2.ts 1->Emitted(5, 5) Source(4, 1) + SourceIndex(0) 2 >Emitted(5, 17) Source(4, 2) + SourceIndex(0) --- ->>>})(); +>>>}()); 1 > 2 >^ 3 > @@ -366,7 +366,7 @@ sourceFile:outputdir_multifolder/test.ts 1->Emitted(7, 5) Source(6, 1) + SourceIndex(0) 2 >Emitted(7, 14) Source(6, 2) + SourceIndex(0) --- ->>>})(); +>>>}()); 1 > 2 >^ 3 > diff --git a/tests/baselines/reference/project/sourceRootAbsolutePathMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_multifolder/ref/m1.js b/tests/baselines/reference/project/sourceRootAbsolutePathMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_multifolder/ref/m1.js index f6b169662c9..b7283f7fd88 100644 --- a/tests/baselines/reference/project/sourceRootAbsolutePathMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_multifolder/ref/m1.js +++ b/tests/baselines/reference/project/sourceRootAbsolutePathMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_multifolder/ref/m1.js @@ -3,7 +3,7 @@ var m1_c1 = (function () { function m1_c1() { } return m1_c1; -})(); +}()); var m1_instance1 = new m1_c1(); function m1_f1() { return m1_instance1; diff --git a/tests/baselines/reference/project/sourceRootAbsolutePathMultifolderSpecifyOutputDirectory/amd/sourceRootAbsolutePathMultifolderSpecifyOutputDirectory.sourcemap.txt b/tests/baselines/reference/project/sourceRootAbsolutePathMultifolderSpecifyOutputDirectory/amd/sourceRootAbsolutePathMultifolderSpecifyOutputDirectory.sourcemap.txt index 6de3c355d6f..b09f90daa8f 100644 --- a/tests/baselines/reference/project/sourceRootAbsolutePathMultifolderSpecifyOutputDirectory/amd/sourceRootAbsolutePathMultifolderSpecifyOutputDirectory.sourcemap.txt +++ b/tests/baselines/reference/project/sourceRootAbsolutePathMultifolderSpecifyOutputDirectory/amd/sourceRootAbsolutePathMultifolderSpecifyOutputDirectory.sourcemap.txt @@ -61,7 +61,7 @@ sourceFile:outputdir_multifolder/ref/m1.ts 1->Emitted(5, 5) Source(4, 1) + SourceIndex(0) 2 >Emitted(5, 17) Source(4, 2) + SourceIndex(0) --- ->>>})(); +>>>}()); 1 > 2 >^ 3 > @@ -204,7 +204,7 @@ sourceFile:outputdir_multifolder_ref/m2.ts 1->Emitted(5, 5) Source(4, 1) + SourceIndex(0) 2 >Emitted(5, 17) Source(4, 2) + SourceIndex(0) --- ->>>})(); +>>>}()); 1 > 2 >^ 3 > @@ -366,7 +366,7 @@ sourceFile:outputdir_multifolder/test.ts 1->Emitted(7, 5) Source(6, 1) + SourceIndex(0) 2 >Emitted(7, 14) Source(6, 2) + SourceIndex(0) --- ->>>})(); +>>>}()); 1 > 2 >^ 3 > diff --git a/tests/baselines/reference/project/sourceRootAbsolutePathMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_multifolder/ref/m1.js b/tests/baselines/reference/project/sourceRootAbsolutePathMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_multifolder/ref/m1.js index f6b169662c9..b7283f7fd88 100644 --- a/tests/baselines/reference/project/sourceRootAbsolutePathMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_multifolder/ref/m1.js +++ b/tests/baselines/reference/project/sourceRootAbsolutePathMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_multifolder/ref/m1.js @@ -3,7 +3,7 @@ var m1_c1 = (function () { function m1_c1() { } return m1_c1; -})(); +}()); var m1_instance1 = new m1_c1(); function m1_f1() { return m1_instance1; diff --git a/tests/baselines/reference/project/sourceRootAbsolutePathMultifolderSpecifyOutputDirectory/node/sourceRootAbsolutePathMultifolderSpecifyOutputDirectory.sourcemap.txt b/tests/baselines/reference/project/sourceRootAbsolutePathMultifolderSpecifyOutputDirectory/node/sourceRootAbsolutePathMultifolderSpecifyOutputDirectory.sourcemap.txt index 6de3c355d6f..b09f90daa8f 100644 --- a/tests/baselines/reference/project/sourceRootAbsolutePathMultifolderSpecifyOutputDirectory/node/sourceRootAbsolutePathMultifolderSpecifyOutputDirectory.sourcemap.txt +++ b/tests/baselines/reference/project/sourceRootAbsolutePathMultifolderSpecifyOutputDirectory/node/sourceRootAbsolutePathMultifolderSpecifyOutputDirectory.sourcemap.txt @@ -61,7 +61,7 @@ sourceFile:outputdir_multifolder/ref/m1.ts 1->Emitted(5, 5) Source(4, 1) + SourceIndex(0) 2 >Emitted(5, 17) Source(4, 2) + SourceIndex(0) --- ->>>})(); +>>>}()); 1 > 2 >^ 3 > @@ -204,7 +204,7 @@ sourceFile:outputdir_multifolder_ref/m2.ts 1->Emitted(5, 5) Source(4, 1) + SourceIndex(0) 2 >Emitted(5, 17) Source(4, 2) + SourceIndex(0) --- ->>>})(); +>>>}()); 1 > 2 >^ 3 > @@ -366,7 +366,7 @@ sourceFile:outputdir_multifolder/test.ts 1->Emitted(7, 5) Source(6, 1) + SourceIndex(0) 2 >Emitted(7, 14) Source(6, 2) + SourceIndex(0) --- ->>>})(); +>>>}()); 1 > 2 >^ 3 > diff --git a/tests/baselines/reference/project/sourceRootAbsolutePathMultifolderSpecifyOutputFile/amd/bin/test.js b/tests/baselines/reference/project/sourceRootAbsolutePathMultifolderSpecifyOutputFile/amd/bin/test.js index e6b143a110a..ad96cca3d79 100644 --- a/tests/baselines/reference/project/sourceRootAbsolutePathMultifolderSpecifyOutputFile/amd/bin/test.js +++ b/tests/baselines/reference/project/sourceRootAbsolutePathMultifolderSpecifyOutputFile/amd/bin/test.js @@ -3,7 +3,7 @@ var m1_c1 = (function () { function m1_c1() { } return m1_c1; -})(); +}()); var m1_instance1 = new m1_c1(); function m1_f1() { return m1_instance1; @@ -13,7 +13,7 @@ var m2_c1 = (function () { function m2_c1() { } return m2_c1; -})(); +}()); var m2_instance1 = new m2_c1(); function m2_f1() { return m2_instance1; @@ -25,7 +25,7 @@ var c1 = (function () { function c1() { } return c1; -})(); +}()); var instance1 = new c1(); function f1() { return instance1; diff --git a/tests/baselines/reference/project/sourceRootAbsolutePathMultifolderSpecifyOutputFile/amd/sourceRootAbsolutePathMultifolderSpecifyOutputFile.sourcemap.txt b/tests/baselines/reference/project/sourceRootAbsolutePathMultifolderSpecifyOutputFile/amd/sourceRootAbsolutePathMultifolderSpecifyOutputFile.sourcemap.txt index bc639f73abf..dcbb570728b 100644 --- a/tests/baselines/reference/project/sourceRootAbsolutePathMultifolderSpecifyOutputFile/amd/sourceRootAbsolutePathMultifolderSpecifyOutputFile.sourcemap.txt +++ b/tests/baselines/reference/project/sourceRootAbsolutePathMultifolderSpecifyOutputFile/amd/sourceRootAbsolutePathMultifolderSpecifyOutputFile.sourcemap.txt @@ -61,7 +61,7 @@ sourceFile:outputdir_multifolder/ref/m1.ts 1->Emitted(5, 5) Source(4, 1) + SourceIndex(0) 2 >Emitted(5, 17) Source(4, 2) + SourceIndex(0) --- ->>>})(); +>>>}()); 1 > 2 >^ 3 > @@ -198,7 +198,7 @@ sourceFile:outputdir_multifolder_ref/m2.ts 1->Emitted(15, 5) Source(4, 1) + SourceIndex(1) 2 >Emitted(15, 17) Source(4, 2) + SourceIndex(1) --- ->>>})(); +>>>}()); 1 > 2 >^ 3 > @@ -354,7 +354,7 @@ sourceFile:outputdir_multifolder/test.ts 1->Emitted(27, 5) Source(6, 1) + SourceIndex(2) 2 >Emitted(27, 14) Source(6, 2) + SourceIndex(2) --- ->>>})(); +>>>}()); 1 > 2 >^ 3 > diff --git a/tests/baselines/reference/project/sourceRootAbsolutePathMultifolderSpecifyOutputFile/node/bin/test.js b/tests/baselines/reference/project/sourceRootAbsolutePathMultifolderSpecifyOutputFile/node/bin/test.js index e6b143a110a..ad96cca3d79 100644 --- a/tests/baselines/reference/project/sourceRootAbsolutePathMultifolderSpecifyOutputFile/node/bin/test.js +++ b/tests/baselines/reference/project/sourceRootAbsolutePathMultifolderSpecifyOutputFile/node/bin/test.js @@ -3,7 +3,7 @@ var m1_c1 = (function () { function m1_c1() { } return m1_c1; -})(); +}()); var m1_instance1 = new m1_c1(); function m1_f1() { return m1_instance1; @@ -13,7 +13,7 @@ var m2_c1 = (function () { function m2_c1() { } return m2_c1; -})(); +}()); var m2_instance1 = new m2_c1(); function m2_f1() { return m2_instance1; @@ -25,7 +25,7 @@ var c1 = (function () { function c1() { } return c1; -})(); +}()); var instance1 = new c1(); function f1() { return instance1; diff --git a/tests/baselines/reference/project/sourceRootAbsolutePathMultifolderSpecifyOutputFile/node/sourceRootAbsolutePathMultifolderSpecifyOutputFile.sourcemap.txt b/tests/baselines/reference/project/sourceRootAbsolutePathMultifolderSpecifyOutputFile/node/sourceRootAbsolutePathMultifolderSpecifyOutputFile.sourcemap.txt index bc639f73abf..dcbb570728b 100644 --- a/tests/baselines/reference/project/sourceRootAbsolutePathMultifolderSpecifyOutputFile/node/sourceRootAbsolutePathMultifolderSpecifyOutputFile.sourcemap.txt +++ b/tests/baselines/reference/project/sourceRootAbsolutePathMultifolderSpecifyOutputFile/node/sourceRootAbsolutePathMultifolderSpecifyOutputFile.sourcemap.txt @@ -61,7 +61,7 @@ sourceFile:outputdir_multifolder/ref/m1.ts 1->Emitted(5, 5) Source(4, 1) + SourceIndex(0) 2 >Emitted(5, 17) Source(4, 2) + SourceIndex(0) --- ->>>})(); +>>>}()); 1 > 2 >^ 3 > @@ -198,7 +198,7 @@ sourceFile:outputdir_multifolder_ref/m2.ts 1->Emitted(15, 5) Source(4, 1) + SourceIndex(1) 2 >Emitted(15, 17) Source(4, 2) + SourceIndex(1) --- ->>>})(); +>>>}()); 1 > 2 >^ 3 > @@ -354,7 +354,7 @@ sourceFile:outputdir_multifolder/test.ts 1->Emitted(27, 5) Source(6, 1) + SourceIndex(2) 2 >Emitted(27, 14) Source(6, 2) + SourceIndex(2) --- ->>>})(); +>>>}()); 1 > 2 >^ 3 > diff --git a/tests/baselines/reference/project/sourceRootAbsolutePathSimpleNoOutdir/amd/m1.js b/tests/baselines/reference/project/sourceRootAbsolutePathSimpleNoOutdir/amd/m1.js index f6b169662c9..b7283f7fd88 100644 --- a/tests/baselines/reference/project/sourceRootAbsolutePathSimpleNoOutdir/amd/m1.js +++ b/tests/baselines/reference/project/sourceRootAbsolutePathSimpleNoOutdir/amd/m1.js @@ -3,7 +3,7 @@ var m1_c1 = (function () { function m1_c1() { } return m1_c1; -})(); +}()); var m1_instance1 = new m1_c1(); function m1_f1() { return m1_instance1; diff --git a/tests/baselines/reference/project/sourceRootAbsolutePathSimpleNoOutdir/amd/sourceRootAbsolutePathSimpleNoOutdir.sourcemap.txt b/tests/baselines/reference/project/sourceRootAbsolutePathSimpleNoOutdir/amd/sourceRootAbsolutePathSimpleNoOutdir.sourcemap.txt index 0062e88d20e..49736d31a0f 100644 --- a/tests/baselines/reference/project/sourceRootAbsolutePathSimpleNoOutdir/amd/sourceRootAbsolutePathSimpleNoOutdir.sourcemap.txt +++ b/tests/baselines/reference/project/sourceRootAbsolutePathSimpleNoOutdir/amd/sourceRootAbsolutePathSimpleNoOutdir.sourcemap.txt @@ -61,7 +61,7 @@ sourceFile:m1.ts 1->Emitted(5, 5) Source(4, 1) + SourceIndex(0) 2 >Emitted(5, 17) Source(4, 2) + SourceIndex(0) --- ->>>})(); +>>>}()); 1 > 2 >^ 3 > @@ -213,7 +213,7 @@ sourceFile:test.ts 1->Emitted(6, 5) Source(5, 1) + SourceIndex(0) 2 >Emitted(6, 14) Source(5, 2) + SourceIndex(0) --- ->>>})(); +>>>}()); 1 > 2 >^ 3 > diff --git a/tests/baselines/reference/project/sourceRootAbsolutePathSimpleNoOutdir/node/m1.js b/tests/baselines/reference/project/sourceRootAbsolutePathSimpleNoOutdir/node/m1.js index f6b169662c9..b7283f7fd88 100644 --- a/tests/baselines/reference/project/sourceRootAbsolutePathSimpleNoOutdir/node/m1.js +++ b/tests/baselines/reference/project/sourceRootAbsolutePathSimpleNoOutdir/node/m1.js @@ -3,7 +3,7 @@ var m1_c1 = (function () { function m1_c1() { } return m1_c1; -})(); +}()); var m1_instance1 = new m1_c1(); function m1_f1() { return m1_instance1; diff --git a/tests/baselines/reference/project/sourceRootAbsolutePathSimpleNoOutdir/node/sourceRootAbsolutePathSimpleNoOutdir.sourcemap.txt b/tests/baselines/reference/project/sourceRootAbsolutePathSimpleNoOutdir/node/sourceRootAbsolutePathSimpleNoOutdir.sourcemap.txt index 0062e88d20e..49736d31a0f 100644 --- a/tests/baselines/reference/project/sourceRootAbsolutePathSimpleNoOutdir/node/sourceRootAbsolutePathSimpleNoOutdir.sourcemap.txt +++ b/tests/baselines/reference/project/sourceRootAbsolutePathSimpleNoOutdir/node/sourceRootAbsolutePathSimpleNoOutdir.sourcemap.txt @@ -61,7 +61,7 @@ sourceFile:m1.ts 1->Emitted(5, 5) Source(4, 1) + SourceIndex(0) 2 >Emitted(5, 17) Source(4, 2) + SourceIndex(0) --- ->>>})(); +>>>}()); 1 > 2 >^ 3 > @@ -213,7 +213,7 @@ sourceFile:test.ts 1->Emitted(6, 5) Source(5, 1) + SourceIndex(0) 2 >Emitted(6, 14) Source(5, 2) + SourceIndex(0) --- ->>>})(); +>>>}()); 1 > 2 >^ 3 > diff --git a/tests/baselines/reference/project/sourceRootAbsolutePathSimpleSpecifyOutputDirectory/amd/outdir/simple/m1.js b/tests/baselines/reference/project/sourceRootAbsolutePathSimpleSpecifyOutputDirectory/amd/outdir/simple/m1.js index f6b169662c9..b7283f7fd88 100644 --- a/tests/baselines/reference/project/sourceRootAbsolutePathSimpleSpecifyOutputDirectory/amd/outdir/simple/m1.js +++ b/tests/baselines/reference/project/sourceRootAbsolutePathSimpleSpecifyOutputDirectory/amd/outdir/simple/m1.js @@ -3,7 +3,7 @@ var m1_c1 = (function () { function m1_c1() { } return m1_c1; -})(); +}()); var m1_instance1 = new m1_c1(); function m1_f1() { return m1_instance1; diff --git a/tests/baselines/reference/project/sourceRootAbsolutePathSimpleSpecifyOutputDirectory/amd/sourceRootAbsolutePathSimpleSpecifyOutputDirectory.sourcemap.txt b/tests/baselines/reference/project/sourceRootAbsolutePathSimpleSpecifyOutputDirectory/amd/sourceRootAbsolutePathSimpleSpecifyOutputDirectory.sourcemap.txt index 98cd3b2fce2..1cef37db0ad 100644 --- a/tests/baselines/reference/project/sourceRootAbsolutePathSimpleSpecifyOutputDirectory/amd/sourceRootAbsolutePathSimpleSpecifyOutputDirectory.sourcemap.txt +++ b/tests/baselines/reference/project/sourceRootAbsolutePathSimpleSpecifyOutputDirectory/amd/sourceRootAbsolutePathSimpleSpecifyOutputDirectory.sourcemap.txt @@ -61,7 +61,7 @@ sourceFile:m1.ts 1->Emitted(5, 5) Source(4, 1) + SourceIndex(0) 2 >Emitted(5, 17) Source(4, 2) + SourceIndex(0) --- ->>>})(); +>>>}()); 1 > 2 >^ 3 > @@ -213,7 +213,7 @@ sourceFile:test.ts 1->Emitted(6, 5) Source(5, 1) + SourceIndex(0) 2 >Emitted(6, 14) Source(5, 2) + SourceIndex(0) --- ->>>})(); +>>>}()); 1 > 2 >^ 3 > diff --git a/tests/baselines/reference/project/sourceRootAbsolutePathSimpleSpecifyOutputDirectory/node/outdir/simple/m1.js b/tests/baselines/reference/project/sourceRootAbsolutePathSimpleSpecifyOutputDirectory/node/outdir/simple/m1.js index f6b169662c9..b7283f7fd88 100644 --- a/tests/baselines/reference/project/sourceRootAbsolutePathSimpleSpecifyOutputDirectory/node/outdir/simple/m1.js +++ b/tests/baselines/reference/project/sourceRootAbsolutePathSimpleSpecifyOutputDirectory/node/outdir/simple/m1.js @@ -3,7 +3,7 @@ var m1_c1 = (function () { function m1_c1() { } return m1_c1; -})(); +}()); var m1_instance1 = new m1_c1(); function m1_f1() { return m1_instance1; diff --git a/tests/baselines/reference/project/sourceRootAbsolutePathSimpleSpecifyOutputDirectory/node/sourceRootAbsolutePathSimpleSpecifyOutputDirectory.sourcemap.txt b/tests/baselines/reference/project/sourceRootAbsolutePathSimpleSpecifyOutputDirectory/node/sourceRootAbsolutePathSimpleSpecifyOutputDirectory.sourcemap.txt index 98cd3b2fce2..1cef37db0ad 100644 --- a/tests/baselines/reference/project/sourceRootAbsolutePathSimpleSpecifyOutputDirectory/node/sourceRootAbsolutePathSimpleSpecifyOutputDirectory.sourcemap.txt +++ b/tests/baselines/reference/project/sourceRootAbsolutePathSimpleSpecifyOutputDirectory/node/sourceRootAbsolutePathSimpleSpecifyOutputDirectory.sourcemap.txt @@ -61,7 +61,7 @@ sourceFile:m1.ts 1->Emitted(5, 5) Source(4, 1) + SourceIndex(0) 2 >Emitted(5, 17) Source(4, 2) + SourceIndex(0) --- ->>>})(); +>>>}()); 1 > 2 >^ 3 > @@ -213,7 +213,7 @@ sourceFile:test.ts 1->Emitted(6, 5) Source(5, 1) + SourceIndex(0) 2 >Emitted(6, 14) Source(5, 2) + SourceIndex(0) --- ->>>})(); +>>>}()); 1 > 2 >^ 3 > diff --git a/tests/baselines/reference/project/sourceRootAbsolutePathSimpleSpecifyOutputFile/amd/bin/test.js b/tests/baselines/reference/project/sourceRootAbsolutePathSimpleSpecifyOutputFile/amd/bin/test.js index 10bcbf92a21..481c10d1a06 100644 --- a/tests/baselines/reference/project/sourceRootAbsolutePathSimpleSpecifyOutputFile/amd/bin/test.js +++ b/tests/baselines/reference/project/sourceRootAbsolutePathSimpleSpecifyOutputFile/amd/bin/test.js @@ -3,7 +3,7 @@ var m1_c1 = (function () { function m1_c1() { } return m1_c1; -})(); +}()); var m1_instance1 = new m1_c1(); function m1_f1() { return m1_instance1; @@ -14,7 +14,7 @@ var c1 = (function () { function c1() { } return c1; -})(); +}()); var instance1 = new c1(); function f1() { return instance1; diff --git a/tests/baselines/reference/project/sourceRootAbsolutePathSimpleSpecifyOutputFile/amd/sourceRootAbsolutePathSimpleSpecifyOutputFile.sourcemap.txt b/tests/baselines/reference/project/sourceRootAbsolutePathSimpleSpecifyOutputFile/amd/sourceRootAbsolutePathSimpleSpecifyOutputFile.sourcemap.txt index ff2cacede46..c9e8934ba27 100644 --- a/tests/baselines/reference/project/sourceRootAbsolutePathSimpleSpecifyOutputFile/amd/sourceRootAbsolutePathSimpleSpecifyOutputFile.sourcemap.txt +++ b/tests/baselines/reference/project/sourceRootAbsolutePathSimpleSpecifyOutputFile/amd/sourceRootAbsolutePathSimpleSpecifyOutputFile.sourcemap.txt @@ -61,7 +61,7 @@ sourceFile:m1.ts 1->Emitted(5, 5) Source(4, 1) + SourceIndex(0) 2 >Emitted(5, 17) Source(4, 2) + SourceIndex(0) --- ->>>})(); +>>>}()); 1 > 2 >^ 3 > @@ -207,7 +207,7 @@ sourceFile:test.ts 1->Emitted(16, 5) Source(5, 1) + SourceIndex(1) 2 >Emitted(16, 14) Source(5, 2) + SourceIndex(1) --- ->>>})(); +>>>}()); 1 > 2 >^ 3 > diff --git a/tests/baselines/reference/project/sourceRootAbsolutePathSimpleSpecifyOutputFile/node/bin/test.js b/tests/baselines/reference/project/sourceRootAbsolutePathSimpleSpecifyOutputFile/node/bin/test.js index 10bcbf92a21..481c10d1a06 100644 --- a/tests/baselines/reference/project/sourceRootAbsolutePathSimpleSpecifyOutputFile/node/bin/test.js +++ b/tests/baselines/reference/project/sourceRootAbsolutePathSimpleSpecifyOutputFile/node/bin/test.js @@ -3,7 +3,7 @@ var m1_c1 = (function () { function m1_c1() { } return m1_c1; -})(); +}()); var m1_instance1 = new m1_c1(); function m1_f1() { return m1_instance1; @@ -14,7 +14,7 @@ var c1 = (function () { function c1() { } return c1; -})(); +}()); var instance1 = new c1(); function f1() { return instance1; diff --git a/tests/baselines/reference/project/sourceRootAbsolutePathSimpleSpecifyOutputFile/node/sourceRootAbsolutePathSimpleSpecifyOutputFile.sourcemap.txt b/tests/baselines/reference/project/sourceRootAbsolutePathSimpleSpecifyOutputFile/node/sourceRootAbsolutePathSimpleSpecifyOutputFile.sourcemap.txt index ff2cacede46..c9e8934ba27 100644 --- a/tests/baselines/reference/project/sourceRootAbsolutePathSimpleSpecifyOutputFile/node/sourceRootAbsolutePathSimpleSpecifyOutputFile.sourcemap.txt +++ b/tests/baselines/reference/project/sourceRootAbsolutePathSimpleSpecifyOutputFile/node/sourceRootAbsolutePathSimpleSpecifyOutputFile.sourcemap.txt @@ -61,7 +61,7 @@ sourceFile:m1.ts 1->Emitted(5, 5) Source(4, 1) + SourceIndex(0) 2 >Emitted(5, 17) Source(4, 2) + SourceIndex(0) --- ->>>})(); +>>>}()); 1 > 2 >^ 3 > @@ -207,7 +207,7 @@ sourceFile:test.ts 1->Emitted(16, 5) Source(5, 1) + SourceIndex(1) 2 >Emitted(16, 14) Source(5, 2) + SourceIndex(1) --- ->>>})(); +>>>}()); 1 > 2 >^ 3 > diff --git a/tests/baselines/reference/project/sourceRootAbsolutePathSingleFileNoOutdir/amd/sourceRootAbsolutePathSingleFileNoOutdir.sourcemap.txt b/tests/baselines/reference/project/sourceRootAbsolutePathSingleFileNoOutdir/amd/sourceRootAbsolutePathSingleFileNoOutdir.sourcemap.txt index 125a4421ad9..5df64d65dda 100644 --- a/tests/baselines/reference/project/sourceRootAbsolutePathSingleFileNoOutdir/amd/sourceRootAbsolutePathSingleFileNoOutdir.sourcemap.txt +++ b/tests/baselines/reference/project/sourceRootAbsolutePathSingleFileNoOutdir/amd/sourceRootAbsolutePathSingleFileNoOutdir.sourcemap.txt @@ -61,7 +61,7 @@ sourceFile:test.ts 1->Emitted(5, 5) Source(4, 1) + SourceIndex(0) 2 >Emitted(5, 14) Source(4, 2) + SourceIndex(0) --- ->>>})(); +>>>}()); 1 > 2 >^ 3 > diff --git a/tests/baselines/reference/project/sourceRootAbsolutePathSingleFileNoOutdir/amd/test.js b/tests/baselines/reference/project/sourceRootAbsolutePathSingleFileNoOutdir/amd/test.js index 335d79c01c6..e5a1c12a732 100644 --- a/tests/baselines/reference/project/sourceRootAbsolutePathSingleFileNoOutdir/amd/test.js +++ b/tests/baselines/reference/project/sourceRootAbsolutePathSingleFileNoOutdir/amd/test.js @@ -3,7 +3,7 @@ var c1 = (function () { function c1() { } return c1; -})(); +}()); var instance1 = new c1(); function f1() { return instance1; diff --git a/tests/baselines/reference/project/sourceRootAbsolutePathSingleFileNoOutdir/node/sourceRootAbsolutePathSingleFileNoOutdir.sourcemap.txt b/tests/baselines/reference/project/sourceRootAbsolutePathSingleFileNoOutdir/node/sourceRootAbsolutePathSingleFileNoOutdir.sourcemap.txt index 125a4421ad9..5df64d65dda 100644 --- a/tests/baselines/reference/project/sourceRootAbsolutePathSingleFileNoOutdir/node/sourceRootAbsolutePathSingleFileNoOutdir.sourcemap.txt +++ b/tests/baselines/reference/project/sourceRootAbsolutePathSingleFileNoOutdir/node/sourceRootAbsolutePathSingleFileNoOutdir.sourcemap.txt @@ -61,7 +61,7 @@ sourceFile:test.ts 1->Emitted(5, 5) Source(4, 1) + SourceIndex(0) 2 >Emitted(5, 14) Source(4, 2) + SourceIndex(0) --- ->>>})(); +>>>}()); 1 > 2 >^ 3 > diff --git a/tests/baselines/reference/project/sourceRootAbsolutePathSingleFileNoOutdir/node/test.js b/tests/baselines/reference/project/sourceRootAbsolutePathSingleFileNoOutdir/node/test.js index 335d79c01c6..e5a1c12a732 100644 --- a/tests/baselines/reference/project/sourceRootAbsolutePathSingleFileNoOutdir/node/test.js +++ b/tests/baselines/reference/project/sourceRootAbsolutePathSingleFileNoOutdir/node/test.js @@ -3,7 +3,7 @@ var c1 = (function () { function c1() { } return c1; -})(); +}()); var instance1 = new c1(); function f1() { return instance1; diff --git a/tests/baselines/reference/project/sourceRootAbsolutePathSingleFileSpecifyOutputDirectory/amd/outdir/simple/test.js b/tests/baselines/reference/project/sourceRootAbsolutePathSingleFileSpecifyOutputDirectory/amd/outdir/simple/test.js index 335d79c01c6..e5a1c12a732 100644 --- a/tests/baselines/reference/project/sourceRootAbsolutePathSingleFileSpecifyOutputDirectory/amd/outdir/simple/test.js +++ b/tests/baselines/reference/project/sourceRootAbsolutePathSingleFileSpecifyOutputDirectory/amd/outdir/simple/test.js @@ -3,7 +3,7 @@ var c1 = (function () { function c1() { } return c1; -})(); +}()); var instance1 = new c1(); function f1() { return instance1; diff --git a/tests/baselines/reference/project/sourceRootAbsolutePathSingleFileSpecifyOutputDirectory/amd/sourceRootAbsolutePathSingleFileSpecifyOutputDirectory.sourcemap.txt b/tests/baselines/reference/project/sourceRootAbsolutePathSingleFileSpecifyOutputDirectory/amd/sourceRootAbsolutePathSingleFileSpecifyOutputDirectory.sourcemap.txt index 9a26f02b8a5..fb45c5ce2a5 100644 --- a/tests/baselines/reference/project/sourceRootAbsolutePathSingleFileSpecifyOutputDirectory/amd/sourceRootAbsolutePathSingleFileSpecifyOutputDirectory.sourcemap.txt +++ b/tests/baselines/reference/project/sourceRootAbsolutePathSingleFileSpecifyOutputDirectory/amd/sourceRootAbsolutePathSingleFileSpecifyOutputDirectory.sourcemap.txt @@ -61,7 +61,7 @@ sourceFile:test.ts 1->Emitted(5, 5) Source(4, 1) + SourceIndex(0) 2 >Emitted(5, 14) Source(4, 2) + SourceIndex(0) --- ->>>})(); +>>>}()); 1 > 2 >^ 3 > diff --git a/tests/baselines/reference/project/sourceRootAbsolutePathSingleFileSpecifyOutputDirectory/node/outdir/simple/test.js b/tests/baselines/reference/project/sourceRootAbsolutePathSingleFileSpecifyOutputDirectory/node/outdir/simple/test.js index 335d79c01c6..e5a1c12a732 100644 --- a/tests/baselines/reference/project/sourceRootAbsolutePathSingleFileSpecifyOutputDirectory/node/outdir/simple/test.js +++ b/tests/baselines/reference/project/sourceRootAbsolutePathSingleFileSpecifyOutputDirectory/node/outdir/simple/test.js @@ -3,7 +3,7 @@ var c1 = (function () { function c1() { } return c1; -})(); +}()); var instance1 = new c1(); function f1() { return instance1; diff --git a/tests/baselines/reference/project/sourceRootAbsolutePathSingleFileSpecifyOutputDirectory/node/sourceRootAbsolutePathSingleFileSpecifyOutputDirectory.sourcemap.txt b/tests/baselines/reference/project/sourceRootAbsolutePathSingleFileSpecifyOutputDirectory/node/sourceRootAbsolutePathSingleFileSpecifyOutputDirectory.sourcemap.txt index 9a26f02b8a5..fb45c5ce2a5 100644 --- a/tests/baselines/reference/project/sourceRootAbsolutePathSingleFileSpecifyOutputDirectory/node/sourceRootAbsolutePathSingleFileSpecifyOutputDirectory.sourcemap.txt +++ b/tests/baselines/reference/project/sourceRootAbsolutePathSingleFileSpecifyOutputDirectory/node/sourceRootAbsolutePathSingleFileSpecifyOutputDirectory.sourcemap.txt @@ -61,7 +61,7 @@ sourceFile:test.ts 1->Emitted(5, 5) Source(4, 1) + SourceIndex(0) 2 >Emitted(5, 14) Source(4, 2) + SourceIndex(0) --- ->>>})(); +>>>}()); 1 > 2 >^ 3 > diff --git a/tests/baselines/reference/project/sourceRootAbsolutePathSingleFileSpecifyOutputFile/amd/bin/test.js b/tests/baselines/reference/project/sourceRootAbsolutePathSingleFileSpecifyOutputFile/amd/bin/test.js index 335d79c01c6..e5a1c12a732 100644 --- a/tests/baselines/reference/project/sourceRootAbsolutePathSingleFileSpecifyOutputFile/amd/bin/test.js +++ b/tests/baselines/reference/project/sourceRootAbsolutePathSingleFileSpecifyOutputFile/amd/bin/test.js @@ -3,7 +3,7 @@ var c1 = (function () { function c1() { } return c1; -})(); +}()); var instance1 = new c1(); function f1() { return instance1; diff --git a/tests/baselines/reference/project/sourceRootAbsolutePathSingleFileSpecifyOutputFile/amd/sourceRootAbsolutePathSingleFileSpecifyOutputFile.sourcemap.txt b/tests/baselines/reference/project/sourceRootAbsolutePathSingleFileSpecifyOutputFile/amd/sourceRootAbsolutePathSingleFileSpecifyOutputFile.sourcemap.txt index e5ab088d092..70172cbcfcf 100644 --- a/tests/baselines/reference/project/sourceRootAbsolutePathSingleFileSpecifyOutputFile/amd/sourceRootAbsolutePathSingleFileSpecifyOutputFile.sourcemap.txt +++ b/tests/baselines/reference/project/sourceRootAbsolutePathSingleFileSpecifyOutputFile/amd/sourceRootAbsolutePathSingleFileSpecifyOutputFile.sourcemap.txt @@ -61,7 +61,7 @@ sourceFile:test.ts 1->Emitted(5, 5) Source(4, 1) + SourceIndex(0) 2 >Emitted(5, 14) Source(4, 2) + SourceIndex(0) --- ->>>})(); +>>>}()); 1 > 2 >^ 3 > diff --git a/tests/baselines/reference/project/sourceRootAbsolutePathSingleFileSpecifyOutputFile/node/bin/test.js b/tests/baselines/reference/project/sourceRootAbsolutePathSingleFileSpecifyOutputFile/node/bin/test.js index 335d79c01c6..e5a1c12a732 100644 --- a/tests/baselines/reference/project/sourceRootAbsolutePathSingleFileSpecifyOutputFile/node/bin/test.js +++ b/tests/baselines/reference/project/sourceRootAbsolutePathSingleFileSpecifyOutputFile/node/bin/test.js @@ -3,7 +3,7 @@ var c1 = (function () { function c1() { } return c1; -})(); +}()); var instance1 = new c1(); function f1() { return instance1; diff --git a/tests/baselines/reference/project/sourceRootAbsolutePathSingleFileSpecifyOutputFile/node/sourceRootAbsolutePathSingleFileSpecifyOutputFile.sourcemap.txt b/tests/baselines/reference/project/sourceRootAbsolutePathSingleFileSpecifyOutputFile/node/sourceRootAbsolutePathSingleFileSpecifyOutputFile.sourcemap.txt index e5ab088d092..70172cbcfcf 100644 --- a/tests/baselines/reference/project/sourceRootAbsolutePathSingleFileSpecifyOutputFile/node/sourceRootAbsolutePathSingleFileSpecifyOutputFile.sourcemap.txt +++ b/tests/baselines/reference/project/sourceRootAbsolutePathSingleFileSpecifyOutputFile/node/sourceRootAbsolutePathSingleFileSpecifyOutputFile.sourcemap.txt @@ -61,7 +61,7 @@ sourceFile:test.ts 1->Emitted(5, 5) Source(4, 1) + SourceIndex(0) 2 >Emitted(5, 14) Source(4, 2) + SourceIndex(0) --- ->>>})(); +>>>}()); 1 > 2 >^ 3 > diff --git a/tests/baselines/reference/project/sourceRootAbsolutePathSubfolderNoOutdir/amd/ref/m1.js b/tests/baselines/reference/project/sourceRootAbsolutePathSubfolderNoOutdir/amd/ref/m1.js index f6b169662c9..b7283f7fd88 100644 --- a/tests/baselines/reference/project/sourceRootAbsolutePathSubfolderNoOutdir/amd/ref/m1.js +++ b/tests/baselines/reference/project/sourceRootAbsolutePathSubfolderNoOutdir/amd/ref/m1.js @@ -3,7 +3,7 @@ var m1_c1 = (function () { function m1_c1() { } return m1_c1; -})(); +}()); var m1_instance1 = new m1_c1(); function m1_f1() { return m1_instance1; diff --git a/tests/baselines/reference/project/sourceRootAbsolutePathSubfolderNoOutdir/amd/sourceRootAbsolutePathSubfolderNoOutdir.sourcemap.txt b/tests/baselines/reference/project/sourceRootAbsolutePathSubfolderNoOutdir/amd/sourceRootAbsolutePathSubfolderNoOutdir.sourcemap.txt index 2ef04f2b3f7..04278e4304f 100644 --- a/tests/baselines/reference/project/sourceRootAbsolutePathSubfolderNoOutdir/amd/sourceRootAbsolutePathSubfolderNoOutdir.sourcemap.txt +++ b/tests/baselines/reference/project/sourceRootAbsolutePathSubfolderNoOutdir/amd/sourceRootAbsolutePathSubfolderNoOutdir.sourcemap.txt @@ -61,7 +61,7 @@ sourceFile:ref/m1.ts 1->Emitted(5, 5) Source(4, 1) + SourceIndex(0) 2 >Emitted(5, 17) Source(4, 2) + SourceIndex(0) --- ->>>})(); +>>>}()); 1 > 2 >^ 3 > @@ -213,7 +213,7 @@ sourceFile:test.ts 1->Emitted(6, 5) Source(5, 1) + SourceIndex(0) 2 >Emitted(6, 14) Source(5, 2) + SourceIndex(0) --- ->>>})(); +>>>}()); 1 > 2 >^ 3 > diff --git a/tests/baselines/reference/project/sourceRootAbsolutePathSubfolderNoOutdir/node/ref/m1.js b/tests/baselines/reference/project/sourceRootAbsolutePathSubfolderNoOutdir/node/ref/m1.js index f6b169662c9..b7283f7fd88 100644 --- a/tests/baselines/reference/project/sourceRootAbsolutePathSubfolderNoOutdir/node/ref/m1.js +++ b/tests/baselines/reference/project/sourceRootAbsolutePathSubfolderNoOutdir/node/ref/m1.js @@ -3,7 +3,7 @@ var m1_c1 = (function () { function m1_c1() { } return m1_c1; -})(); +}()); var m1_instance1 = new m1_c1(); function m1_f1() { return m1_instance1; diff --git a/tests/baselines/reference/project/sourceRootAbsolutePathSubfolderNoOutdir/node/sourceRootAbsolutePathSubfolderNoOutdir.sourcemap.txt b/tests/baselines/reference/project/sourceRootAbsolutePathSubfolderNoOutdir/node/sourceRootAbsolutePathSubfolderNoOutdir.sourcemap.txt index 2ef04f2b3f7..04278e4304f 100644 --- a/tests/baselines/reference/project/sourceRootAbsolutePathSubfolderNoOutdir/node/sourceRootAbsolutePathSubfolderNoOutdir.sourcemap.txt +++ b/tests/baselines/reference/project/sourceRootAbsolutePathSubfolderNoOutdir/node/sourceRootAbsolutePathSubfolderNoOutdir.sourcemap.txt @@ -61,7 +61,7 @@ sourceFile:ref/m1.ts 1->Emitted(5, 5) Source(4, 1) + SourceIndex(0) 2 >Emitted(5, 17) Source(4, 2) + SourceIndex(0) --- ->>>})(); +>>>}()); 1 > 2 >^ 3 > @@ -213,7 +213,7 @@ sourceFile:test.ts 1->Emitted(6, 5) Source(5, 1) + SourceIndex(0) 2 >Emitted(6, 14) Source(5, 2) + SourceIndex(0) --- ->>>})(); +>>>}()); 1 > 2 >^ 3 > diff --git a/tests/baselines/reference/project/sourceRootAbsolutePathSubfolderSpecifyOutputDirectory/amd/outdir/simple/ref/m1.js b/tests/baselines/reference/project/sourceRootAbsolutePathSubfolderSpecifyOutputDirectory/amd/outdir/simple/ref/m1.js index f6b169662c9..b7283f7fd88 100644 --- a/tests/baselines/reference/project/sourceRootAbsolutePathSubfolderSpecifyOutputDirectory/amd/outdir/simple/ref/m1.js +++ b/tests/baselines/reference/project/sourceRootAbsolutePathSubfolderSpecifyOutputDirectory/amd/outdir/simple/ref/m1.js @@ -3,7 +3,7 @@ var m1_c1 = (function () { function m1_c1() { } return m1_c1; -})(); +}()); var m1_instance1 = new m1_c1(); function m1_f1() { return m1_instance1; diff --git a/tests/baselines/reference/project/sourceRootAbsolutePathSubfolderSpecifyOutputDirectory/amd/sourceRootAbsolutePathSubfolderSpecifyOutputDirectory.sourcemap.txt b/tests/baselines/reference/project/sourceRootAbsolutePathSubfolderSpecifyOutputDirectory/amd/sourceRootAbsolutePathSubfolderSpecifyOutputDirectory.sourcemap.txt index d197965afca..eb461863ded 100644 --- a/tests/baselines/reference/project/sourceRootAbsolutePathSubfolderSpecifyOutputDirectory/amd/sourceRootAbsolutePathSubfolderSpecifyOutputDirectory.sourcemap.txt +++ b/tests/baselines/reference/project/sourceRootAbsolutePathSubfolderSpecifyOutputDirectory/amd/sourceRootAbsolutePathSubfolderSpecifyOutputDirectory.sourcemap.txt @@ -61,7 +61,7 @@ sourceFile:ref/m1.ts 1->Emitted(5, 5) Source(4, 1) + SourceIndex(0) 2 >Emitted(5, 17) Source(4, 2) + SourceIndex(0) --- ->>>})(); +>>>}()); 1 > 2 >^ 3 > @@ -213,7 +213,7 @@ sourceFile:test.ts 1->Emitted(6, 5) Source(5, 1) + SourceIndex(0) 2 >Emitted(6, 14) Source(5, 2) + SourceIndex(0) --- ->>>})(); +>>>}()); 1 > 2 >^ 3 > diff --git a/tests/baselines/reference/project/sourceRootAbsolutePathSubfolderSpecifyOutputDirectory/node/outdir/simple/ref/m1.js b/tests/baselines/reference/project/sourceRootAbsolutePathSubfolderSpecifyOutputDirectory/node/outdir/simple/ref/m1.js index f6b169662c9..b7283f7fd88 100644 --- a/tests/baselines/reference/project/sourceRootAbsolutePathSubfolderSpecifyOutputDirectory/node/outdir/simple/ref/m1.js +++ b/tests/baselines/reference/project/sourceRootAbsolutePathSubfolderSpecifyOutputDirectory/node/outdir/simple/ref/m1.js @@ -3,7 +3,7 @@ var m1_c1 = (function () { function m1_c1() { } return m1_c1; -})(); +}()); var m1_instance1 = new m1_c1(); function m1_f1() { return m1_instance1; diff --git a/tests/baselines/reference/project/sourceRootAbsolutePathSubfolderSpecifyOutputDirectory/node/sourceRootAbsolutePathSubfolderSpecifyOutputDirectory.sourcemap.txt b/tests/baselines/reference/project/sourceRootAbsolutePathSubfolderSpecifyOutputDirectory/node/sourceRootAbsolutePathSubfolderSpecifyOutputDirectory.sourcemap.txt index d197965afca..eb461863ded 100644 --- a/tests/baselines/reference/project/sourceRootAbsolutePathSubfolderSpecifyOutputDirectory/node/sourceRootAbsolutePathSubfolderSpecifyOutputDirectory.sourcemap.txt +++ b/tests/baselines/reference/project/sourceRootAbsolutePathSubfolderSpecifyOutputDirectory/node/sourceRootAbsolutePathSubfolderSpecifyOutputDirectory.sourcemap.txt @@ -61,7 +61,7 @@ sourceFile:ref/m1.ts 1->Emitted(5, 5) Source(4, 1) + SourceIndex(0) 2 >Emitted(5, 17) Source(4, 2) + SourceIndex(0) --- ->>>})(); +>>>}()); 1 > 2 >^ 3 > @@ -213,7 +213,7 @@ sourceFile:test.ts 1->Emitted(6, 5) Source(5, 1) + SourceIndex(0) 2 >Emitted(6, 14) Source(5, 2) + SourceIndex(0) --- ->>>})(); +>>>}()); 1 > 2 >^ 3 > diff --git a/tests/baselines/reference/project/sourceRootAbsolutePathSubfolderSpecifyOutputFile/amd/bin/test.js b/tests/baselines/reference/project/sourceRootAbsolutePathSubfolderSpecifyOutputFile/amd/bin/test.js index c82993389bf..a4566036746 100644 --- a/tests/baselines/reference/project/sourceRootAbsolutePathSubfolderSpecifyOutputFile/amd/bin/test.js +++ b/tests/baselines/reference/project/sourceRootAbsolutePathSubfolderSpecifyOutputFile/amd/bin/test.js @@ -3,7 +3,7 @@ var m1_c1 = (function () { function m1_c1() { } return m1_c1; -})(); +}()); var m1_instance1 = new m1_c1(); function m1_f1() { return m1_instance1; @@ -14,7 +14,7 @@ var c1 = (function () { function c1() { } return c1; -})(); +}()); var instance1 = new c1(); function f1() { return instance1; diff --git a/tests/baselines/reference/project/sourceRootAbsolutePathSubfolderSpecifyOutputFile/amd/sourceRootAbsolutePathSubfolderSpecifyOutputFile.sourcemap.txt b/tests/baselines/reference/project/sourceRootAbsolutePathSubfolderSpecifyOutputFile/amd/sourceRootAbsolutePathSubfolderSpecifyOutputFile.sourcemap.txt index 6b213c2a75c..5e0522712ed 100644 --- a/tests/baselines/reference/project/sourceRootAbsolutePathSubfolderSpecifyOutputFile/amd/sourceRootAbsolutePathSubfolderSpecifyOutputFile.sourcemap.txt +++ b/tests/baselines/reference/project/sourceRootAbsolutePathSubfolderSpecifyOutputFile/amd/sourceRootAbsolutePathSubfolderSpecifyOutputFile.sourcemap.txt @@ -61,7 +61,7 @@ sourceFile:ref/m1.ts 1->Emitted(5, 5) Source(4, 1) + SourceIndex(0) 2 >Emitted(5, 17) Source(4, 2) + SourceIndex(0) --- ->>>})(); +>>>}()); 1 > 2 >^ 3 > @@ -207,7 +207,7 @@ sourceFile:test.ts 1->Emitted(16, 5) Source(5, 1) + SourceIndex(1) 2 >Emitted(16, 14) Source(5, 2) + SourceIndex(1) --- ->>>})(); +>>>}()); 1 > 2 >^ 3 > diff --git a/tests/baselines/reference/project/sourceRootAbsolutePathSubfolderSpecifyOutputFile/node/bin/test.js b/tests/baselines/reference/project/sourceRootAbsolutePathSubfolderSpecifyOutputFile/node/bin/test.js index c82993389bf..a4566036746 100644 --- a/tests/baselines/reference/project/sourceRootAbsolutePathSubfolderSpecifyOutputFile/node/bin/test.js +++ b/tests/baselines/reference/project/sourceRootAbsolutePathSubfolderSpecifyOutputFile/node/bin/test.js @@ -3,7 +3,7 @@ var m1_c1 = (function () { function m1_c1() { } return m1_c1; -})(); +}()); var m1_instance1 = new m1_c1(); function m1_f1() { return m1_instance1; @@ -14,7 +14,7 @@ var c1 = (function () { function c1() { } return c1; -})(); +}()); var instance1 = new c1(); function f1() { return instance1; diff --git a/tests/baselines/reference/project/sourceRootAbsolutePathSubfolderSpecifyOutputFile/node/sourceRootAbsolutePathSubfolderSpecifyOutputFile.sourcemap.txt b/tests/baselines/reference/project/sourceRootAbsolutePathSubfolderSpecifyOutputFile/node/sourceRootAbsolutePathSubfolderSpecifyOutputFile.sourcemap.txt index 6b213c2a75c..5e0522712ed 100644 --- a/tests/baselines/reference/project/sourceRootAbsolutePathSubfolderSpecifyOutputFile/node/sourceRootAbsolutePathSubfolderSpecifyOutputFile.sourcemap.txt +++ b/tests/baselines/reference/project/sourceRootAbsolutePathSubfolderSpecifyOutputFile/node/sourceRootAbsolutePathSubfolderSpecifyOutputFile.sourcemap.txt @@ -61,7 +61,7 @@ sourceFile:ref/m1.ts 1->Emitted(5, 5) Source(4, 1) + SourceIndex(0) 2 >Emitted(5, 17) Source(4, 2) + SourceIndex(0) --- ->>>})(); +>>>}()); 1 > 2 >^ 3 > @@ -207,7 +207,7 @@ sourceFile:test.ts 1->Emitted(16, 5) Source(5, 1) + SourceIndex(1) 2 >Emitted(16, 14) Source(5, 2) + SourceIndex(1) --- ->>>})(); +>>>}()); 1 > 2 >^ 3 > diff --git a/tests/baselines/reference/project/sourceRootRelativePathMixedSubfolderNoOutdir/amd/ref/m1.js b/tests/baselines/reference/project/sourceRootRelativePathMixedSubfolderNoOutdir/amd/ref/m1.js index f6b169662c9..b7283f7fd88 100644 --- a/tests/baselines/reference/project/sourceRootRelativePathMixedSubfolderNoOutdir/amd/ref/m1.js +++ b/tests/baselines/reference/project/sourceRootRelativePathMixedSubfolderNoOutdir/amd/ref/m1.js @@ -3,7 +3,7 @@ var m1_c1 = (function () { function m1_c1() { } return m1_c1; -})(); +}()); var m1_instance1 = new m1_c1(); function m1_f1() { return m1_instance1; diff --git a/tests/baselines/reference/project/sourceRootRelativePathMixedSubfolderNoOutdir/amd/sourceRootRelativePathMixedSubfolderNoOutdir.sourcemap.txt b/tests/baselines/reference/project/sourceRootRelativePathMixedSubfolderNoOutdir/amd/sourceRootRelativePathMixedSubfolderNoOutdir.sourcemap.txt index 54e361169bf..489e78d9fde 100644 --- a/tests/baselines/reference/project/sourceRootRelativePathMixedSubfolderNoOutdir/amd/sourceRootRelativePathMixedSubfolderNoOutdir.sourcemap.txt +++ b/tests/baselines/reference/project/sourceRootRelativePathMixedSubfolderNoOutdir/amd/sourceRootRelativePathMixedSubfolderNoOutdir.sourcemap.txt @@ -61,7 +61,7 @@ sourceFile:ref/m1.ts 1->Emitted(5, 5) Source(4, 1) + SourceIndex(0) 2 >Emitted(5, 17) Source(4, 2) + SourceIndex(0) --- ->>>})(); +>>>}()); 1 > 2 >^ 3 > @@ -203,7 +203,7 @@ sourceFile:ref/m2.ts 1->Emitted(7, 9) Source(4, 1) + SourceIndex(0) 2 >Emitted(7, 21) Source(4, 2) + SourceIndex(0) --- ->>> })(); +>>> }()); 1 >^^^^ 2 > ^ 3 > @@ -396,7 +396,7 @@ sourceFile:test.ts 1->Emitted(7, 5) Source(6, 1) + SourceIndex(0) 2 >Emitted(7, 14) Source(6, 2) + SourceIndex(0) --- ->>>})(); +>>>}()); 1 > 2 >^ 3 > diff --git a/tests/baselines/reference/project/sourceRootRelativePathMixedSubfolderNoOutdir/node/ref/m1.js b/tests/baselines/reference/project/sourceRootRelativePathMixedSubfolderNoOutdir/node/ref/m1.js index f6b169662c9..b7283f7fd88 100644 --- a/tests/baselines/reference/project/sourceRootRelativePathMixedSubfolderNoOutdir/node/ref/m1.js +++ b/tests/baselines/reference/project/sourceRootRelativePathMixedSubfolderNoOutdir/node/ref/m1.js @@ -3,7 +3,7 @@ var m1_c1 = (function () { function m1_c1() { } return m1_c1; -})(); +}()); var m1_instance1 = new m1_c1(); function m1_f1() { return m1_instance1; diff --git a/tests/baselines/reference/project/sourceRootRelativePathMixedSubfolderNoOutdir/node/sourceRootRelativePathMixedSubfolderNoOutdir.sourcemap.txt b/tests/baselines/reference/project/sourceRootRelativePathMixedSubfolderNoOutdir/node/sourceRootRelativePathMixedSubfolderNoOutdir.sourcemap.txt index 122955308fc..baef829e57b 100644 --- a/tests/baselines/reference/project/sourceRootRelativePathMixedSubfolderNoOutdir/node/sourceRootRelativePathMixedSubfolderNoOutdir.sourcemap.txt +++ b/tests/baselines/reference/project/sourceRootRelativePathMixedSubfolderNoOutdir/node/sourceRootRelativePathMixedSubfolderNoOutdir.sourcemap.txt @@ -61,7 +61,7 @@ sourceFile:ref/m1.ts 1->Emitted(5, 5) Source(4, 1) + SourceIndex(0) 2 >Emitted(5, 17) Source(4, 2) + SourceIndex(0) --- ->>>})(); +>>>}()); 1 > 2 >^ 3 > @@ -202,7 +202,7 @@ sourceFile:ref/m2.ts 1->Emitted(6, 5) Source(4, 1) + SourceIndex(0) 2 >Emitted(6, 17) Source(4, 2) + SourceIndex(0) --- ->>>})(); +>>>}()); 1 > 2 >^ 3 > @@ -395,7 +395,7 @@ sourceFile:test.ts 1->Emitted(7, 5) Source(6, 1) + SourceIndex(0) 2 >Emitted(7, 14) Source(6, 2) + SourceIndex(0) --- ->>>})(); +>>>}()); 1 > 2 >^ 3 > diff --git a/tests/baselines/reference/project/sourceRootRelativePathMixedSubfolderSpecifyOutputDirectory/amd/outdir/simple/ref/m1.js b/tests/baselines/reference/project/sourceRootRelativePathMixedSubfolderSpecifyOutputDirectory/amd/outdir/simple/ref/m1.js index f6b169662c9..b7283f7fd88 100644 --- a/tests/baselines/reference/project/sourceRootRelativePathMixedSubfolderSpecifyOutputDirectory/amd/outdir/simple/ref/m1.js +++ b/tests/baselines/reference/project/sourceRootRelativePathMixedSubfolderSpecifyOutputDirectory/amd/outdir/simple/ref/m1.js @@ -3,7 +3,7 @@ var m1_c1 = (function () { function m1_c1() { } return m1_c1; -})(); +}()); var m1_instance1 = new m1_c1(); function m1_f1() { return m1_instance1; diff --git a/tests/baselines/reference/project/sourceRootRelativePathMixedSubfolderSpecifyOutputDirectory/amd/sourceRootRelativePathMixedSubfolderSpecifyOutputDirectory.sourcemap.txt b/tests/baselines/reference/project/sourceRootRelativePathMixedSubfolderSpecifyOutputDirectory/amd/sourceRootRelativePathMixedSubfolderSpecifyOutputDirectory.sourcemap.txt index babb39e3518..81ab0390e62 100644 --- a/tests/baselines/reference/project/sourceRootRelativePathMixedSubfolderSpecifyOutputDirectory/amd/sourceRootRelativePathMixedSubfolderSpecifyOutputDirectory.sourcemap.txt +++ b/tests/baselines/reference/project/sourceRootRelativePathMixedSubfolderSpecifyOutputDirectory/amd/sourceRootRelativePathMixedSubfolderSpecifyOutputDirectory.sourcemap.txt @@ -61,7 +61,7 @@ sourceFile:ref/m1.ts 1->Emitted(5, 5) Source(4, 1) + SourceIndex(0) 2 >Emitted(5, 17) Source(4, 2) + SourceIndex(0) --- ->>>})(); +>>>}()); 1 > 2 >^ 3 > @@ -203,7 +203,7 @@ sourceFile:ref/m2.ts 1->Emitted(7, 9) Source(4, 1) + SourceIndex(0) 2 >Emitted(7, 21) Source(4, 2) + SourceIndex(0) --- ->>> })(); +>>> }()); 1 >^^^^ 2 > ^ 3 > @@ -396,7 +396,7 @@ sourceFile:test.ts 1->Emitted(7, 5) Source(6, 1) + SourceIndex(0) 2 >Emitted(7, 14) Source(6, 2) + SourceIndex(0) --- ->>>})(); +>>>}()); 1 > 2 >^ 3 > diff --git a/tests/baselines/reference/project/sourceRootRelativePathMixedSubfolderSpecifyOutputDirectory/node/outdir/simple/ref/m1.js b/tests/baselines/reference/project/sourceRootRelativePathMixedSubfolderSpecifyOutputDirectory/node/outdir/simple/ref/m1.js index f6b169662c9..b7283f7fd88 100644 --- a/tests/baselines/reference/project/sourceRootRelativePathMixedSubfolderSpecifyOutputDirectory/node/outdir/simple/ref/m1.js +++ b/tests/baselines/reference/project/sourceRootRelativePathMixedSubfolderSpecifyOutputDirectory/node/outdir/simple/ref/m1.js @@ -3,7 +3,7 @@ var m1_c1 = (function () { function m1_c1() { } return m1_c1; -})(); +}()); var m1_instance1 = new m1_c1(); function m1_f1() { return m1_instance1; diff --git a/tests/baselines/reference/project/sourceRootRelativePathMixedSubfolderSpecifyOutputDirectory/node/sourceRootRelativePathMixedSubfolderSpecifyOutputDirectory.sourcemap.txt b/tests/baselines/reference/project/sourceRootRelativePathMixedSubfolderSpecifyOutputDirectory/node/sourceRootRelativePathMixedSubfolderSpecifyOutputDirectory.sourcemap.txt index f8dac699dd3..2c1bc766f13 100644 --- a/tests/baselines/reference/project/sourceRootRelativePathMixedSubfolderSpecifyOutputDirectory/node/sourceRootRelativePathMixedSubfolderSpecifyOutputDirectory.sourcemap.txt +++ b/tests/baselines/reference/project/sourceRootRelativePathMixedSubfolderSpecifyOutputDirectory/node/sourceRootRelativePathMixedSubfolderSpecifyOutputDirectory.sourcemap.txt @@ -61,7 +61,7 @@ sourceFile:ref/m1.ts 1->Emitted(5, 5) Source(4, 1) + SourceIndex(0) 2 >Emitted(5, 17) Source(4, 2) + SourceIndex(0) --- ->>>})(); +>>>}()); 1 > 2 >^ 3 > @@ -202,7 +202,7 @@ sourceFile:ref/m2.ts 1->Emitted(6, 5) Source(4, 1) + SourceIndex(0) 2 >Emitted(6, 17) Source(4, 2) + SourceIndex(0) --- ->>>})(); +>>>}()); 1 > 2 >^ 3 > @@ -395,7 +395,7 @@ sourceFile:test.ts 1->Emitted(7, 5) Source(6, 1) + SourceIndex(0) 2 >Emitted(7, 14) Source(6, 2) + SourceIndex(0) --- ->>>})(); +>>>}()); 1 > 2 >^ 3 > diff --git a/tests/baselines/reference/project/sourceRootRelativePathMixedSubfolderSpecifyOutputFile/amd/bin/test.js b/tests/baselines/reference/project/sourceRootRelativePathMixedSubfolderSpecifyOutputFile/amd/bin/test.js index a480aa83e80..25cfe0fccb5 100644 --- a/tests/baselines/reference/project/sourceRootRelativePathMixedSubfolderSpecifyOutputFile/amd/bin/test.js +++ b/tests/baselines/reference/project/sourceRootRelativePathMixedSubfolderSpecifyOutputFile/amd/bin/test.js @@ -3,7 +3,7 @@ var m1_c1 = (function () { function m1_c1() { } return m1_c1; -})(); +}()); var m1_instance1 = new m1_c1(); function m1_f1() { return m1_instance1; @@ -15,7 +15,7 @@ define("ref/m2", ["require", "exports"], function (require, exports) { function m2_c1() { } return m2_c1; - })(); + }()); exports.m2_c1 = m2_c1; exports.m2_instance1 = new m2_c1(); function m2_f1() { @@ -30,7 +30,7 @@ var c1 = (function () { function c1() { } return c1; -})(); +}()); var instance1 = new c1(); function f1() { return instance1; diff --git a/tests/baselines/reference/project/sourceRootRelativePathMixedSubfolderSpecifyOutputFile/amd/sourceRootRelativePathMixedSubfolderSpecifyOutputFile.sourcemap.txt b/tests/baselines/reference/project/sourceRootRelativePathMixedSubfolderSpecifyOutputFile/amd/sourceRootRelativePathMixedSubfolderSpecifyOutputFile.sourcemap.txt index 670b7ba5f2b..b38b33e3161 100644 --- a/tests/baselines/reference/project/sourceRootRelativePathMixedSubfolderSpecifyOutputFile/amd/sourceRootRelativePathMixedSubfolderSpecifyOutputFile.sourcemap.txt +++ b/tests/baselines/reference/project/sourceRootRelativePathMixedSubfolderSpecifyOutputFile/amd/sourceRootRelativePathMixedSubfolderSpecifyOutputFile.sourcemap.txt @@ -61,7 +61,7 @@ sourceFile:ref/m1.ts 1->Emitted(5, 5) Source(4, 1) + SourceIndex(0) 2 >Emitted(5, 17) Source(4, 2) + SourceIndex(0) --- ->>>})(); +>>>}()); 1 > 2 >^ 3 > @@ -197,7 +197,7 @@ sourceFile:ref/m2.ts 1->Emitted(17, 9) Source(4, 1) + SourceIndex(1) 2 >Emitted(17, 21) Source(4, 2) + SourceIndex(1) --- ->>> })(); +>>> }()); 1 >^^^^ 2 > ^ 3 > @@ -384,7 +384,7 @@ sourceFile:test.ts 1->Emitted(32, 5) Source(6, 1) + SourceIndex(2) 2 >Emitted(32, 14) Source(6, 2) + SourceIndex(2) --- ->>>})(); +>>>}()); 1 > 2 >^ 3 > diff --git a/tests/baselines/reference/project/sourceRootRelativePathMixedSubfolderSpecifyOutputFile/node/bin/test.js b/tests/baselines/reference/project/sourceRootRelativePathMixedSubfolderSpecifyOutputFile/node/bin/test.js index 5af28cf8560..5d63d624329 100644 --- a/tests/baselines/reference/project/sourceRootRelativePathMixedSubfolderSpecifyOutputFile/node/bin/test.js +++ b/tests/baselines/reference/project/sourceRootRelativePathMixedSubfolderSpecifyOutputFile/node/bin/test.js @@ -3,7 +3,7 @@ var m1_c1 = (function () { function m1_c1() { } return m1_c1; -})(); +}()); var m1_instance1 = new m1_c1(); function m1_f1() { return m1_instance1; @@ -15,7 +15,7 @@ var c1 = (function () { function c1() { } return c1; -})(); +}()); var instance1 = new c1(); function f1() { return instance1; diff --git a/tests/baselines/reference/project/sourceRootRelativePathMixedSubfolderSpecifyOutputFile/node/sourceRootRelativePathMixedSubfolderSpecifyOutputFile.sourcemap.txt b/tests/baselines/reference/project/sourceRootRelativePathMixedSubfolderSpecifyOutputFile/node/sourceRootRelativePathMixedSubfolderSpecifyOutputFile.sourcemap.txt index a4e47c43e8e..44b5904f085 100644 --- a/tests/baselines/reference/project/sourceRootRelativePathMixedSubfolderSpecifyOutputFile/node/sourceRootRelativePathMixedSubfolderSpecifyOutputFile.sourcemap.txt +++ b/tests/baselines/reference/project/sourceRootRelativePathMixedSubfolderSpecifyOutputFile/node/sourceRootRelativePathMixedSubfolderSpecifyOutputFile.sourcemap.txt @@ -61,7 +61,7 @@ sourceFile:ref/m1.ts 1->Emitted(5, 5) Source(4, 1) + SourceIndex(0) 2 >Emitted(5, 17) Source(4, 2) + SourceIndex(0) --- ->>>})(); +>>>}()); 1 > 2 >^ 3 > @@ -217,7 +217,7 @@ sourceFile:test.ts 1->Emitted(17, 5) Source(6, 1) + SourceIndex(2) 2 >Emitted(17, 14) Source(6, 2) + SourceIndex(2) --- ->>>})(); +>>>}()); 1 > 2 >^ 3 > diff --git a/tests/baselines/reference/project/sourceRootRelativePathMixedSubfolderSpecifyOutputFileAndOutputDirectory/amd/bin/outAndOutDirFile.js b/tests/baselines/reference/project/sourceRootRelativePathMixedSubfolderSpecifyOutputFileAndOutputDirectory/amd/bin/outAndOutDirFile.js index 1ebe03468c7..de21b030c35 100644 --- a/tests/baselines/reference/project/sourceRootRelativePathMixedSubfolderSpecifyOutputFileAndOutputDirectory/amd/bin/outAndOutDirFile.js +++ b/tests/baselines/reference/project/sourceRootRelativePathMixedSubfolderSpecifyOutputFileAndOutputDirectory/amd/bin/outAndOutDirFile.js @@ -3,7 +3,7 @@ var m1_c1 = (function () { function m1_c1() { } return m1_c1; -})(); +}()); var m1_instance1 = new m1_c1(); function m1_f1() { return m1_instance1; @@ -15,7 +15,7 @@ define("ref/m2", ["require", "exports"], function (require, exports) { function m2_c1() { } return m2_c1; - })(); + }()); exports.m2_c1 = m2_c1; exports.m2_instance1 = new m2_c1(); function m2_f1() { @@ -30,7 +30,7 @@ var c1 = (function () { function c1() { } return c1; -})(); +}()); var instance1 = new c1(); function f1() { return instance1; diff --git a/tests/baselines/reference/project/sourceRootRelativePathMixedSubfolderSpecifyOutputFileAndOutputDirectory/amd/sourceRootRelativePathMixedSubfolderSpecifyOutputFileAndOutputDirectory.sourcemap.txt b/tests/baselines/reference/project/sourceRootRelativePathMixedSubfolderSpecifyOutputFileAndOutputDirectory/amd/sourceRootRelativePathMixedSubfolderSpecifyOutputFileAndOutputDirectory.sourcemap.txt index 8ec79895fef..0236ff46b03 100644 --- a/tests/baselines/reference/project/sourceRootRelativePathMixedSubfolderSpecifyOutputFileAndOutputDirectory/amd/sourceRootRelativePathMixedSubfolderSpecifyOutputFileAndOutputDirectory.sourcemap.txt +++ b/tests/baselines/reference/project/sourceRootRelativePathMixedSubfolderSpecifyOutputFileAndOutputDirectory/amd/sourceRootRelativePathMixedSubfolderSpecifyOutputFileAndOutputDirectory.sourcemap.txt @@ -61,7 +61,7 @@ sourceFile:ref/m1.ts 1->Emitted(5, 5) Source(4, 1) + SourceIndex(0) 2 >Emitted(5, 17) Source(4, 2) + SourceIndex(0) --- ->>>})(); +>>>}()); 1 > 2 >^ 3 > @@ -197,7 +197,7 @@ sourceFile:ref/m2.ts 1->Emitted(17, 9) Source(4, 1) + SourceIndex(1) 2 >Emitted(17, 21) Source(4, 2) + SourceIndex(1) --- ->>> })(); +>>> }()); 1 >^^^^ 2 > ^ 3 > @@ -384,7 +384,7 @@ sourceFile:test.ts 1->Emitted(32, 5) Source(6, 1) + SourceIndex(2) 2 >Emitted(32, 14) Source(6, 2) + SourceIndex(2) --- ->>>})(); +>>>}()); 1 > 2 >^ 3 > diff --git a/tests/baselines/reference/project/sourceRootRelativePathMixedSubfolderSpecifyOutputFileAndOutputDirectory/node/bin/outAndOutDirFile.js b/tests/baselines/reference/project/sourceRootRelativePathMixedSubfolderSpecifyOutputFileAndOutputDirectory/node/bin/outAndOutDirFile.js index 1750a5975ae..da6a2015143 100644 --- a/tests/baselines/reference/project/sourceRootRelativePathMixedSubfolderSpecifyOutputFileAndOutputDirectory/node/bin/outAndOutDirFile.js +++ b/tests/baselines/reference/project/sourceRootRelativePathMixedSubfolderSpecifyOutputFileAndOutputDirectory/node/bin/outAndOutDirFile.js @@ -3,7 +3,7 @@ var m1_c1 = (function () { function m1_c1() { } return m1_c1; -})(); +}()); var m1_instance1 = new m1_c1(); function m1_f1() { return m1_instance1; @@ -15,7 +15,7 @@ var c1 = (function () { function c1() { } return c1; -})(); +}()); var instance1 = new c1(); function f1() { return instance1; diff --git a/tests/baselines/reference/project/sourceRootRelativePathMixedSubfolderSpecifyOutputFileAndOutputDirectory/node/sourceRootRelativePathMixedSubfolderSpecifyOutputFileAndOutputDirectory.sourcemap.txt b/tests/baselines/reference/project/sourceRootRelativePathMixedSubfolderSpecifyOutputFileAndOutputDirectory/node/sourceRootRelativePathMixedSubfolderSpecifyOutputFileAndOutputDirectory.sourcemap.txt index b424fde902b..31f4457f565 100644 --- a/tests/baselines/reference/project/sourceRootRelativePathMixedSubfolderSpecifyOutputFileAndOutputDirectory/node/sourceRootRelativePathMixedSubfolderSpecifyOutputFileAndOutputDirectory.sourcemap.txt +++ b/tests/baselines/reference/project/sourceRootRelativePathMixedSubfolderSpecifyOutputFileAndOutputDirectory/node/sourceRootRelativePathMixedSubfolderSpecifyOutputFileAndOutputDirectory.sourcemap.txt @@ -61,7 +61,7 @@ sourceFile:ref/m1.ts 1->Emitted(5, 5) Source(4, 1) + SourceIndex(0) 2 >Emitted(5, 17) Source(4, 2) + SourceIndex(0) --- ->>>})(); +>>>}()); 1 > 2 >^ 3 > @@ -217,7 +217,7 @@ sourceFile:test.ts 1->Emitted(17, 5) Source(6, 1) + SourceIndex(2) 2 >Emitted(17, 14) Source(6, 2) + SourceIndex(2) --- ->>>})(); +>>>}()); 1 > 2 >^ 3 > diff --git a/tests/baselines/reference/project/sourceRootRelativePathModuleMultifolderNoOutdir/amd/ref/m1.js b/tests/baselines/reference/project/sourceRootRelativePathModuleMultifolderNoOutdir/amd/ref/m1.js index 25001d63d84..bb59c6fbd90 100644 --- a/tests/baselines/reference/project/sourceRootRelativePathModuleMultifolderNoOutdir/amd/ref/m1.js +++ b/tests/baselines/reference/project/sourceRootRelativePathModuleMultifolderNoOutdir/amd/ref/m1.js @@ -5,7 +5,7 @@ define(["require", "exports"], function (require, exports) { function m1_c1() { } return m1_c1; - })(); + }()); exports.m1_c1 = m1_c1; exports.m1_instance1 = new m1_c1(); function m1_f1() { diff --git a/tests/baselines/reference/project/sourceRootRelativePathModuleMultifolderNoOutdir/amd/sourceRootRelativePathModuleMultifolderNoOutdir.sourcemap.txt b/tests/baselines/reference/project/sourceRootRelativePathModuleMultifolderNoOutdir/amd/sourceRootRelativePathModuleMultifolderNoOutdir.sourcemap.txt index 496f1849d69..a82b4bfaabe 100644 --- a/tests/baselines/reference/project/sourceRootRelativePathModuleMultifolderNoOutdir/amd/sourceRootRelativePathModuleMultifolderNoOutdir.sourcemap.txt +++ b/tests/baselines/reference/project/sourceRootRelativePathModuleMultifolderNoOutdir/amd/sourceRootRelativePathModuleMultifolderNoOutdir.sourcemap.txt @@ -60,7 +60,7 @@ sourceFile:outputdir_module_multifolder/ref/m1.ts 1->Emitted(7, 9) Source(4, 1) + SourceIndex(0) 2 >Emitted(7, 21) Source(4, 2) + SourceIndex(0) --- ->>> })(); +>>> }()); 1 >^^^^ 2 > ^ 3 > @@ -233,7 +233,7 @@ sourceFile:outputdir_module_multifolder_ref/m2.ts 1->Emitted(7, 9) Source(4, 1) + SourceIndex(0) 2 >Emitted(7, 21) Source(4, 2) + SourceIndex(0) --- ->>> })(); +>>> }()); 1 >^^^^ 2 > ^ 3 > @@ -408,7 +408,7 @@ sourceFile:outputdir_module_multifolder/test.ts 1->Emitted(7, 9) Source(6, 1) + SourceIndex(0) 2 >Emitted(7, 18) Source(6, 2) + SourceIndex(0) --- ->>> })(); +>>> }()); 1 >^^^^ 2 > ^ 3 > diff --git a/tests/baselines/reference/project/sourceRootRelativePathModuleMultifolderNoOutdir/node/ref/m1.js b/tests/baselines/reference/project/sourceRootRelativePathModuleMultifolderNoOutdir/node/ref/m1.js index 3bc07083900..121a089af23 100644 --- a/tests/baselines/reference/project/sourceRootRelativePathModuleMultifolderNoOutdir/node/ref/m1.js +++ b/tests/baselines/reference/project/sourceRootRelativePathModuleMultifolderNoOutdir/node/ref/m1.js @@ -4,7 +4,7 @@ var m1_c1 = (function () { function m1_c1() { } return m1_c1; -})(); +}()); exports.m1_c1 = m1_c1; exports.m1_instance1 = new m1_c1(); function m1_f1() { diff --git a/tests/baselines/reference/project/sourceRootRelativePathModuleMultifolderNoOutdir/node/sourceRootRelativePathModuleMultifolderNoOutdir.sourcemap.txt b/tests/baselines/reference/project/sourceRootRelativePathModuleMultifolderNoOutdir/node/sourceRootRelativePathModuleMultifolderNoOutdir.sourcemap.txt index 6d4fcd7bf89..c110e9cbd87 100644 --- a/tests/baselines/reference/project/sourceRootRelativePathModuleMultifolderNoOutdir/node/sourceRootRelativePathModuleMultifolderNoOutdir.sourcemap.txt +++ b/tests/baselines/reference/project/sourceRootRelativePathModuleMultifolderNoOutdir/node/sourceRootRelativePathModuleMultifolderNoOutdir.sourcemap.txt @@ -59,7 +59,7 @@ sourceFile:outputdir_module_multifolder/ref/m1.ts 1->Emitted(6, 5) Source(4, 1) + SourceIndex(0) 2 >Emitted(6, 17) Source(4, 2) + SourceIndex(0) --- ->>>})(); +>>>}()); 1 > 2 >^ 3 > @@ -231,7 +231,7 @@ sourceFile:outputdir_module_multifolder_ref/m2.ts 1->Emitted(6, 5) Source(4, 1) + SourceIndex(0) 2 >Emitted(6, 17) Source(4, 2) + SourceIndex(0) --- ->>>})(); +>>>}()); 1 > 2 >^ 3 > @@ -452,7 +452,7 @@ sourceFile:outputdir_module_multifolder/test.ts 1->Emitted(8, 5) Source(6, 1) + SourceIndex(0) 2 >Emitted(8, 14) Source(6, 2) + SourceIndex(0) --- ->>>})(); +>>>}()); 1 > 2 >^ 3 > diff --git a/tests/baselines/reference/project/sourceRootRelativePathModuleMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_module_multifolder/ref/m1.js b/tests/baselines/reference/project/sourceRootRelativePathModuleMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_module_multifolder/ref/m1.js index 25001d63d84..bb59c6fbd90 100644 --- a/tests/baselines/reference/project/sourceRootRelativePathModuleMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_module_multifolder/ref/m1.js +++ b/tests/baselines/reference/project/sourceRootRelativePathModuleMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_module_multifolder/ref/m1.js @@ -5,7 +5,7 @@ define(["require", "exports"], function (require, exports) { function m1_c1() { } return m1_c1; - })(); + }()); exports.m1_c1 = m1_c1; exports.m1_instance1 = new m1_c1(); function m1_f1() { diff --git a/tests/baselines/reference/project/sourceRootRelativePathModuleMultifolderSpecifyOutputDirectory/amd/sourceRootRelativePathModuleMultifolderSpecifyOutputDirectory.sourcemap.txt b/tests/baselines/reference/project/sourceRootRelativePathModuleMultifolderSpecifyOutputDirectory/amd/sourceRootRelativePathModuleMultifolderSpecifyOutputDirectory.sourcemap.txt index dc6fc0fda03..27786349283 100644 --- a/tests/baselines/reference/project/sourceRootRelativePathModuleMultifolderSpecifyOutputDirectory/amd/sourceRootRelativePathModuleMultifolderSpecifyOutputDirectory.sourcemap.txt +++ b/tests/baselines/reference/project/sourceRootRelativePathModuleMultifolderSpecifyOutputDirectory/amd/sourceRootRelativePathModuleMultifolderSpecifyOutputDirectory.sourcemap.txt @@ -60,7 +60,7 @@ sourceFile:outputdir_module_multifolder/ref/m1.ts 1->Emitted(7, 9) Source(4, 1) + SourceIndex(0) 2 >Emitted(7, 21) Source(4, 2) + SourceIndex(0) --- ->>> })(); +>>> }()); 1 >^^^^ 2 > ^ 3 > @@ -233,7 +233,7 @@ sourceFile:outputdir_module_multifolder_ref/m2.ts 1->Emitted(7, 9) Source(4, 1) + SourceIndex(0) 2 >Emitted(7, 21) Source(4, 2) + SourceIndex(0) --- ->>> })(); +>>> }()); 1 >^^^^ 2 > ^ 3 > @@ -408,7 +408,7 @@ sourceFile:outputdir_module_multifolder/test.ts 1->Emitted(7, 9) Source(6, 1) + SourceIndex(0) 2 >Emitted(7, 18) Source(6, 2) + SourceIndex(0) --- ->>> })(); +>>> }()); 1 >^^^^ 2 > ^ 3 > diff --git a/tests/baselines/reference/project/sourceRootRelativePathModuleMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_module_multifolder/ref/m1.js b/tests/baselines/reference/project/sourceRootRelativePathModuleMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_module_multifolder/ref/m1.js index 3bc07083900..121a089af23 100644 --- a/tests/baselines/reference/project/sourceRootRelativePathModuleMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_module_multifolder/ref/m1.js +++ b/tests/baselines/reference/project/sourceRootRelativePathModuleMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_module_multifolder/ref/m1.js @@ -4,7 +4,7 @@ var m1_c1 = (function () { function m1_c1() { } return m1_c1; -})(); +}()); exports.m1_c1 = m1_c1; exports.m1_instance1 = new m1_c1(); function m1_f1() { diff --git a/tests/baselines/reference/project/sourceRootRelativePathModuleMultifolderSpecifyOutputDirectory/node/sourceRootRelativePathModuleMultifolderSpecifyOutputDirectory.sourcemap.txt b/tests/baselines/reference/project/sourceRootRelativePathModuleMultifolderSpecifyOutputDirectory/node/sourceRootRelativePathModuleMultifolderSpecifyOutputDirectory.sourcemap.txt index 992c66e53ae..f21172cd798 100644 --- a/tests/baselines/reference/project/sourceRootRelativePathModuleMultifolderSpecifyOutputDirectory/node/sourceRootRelativePathModuleMultifolderSpecifyOutputDirectory.sourcemap.txt +++ b/tests/baselines/reference/project/sourceRootRelativePathModuleMultifolderSpecifyOutputDirectory/node/sourceRootRelativePathModuleMultifolderSpecifyOutputDirectory.sourcemap.txt @@ -59,7 +59,7 @@ sourceFile:outputdir_module_multifolder/ref/m1.ts 1->Emitted(6, 5) Source(4, 1) + SourceIndex(0) 2 >Emitted(6, 17) Source(4, 2) + SourceIndex(0) --- ->>>})(); +>>>}()); 1 > 2 >^ 3 > @@ -231,7 +231,7 @@ sourceFile:outputdir_module_multifolder_ref/m2.ts 1->Emitted(6, 5) Source(4, 1) + SourceIndex(0) 2 >Emitted(6, 17) Source(4, 2) + SourceIndex(0) --- ->>>})(); +>>>}()); 1 > 2 >^ 3 > @@ -452,7 +452,7 @@ sourceFile:outputdir_module_multifolder/test.ts 1->Emitted(8, 5) Source(6, 1) + SourceIndex(0) 2 >Emitted(8, 14) Source(6, 2) + SourceIndex(0) --- ->>>})(); +>>>}()); 1 > 2 >^ 3 > diff --git a/tests/baselines/reference/project/sourceRootRelativePathModuleMultifolderSpecifyOutputFile/amd/bin/test.js b/tests/baselines/reference/project/sourceRootRelativePathModuleMultifolderSpecifyOutputFile/amd/bin/test.js index 5db4d6336f1..37064fb583b 100644 --- a/tests/baselines/reference/project/sourceRootRelativePathModuleMultifolderSpecifyOutputFile/amd/bin/test.js +++ b/tests/baselines/reference/project/sourceRootRelativePathModuleMultifolderSpecifyOutputFile/amd/bin/test.js @@ -5,7 +5,7 @@ define("outputdir_module_multifolder/ref/m1", ["require", "exports"], function ( function m1_c1() { } return m1_c1; - })(); + }()); exports.m1_c1 = m1_c1; exports.m1_instance1 = new m1_c1(); function m1_f1() { @@ -20,7 +20,7 @@ define("outputdir_module_multifolder_ref/m2", ["require", "exports"], function ( function m2_c1() { } return m2_c1; - })(); + }()); exports.m2_c1 = m2_c1; exports.m2_instance1 = new m2_c1(); function m2_f1() { @@ -35,7 +35,7 @@ define("outputdir_module_multifolder/test", ["require", "exports", "outputdir_mo function c1() { } return c1; - })(); + }()); exports.c1 = c1; exports.instance1 = new c1(); function f1() { diff --git a/tests/baselines/reference/project/sourceRootRelativePathModuleMultifolderSpecifyOutputFile/amd/sourceRootRelativePathModuleMultifolderSpecifyOutputFile.sourcemap.txt b/tests/baselines/reference/project/sourceRootRelativePathModuleMultifolderSpecifyOutputFile/amd/sourceRootRelativePathModuleMultifolderSpecifyOutputFile.sourcemap.txt index 14557880a96..6e350e166a9 100644 --- a/tests/baselines/reference/project/sourceRootRelativePathModuleMultifolderSpecifyOutputFile/amd/sourceRootRelativePathModuleMultifolderSpecifyOutputFile.sourcemap.txt +++ b/tests/baselines/reference/project/sourceRootRelativePathModuleMultifolderSpecifyOutputFile/amd/sourceRootRelativePathModuleMultifolderSpecifyOutputFile.sourcemap.txt @@ -60,7 +60,7 @@ sourceFile:outputdir_module_multifolder/ref/m1.ts 1->Emitted(7, 9) Source(4, 1) + SourceIndex(0) 2 >Emitted(7, 21) Source(4, 2) + SourceIndex(0) --- ->>> })(); +>>> }()); 1 >^^^^ 2 > ^ 3 > @@ -227,7 +227,7 @@ sourceFile:outputdir_module_multifolder_ref/m2.ts 1->Emitted(22, 9) Source(4, 1) + SourceIndex(1) 2 >Emitted(22, 21) Source(4, 2) + SourceIndex(1) --- ->>> })(); +>>> }()); 1 >^^^^ 2 > ^ 3 > @@ -396,7 +396,7 @@ sourceFile:outputdir_module_multifolder/test.ts 1->Emitted(37, 9) Source(6, 1) + SourceIndex(2) 2 >Emitted(37, 18) Source(6, 2) + SourceIndex(2) --- ->>> })(); +>>> }()); 1 >^^^^ 2 > ^ 3 > diff --git a/tests/baselines/reference/project/sourceRootRelativePathModuleSimpleNoOutdir/amd/m1.js b/tests/baselines/reference/project/sourceRootRelativePathModuleSimpleNoOutdir/amd/m1.js index 25001d63d84..bb59c6fbd90 100644 --- a/tests/baselines/reference/project/sourceRootRelativePathModuleSimpleNoOutdir/amd/m1.js +++ b/tests/baselines/reference/project/sourceRootRelativePathModuleSimpleNoOutdir/amd/m1.js @@ -5,7 +5,7 @@ define(["require", "exports"], function (require, exports) { function m1_c1() { } return m1_c1; - })(); + }()); exports.m1_c1 = m1_c1; exports.m1_instance1 = new m1_c1(); function m1_f1() { diff --git a/tests/baselines/reference/project/sourceRootRelativePathModuleSimpleNoOutdir/amd/sourceRootRelativePathModuleSimpleNoOutdir.sourcemap.txt b/tests/baselines/reference/project/sourceRootRelativePathModuleSimpleNoOutdir/amd/sourceRootRelativePathModuleSimpleNoOutdir.sourcemap.txt index 0f93a19bb74..adef47fb19e 100644 --- a/tests/baselines/reference/project/sourceRootRelativePathModuleSimpleNoOutdir/amd/sourceRootRelativePathModuleSimpleNoOutdir.sourcemap.txt +++ b/tests/baselines/reference/project/sourceRootRelativePathModuleSimpleNoOutdir/amd/sourceRootRelativePathModuleSimpleNoOutdir.sourcemap.txt @@ -60,7 +60,7 @@ sourceFile:m1.ts 1->Emitted(7, 9) Source(4, 1) + SourceIndex(0) 2 >Emitted(7, 21) Source(4, 2) + SourceIndex(0) --- ->>> })(); +>>> }()); 1 >^^^^ 2 > ^ 3 > @@ -234,7 +234,7 @@ sourceFile:test.ts 1->Emitted(7, 9) Source(5, 1) + SourceIndex(0) 2 >Emitted(7, 18) Source(5, 2) + SourceIndex(0) --- ->>> })(); +>>> }()); 1 >^^^^ 2 > ^ 3 > diff --git a/tests/baselines/reference/project/sourceRootRelativePathModuleSimpleNoOutdir/node/m1.js b/tests/baselines/reference/project/sourceRootRelativePathModuleSimpleNoOutdir/node/m1.js index 3bc07083900..121a089af23 100644 --- a/tests/baselines/reference/project/sourceRootRelativePathModuleSimpleNoOutdir/node/m1.js +++ b/tests/baselines/reference/project/sourceRootRelativePathModuleSimpleNoOutdir/node/m1.js @@ -4,7 +4,7 @@ var m1_c1 = (function () { function m1_c1() { } return m1_c1; -})(); +}()); exports.m1_c1 = m1_c1; exports.m1_instance1 = new m1_c1(); function m1_f1() { diff --git a/tests/baselines/reference/project/sourceRootRelativePathModuleSimpleNoOutdir/node/sourceRootRelativePathModuleSimpleNoOutdir.sourcemap.txt b/tests/baselines/reference/project/sourceRootRelativePathModuleSimpleNoOutdir/node/sourceRootRelativePathModuleSimpleNoOutdir.sourcemap.txt index e2082869022..53d5f7aae84 100644 --- a/tests/baselines/reference/project/sourceRootRelativePathModuleSimpleNoOutdir/node/sourceRootRelativePathModuleSimpleNoOutdir.sourcemap.txt +++ b/tests/baselines/reference/project/sourceRootRelativePathModuleSimpleNoOutdir/node/sourceRootRelativePathModuleSimpleNoOutdir.sourcemap.txt @@ -59,7 +59,7 @@ sourceFile:m1.ts 1->Emitted(6, 5) Source(4, 1) + SourceIndex(0) 2 >Emitted(6, 17) Source(4, 2) + SourceIndex(0) --- ->>>})(); +>>>}()); 1 > 2 >^ 3 > @@ -255,7 +255,7 @@ sourceFile:test.ts 1->Emitted(7, 5) Source(5, 1) + SourceIndex(0) 2 >Emitted(7, 14) Source(5, 2) + SourceIndex(0) --- ->>>})(); +>>>}()); 1 > 2 >^ 3 > diff --git a/tests/baselines/reference/project/sourceRootRelativePathModuleSimpleSpecifyOutputDirectory/amd/outdir/simple/m1.js b/tests/baselines/reference/project/sourceRootRelativePathModuleSimpleSpecifyOutputDirectory/amd/outdir/simple/m1.js index 25001d63d84..bb59c6fbd90 100644 --- a/tests/baselines/reference/project/sourceRootRelativePathModuleSimpleSpecifyOutputDirectory/amd/outdir/simple/m1.js +++ b/tests/baselines/reference/project/sourceRootRelativePathModuleSimpleSpecifyOutputDirectory/amd/outdir/simple/m1.js @@ -5,7 +5,7 @@ define(["require", "exports"], function (require, exports) { function m1_c1() { } return m1_c1; - })(); + }()); exports.m1_c1 = m1_c1; exports.m1_instance1 = new m1_c1(); function m1_f1() { diff --git a/tests/baselines/reference/project/sourceRootRelativePathModuleSimpleSpecifyOutputDirectory/amd/sourceRootRelativePathModuleSimpleSpecifyOutputDirectory.sourcemap.txt b/tests/baselines/reference/project/sourceRootRelativePathModuleSimpleSpecifyOutputDirectory/amd/sourceRootRelativePathModuleSimpleSpecifyOutputDirectory.sourcemap.txt index aa1b771c0bb..404c165ed4f 100644 --- a/tests/baselines/reference/project/sourceRootRelativePathModuleSimpleSpecifyOutputDirectory/amd/sourceRootRelativePathModuleSimpleSpecifyOutputDirectory.sourcemap.txt +++ b/tests/baselines/reference/project/sourceRootRelativePathModuleSimpleSpecifyOutputDirectory/amd/sourceRootRelativePathModuleSimpleSpecifyOutputDirectory.sourcemap.txt @@ -60,7 +60,7 @@ sourceFile:m1.ts 1->Emitted(7, 9) Source(4, 1) + SourceIndex(0) 2 >Emitted(7, 21) Source(4, 2) + SourceIndex(0) --- ->>> })(); +>>> }()); 1 >^^^^ 2 > ^ 3 > @@ -234,7 +234,7 @@ sourceFile:test.ts 1->Emitted(7, 9) Source(5, 1) + SourceIndex(0) 2 >Emitted(7, 18) Source(5, 2) + SourceIndex(0) --- ->>> })(); +>>> }()); 1 >^^^^ 2 > ^ 3 > diff --git a/tests/baselines/reference/project/sourceRootRelativePathModuleSimpleSpecifyOutputDirectory/node/outdir/simple/m1.js b/tests/baselines/reference/project/sourceRootRelativePathModuleSimpleSpecifyOutputDirectory/node/outdir/simple/m1.js index 3bc07083900..121a089af23 100644 --- a/tests/baselines/reference/project/sourceRootRelativePathModuleSimpleSpecifyOutputDirectory/node/outdir/simple/m1.js +++ b/tests/baselines/reference/project/sourceRootRelativePathModuleSimpleSpecifyOutputDirectory/node/outdir/simple/m1.js @@ -4,7 +4,7 @@ var m1_c1 = (function () { function m1_c1() { } return m1_c1; -})(); +}()); exports.m1_c1 = m1_c1; exports.m1_instance1 = new m1_c1(); function m1_f1() { diff --git a/tests/baselines/reference/project/sourceRootRelativePathModuleSimpleSpecifyOutputDirectory/node/sourceRootRelativePathModuleSimpleSpecifyOutputDirectory.sourcemap.txt b/tests/baselines/reference/project/sourceRootRelativePathModuleSimpleSpecifyOutputDirectory/node/sourceRootRelativePathModuleSimpleSpecifyOutputDirectory.sourcemap.txt index 84a1e0175f5..419535bbff4 100644 --- a/tests/baselines/reference/project/sourceRootRelativePathModuleSimpleSpecifyOutputDirectory/node/sourceRootRelativePathModuleSimpleSpecifyOutputDirectory.sourcemap.txt +++ b/tests/baselines/reference/project/sourceRootRelativePathModuleSimpleSpecifyOutputDirectory/node/sourceRootRelativePathModuleSimpleSpecifyOutputDirectory.sourcemap.txt @@ -59,7 +59,7 @@ sourceFile:m1.ts 1->Emitted(6, 5) Source(4, 1) + SourceIndex(0) 2 >Emitted(6, 17) Source(4, 2) + SourceIndex(0) --- ->>>})(); +>>>}()); 1 > 2 >^ 3 > @@ -255,7 +255,7 @@ sourceFile:test.ts 1->Emitted(7, 5) Source(5, 1) + SourceIndex(0) 2 >Emitted(7, 14) Source(5, 2) + SourceIndex(0) --- ->>>})(); +>>>}()); 1 > 2 >^ 3 > diff --git a/tests/baselines/reference/project/sourceRootRelativePathModuleSimpleSpecifyOutputFile/amd/bin/test.js b/tests/baselines/reference/project/sourceRootRelativePathModuleSimpleSpecifyOutputFile/amd/bin/test.js index cc73ea698fe..d650b20ae5f 100644 --- a/tests/baselines/reference/project/sourceRootRelativePathModuleSimpleSpecifyOutputFile/amd/bin/test.js +++ b/tests/baselines/reference/project/sourceRootRelativePathModuleSimpleSpecifyOutputFile/amd/bin/test.js @@ -5,7 +5,7 @@ define("m1", ["require", "exports"], function (require, exports) { function m1_c1() { } return m1_c1; - })(); + }()); exports.m1_c1 = m1_c1; exports.m1_instance1 = new m1_c1(); function m1_f1() { @@ -20,7 +20,7 @@ define("test", ["require", "exports", "m1"], function (require, exports, m1) { function c1() { } return c1; - })(); + }()); exports.c1 = c1; exports.instance1 = new c1(); function f1() { diff --git a/tests/baselines/reference/project/sourceRootRelativePathModuleSimpleSpecifyOutputFile/amd/sourceRootRelativePathModuleSimpleSpecifyOutputFile.sourcemap.txt b/tests/baselines/reference/project/sourceRootRelativePathModuleSimpleSpecifyOutputFile/amd/sourceRootRelativePathModuleSimpleSpecifyOutputFile.sourcemap.txt index 66f462e7c9f..8c581023df2 100644 --- a/tests/baselines/reference/project/sourceRootRelativePathModuleSimpleSpecifyOutputFile/amd/sourceRootRelativePathModuleSimpleSpecifyOutputFile.sourcemap.txt +++ b/tests/baselines/reference/project/sourceRootRelativePathModuleSimpleSpecifyOutputFile/amd/sourceRootRelativePathModuleSimpleSpecifyOutputFile.sourcemap.txt @@ -60,7 +60,7 @@ sourceFile:m1.ts 1->Emitted(7, 9) Source(4, 1) + SourceIndex(0) 2 >Emitted(7, 21) Source(4, 2) + SourceIndex(0) --- ->>> })(); +>>> }()); 1 >^^^^ 2 > ^ 3 > @@ -228,7 +228,7 @@ sourceFile:test.ts 1->Emitted(22, 9) Source(5, 1) + SourceIndex(1) 2 >Emitted(22, 18) Source(5, 2) + SourceIndex(1) --- ->>> })(); +>>> }()); 1 >^^^^ 2 > ^ 3 > diff --git a/tests/baselines/reference/project/sourceRootRelativePathModuleSubfolderNoOutdir/amd/ref/m1.js b/tests/baselines/reference/project/sourceRootRelativePathModuleSubfolderNoOutdir/amd/ref/m1.js index 25001d63d84..bb59c6fbd90 100644 --- a/tests/baselines/reference/project/sourceRootRelativePathModuleSubfolderNoOutdir/amd/ref/m1.js +++ b/tests/baselines/reference/project/sourceRootRelativePathModuleSubfolderNoOutdir/amd/ref/m1.js @@ -5,7 +5,7 @@ define(["require", "exports"], function (require, exports) { function m1_c1() { } return m1_c1; - })(); + }()); exports.m1_c1 = m1_c1; exports.m1_instance1 = new m1_c1(); function m1_f1() { diff --git a/tests/baselines/reference/project/sourceRootRelativePathModuleSubfolderNoOutdir/amd/sourceRootRelativePathModuleSubfolderNoOutdir.sourcemap.txt b/tests/baselines/reference/project/sourceRootRelativePathModuleSubfolderNoOutdir/amd/sourceRootRelativePathModuleSubfolderNoOutdir.sourcemap.txt index 2030173b30d..9e9e1aad878 100644 --- a/tests/baselines/reference/project/sourceRootRelativePathModuleSubfolderNoOutdir/amd/sourceRootRelativePathModuleSubfolderNoOutdir.sourcemap.txt +++ b/tests/baselines/reference/project/sourceRootRelativePathModuleSubfolderNoOutdir/amd/sourceRootRelativePathModuleSubfolderNoOutdir.sourcemap.txt @@ -60,7 +60,7 @@ sourceFile:ref/m1.ts 1->Emitted(7, 9) Source(4, 1) + SourceIndex(0) 2 >Emitted(7, 21) Source(4, 2) + SourceIndex(0) --- ->>> })(); +>>> }()); 1 >^^^^ 2 > ^ 3 > @@ -234,7 +234,7 @@ sourceFile:test.ts 1->Emitted(7, 9) Source(5, 1) + SourceIndex(0) 2 >Emitted(7, 18) Source(5, 2) + SourceIndex(0) --- ->>> })(); +>>> }()); 1 >^^^^ 2 > ^ 3 > diff --git a/tests/baselines/reference/project/sourceRootRelativePathModuleSubfolderNoOutdir/node/ref/m1.js b/tests/baselines/reference/project/sourceRootRelativePathModuleSubfolderNoOutdir/node/ref/m1.js index 3bc07083900..121a089af23 100644 --- a/tests/baselines/reference/project/sourceRootRelativePathModuleSubfolderNoOutdir/node/ref/m1.js +++ b/tests/baselines/reference/project/sourceRootRelativePathModuleSubfolderNoOutdir/node/ref/m1.js @@ -4,7 +4,7 @@ var m1_c1 = (function () { function m1_c1() { } return m1_c1; -})(); +}()); exports.m1_c1 = m1_c1; exports.m1_instance1 = new m1_c1(); function m1_f1() { diff --git a/tests/baselines/reference/project/sourceRootRelativePathModuleSubfolderNoOutdir/node/sourceRootRelativePathModuleSubfolderNoOutdir.sourcemap.txt b/tests/baselines/reference/project/sourceRootRelativePathModuleSubfolderNoOutdir/node/sourceRootRelativePathModuleSubfolderNoOutdir.sourcemap.txt index 5e251d7c7e8..8700999ae53 100644 --- a/tests/baselines/reference/project/sourceRootRelativePathModuleSubfolderNoOutdir/node/sourceRootRelativePathModuleSubfolderNoOutdir.sourcemap.txt +++ b/tests/baselines/reference/project/sourceRootRelativePathModuleSubfolderNoOutdir/node/sourceRootRelativePathModuleSubfolderNoOutdir.sourcemap.txt @@ -59,7 +59,7 @@ sourceFile:ref/m1.ts 1->Emitted(6, 5) Source(4, 1) + SourceIndex(0) 2 >Emitted(6, 17) Source(4, 2) + SourceIndex(0) --- ->>>})(); +>>>}()); 1 > 2 >^ 3 > @@ -255,7 +255,7 @@ sourceFile:test.ts 1->Emitted(7, 5) Source(5, 1) + SourceIndex(0) 2 >Emitted(7, 14) Source(5, 2) + SourceIndex(0) --- ->>>})(); +>>>}()); 1 > 2 >^ 3 > diff --git a/tests/baselines/reference/project/sourceRootRelativePathModuleSubfolderSpecifyOutputDirectory/amd/outdir/simple/ref/m1.js b/tests/baselines/reference/project/sourceRootRelativePathModuleSubfolderSpecifyOutputDirectory/amd/outdir/simple/ref/m1.js index 25001d63d84..bb59c6fbd90 100644 --- a/tests/baselines/reference/project/sourceRootRelativePathModuleSubfolderSpecifyOutputDirectory/amd/outdir/simple/ref/m1.js +++ b/tests/baselines/reference/project/sourceRootRelativePathModuleSubfolderSpecifyOutputDirectory/amd/outdir/simple/ref/m1.js @@ -5,7 +5,7 @@ define(["require", "exports"], function (require, exports) { function m1_c1() { } return m1_c1; - })(); + }()); exports.m1_c1 = m1_c1; exports.m1_instance1 = new m1_c1(); function m1_f1() { diff --git a/tests/baselines/reference/project/sourceRootRelativePathModuleSubfolderSpecifyOutputDirectory/amd/sourceRootRelativePathModuleSubfolderSpecifyOutputDirectory.sourcemap.txt b/tests/baselines/reference/project/sourceRootRelativePathModuleSubfolderSpecifyOutputDirectory/amd/sourceRootRelativePathModuleSubfolderSpecifyOutputDirectory.sourcemap.txt index 3a62229b645..196de117349 100644 --- a/tests/baselines/reference/project/sourceRootRelativePathModuleSubfolderSpecifyOutputDirectory/amd/sourceRootRelativePathModuleSubfolderSpecifyOutputDirectory.sourcemap.txt +++ b/tests/baselines/reference/project/sourceRootRelativePathModuleSubfolderSpecifyOutputDirectory/amd/sourceRootRelativePathModuleSubfolderSpecifyOutputDirectory.sourcemap.txt @@ -60,7 +60,7 @@ sourceFile:ref/m1.ts 1->Emitted(7, 9) Source(4, 1) + SourceIndex(0) 2 >Emitted(7, 21) Source(4, 2) + SourceIndex(0) --- ->>> })(); +>>> }()); 1 >^^^^ 2 > ^ 3 > @@ -234,7 +234,7 @@ sourceFile:test.ts 1->Emitted(7, 9) Source(5, 1) + SourceIndex(0) 2 >Emitted(7, 18) Source(5, 2) + SourceIndex(0) --- ->>> })(); +>>> }()); 1 >^^^^ 2 > ^ 3 > diff --git a/tests/baselines/reference/project/sourceRootRelativePathModuleSubfolderSpecifyOutputDirectory/node/outdir/simple/ref/m1.js b/tests/baselines/reference/project/sourceRootRelativePathModuleSubfolderSpecifyOutputDirectory/node/outdir/simple/ref/m1.js index 3bc07083900..121a089af23 100644 --- a/tests/baselines/reference/project/sourceRootRelativePathModuleSubfolderSpecifyOutputDirectory/node/outdir/simple/ref/m1.js +++ b/tests/baselines/reference/project/sourceRootRelativePathModuleSubfolderSpecifyOutputDirectory/node/outdir/simple/ref/m1.js @@ -4,7 +4,7 @@ var m1_c1 = (function () { function m1_c1() { } return m1_c1; -})(); +}()); exports.m1_c1 = m1_c1; exports.m1_instance1 = new m1_c1(); function m1_f1() { diff --git a/tests/baselines/reference/project/sourceRootRelativePathModuleSubfolderSpecifyOutputDirectory/node/sourceRootRelativePathModuleSubfolderSpecifyOutputDirectory.sourcemap.txt b/tests/baselines/reference/project/sourceRootRelativePathModuleSubfolderSpecifyOutputDirectory/node/sourceRootRelativePathModuleSubfolderSpecifyOutputDirectory.sourcemap.txt index 552fa69288c..8913576d745 100644 --- a/tests/baselines/reference/project/sourceRootRelativePathModuleSubfolderSpecifyOutputDirectory/node/sourceRootRelativePathModuleSubfolderSpecifyOutputDirectory.sourcemap.txt +++ b/tests/baselines/reference/project/sourceRootRelativePathModuleSubfolderSpecifyOutputDirectory/node/sourceRootRelativePathModuleSubfolderSpecifyOutputDirectory.sourcemap.txt @@ -59,7 +59,7 @@ sourceFile:ref/m1.ts 1->Emitted(6, 5) Source(4, 1) + SourceIndex(0) 2 >Emitted(6, 17) Source(4, 2) + SourceIndex(0) --- ->>>})(); +>>>}()); 1 > 2 >^ 3 > @@ -255,7 +255,7 @@ sourceFile:test.ts 1->Emitted(7, 5) Source(5, 1) + SourceIndex(0) 2 >Emitted(7, 14) Source(5, 2) + SourceIndex(0) --- ->>>})(); +>>>}()); 1 > 2 >^ 3 > diff --git a/tests/baselines/reference/project/sourceRootRelativePathModuleSubfolderSpecifyOutputFile/amd/bin/test.js b/tests/baselines/reference/project/sourceRootRelativePathModuleSubfolderSpecifyOutputFile/amd/bin/test.js index 93a25f7ef19..f55492f4b49 100644 --- a/tests/baselines/reference/project/sourceRootRelativePathModuleSubfolderSpecifyOutputFile/amd/bin/test.js +++ b/tests/baselines/reference/project/sourceRootRelativePathModuleSubfolderSpecifyOutputFile/amd/bin/test.js @@ -5,7 +5,7 @@ define("ref/m1", ["require", "exports"], function (require, exports) { function m1_c1() { } return m1_c1; - })(); + }()); exports.m1_c1 = m1_c1; exports.m1_instance1 = new m1_c1(); function m1_f1() { @@ -20,7 +20,7 @@ define("test", ["require", "exports", "ref/m1"], function (require, exports, m1) function c1() { } return c1; - })(); + }()); exports.c1 = c1; exports.instance1 = new c1(); function f1() { diff --git a/tests/baselines/reference/project/sourceRootRelativePathModuleSubfolderSpecifyOutputFile/amd/sourceRootRelativePathModuleSubfolderSpecifyOutputFile.sourcemap.txt b/tests/baselines/reference/project/sourceRootRelativePathModuleSubfolderSpecifyOutputFile/amd/sourceRootRelativePathModuleSubfolderSpecifyOutputFile.sourcemap.txt index 88ab2d26154..e1c9ad562b4 100644 --- a/tests/baselines/reference/project/sourceRootRelativePathModuleSubfolderSpecifyOutputFile/amd/sourceRootRelativePathModuleSubfolderSpecifyOutputFile.sourcemap.txt +++ b/tests/baselines/reference/project/sourceRootRelativePathModuleSubfolderSpecifyOutputFile/amd/sourceRootRelativePathModuleSubfolderSpecifyOutputFile.sourcemap.txt @@ -60,7 +60,7 @@ sourceFile:ref/m1.ts 1->Emitted(7, 9) Source(4, 1) + SourceIndex(0) 2 >Emitted(7, 21) Source(4, 2) + SourceIndex(0) --- ->>> })(); +>>> }()); 1 >^^^^ 2 > ^ 3 > @@ -228,7 +228,7 @@ sourceFile:test.ts 1->Emitted(22, 9) Source(5, 1) + SourceIndex(1) 2 >Emitted(22, 18) Source(5, 2) + SourceIndex(1) --- ->>> })(); +>>> }()); 1 >^^^^ 2 > ^ 3 > diff --git a/tests/baselines/reference/project/sourceRootRelativePathMultifolderNoOutdir/amd/ref/m1.js b/tests/baselines/reference/project/sourceRootRelativePathMultifolderNoOutdir/amd/ref/m1.js index f6b169662c9..b7283f7fd88 100644 --- a/tests/baselines/reference/project/sourceRootRelativePathMultifolderNoOutdir/amd/ref/m1.js +++ b/tests/baselines/reference/project/sourceRootRelativePathMultifolderNoOutdir/amd/ref/m1.js @@ -3,7 +3,7 @@ var m1_c1 = (function () { function m1_c1() { } return m1_c1; -})(); +}()); var m1_instance1 = new m1_c1(); function m1_f1() { return m1_instance1; diff --git a/tests/baselines/reference/project/sourceRootRelativePathMultifolderNoOutdir/amd/sourceRootRelativePathMultifolderNoOutdir.sourcemap.txt b/tests/baselines/reference/project/sourceRootRelativePathMultifolderNoOutdir/amd/sourceRootRelativePathMultifolderNoOutdir.sourcemap.txt index 1e7409b8778..445dc0b3d7b 100644 --- a/tests/baselines/reference/project/sourceRootRelativePathMultifolderNoOutdir/amd/sourceRootRelativePathMultifolderNoOutdir.sourcemap.txt +++ b/tests/baselines/reference/project/sourceRootRelativePathMultifolderNoOutdir/amd/sourceRootRelativePathMultifolderNoOutdir.sourcemap.txt @@ -61,7 +61,7 @@ sourceFile:outputdir_multifolder/ref/m1.ts 1->Emitted(5, 5) Source(4, 1) + SourceIndex(0) 2 >Emitted(5, 17) Source(4, 2) + SourceIndex(0) --- ->>>})(); +>>>}()); 1 > 2 >^ 3 > @@ -204,7 +204,7 @@ sourceFile:outputdir_multifolder_ref/m2.ts 1->Emitted(5, 5) Source(4, 1) + SourceIndex(0) 2 >Emitted(5, 17) Source(4, 2) + SourceIndex(0) --- ->>>})(); +>>>}()); 1 > 2 >^ 3 > @@ -366,7 +366,7 @@ sourceFile:outputdir_multifolder/test.ts 1->Emitted(7, 5) Source(6, 1) + SourceIndex(0) 2 >Emitted(7, 14) Source(6, 2) + SourceIndex(0) --- ->>>})(); +>>>}()); 1 > 2 >^ 3 > diff --git a/tests/baselines/reference/project/sourceRootRelativePathMultifolderNoOutdir/node/ref/m1.js b/tests/baselines/reference/project/sourceRootRelativePathMultifolderNoOutdir/node/ref/m1.js index f6b169662c9..b7283f7fd88 100644 --- a/tests/baselines/reference/project/sourceRootRelativePathMultifolderNoOutdir/node/ref/m1.js +++ b/tests/baselines/reference/project/sourceRootRelativePathMultifolderNoOutdir/node/ref/m1.js @@ -3,7 +3,7 @@ var m1_c1 = (function () { function m1_c1() { } return m1_c1; -})(); +}()); var m1_instance1 = new m1_c1(); function m1_f1() { return m1_instance1; diff --git a/tests/baselines/reference/project/sourceRootRelativePathMultifolderNoOutdir/node/sourceRootRelativePathMultifolderNoOutdir.sourcemap.txt b/tests/baselines/reference/project/sourceRootRelativePathMultifolderNoOutdir/node/sourceRootRelativePathMultifolderNoOutdir.sourcemap.txt index 1e7409b8778..445dc0b3d7b 100644 --- a/tests/baselines/reference/project/sourceRootRelativePathMultifolderNoOutdir/node/sourceRootRelativePathMultifolderNoOutdir.sourcemap.txt +++ b/tests/baselines/reference/project/sourceRootRelativePathMultifolderNoOutdir/node/sourceRootRelativePathMultifolderNoOutdir.sourcemap.txt @@ -61,7 +61,7 @@ sourceFile:outputdir_multifolder/ref/m1.ts 1->Emitted(5, 5) Source(4, 1) + SourceIndex(0) 2 >Emitted(5, 17) Source(4, 2) + SourceIndex(0) --- ->>>})(); +>>>}()); 1 > 2 >^ 3 > @@ -204,7 +204,7 @@ sourceFile:outputdir_multifolder_ref/m2.ts 1->Emitted(5, 5) Source(4, 1) + SourceIndex(0) 2 >Emitted(5, 17) Source(4, 2) + SourceIndex(0) --- ->>>})(); +>>>}()); 1 > 2 >^ 3 > @@ -366,7 +366,7 @@ sourceFile:outputdir_multifolder/test.ts 1->Emitted(7, 5) Source(6, 1) + SourceIndex(0) 2 >Emitted(7, 14) Source(6, 2) + SourceIndex(0) --- ->>>})(); +>>>}()); 1 > 2 >^ 3 > diff --git a/tests/baselines/reference/project/sourceRootRelativePathMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_multifolder/ref/m1.js b/tests/baselines/reference/project/sourceRootRelativePathMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_multifolder/ref/m1.js index f6b169662c9..b7283f7fd88 100644 --- a/tests/baselines/reference/project/sourceRootRelativePathMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_multifolder/ref/m1.js +++ b/tests/baselines/reference/project/sourceRootRelativePathMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_multifolder/ref/m1.js @@ -3,7 +3,7 @@ var m1_c1 = (function () { function m1_c1() { } return m1_c1; -})(); +}()); var m1_instance1 = new m1_c1(); function m1_f1() { return m1_instance1; diff --git a/tests/baselines/reference/project/sourceRootRelativePathMultifolderSpecifyOutputDirectory/amd/sourceRootRelativePathMultifolderSpecifyOutputDirectory.sourcemap.txt b/tests/baselines/reference/project/sourceRootRelativePathMultifolderSpecifyOutputDirectory/amd/sourceRootRelativePathMultifolderSpecifyOutputDirectory.sourcemap.txt index f22687619bc..4f66a91c563 100644 --- a/tests/baselines/reference/project/sourceRootRelativePathMultifolderSpecifyOutputDirectory/amd/sourceRootRelativePathMultifolderSpecifyOutputDirectory.sourcemap.txt +++ b/tests/baselines/reference/project/sourceRootRelativePathMultifolderSpecifyOutputDirectory/amd/sourceRootRelativePathMultifolderSpecifyOutputDirectory.sourcemap.txt @@ -61,7 +61,7 @@ sourceFile:outputdir_multifolder/ref/m1.ts 1->Emitted(5, 5) Source(4, 1) + SourceIndex(0) 2 >Emitted(5, 17) Source(4, 2) + SourceIndex(0) --- ->>>})(); +>>>}()); 1 > 2 >^ 3 > @@ -204,7 +204,7 @@ sourceFile:outputdir_multifolder_ref/m2.ts 1->Emitted(5, 5) Source(4, 1) + SourceIndex(0) 2 >Emitted(5, 17) Source(4, 2) + SourceIndex(0) --- ->>>})(); +>>>}()); 1 > 2 >^ 3 > @@ -366,7 +366,7 @@ sourceFile:outputdir_multifolder/test.ts 1->Emitted(7, 5) Source(6, 1) + SourceIndex(0) 2 >Emitted(7, 14) Source(6, 2) + SourceIndex(0) --- ->>>})(); +>>>}()); 1 > 2 >^ 3 > diff --git a/tests/baselines/reference/project/sourceRootRelativePathMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_multifolder/ref/m1.js b/tests/baselines/reference/project/sourceRootRelativePathMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_multifolder/ref/m1.js index f6b169662c9..b7283f7fd88 100644 --- a/tests/baselines/reference/project/sourceRootRelativePathMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_multifolder/ref/m1.js +++ b/tests/baselines/reference/project/sourceRootRelativePathMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_multifolder/ref/m1.js @@ -3,7 +3,7 @@ var m1_c1 = (function () { function m1_c1() { } return m1_c1; -})(); +}()); var m1_instance1 = new m1_c1(); function m1_f1() { return m1_instance1; diff --git a/tests/baselines/reference/project/sourceRootRelativePathMultifolderSpecifyOutputDirectory/node/sourceRootRelativePathMultifolderSpecifyOutputDirectory.sourcemap.txt b/tests/baselines/reference/project/sourceRootRelativePathMultifolderSpecifyOutputDirectory/node/sourceRootRelativePathMultifolderSpecifyOutputDirectory.sourcemap.txt index f22687619bc..4f66a91c563 100644 --- a/tests/baselines/reference/project/sourceRootRelativePathMultifolderSpecifyOutputDirectory/node/sourceRootRelativePathMultifolderSpecifyOutputDirectory.sourcemap.txt +++ b/tests/baselines/reference/project/sourceRootRelativePathMultifolderSpecifyOutputDirectory/node/sourceRootRelativePathMultifolderSpecifyOutputDirectory.sourcemap.txt @@ -61,7 +61,7 @@ sourceFile:outputdir_multifolder/ref/m1.ts 1->Emitted(5, 5) Source(4, 1) + SourceIndex(0) 2 >Emitted(5, 17) Source(4, 2) + SourceIndex(0) --- ->>>})(); +>>>}()); 1 > 2 >^ 3 > @@ -204,7 +204,7 @@ sourceFile:outputdir_multifolder_ref/m2.ts 1->Emitted(5, 5) Source(4, 1) + SourceIndex(0) 2 >Emitted(5, 17) Source(4, 2) + SourceIndex(0) --- ->>>})(); +>>>}()); 1 > 2 >^ 3 > @@ -366,7 +366,7 @@ sourceFile:outputdir_multifolder/test.ts 1->Emitted(7, 5) Source(6, 1) + SourceIndex(0) 2 >Emitted(7, 14) Source(6, 2) + SourceIndex(0) --- ->>>})(); +>>>}()); 1 > 2 >^ 3 > diff --git a/tests/baselines/reference/project/sourceRootRelativePathMultifolderSpecifyOutputFile/amd/bin/test.js b/tests/baselines/reference/project/sourceRootRelativePathMultifolderSpecifyOutputFile/amd/bin/test.js index e6b143a110a..ad96cca3d79 100644 --- a/tests/baselines/reference/project/sourceRootRelativePathMultifolderSpecifyOutputFile/amd/bin/test.js +++ b/tests/baselines/reference/project/sourceRootRelativePathMultifolderSpecifyOutputFile/amd/bin/test.js @@ -3,7 +3,7 @@ var m1_c1 = (function () { function m1_c1() { } return m1_c1; -})(); +}()); var m1_instance1 = new m1_c1(); function m1_f1() { return m1_instance1; @@ -13,7 +13,7 @@ var m2_c1 = (function () { function m2_c1() { } return m2_c1; -})(); +}()); var m2_instance1 = new m2_c1(); function m2_f1() { return m2_instance1; @@ -25,7 +25,7 @@ var c1 = (function () { function c1() { } return c1; -})(); +}()); var instance1 = new c1(); function f1() { return instance1; diff --git a/tests/baselines/reference/project/sourceRootRelativePathMultifolderSpecifyOutputFile/amd/sourceRootRelativePathMultifolderSpecifyOutputFile.sourcemap.txt b/tests/baselines/reference/project/sourceRootRelativePathMultifolderSpecifyOutputFile/amd/sourceRootRelativePathMultifolderSpecifyOutputFile.sourcemap.txt index 53d479879d6..95b3a8d15b1 100644 --- a/tests/baselines/reference/project/sourceRootRelativePathMultifolderSpecifyOutputFile/amd/sourceRootRelativePathMultifolderSpecifyOutputFile.sourcemap.txt +++ b/tests/baselines/reference/project/sourceRootRelativePathMultifolderSpecifyOutputFile/amd/sourceRootRelativePathMultifolderSpecifyOutputFile.sourcemap.txt @@ -61,7 +61,7 @@ sourceFile:outputdir_multifolder/ref/m1.ts 1->Emitted(5, 5) Source(4, 1) + SourceIndex(0) 2 >Emitted(5, 17) Source(4, 2) + SourceIndex(0) --- ->>>})(); +>>>}()); 1 > 2 >^ 3 > @@ -198,7 +198,7 @@ sourceFile:outputdir_multifolder_ref/m2.ts 1->Emitted(15, 5) Source(4, 1) + SourceIndex(1) 2 >Emitted(15, 17) Source(4, 2) + SourceIndex(1) --- ->>>})(); +>>>}()); 1 > 2 >^ 3 > @@ -354,7 +354,7 @@ sourceFile:outputdir_multifolder/test.ts 1->Emitted(27, 5) Source(6, 1) + SourceIndex(2) 2 >Emitted(27, 14) Source(6, 2) + SourceIndex(2) --- ->>>})(); +>>>}()); 1 > 2 >^ 3 > diff --git a/tests/baselines/reference/project/sourceRootRelativePathMultifolderSpecifyOutputFile/node/bin/test.js b/tests/baselines/reference/project/sourceRootRelativePathMultifolderSpecifyOutputFile/node/bin/test.js index e6b143a110a..ad96cca3d79 100644 --- a/tests/baselines/reference/project/sourceRootRelativePathMultifolderSpecifyOutputFile/node/bin/test.js +++ b/tests/baselines/reference/project/sourceRootRelativePathMultifolderSpecifyOutputFile/node/bin/test.js @@ -3,7 +3,7 @@ var m1_c1 = (function () { function m1_c1() { } return m1_c1; -})(); +}()); var m1_instance1 = new m1_c1(); function m1_f1() { return m1_instance1; @@ -13,7 +13,7 @@ var m2_c1 = (function () { function m2_c1() { } return m2_c1; -})(); +}()); var m2_instance1 = new m2_c1(); function m2_f1() { return m2_instance1; @@ -25,7 +25,7 @@ var c1 = (function () { function c1() { } return c1; -})(); +}()); var instance1 = new c1(); function f1() { return instance1; diff --git a/tests/baselines/reference/project/sourceRootRelativePathMultifolderSpecifyOutputFile/node/sourceRootRelativePathMultifolderSpecifyOutputFile.sourcemap.txt b/tests/baselines/reference/project/sourceRootRelativePathMultifolderSpecifyOutputFile/node/sourceRootRelativePathMultifolderSpecifyOutputFile.sourcemap.txt index 53d479879d6..95b3a8d15b1 100644 --- a/tests/baselines/reference/project/sourceRootRelativePathMultifolderSpecifyOutputFile/node/sourceRootRelativePathMultifolderSpecifyOutputFile.sourcemap.txt +++ b/tests/baselines/reference/project/sourceRootRelativePathMultifolderSpecifyOutputFile/node/sourceRootRelativePathMultifolderSpecifyOutputFile.sourcemap.txt @@ -61,7 +61,7 @@ sourceFile:outputdir_multifolder/ref/m1.ts 1->Emitted(5, 5) Source(4, 1) + SourceIndex(0) 2 >Emitted(5, 17) Source(4, 2) + SourceIndex(0) --- ->>>})(); +>>>}()); 1 > 2 >^ 3 > @@ -198,7 +198,7 @@ sourceFile:outputdir_multifolder_ref/m2.ts 1->Emitted(15, 5) Source(4, 1) + SourceIndex(1) 2 >Emitted(15, 17) Source(4, 2) + SourceIndex(1) --- ->>>})(); +>>>}()); 1 > 2 >^ 3 > @@ -354,7 +354,7 @@ sourceFile:outputdir_multifolder/test.ts 1->Emitted(27, 5) Source(6, 1) + SourceIndex(2) 2 >Emitted(27, 14) Source(6, 2) + SourceIndex(2) --- ->>>})(); +>>>}()); 1 > 2 >^ 3 > diff --git a/tests/baselines/reference/project/sourceRootRelativePathSimpleNoOutdir/amd/m1.js b/tests/baselines/reference/project/sourceRootRelativePathSimpleNoOutdir/amd/m1.js index f6b169662c9..b7283f7fd88 100644 --- a/tests/baselines/reference/project/sourceRootRelativePathSimpleNoOutdir/amd/m1.js +++ b/tests/baselines/reference/project/sourceRootRelativePathSimpleNoOutdir/amd/m1.js @@ -3,7 +3,7 @@ var m1_c1 = (function () { function m1_c1() { } return m1_c1; -})(); +}()); var m1_instance1 = new m1_c1(); function m1_f1() { return m1_instance1; diff --git a/tests/baselines/reference/project/sourceRootRelativePathSimpleNoOutdir/amd/sourceRootRelativePathSimpleNoOutdir.sourcemap.txt b/tests/baselines/reference/project/sourceRootRelativePathSimpleNoOutdir/amd/sourceRootRelativePathSimpleNoOutdir.sourcemap.txt index 02199705e31..3257fb566ef 100644 --- a/tests/baselines/reference/project/sourceRootRelativePathSimpleNoOutdir/amd/sourceRootRelativePathSimpleNoOutdir.sourcemap.txt +++ b/tests/baselines/reference/project/sourceRootRelativePathSimpleNoOutdir/amd/sourceRootRelativePathSimpleNoOutdir.sourcemap.txt @@ -61,7 +61,7 @@ sourceFile:m1.ts 1->Emitted(5, 5) Source(4, 1) + SourceIndex(0) 2 >Emitted(5, 17) Source(4, 2) + SourceIndex(0) --- ->>>})(); +>>>}()); 1 > 2 >^ 3 > @@ -213,7 +213,7 @@ sourceFile:test.ts 1->Emitted(6, 5) Source(5, 1) + SourceIndex(0) 2 >Emitted(6, 14) Source(5, 2) + SourceIndex(0) --- ->>>})(); +>>>}()); 1 > 2 >^ 3 > diff --git a/tests/baselines/reference/project/sourceRootRelativePathSimpleNoOutdir/node/m1.js b/tests/baselines/reference/project/sourceRootRelativePathSimpleNoOutdir/node/m1.js index f6b169662c9..b7283f7fd88 100644 --- a/tests/baselines/reference/project/sourceRootRelativePathSimpleNoOutdir/node/m1.js +++ b/tests/baselines/reference/project/sourceRootRelativePathSimpleNoOutdir/node/m1.js @@ -3,7 +3,7 @@ var m1_c1 = (function () { function m1_c1() { } return m1_c1; -})(); +}()); var m1_instance1 = new m1_c1(); function m1_f1() { return m1_instance1; diff --git a/tests/baselines/reference/project/sourceRootRelativePathSimpleNoOutdir/node/sourceRootRelativePathSimpleNoOutdir.sourcemap.txt b/tests/baselines/reference/project/sourceRootRelativePathSimpleNoOutdir/node/sourceRootRelativePathSimpleNoOutdir.sourcemap.txt index 02199705e31..3257fb566ef 100644 --- a/tests/baselines/reference/project/sourceRootRelativePathSimpleNoOutdir/node/sourceRootRelativePathSimpleNoOutdir.sourcemap.txt +++ b/tests/baselines/reference/project/sourceRootRelativePathSimpleNoOutdir/node/sourceRootRelativePathSimpleNoOutdir.sourcemap.txt @@ -61,7 +61,7 @@ sourceFile:m1.ts 1->Emitted(5, 5) Source(4, 1) + SourceIndex(0) 2 >Emitted(5, 17) Source(4, 2) + SourceIndex(0) --- ->>>})(); +>>>}()); 1 > 2 >^ 3 > @@ -213,7 +213,7 @@ sourceFile:test.ts 1->Emitted(6, 5) Source(5, 1) + SourceIndex(0) 2 >Emitted(6, 14) Source(5, 2) + SourceIndex(0) --- ->>>})(); +>>>}()); 1 > 2 >^ 3 > diff --git a/tests/baselines/reference/project/sourceRootRelativePathSimpleSpecifyOutputDirectory/amd/outdir/simple/m1.js b/tests/baselines/reference/project/sourceRootRelativePathSimpleSpecifyOutputDirectory/amd/outdir/simple/m1.js index f6b169662c9..b7283f7fd88 100644 --- a/tests/baselines/reference/project/sourceRootRelativePathSimpleSpecifyOutputDirectory/amd/outdir/simple/m1.js +++ b/tests/baselines/reference/project/sourceRootRelativePathSimpleSpecifyOutputDirectory/amd/outdir/simple/m1.js @@ -3,7 +3,7 @@ var m1_c1 = (function () { function m1_c1() { } return m1_c1; -})(); +}()); var m1_instance1 = new m1_c1(); function m1_f1() { return m1_instance1; diff --git a/tests/baselines/reference/project/sourceRootRelativePathSimpleSpecifyOutputDirectory/amd/sourceRootRelativePathSimpleSpecifyOutputDirectory.sourcemap.txt b/tests/baselines/reference/project/sourceRootRelativePathSimpleSpecifyOutputDirectory/amd/sourceRootRelativePathSimpleSpecifyOutputDirectory.sourcemap.txt index 43993182320..bede164b9dc 100644 --- a/tests/baselines/reference/project/sourceRootRelativePathSimpleSpecifyOutputDirectory/amd/sourceRootRelativePathSimpleSpecifyOutputDirectory.sourcemap.txt +++ b/tests/baselines/reference/project/sourceRootRelativePathSimpleSpecifyOutputDirectory/amd/sourceRootRelativePathSimpleSpecifyOutputDirectory.sourcemap.txt @@ -61,7 +61,7 @@ sourceFile:m1.ts 1->Emitted(5, 5) Source(4, 1) + SourceIndex(0) 2 >Emitted(5, 17) Source(4, 2) + SourceIndex(0) --- ->>>})(); +>>>}()); 1 > 2 >^ 3 > @@ -213,7 +213,7 @@ sourceFile:test.ts 1->Emitted(6, 5) Source(5, 1) + SourceIndex(0) 2 >Emitted(6, 14) Source(5, 2) + SourceIndex(0) --- ->>>})(); +>>>}()); 1 > 2 >^ 3 > diff --git a/tests/baselines/reference/project/sourceRootRelativePathSimpleSpecifyOutputDirectory/node/outdir/simple/m1.js b/tests/baselines/reference/project/sourceRootRelativePathSimpleSpecifyOutputDirectory/node/outdir/simple/m1.js index f6b169662c9..b7283f7fd88 100644 --- a/tests/baselines/reference/project/sourceRootRelativePathSimpleSpecifyOutputDirectory/node/outdir/simple/m1.js +++ b/tests/baselines/reference/project/sourceRootRelativePathSimpleSpecifyOutputDirectory/node/outdir/simple/m1.js @@ -3,7 +3,7 @@ var m1_c1 = (function () { function m1_c1() { } return m1_c1; -})(); +}()); var m1_instance1 = new m1_c1(); function m1_f1() { return m1_instance1; diff --git a/tests/baselines/reference/project/sourceRootRelativePathSimpleSpecifyOutputDirectory/node/sourceRootRelativePathSimpleSpecifyOutputDirectory.sourcemap.txt b/tests/baselines/reference/project/sourceRootRelativePathSimpleSpecifyOutputDirectory/node/sourceRootRelativePathSimpleSpecifyOutputDirectory.sourcemap.txt index 43993182320..bede164b9dc 100644 --- a/tests/baselines/reference/project/sourceRootRelativePathSimpleSpecifyOutputDirectory/node/sourceRootRelativePathSimpleSpecifyOutputDirectory.sourcemap.txt +++ b/tests/baselines/reference/project/sourceRootRelativePathSimpleSpecifyOutputDirectory/node/sourceRootRelativePathSimpleSpecifyOutputDirectory.sourcemap.txt @@ -61,7 +61,7 @@ sourceFile:m1.ts 1->Emitted(5, 5) Source(4, 1) + SourceIndex(0) 2 >Emitted(5, 17) Source(4, 2) + SourceIndex(0) --- ->>>})(); +>>>}()); 1 > 2 >^ 3 > @@ -213,7 +213,7 @@ sourceFile:test.ts 1->Emitted(6, 5) Source(5, 1) + SourceIndex(0) 2 >Emitted(6, 14) Source(5, 2) + SourceIndex(0) --- ->>>})(); +>>>}()); 1 > 2 >^ 3 > diff --git a/tests/baselines/reference/project/sourceRootRelativePathSimpleSpecifyOutputFile/amd/bin/test.js b/tests/baselines/reference/project/sourceRootRelativePathSimpleSpecifyOutputFile/amd/bin/test.js index 10bcbf92a21..481c10d1a06 100644 --- a/tests/baselines/reference/project/sourceRootRelativePathSimpleSpecifyOutputFile/amd/bin/test.js +++ b/tests/baselines/reference/project/sourceRootRelativePathSimpleSpecifyOutputFile/amd/bin/test.js @@ -3,7 +3,7 @@ var m1_c1 = (function () { function m1_c1() { } return m1_c1; -})(); +}()); var m1_instance1 = new m1_c1(); function m1_f1() { return m1_instance1; @@ -14,7 +14,7 @@ var c1 = (function () { function c1() { } return c1; -})(); +}()); var instance1 = new c1(); function f1() { return instance1; diff --git a/tests/baselines/reference/project/sourceRootRelativePathSimpleSpecifyOutputFile/amd/sourceRootRelativePathSimpleSpecifyOutputFile.sourcemap.txt b/tests/baselines/reference/project/sourceRootRelativePathSimpleSpecifyOutputFile/amd/sourceRootRelativePathSimpleSpecifyOutputFile.sourcemap.txt index c797be4d432..84caf2a5209 100644 --- a/tests/baselines/reference/project/sourceRootRelativePathSimpleSpecifyOutputFile/amd/sourceRootRelativePathSimpleSpecifyOutputFile.sourcemap.txt +++ b/tests/baselines/reference/project/sourceRootRelativePathSimpleSpecifyOutputFile/amd/sourceRootRelativePathSimpleSpecifyOutputFile.sourcemap.txt @@ -61,7 +61,7 @@ sourceFile:m1.ts 1->Emitted(5, 5) Source(4, 1) + SourceIndex(0) 2 >Emitted(5, 17) Source(4, 2) + SourceIndex(0) --- ->>>})(); +>>>}()); 1 > 2 >^ 3 > @@ -207,7 +207,7 @@ sourceFile:test.ts 1->Emitted(16, 5) Source(5, 1) + SourceIndex(1) 2 >Emitted(16, 14) Source(5, 2) + SourceIndex(1) --- ->>>})(); +>>>}()); 1 > 2 >^ 3 > diff --git a/tests/baselines/reference/project/sourceRootRelativePathSimpleSpecifyOutputFile/node/bin/test.js b/tests/baselines/reference/project/sourceRootRelativePathSimpleSpecifyOutputFile/node/bin/test.js index 10bcbf92a21..481c10d1a06 100644 --- a/tests/baselines/reference/project/sourceRootRelativePathSimpleSpecifyOutputFile/node/bin/test.js +++ b/tests/baselines/reference/project/sourceRootRelativePathSimpleSpecifyOutputFile/node/bin/test.js @@ -3,7 +3,7 @@ var m1_c1 = (function () { function m1_c1() { } return m1_c1; -})(); +}()); var m1_instance1 = new m1_c1(); function m1_f1() { return m1_instance1; @@ -14,7 +14,7 @@ var c1 = (function () { function c1() { } return c1; -})(); +}()); var instance1 = new c1(); function f1() { return instance1; diff --git a/tests/baselines/reference/project/sourceRootRelativePathSimpleSpecifyOutputFile/node/sourceRootRelativePathSimpleSpecifyOutputFile.sourcemap.txt b/tests/baselines/reference/project/sourceRootRelativePathSimpleSpecifyOutputFile/node/sourceRootRelativePathSimpleSpecifyOutputFile.sourcemap.txt index c797be4d432..84caf2a5209 100644 --- a/tests/baselines/reference/project/sourceRootRelativePathSimpleSpecifyOutputFile/node/sourceRootRelativePathSimpleSpecifyOutputFile.sourcemap.txt +++ b/tests/baselines/reference/project/sourceRootRelativePathSimpleSpecifyOutputFile/node/sourceRootRelativePathSimpleSpecifyOutputFile.sourcemap.txt @@ -61,7 +61,7 @@ sourceFile:m1.ts 1->Emitted(5, 5) Source(4, 1) + SourceIndex(0) 2 >Emitted(5, 17) Source(4, 2) + SourceIndex(0) --- ->>>})(); +>>>}()); 1 > 2 >^ 3 > @@ -207,7 +207,7 @@ sourceFile:test.ts 1->Emitted(16, 5) Source(5, 1) + SourceIndex(1) 2 >Emitted(16, 14) Source(5, 2) + SourceIndex(1) --- ->>>})(); +>>>}()); 1 > 2 >^ 3 > diff --git a/tests/baselines/reference/project/sourceRootRelativePathSingleFileNoOutdir/amd/sourceRootRelativePathSingleFileNoOutdir.sourcemap.txt b/tests/baselines/reference/project/sourceRootRelativePathSingleFileNoOutdir/amd/sourceRootRelativePathSingleFileNoOutdir.sourcemap.txt index e125816f9a1..e08628e78a5 100644 --- a/tests/baselines/reference/project/sourceRootRelativePathSingleFileNoOutdir/amd/sourceRootRelativePathSingleFileNoOutdir.sourcemap.txt +++ b/tests/baselines/reference/project/sourceRootRelativePathSingleFileNoOutdir/amd/sourceRootRelativePathSingleFileNoOutdir.sourcemap.txt @@ -61,7 +61,7 @@ sourceFile:test.ts 1->Emitted(5, 5) Source(4, 1) + SourceIndex(0) 2 >Emitted(5, 14) Source(4, 2) + SourceIndex(0) --- ->>>})(); +>>>}()); 1 > 2 >^ 3 > diff --git a/tests/baselines/reference/project/sourceRootRelativePathSingleFileNoOutdir/amd/test.js b/tests/baselines/reference/project/sourceRootRelativePathSingleFileNoOutdir/amd/test.js index 335d79c01c6..e5a1c12a732 100644 --- a/tests/baselines/reference/project/sourceRootRelativePathSingleFileNoOutdir/amd/test.js +++ b/tests/baselines/reference/project/sourceRootRelativePathSingleFileNoOutdir/amd/test.js @@ -3,7 +3,7 @@ var c1 = (function () { function c1() { } return c1; -})(); +}()); var instance1 = new c1(); function f1() { return instance1; diff --git a/tests/baselines/reference/project/sourceRootRelativePathSingleFileNoOutdir/node/sourceRootRelativePathSingleFileNoOutdir.sourcemap.txt b/tests/baselines/reference/project/sourceRootRelativePathSingleFileNoOutdir/node/sourceRootRelativePathSingleFileNoOutdir.sourcemap.txt index e125816f9a1..e08628e78a5 100644 --- a/tests/baselines/reference/project/sourceRootRelativePathSingleFileNoOutdir/node/sourceRootRelativePathSingleFileNoOutdir.sourcemap.txt +++ b/tests/baselines/reference/project/sourceRootRelativePathSingleFileNoOutdir/node/sourceRootRelativePathSingleFileNoOutdir.sourcemap.txt @@ -61,7 +61,7 @@ sourceFile:test.ts 1->Emitted(5, 5) Source(4, 1) + SourceIndex(0) 2 >Emitted(5, 14) Source(4, 2) + SourceIndex(0) --- ->>>})(); +>>>}()); 1 > 2 >^ 3 > diff --git a/tests/baselines/reference/project/sourceRootRelativePathSingleFileNoOutdir/node/test.js b/tests/baselines/reference/project/sourceRootRelativePathSingleFileNoOutdir/node/test.js index 335d79c01c6..e5a1c12a732 100644 --- a/tests/baselines/reference/project/sourceRootRelativePathSingleFileNoOutdir/node/test.js +++ b/tests/baselines/reference/project/sourceRootRelativePathSingleFileNoOutdir/node/test.js @@ -3,7 +3,7 @@ var c1 = (function () { function c1() { } return c1; -})(); +}()); var instance1 = new c1(); function f1() { return instance1; diff --git a/tests/baselines/reference/project/sourceRootRelativePathSingleFileSpecifyOutputDirectory/amd/outdir/simple/test.js b/tests/baselines/reference/project/sourceRootRelativePathSingleFileSpecifyOutputDirectory/amd/outdir/simple/test.js index 335d79c01c6..e5a1c12a732 100644 --- a/tests/baselines/reference/project/sourceRootRelativePathSingleFileSpecifyOutputDirectory/amd/outdir/simple/test.js +++ b/tests/baselines/reference/project/sourceRootRelativePathSingleFileSpecifyOutputDirectory/amd/outdir/simple/test.js @@ -3,7 +3,7 @@ var c1 = (function () { function c1() { } return c1; -})(); +}()); var instance1 = new c1(); function f1() { return instance1; diff --git a/tests/baselines/reference/project/sourceRootRelativePathSingleFileSpecifyOutputDirectory/amd/sourceRootRelativePathSingleFileSpecifyOutputDirectory.sourcemap.txt b/tests/baselines/reference/project/sourceRootRelativePathSingleFileSpecifyOutputDirectory/amd/sourceRootRelativePathSingleFileSpecifyOutputDirectory.sourcemap.txt index 3c8bc78f8f3..ea92fb80cf5 100644 --- a/tests/baselines/reference/project/sourceRootRelativePathSingleFileSpecifyOutputDirectory/amd/sourceRootRelativePathSingleFileSpecifyOutputDirectory.sourcemap.txt +++ b/tests/baselines/reference/project/sourceRootRelativePathSingleFileSpecifyOutputDirectory/amd/sourceRootRelativePathSingleFileSpecifyOutputDirectory.sourcemap.txt @@ -61,7 +61,7 @@ sourceFile:test.ts 1->Emitted(5, 5) Source(4, 1) + SourceIndex(0) 2 >Emitted(5, 14) Source(4, 2) + SourceIndex(0) --- ->>>})(); +>>>}()); 1 > 2 >^ 3 > diff --git a/tests/baselines/reference/project/sourceRootRelativePathSingleFileSpecifyOutputDirectory/node/outdir/simple/test.js b/tests/baselines/reference/project/sourceRootRelativePathSingleFileSpecifyOutputDirectory/node/outdir/simple/test.js index 335d79c01c6..e5a1c12a732 100644 --- a/tests/baselines/reference/project/sourceRootRelativePathSingleFileSpecifyOutputDirectory/node/outdir/simple/test.js +++ b/tests/baselines/reference/project/sourceRootRelativePathSingleFileSpecifyOutputDirectory/node/outdir/simple/test.js @@ -3,7 +3,7 @@ var c1 = (function () { function c1() { } return c1; -})(); +}()); var instance1 = new c1(); function f1() { return instance1; diff --git a/tests/baselines/reference/project/sourceRootRelativePathSingleFileSpecifyOutputDirectory/node/sourceRootRelativePathSingleFileSpecifyOutputDirectory.sourcemap.txt b/tests/baselines/reference/project/sourceRootRelativePathSingleFileSpecifyOutputDirectory/node/sourceRootRelativePathSingleFileSpecifyOutputDirectory.sourcemap.txt index 3c8bc78f8f3..ea92fb80cf5 100644 --- a/tests/baselines/reference/project/sourceRootRelativePathSingleFileSpecifyOutputDirectory/node/sourceRootRelativePathSingleFileSpecifyOutputDirectory.sourcemap.txt +++ b/tests/baselines/reference/project/sourceRootRelativePathSingleFileSpecifyOutputDirectory/node/sourceRootRelativePathSingleFileSpecifyOutputDirectory.sourcemap.txt @@ -61,7 +61,7 @@ sourceFile:test.ts 1->Emitted(5, 5) Source(4, 1) + SourceIndex(0) 2 >Emitted(5, 14) Source(4, 2) + SourceIndex(0) --- ->>>})(); +>>>}()); 1 > 2 >^ 3 > diff --git a/tests/baselines/reference/project/sourceRootRelativePathSingleFileSpecifyOutputFile/amd/bin/test.js b/tests/baselines/reference/project/sourceRootRelativePathSingleFileSpecifyOutputFile/amd/bin/test.js index 335d79c01c6..e5a1c12a732 100644 --- a/tests/baselines/reference/project/sourceRootRelativePathSingleFileSpecifyOutputFile/amd/bin/test.js +++ b/tests/baselines/reference/project/sourceRootRelativePathSingleFileSpecifyOutputFile/amd/bin/test.js @@ -3,7 +3,7 @@ var c1 = (function () { function c1() { } return c1; -})(); +}()); var instance1 = new c1(); function f1() { return instance1; diff --git a/tests/baselines/reference/project/sourceRootRelativePathSingleFileSpecifyOutputFile/amd/sourceRootRelativePathSingleFileSpecifyOutputFile.sourcemap.txt b/tests/baselines/reference/project/sourceRootRelativePathSingleFileSpecifyOutputFile/amd/sourceRootRelativePathSingleFileSpecifyOutputFile.sourcemap.txt index 6d92e64eb64..a61409263fc 100644 --- a/tests/baselines/reference/project/sourceRootRelativePathSingleFileSpecifyOutputFile/amd/sourceRootRelativePathSingleFileSpecifyOutputFile.sourcemap.txt +++ b/tests/baselines/reference/project/sourceRootRelativePathSingleFileSpecifyOutputFile/amd/sourceRootRelativePathSingleFileSpecifyOutputFile.sourcemap.txt @@ -61,7 +61,7 @@ sourceFile:test.ts 1->Emitted(5, 5) Source(4, 1) + SourceIndex(0) 2 >Emitted(5, 14) Source(4, 2) + SourceIndex(0) --- ->>>})(); +>>>}()); 1 > 2 >^ 3 > diff --git a/tests/baselines/reference/project/sourceRootRelativePathSingleFileSpecifyOutputFile/node/bin/test.js b/tests/baselines/reference/project/sourceRootRelativePathSingleFileSpecifyOutputFile/node/bin/test.js index 335d79c01c6..e5a1c12a732 100644 --- a/tests/baselines/reference/project/sourceRootRelativePathSingleFileSpecifyOutputFile/node/bin/test.js +++ b/tests/baselines/reference/project/sourceRootRelativePathSingleFileSpecifyOutputFile/node/bin/test.js @@ -3,7 +3,7 @@ var c1 = (function () { function c1() { } return c1; -})(); +}()); var instance1 = new c1(); function f1() { return instance1; diff --git a/tests/baselines/reference/project/sourceRootRelativePathSingleFileSpecifyOutputFile/node/sourceRootRelativePathSingleFileSpecifyOutputFile.sourcemap.txt b/tests/baselines/reference/project/sourceRootRelativePathSingleFileSpecifyOutputFile/node/sourceRootRelativePathSingleFileSpecifyOutputFile.sourcemap.txt index 6d92e64eb64..a61409263fc 100644 --- a/tests/baselines/reference/project/sourceRootRelativePathSingleFileSpecifyOutputFile/node/sourceRootRelativePathSingleFileSpecifyOutputFile.sourcemap.txt +++ b/tests/baselines/reference/project/sourceRootRelativePathSingleFileSpecifyOutputFile/node/sourceRootRelativePathSingleFileSpecifyOutputFile.sourcemap.txt @@ -61,7 +61,7 @@ sourceFile:test.ts 1->Emitted(5, 5) Source(4, 1) + SourceIndex(0) 2 >Emitted(5, 14) Source(4, 2) + SourceIndex(0) --- ->>>})(); +>>>}()); 1 > 2 >^ 3 > diff --git a/tests/baselines/reference/project/sourceRootRelativePathSubfolderNoOutdir/amd/ref/m1.js b/tests/baselines/reference/project/sourceRootRelativePathSubfolderNoOutdir/amd/ref/m1.js index f6b169662c9..b7283f7fd88 100644 --- a/tests/baselines/reference/project/sourceRootRelativePathSubfolderNoOutdir/amd/ref/m1.js +++ b/tests/baselines/reference/project/sourceRootRelativePathSubfolderNoOutdir/amd/ref/m1.js @@ -3,7 +3,7 @@ var m1_c1 = (function () { function m1_c1() { } return m1_c1; -})(); +}()); var m1_instance1 = new m1_c1(); function m1_f1() { return m1_instance1; diff --git a/tests/baselines/reference/project/sourceRootRelativePathSubfolderNoOutdir/amd/sourceRootRelativePathSubfolderNoOutdir.sourcemap.txt b/tests/baselines/reference/project/sourceRootRelativePathSubfolderNoOutdir/amd/sourceRootRelativePathSubfolderNoOutdir.sourcemap.txt index 64d3f901d6d..a986dda9056 100644 --- a/tests/baselines/reference/project/sourceRootRelativePathSubfolderNoOutdir/amd/sourceRootRelativePathSubfolderNoOutdir.sourcemap.txt +++ b/tests/baselines/reference/project/sourceRootRelativePathSubfolderNoOutdir/amd/sourceRootRelativePathSubfolderNoOutdir.sourcemap.txt @@ -61,7 +61,7 @@ sourceFile:ref/m1.ts 1->Emitted(5, 5) Source(4, 1) + SourceIndex(0) 2 >Emitted(5, 17) Source(4, 2) + SourceIndex(0) --- ->>>})(); +>>>}()); 1 > 2 >^ 3 > @@ -213,7 +213,7 @@ sourceFile:test.ts 1->Emitted(6, 5) Source(5, 1) + SourceIndex(0) 2 >Emitted(6, 14) Source(5, 2) + SourceIndex(0) --- ->>>})(); +>>>}()); 1 > 2 >^ 3 > diff --git a/tests/baselines/reference/project/sourceRootRelativePathSubfolderNoOutdir/node/ref/m1.js b/tests/baselines/reference/project/sourceRootRelativePathSubfolderNoOutdir/node/ref/m1.js index f6b169662c9..b7283f7fd88 100644 --- a/tests/baselines/reference/project/sourceRootRelativePathSubfolderNoOutdir/node/ref/m1.js +++ b/tests/baselines/reference/project/sourceRootRelativePathSubfolderNoOutdir/node/ref/m1.js @@ -3,7 +3,7 @@ var m1_c1 = (function () { function m1_c1() { } return m1_c1; -})(); +}()); var m1_instance1 = new m1_c1(); function m1_f1() { return m1_instance1; diff --git a/tests/baselines/reference/project/sourceRootRelativePathSubfolderNoOutdir/node/sourceRootRelativePathSubfolderNoOutdir.sourcemap.txt b/tests/baselines/reference/project/sourceRootRelativePathSubfolderNoOutdir/node/sourceRootRelativePathSubfolderNoOutdir.sourcemap.txt index 64d3f901d6d..a986dda9056 100644 --- a/tests/baselines/reference/project/sourceRootRelativePathSubfolderNoOutdir/node/sourceRootRelativePathSubfolderNoOutdir.sourcemap.txt +++ b/tests/baselines/reference/project/sourceRootRelativePathSubfolderNoOutdir/node/sourceRootRelativePathSubfolderNoOutdir.sourcemap.txt @@ -61,7 +61,7 @@ sourceFile:ref/m1.ts 1->Emitted(5, 5) Source(4, 1) + SourceIndex(0) 2 >Emitted(5, 17) Source(4, 2) + SourceIndex(0) --- ->>>})(); +>>>}()); 1 > 2 >^ 3 > @@ -213,7 +213,7 @@ sourceFile:test.ts 1->Emitted(6, 5) Source(5, 1) + SourceIndex(0) 2 >Emitted(6, 14) Source(5, 2) + SourceIndex(0) --- ->>>})(); +>>>}()); 1 > 2 >^ 3 > diff --git a/tests/baselines/reference/project/sourceRootRelativePathSubfolderSpecifyOutputDirectory/amd/outdir/simple/ref/m1.js b/tests/baselines/reference/project/sourceRootRelativePathSubfolderSpecifyOutputDirectory/amd/outdir/simple/ref/m1.js index f6b169662c9..b7283f7fd88 100644 --- a/tests/baselines/reference/project/sourceRootRelativePathSubfolderSpecifyOutputDirectory/amd/outdir/simple/ref/m1.js +++ b/tests/baselines/reference/project/sourceRootRelativePathSubfolderSpecifyOutputDirectory/amd/outdir/simple/ref/m1.js @@ -3,7 +3,7 @@ var m1_c1 = (function () { function m1_c1() { } return m1_c1; -})(); +}()); var m1_instance1 = new m1_c1(); function m1_f1() { return m1_instance1; diff --git a/tests/baselines/reference/project/sourceRootRelativePathSubfolderSpecifyOutputDirectory/amd/sourceRootRelativePathSubfolderSpecifyOutputDirectory.sourcemap.txt b/tests/baselines/reference/project/sourceRootRelativePathSubfolderSpecifyOutputDirectory/amd/sourceRootRelativePathSubfolderSpecifyOutputDirectory.sourcemap.txt index e9073db7f8e..e90f9f14521 100644 --- a/tests/baselines/reference/project/sourceRootRelativePathSubfolderSpecifyOutputDirectory/amd/sourceRootRelativePathSubfolderSpecifyOutputDirectory.sourcemap.txt +++ b/tests/baselines/reference/project/sourceRootRelativePathSubfolderSpecifyOutputDirectory/amd/sourceRootRelativePathSubfolderSpecifyOutputDirectory.sourcemap.txt @@ -61,7 +61,7 @@ sourceFile:ref/m1.ts 1->Emitted(5, 5) Source(4, 1) + SourceIndex(0) 2 >Emitted(5, 17) Source(4, 2) + SourceIndex(0) --- ->>>})(); +>>>}()); 1 > 2 >^ 3 > @@ -213,7 +213,7 @@ sourceFile:test.ts 1->Emitted(6, 5) Source(5, 1) + SourceIndex(0) 2 >Emitted(6, 14) Source(5, 2) + SourceIndex(0) --- ->>>})(); +>>>}()); 1 > 2 >^ 3 > diff --git a/tests/baselines/reference/project/sourceRootRelativePathSubfolderSpecifyOutputDirectory/node/outdir/simple/ref/m1.js b/tests/baselines/reference/project/sourceRootRelativePathSubfolderSpecifyOutputDirectory/node/outdir/simple/ref/m1.js index f6b169662c9..b7283f7fd88 100644 --- a/tests/baselines/reference/project/sourceRootRelativePathSubfolderSpecifyOutputDirectory/node/outdir/simple/ref/m1.js +++ b/tests/baselines/reference/project/sourceRootRelativePathSubfolderSpecifyOutputDirectory/node/outdir/simple/ref/m1.js @@ -3,7 +3,7 @@ var m1_c1 = (function () { function m1_c1() { } return m1_c1; -})(); +}()); var m1_instance1 = new m1_c1(); function m1_f1() { return m1_instance1; diff --git a/tests/baselines/reference/project/sourceRootRelativePathSubfolderSpecifyOutputDirectory/node/sourceRootRelativePathSubfolderSpecifyOutputDirectory.sourcemap.txt b/tests/baselines/reference/project/sourceRootRelativePathSubfolderSpecifyOutputDirectory/node/sourceRootRelativePathSubfolderSpecifyOutputDirectory.sourcemap.txt index e9073db7f8e..e90f9f14521 100644 --- a/tests/baselines/reference/project/sourceRootRelativePathSubfolderSpecifyOutputDirectory/node/sourceRootRelativePathSubfolderSpecifyOutputDirectory.sourcemap.txt +++ b/tests/baselines/reference/project/sourceRootRelativePathSubfolderSpecifyOutputDirectory/node/sourceRootRelativePathSubfolderSpecifyOutputDirectory.sourcemap.txt @@ -61,7 +61,7 @@ sourceFile:ref/m1.ts 1->Emitted(5, 5) Source(4, 1) + SourceIndex(0) 2 >Emitted(5, 17) Source(4, 2) + SourceIndex(0) --- ->>>})(); +>>>}()); 1 > 2 >^ 3 > @@ -213,7 +213,7 @@ sourceFile:test.ts 1->Emitted(6, 5) Source(5, 1) + SourceIndex(0) 2 >Emitted(6, 14) Source(5, 2) + SourceIndex(0) --- ->>>})(); +>>>}()); 1 > 2 >^ 3 > diff --git a/tests/baselines/reference/project/sourceRootRelativePathSubfolderSpecifyOutputFile/amd/bin/test.js b/tests/baselines/reference/project/sourceRootRelativePathSubfolderSpecifyOutputFile/amd/bin/test.js index c82993389bf..a4566036746 100644 --- a/tests/baselines/reference/project/sourceRootRelativePathSubfolderSpecifyOutputFile/amd/bin/test.js +++ b/tests/baselines/reference/project/sourceRootRelativePathSubfolderSpecifyOutputFile/amd/bin/test.js @@ -3,7 +3,7 @@ var m1_c1 = (function () { function m1_c1() { } return m1_c1; -})(); +}()); var m1_instance1 = new m1_c1(); function m1_f1() { return m1_instance1; @@ -14,7 +14,7 @@ var c1 = (function () { function c1() { } return c1; -})(); +}()); var instance1 = new c1(); function f1() { return instance1; diff --git a/tests/baselines/reference/project/sourceRootRelativePathSubfolderSpecifyOutputFile/amd/sourceRootRelativePathSubfolderSpecifyOutputFile.sourcemap.txt b/tests/baselines/reference/project/sourceRootRelativePathSubfolderSpecifyOutputFile/amd/sourceRootRelativePathSubfolderSpecifyOutputFile.sourcemap.txt index e66acb3fe68..3ef8bd4d658 100644 --- a/tests/baselines/reference/project/sourceRootRelativePathSubfolderSpecifyOutputFile/amd/sourceRootRelativePathSubfolderSpecifyOutputFile.sourcemap.txt +++ b/tests/baselines/reference/project/sourceRootRelativePathSubfolderSpecifyOutputFile/amd/sourceRootRelativePathSubfolderSpecifyOutputFile.sourcemap.txt @@ -61,7 +61,7 @@ sourceFile:ref/m1.ts 1->Emitted(5, 5) Source(4, 1) + SourceIndex(0) 2 >Emitted(5, 17) Source(4, 2) + SourceIndex(0) --- ->>>})(); +>>>}()); 1 > 2 >^ 3 > @@ -207,7 +207,7 @@ sourceFile:test.ts 1->Emitted(16, 5) Source(5, 1) + SourceIndex(1) 2 >Emitted(16, 14) Source(5, 2) + SourceIndex(1) --- ->>>})(); +>>>}()); 1 > 2 >^ 3 > diff --git a/tests/baselines/reference/project/sourceRootRelativePathSubfolderSpecifyOutputFile/node/bin/test.js b/tests/baselines/reference/project/sourceRootRelativePathSubfolderSpecifyOutputFile/node/bin/test.js index c82993389bf..a4566036746 100644 --- a/tests/baselines/reference/project/sourceRootRelativePathSubfolderSpecifyOutputFile/node/bin/test.js +++ b/tests/baselines/reference/project/sourceRootRelativePathSubfolderSpecifyOutputFile/node/bin/test.js @@ -3,7 +3,7 @@ var m1_c1 = (function () { function m1_c1() { } return m1_c1; -})(); +}()); var m1_instance1 = new m1_c1(); function m1_f1() { return m1_instance1; @@ -14,7 +14,7 @@ var c1 = (function () { function c1() { } return c1; -})(); +}()); var instance1 = new c1(); function f1() { return instance1; diff --git a/tests/baselines/reference/project/sourceRootRelativePathSubfolderSpecifyOutputFile/node/sourceRootRelativePathSubfolderSpecifyOutputFile.sourcemap.txt b/tests/baselines/reference/project/sourceRootRelativePathSubfolderSpecifyOutputFile/node/sourceRootRelativePathSubfolderSpecifyOutputFile.sourcemap.txt index e66acb3fe68..3ef8bd4d658 100644 --- a/tests/baselines/reference/project/sourceRootRelativePathSubfolderSpecifyOutputFile/node/sourceRootRelativePathSubfolderSpecifyOutputFile.sourcemap.txt +++ b/tests/baselines/reference/project/sourceRootRelativePathSubfolderSpecifyOutputFile/node/sourceRootRelativePathSubfolderSpecifyOutputFile.sourcemap.txt @@ -61,7 +61,7 @@ sourceFile:ref/m1.ts 1->Emitted(5, 5) Source(4, 1) + SourceIndex(0) 2 >Emitted(5, 17) Source(4, 2) + SourceIndex(0) --- ->>>})(); +>>>}()); 1 > 2 >^ 3 > @@ -207,7 +207,7 @@ sourceFile:test.ts 1->Emitted(16, 5) Source(5, 1) + SourceIndex(1) 2 >Emitted(16, 14) Source(5, 2) + SourceIndex(1) --- ->>>})(); +>>>}()); 1 > 2 >^ 3 > diff --git a/tests/baselines/reference/project/sourcemapMixedSubfolderNoOutdir/amd/ref/m1.js b/tests/baselines/reference/project/sourcemapMixedSubfolderNoOutdir/amd/ref/m1.js index f6b169662c9..b7283f7fd88 100644 --- a/tests/baselines/reference/project/sourcemapMixedSubfolderNoOutdir/amd/ref/m1.js +++ b/tests/baselines/reference/project/sourcemapMixedSubfolderNoOutdir/amd/ref/m1.js @@ -3,7 +3,7 @@ var m1_c1 = (function () { function m1_c1() { } return m1_c1; -})(); +}()); var m1_instance1 = new m1_c1(); function m1_f1() { return m1_instance1; diff --git a/tests/baselines/reference/project/sourcemapMixedSubfolderNoOutdir/amd/sourcemapMixedSubfolderNoOutdir.sourcemap.txt b/tests/baselines/reference/project/sourcemapMixedSubfolderNoOutdir/amd/sourcemapMixedSubfolderNoOutdir.sourcemap.txt index bc878affc7d..cffb2cc9397 100644 --- a/tests/baselines/reference/project/sourcemapMixedSubfolderNoOutdir/amd/sourcemapMixedSubfolderNoOutdir.sourcemap.txt +++ b/tests/baselines/reference/project/sourcemapMixedSubfolderNoOutdir/amd/sourcemapMixedSubfolderNoOutdir.sourcemap.txt @@ -61,7 +61,7 @@ sourceFile:m1.ts 1->Emitted(5, 5) Source(4, 1) + SourceIndex(0) 2 >Emitted(5, 17) Source(4, 2) + SourceIndex(0) --- ->>>})(); +>>>}()); 1 > 2 >^ 3 > @@ -203,7 +203,7 @@ sourceFile:m2.ts 1->Emitted(7, 9) Source(4, 1) + SourceIndex(0) 2 >Emitted(7, 21) Source(4, 2) + SourceIndex(0) --- ->>> })(); +>>> }()); 1 >^^^^ 2 > ^ 3 > @@ -396,7 +396,7 @@ sourceFile:test.ts 1->Emitted(7, 5) Source(6, 1) + SourceIndex(0) 2 >Emitted(7, 14) Source(6, 2) + SourceIndex(0) --- ->>>})(); +>>>}()); 1 > 2 >^ 3 > diff --git a/tests/baselines/reference/project/sourcemapMixedSubfolderNoOutdir/node/ref/m1.js b/tests/baselines/reference/project/sourcemapMixedSubfolderNoOutdir/node/ref/m1.js index f6b169662c9..b7283f7fd88 100644 --- a/tests/baselines/reference/project/sourcemapMixedSubfolderNoOutdir/node/ref/m1.js +++ b/tests/baselines/reference/project/sourcemapMixedSubfolderNoOutdir/node/ref/m1.js @@ -3,7 +3,7 @@ var m1_c1 = (function () { function m1_c1() { } return m1_c1; -})(); +}()); var m1_instance1 = new m1_c1(); function m1_f1() { return m1_instance1; diff --git a/tests/baselines/reference/project/sourcemapMixedSubfolderNoOutdir/node/sourcemapMixedSubfolderNoOutdir.sourcemap.txt b/tests/baselines/reference/project/sourcemapMixedSubfolderNoOutdir/node/sourcemapMixedSubfolderNoOutdir.sourcemap.txt index f383541378f..d13bb52d152 100644 --- a/tests/baselines/reference/project/sourcemapMixedSubfolderNoOutdir/node/sourcemapMixedSubfolderNoOutdir.sourcemap.txt +++ b/tests/baselines/reference/project/sourcemapMixedSubfolderNoOutdir/node/sourcemapMixedSubfolderNoOutdir.sourcemap.txt @@ -61,7 +61,7 @@ sourceFile:m1.ts 1->Emitted(5, 5) Source(4, 1) + SourceIndex(0) 2 >Emitted(5, 17) Source(4, 2) + SourceIndex(0) --- ->>>})(); +>>>}()); 1 > 2 >^ 3 > @@ -202,7 +202,7 @@ sourceFile:m2.ts 1->Emitted(6, 5) Source(4, 1) + SourceIndex(0) 2 >Emitted(6, 17) Source(4, 2) + SourceIndex(0) --- ->>>})(); +>>>}()); 1 > 2 >^ 3 > @@ -395,7 +395,7 @@ sourceFile:test.ts 1->Emitted(7, 5) Source(6, 1) + SourceIndex(0) 2 >Emitted(7, 14) Source(6, 2) + SourceIndex(0) --- ->>>})(); +>>>}()); 1 > 2 >^ 3 > diff --git a/tests/baselines/reference/project/sourcemapMixedSubfolderSpecifyOutputDirectory/amd/outdir/simple/ref/m1.js b/tests/baselines/reference/project/sourcemapMixedSubfolderSpecifyOutputDirectory/amd/outdir/simple/ref/m1.js index f6b169662c9..b7283f7fd88 100644 --- a/tests/baselines/reference/project/sourcemapMixedSubfolderSpecifyOutputDirectory/amd/outdir/simple/ref/m1.js +++ b/tests/baselines/reference/project/sourcemapMixedSubfolderSpecifyOutputDirectory/amd/outdir/simple/ref/m1.js @@ -3,7 +3,7 @@ var m1_c1 = (function () { function m1_c1() { } return m1_c1; -})(); +}()); var m1_instance1 = new m1_c1(); function m1_f1() { return m1_instance1; diff --git a/tests/baselines/reference/project/sourcemapMixedSubfolderSpecifyOutputDirectory/amd/sourcemapMixedSubfolderSpecifyOutputDirectory.sourcemap.txt b/tests/baselines/reference/project/sourcemapMixedSubfolderSpecifyOutputDirectory/amd/sourcemapMixedSubfolderSpecifyOutputDirectory.sourcemap.txt index 534a9499a68..787127afb9c 100644 --- a/tests/baselines/reference/project/sourcemapMixedSubfolderSpecifyOutputDirectory/amd/sourcemapMixedSubfolderSpecifyOutputDirectory.sourcemap.txt +++ b/tests/baselines/reference/project/sourcemapMixedSubfolderSpecifyOutputDirectory/amd/sourcemapMixedSubfolderSpecifyOutputDirectory.sourcemap.txt @@ -61,7 +61,7 @@ sourceFile:../../../ref/m1.ts 1->Emitted(5, 5) Source(4, 1) + SourceIndex(0) 2 >Emitted(5, 17) Source(4, 2) + SourceIndex(0) --- ->>>})(); +>>>}()); 1 > 2 >^ 3 > @@ -203,7 +203,7 @@ sourceFile:../../../ref/m2.ts 1->Emitted(7, 9) Source(4, 1) + SourceIndex(0) 2 >Emitted(7, 21) Source(4, 2) + SourceIndex(0) --- ->>> })(); +>>> }()); 1 >^^^^ 2 > ^ 3 > @@ -396,7 +396,7 @@ sourceFile:../../test.ts 1->Emitted(7, 5) Source(6, 1) + SourceIndex(0) 2 >Emitted(7, 14) Source(6, 2) + SourceIndex(0) --- ->>>})(); +>>>}()); 1 > 2 >^ 3 > diff --git a/tests/baselines/reference/project/sourcemapMixedSubfolderSpecifyOutputDirectory/node/outdir/simple/ref/m1.js b/tests/baselines/reference/project/sourcemapMixedSubfolderSpecifyOutputDirectory/node/outdir/simple/ref/m1.js index f6b169662c9..b7283f7fd88 100644 --- a/tests/baselines/reference/project/sourcemapMixedSubfolderSpecifyOutputDirectory/node/outdir/simple/ref/m1.js +++ b/tests/baselines/reference/project/sourcemapMixedSubfolderSpecifyOutputDirectory/node/outdir/simple/ref/m1.js @@ -3,7 +3,7 @@ var m1_c1 = (function () { function m1_c1() { } return m1_c1; -})(); +}()); var m1_instance1 = new m1_c1(); function m1_f1() { return m1_instance1; diff --git a/tests/baselines/reference/project/sourcemapMixedSubfolderSpecifyOutputDirectory/node/sourcemapMixedSubfolderSpecifyOutputDirectory.sourcemap.txt b/tests/baselines/reference/project/sourcemapMixedSubfolderSpecifyOutputDirectory/node/sourcemapMixedSubfolderSpecifyOutputDirectory.sourcemap.txt index 56f5ff25cc3..f4599748e77 100644 --- a/tests/baselines/reference/project/sourcemapMixedSubfolderSpecifyOutputDirectory/node/sourcemapMixedSubfolderSpecifyOutputDirectory.sourcemap.txt +++ b/tests/baselines/reference/project/sourcemapMixedSubfolderSpecifyOutputDirectory/node/sourcemapMixedSubfolderSpecifyOutputDirectory.sourcemap.txt @@ -61,7 +61,7 @@ sourceFile:../../../ref/m1.ts 1->Emitted(5, 5) Source(4, 1) + SourceIndex(0) 2 >Emitted(5, 17) Source(4, 2) + SourceIndex(0) --- ->>>})(); +>>>}()); 1 > 2 >^ 3 > @@ -202,7 +202,7 @@ sourceFile:../../../ref/m2.ts 1->Emitted(6, 5) Source(4, 1) + SourceIndex(0) 2 >Emitted(6, 17) Source(4, 2) + SourceIndex(0) --- ->>>})(); +>>>}()); 1 > 2 >^ 3 > @@ -395,7 +395,7 @@ sourceFile:../../test.ts 1->Emitted(7, 5) Source(6, 1) + SourceIndex(0) 2 >Emitted(7, 14) Source(6, 2) + SourceIndex(0) --- ->>>})(); +>>>}()); 1 > 2 >^ 3 > diff --git a/tests/baselines/reference/project/sourcemapMixedSubfolderSpecifyOutputFile/amd/bin/test.js b/tests/baselines/reference/project/sourcemapMixedSubfolderSpecifyOutputFile/amd/bin/test.js index a480aa83e80..25cfe0fccb5 100644 --- a/tests/baselines/reference/project/sourcemapMixedSubfolderSpecifyOutputFile/amd/bin/test.js +++ b/tests/baselines/reference/project/sourcemapMixedSubfolderSpecifyOutputFile/amd/bin/test.js @@ -3,7 +3,7 @@ var m1_c1 = (function () { function m1_c1() { } return m1_c1; -})(); +}()); var m1_instance1 = new m1_c1(); function m1_f1() { return m1_instance1; @@ -15,7 +15,7 @@ define("ref/m2", ["require", "exports"], function (require, exports) { function m2_c1() { } return m2_c1; - })(); + }()); exports.m2_c1 = m2_c1; exports.m2_instance1 = new m2_c1(); function m2_f1() { @@ -30,7 +30,7 @@ var c1 = (function () { function c1() { } return c1; -})(); +}()); var instance1 = new c1(); function f1() { return instance1; diff --git a/tests/baselines/reference/project/sourcemapMixedSubfolderSpecifyOutputFile/amd/sourcemapMixedSubfolderSpecifyOutputFile.sourcemap.txt b/tests/baselines/reference/project/sourcemapMixedSubfolderSpecifyOutputFile/amd/sourcemapMixedSubfolderSpecifyOutputFile.sourcemap.txt index fbb97b14e90..c8992c0f939 100644 --- a/tests/baselines/reference/project/sourcemapMixedSubfolderSpecifyOutputFile/amd/sourcemapMixedSubfolderSpecifyOutputFile.sourcemap.txt +++ b/tests/baselines/reference/project/sourcemapMixedSubfolderSpecifyOutputFile/amd/sourcemapMixedSubfolderSpecifyOutputFile.sourcemap.txt @@ -61,7 +61,7 @@ sourceFile:../ref/m1.ts 1->Emitted(5, 5) Source(4, 1) + SourceIndex(0) 2 >Emitted(5, 17) Source(4, 2) + SourceIndex(0) --- ->>>})(); +>>>}()); 1 > 2 >^ 3 > @@ -197,7 +197,7 @@ sourceFile:../ref/m2.ts 1->Emitted(17, 9) Source(4, 1) + SourceIndex(1) 2 >Emitted(17, 21) Source(4, 2) + SourceIndex(1) --- ->>> })(); +>>> }()); 1 >^^^^ 2 > ^ 3 > @@ -384,7 +384,7 @@ sourceFile:../test.ts 1->Emitted(32, 5) Source(6, 1) + SourceIndex(2) 2 >Emitted(32, 14) Source(6, 2) + SourceIndex(2) --- ->>>})(); +>>>}()); 1 > 2 >^ 3 > diff --git a/tests/baselines/reference/project/sourcemapMixedSubfolderSpecifyOutputFile/node/bin/test.js b/tests/baselines/reference/project/sourcemapMixedSubfolderSpecifyOutputFile/node/bin/test.js index 5af28cf8560..5d63d624329 100644 --- a/tests/baselines/reference/project/sourcemapMixedSubfolderSpecifyOutputFile/node/bin/test.js +++ b/tests/baselines/reference/project/sourcemapMixedSubfolderSpecifyOutputFile/node/bin/test.js @@ -3,7 +3,7 @@ var m1_c1 = (function () { function m1_c1() { } return m1_c1; -})(); +}()); var m1_instance1 = new m1_c1(); function m1_f1() { return m1_instance1; @@ -15,7 +15,7 @@ var c1 = (function () { function c1() { } return c1; -})(); +}()); var instance1 = new c1(); function f1() { return instance1; diff --git a/tests/baselines/reference/project/sourcemapMixedSubfolderSpecifyOutputFile/node/sourcemapMixedSubfolderSpecifyOutputFile.sourcemap.txt b/tests/baselines/reference/project/sourcemapMixedSubfolderSpecifyOutputFile/node/sourcemapMixedSubfolderSpecifyOutputFile.sourcemap.txt index 08c87a22d23..3cdd70b7404 100644 --- a/tests/baselines/reference/project/sourcemapMixedSubfolderSpecifyOutputFile/node/sourcemapMixedSubfolderSpecifyOutputFile.sourcemap.txt +++ b/tests/baselines/reference/project/sourcemapMixedSubfolderSpecifyOutputFile/node/sourcemapMixedSubfolderSpecifyOutputFile.sourcemap.txt @@ -61,7 +61,7 @@ sourceFile:../ref/m1.ts 1->Emitted(5, 5) Source(4, 1) + SourceIndex(0) 2 >Emitted(5, 17) Source(4, 2) + SourceIndex(0) --- ->>>})(); +>>>}()); 1 > 2 >^ 3 > @@ -217,7 +217,7 @@ sourceFile:../test.ts 1->Emitted(17, 5) Source(6, 1) + SourceIndex(2) 2 >Emitted(17, 14) Source(6, 2) + SourceIndex(2) --- ->>>})(); +>>>}()); 1 > 2 >^ 3 > diff --git a/tests/baselines/reference/project/sourcemapMixedSubfolderSpecifyOutputFileAndOutputDirectory/amd/bin/outAndOutDirFile.js b/tests/baselines/reference/project/sourcemapMixedSubfolderSpecifyOutputFileAndOutputDirectory/amd/bin/outAndOutDirFile.js index 1ebe03468c7..de21b030c35 100644 --- a/tests/baselines/reference/project/sourcemapMixedSubfolderSpecifyOutputFileAndOutputDirectory/amd/bin/outAndOutDirFile.js +++ b/tests/baselines/reference/project/sourcemapMixedSubfolderSpecifyOutputFileAndOutputDirectory/amd/bin/outAndOutDirFile.js @@ -3,7 +3,7 @@ var m1_c1 = (function () { function m1_c1() { } return m1_c1; -})(); +}()); var m1_instance1 = new m1_c1(); function m1_f1() { return m1_instance1; @@ -15,7 +15,7 @@ define("ref/m2", ["require", "exports"], function (require, exports) { function m2_c1() { } return m2_c1; - })(); + }()); exports.m2_c1 = m2_c1; exports.m2_instance1 = new m2_c1(); function m2_f1() { @@ -30,7 +30,7 @@ var c1 = (function () { function c1() { } return c1; -})(); +}()); var instance1 = new c1(); function f1() { return instance1; diff --git a/tests/baselines/reference/project/sourcemapMixedSubfolderSpecifyOutputFileAndOutputDirectory/amd/sourcemapMixedSubfolderSpecifyOutputFileAndOutputDirectory.sourcemap.txt b/tests/baselines/reference/project/sourcemapMixedSubfolderSpecifyOutputFileAndOutputDirectory/amd/sourcemapMixedSubfolderSpecifyOutputFileAndOutputDirectory.sourcemap.txt index 6e2448fdb3e..986e49e04c5 100644 --- a/tests/baselines/reference/project/sourcemapMixedSubfolderSpecifyOutputFileAndOutputDirectory/amd/sourcemapMixedSubfolderSpecifyOutputFileAndOutputDirectory.sourcemap.txt +++ b/tests/baselines/reference/project/sourcemapMixedSubfolderSpecifyOutputFileAndOutputDirectory/amd/sourcemapMixedSubfolderSpecifyOutputFileAndOutputDirectory.sourcemap.txt @@ -61,7 +61,7 @@ sourceFile:../ref/m1.ts 1->Emitted(5, 5) Source(4, 1) + SourceIndex(0) 2 >Emitted(5, 17) Source(4, 2) + SourceIndex(0) --- ->>>})(); +>>>}()); 1 > 2 >^ 3 > @@ -197,7 +197,7 @@ sourceFile:../ref/m2.ts 1->Emitted(17, 9) Source(4, 1) + SourceIndex(1) 2 >Emitted(17, 21) Source(4, 2) + SourceIndex(1) --- ->>> })(); +>>> }()); 1 >^^^^ 2 > ^ 3 > @@ -384,7 +384,7 @@ sourceFile:../test.ts 1->Emitted(32, 5) Source(6, 1) + SourceIndex(2) 2 >Emitted(32, 14) Source(6, 2) + SourceIndex(2) --- ->>>})(); +>>>}()); 1 > 2 >^ 3 > diff --git a/tests/baselines/reference/project/sourcemapMixedSubfolderSpecifyOutputFileAndOutputDirectory/node/bin/outAndOutDirFile.js b/tests/baselines/reference/project/sourcemapMixedSubfolderSpecifyOutputFileAndOutputDirectory/node/bin/outAndOutDirFile.js index 1750a5975ae..da6a2015143 100644 --- a/tests/baselines/reference/project/sourcemapMixedSubfolderSpecifyOutputFileAndOutputDirectory/node/bin/outAndOutDirFile.js +++ b/tests/baselines/reference/project/sourcemapMixedSubfolderSpecifyOutputFileAndOutputDirectory/node/bin/outAndOutDirFile.js @@ -3,7 +3,7 @@ var m1_c1 = (function () { function m1_c1() { } return m1_c1; -})(); +}()); var m1_instance1 = new m1_c1(); function m1_f1() { return m1_instance1; @@ -15,7 +15,7 @@ var c1 = (function () { function c1() { } return c1; -})(); +}()); var instance1 = new c1(); function f1() { return instance1; diff --git a/tests/baselines/reference/project/sourcemapMixedSubfolderSpecifyOutputFileAndOutputDirectory/node/sourcemapMixedSubfolderSpecifyOutputFileAndOutputDirectory.sourcemap.txt b/tests/baselines/reference/project/sourcemapMixedSubfolderSpecifyOutputFileAndOutputDirectory/node/sourcemapMixedSubfolderSpecifyOutputFileAndOutputDirectory.sourcemap.txt index 67bff385434..76d937730eb 100644 --- a/tests/baselines/reference/project/sourcemapMixedSubfolderSpecifyOutputFileAndOutputDirectory/node/sourcemapMixedSubfolderSpecifyOutputFileAndOutputDirectory.sourcemap.txt +++ b/tests/baselines/reference/project/sourcemapMixedSubfolderSpecifyOutputFileAndOutputDirectory/node/sourcemapMixedSubfolderSpecifyOutputFileAndOutputDirectory.sourcemap.txt @@ -61,7 +61,7 @@ sourceFile:../ref/m1.ts 1->Emitted(5, 5) Source(4, 1) + SourceIndex(0) 2 >Emitted(5, 17) Source(4, 2) + SourceIndex(0) --- ->>>})(); +>>>}()); 1 > 2 >^ 3 > @@ -217,7 +217,7 @@ sourceFile:../test.ts 1->Emitted(17, 5) Source(6, 1) + SourceIndex(2) 2 >Emitted(17, 14) Source(6, 2) + SourceIndex(2) --- ->>>})(); +>>>}()); 1 > 2 >^ 3 > diff --git a/tests/baselines/reference/project/sourcemapModuleMultifolderNoOutdir/amd/ref/m1.js b/tests/baselines/reference/project/sourcemapModuleMultifolderNoOutdir/amd/ref/m1.js index 25001d63d84..bb59c6fbd90 100644 --- a/tests/baselines/reference/project/sourcemapModuleMultifolderNoOutdir/amd/ref/m1.js +++ b/tests/baselines/reference/project/sourcemapModuleMultifolderNoOutdir/amd/ref/m1.js @@ -5,7 +5,7 @@ define(["require", "exports"], function (require, exports) { function m1_c1() { } return m1_c1; - })(); + }()); exports.m1_c1 = m1_c1; exports.m1_instance1 = new m1_c1(); function m1_f1() { diff --git a/tests/baselines/reference/project/sourcemapModuleMultifolderNoOutdir/amd/sourcemapModuleMultifolderNoOutdir.sourcemap.txt b/tests/baselines/reference/project/sourcemapModuleMultifolderNoOutdir/amd/sourcemapModuleMultifolderNoOutdir.sourcemap.txt index 1939a9428a6..9547f1b0342 100644 --- a/tests/baselines/reference/project/sourcemapModuleMultifolderNoOutdir/amd/sourcemapModuleMultifolderNoOutdir.sourcemap.txt +++ b/tests/baselines/reference/project/sourcemapModuleMultifolderNoOutdir/amd/sourcemapModuleMultifolderNoOutdir.sourcemap.txt @@ -60,7 +60,7 @@ sourceFile:m1.ts 1->Emitted(7, 9) Source(4, 1) + SourceIndex(0) 2 >Emitted(7, 21) Source(4, 2) + SourceIndex(0) --- ->>> })(); +>>> }()); 1 >^^^^ 2 > ^ 3 > @@ -233,7 +233,7 @@ sourceFile:m2.ts 1->Emitted(7, 9) Source(4, 1) + SourceIndex(0) 2 >Emitted(7, 21) Source(4, 2) + SourceIndex(0) --- ->>> })(); +>>> }()); 1 >^^^^ 2 > ^ 3 > @@ -408,7 +408,7 @@ sourceFile:test.ts 1->Emitted(7, 9) Source(6, 1) + SourceIndex(0) 2 >Emitted(7, 18) Source(6, 2) + SourceIndex(0) --- ->>> })(); +>>> }()); 1 >^^^^ 2 > ^ 3 > diff --git a/tests/baselines/reference/project/sourcemapModuleMultifolderNoOutdir/node/ref/m1.js b/tests/baselines/reference/project/sourcemapModuleMultifolderNoOutdir/node/ref/m1.js index 3bc07083900..121a089af23 100644 --- a/tests/baselines/reference/project/sourcemapModuleMultifolderNoOutdir/node/ref/m1.js +++ b/tests/baselines/reference/project/sourcemapModuleMultifolderNoOutdir/node/ref/m1.js @@ -4,7 +4,7 @@ var m1_c1 = (function () { function m1_c1() { } return m1_c1; -})(); +}()); exports.m1_c1 = m1_c1; exports.m1_instance1 = new m1_c1(); function m1_f1() { diff --git a/tests/baselines/reference/project/sourcemapModuleMultifolderNoOutdir/node/sourcemapModuleMultifolderNoOutdir.sourcemap.txt b/tests/baselines/reference/project/sourcemapModuleMultifolderNoOutdir/node/sourcemapModuleMultifolderNoOutdir.sourcemap.txt index fe3c83ed283..943ec822c5b 100644 --- a/tests/baselines/reference/project/sourcemapModuleMultifolderNoOutdir/node/sourcemapModuleMultifolderNoOutdir.sourcemap.txt +++ b/tests/baselines/reference/project/sourcemapModuleMultifolderNoOutdir/node/sourcemapModuleMultifolderNoOutdir.sourcemap.txt @@ -59,7 +59,7 @@ sourceFile:m1.ts 1->Emitted(6, 5) Source(4, 1) + SourceIndex(0) 2 >Emitted(6, 17) Source(4, 2) + SourceIndex(0) --- ->>>})(); +>>>}()); 1 > 2 >^ 3 > @@ -231,7 +231,7 @@ sourceFile:m2.ts 1->Emitted(6, 5) Source(4, 1) + SourceIndex(0) 2 >Emitted(6, 17) Source(4, 2) + SourceIndex(0) --- ->>>})(); +>>>}()); 1 > 2 >^ 3 > @@ -452,7 +452,7 @@ sourceFile:test.ts 1->Emitted(8, 5) Source(6, 1) + SourceIndex(0) 2 >Emitted(8, 14) Source(6, 2) + SourceIndex(0) --- ->>>})(); +>>>}()); 1 > 2 >^ 3 > diff --git a/tests/baselines/reference/project/sourcemapModuleMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_module_multifolder/ref/m1.js b/tests/baselines/reference/project/sourcemapModuleMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_module_multifolder/ref/m1.js index 25001d63d84..bb59c6fbd90 100644 --- a/tests/baselines/reference/project/sourcemapModuleMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_module_multifolder/ref/m1.js +++ b/tests/baselines/reference/project/sourcemapModuleMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_module_multifolder/ref/m1.js @@ -5,7 +5,7 @@ define(["require", "exports"], function (require, exports) { function m1_c1() { } return m1_c1; - })(); + }()); exports.m1_c1 = m1_c1; exports.m1_instance1 = new m1_c1(); function m1_f1() { diff --git a/tests/baselines/reference/project/sourcemapModuleMultifolderSpecifyOutputDirectory/amd/sourcemapModuleMultifolderSpecifyOutputDirectory.sourcemap.txt b/tests/baselines/reference/project/sourcemapModuleMultifolderSpecifyOutputDirectory/amd/sourcemapModuleMultifolderSpecifyOutputDirectory.sourcemap.txt index fac0536ad7d..36d7531c895 100644 --- a/tests/baselines/reference/project/sourcemapModuleMultifolderSpecifyOutputDirectory/amd/sourcemapModuleMultifolderSpecifyOutputDirectory.sourcemap.txt +++ b/tests/baselines/reference/project/sourcemapModuleMultifolderSpecifyOutputDirectory/amd/sourcemapModuleMultifolderSpecifyOutputDirectory.sourcemap.txt @@ -60,7 +60,7 @@ sourceFile:../../../../ref/m1.ts 1->Emitted(7, 9) Source(4, 1) + SourceIndex(0) 2 >Emitted(7, 21) Source(4, 2) + SourceIndex(0) --- ->>> })(); +>>> }()); 1 >^^^^ 2 > ^ 3 > @@ -233,7 +233,7 @@ sourceFile:../../../../outputdir_module_multifolder_ref/m2.ts 1->Emitted(7, 9) Source(4, 1) + SourceIndex(0) 2 >Emitted(7, 21) Source(4, 2) + SourceIndex(0) --- ->>> })(); +>>> }()); 1 >^^^^ 2 > ^ 3 > @@ -408,7 +408,7 @@ sourceFile:../../../test.ts 1->Emitted(7, 9) Source(6, 1) + SourceIndex(0) 2 >Emitted(7, 18) Source(6, 2) + SourceIndex(0) --- ->>> })(); +>>> }()); 1 >^^^^ 2 > ^ 3 > diff --git a/tests/baselines/reference/project/sourcemapModuleMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_module_multifolder/ref/m1.js b/tests/baselines/reference/project/sourcemapModuleMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_module_multifolder/ref/m1.js index 3bc07083900..121a089af23 100644 --- a/tests/baselines/reference/project/sourcemapModuleMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_module_multifolder/ref/m1.js +++ b/tests/baselines/reference/project/sourcemapModuleMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_module_multifolder/ref/m1.js @@ -4,7 +4,7 @@ var m1_c1 = (function () { function m1_c1() { } return m1_c1; -})(); +}()); exports.m1_c1 = m1_c1; exports.m1_instance1 = new m1_c1(); function m1_f1() { diff --git a/tests/baselines/reference/project/sourcemapModuleMultifolderSpecifyOutputDirectory/node/sourcemapModuleMultifolderSpecifyOutputDirectory.sourcemap.txt b/tests/baselines/reference/project/sourcemapModuleMultifolderSpecifyOutputDirectory/node/sourcemapModuleMultifolderSpecifyOutputDirectory.sourcemap.txt index dcb25b43394..6e680ecfa65 100644 --- a/tests/baselines/reference/project/sourcemapModuleMultifolderSpecifyOutputDirectory/node/sourcemapModuleMultifolderSpecifyOutputDirectory.sourcemap.txt +++ b/tests/baselines/reference/project/sourcemapModuleMultifolderSpecifyOutputDirectory/node/sourcemapModuleMultifolderSpecifyOutputDirectory.sourcemap.txt @@ -59,7 +59,7 @@ sourceFile:../../../../ref/m1.ts 1->Emitted(6, 5) Source(4, 1) + SourceIndex(0) 2 >Emitted(6, 17) Source(4, 2) + SourceIndex(0) --- ->>>})(); +>>>}()); 1 > 2 >^ 3 > @@ -231,7 +231,7 @@ sourceFile:../../../../outputdir_module_multifolder_ref/m2.ts 1->Emitted(6, 5) Source(4, 1) + SourceIndex(0) 2 >Emitted(6, 17) Source(4, 2) + SourceIndex(0) --- ->>>})(); +>>>}()); 1 > 2 >^ 3 > @@ -452,7 +452,7 @@ sourceFile:../../../test.ts 1->Emitted(8, 5) Source(6, 1) + SourceIndex(0) 2 >Emitted(8, 14) Source(6, 2) + SourceIndex(0) --- ->>>})(); +>>>}()); 1 > 2 >^ 3 > diff --git a/tests/baselines/reference/project/sourcemapModuleMultifolderSpecifyOutputFile/amd/bin/test.js b/tests/baselines/reference/project/sourcemapModuleMultifolderSpecifyOutputFile/amd/bin/test.js index 5db4d6336f1..37064fb583b 100644 --- a/tests/baselines/reference/project/sourcemapModuleMultifolderSpecifyOutputFile/amd/bin/test.js +++ b/tests/baselines/reference/project/sourcemapModuleMultifolderSpecifyOutputFile/amd/bin/test.js @@ -5,7 +5,7 @@ define("outputdir_module_multifolder/ref/m1", ["require", "exports"], function ( function m1_c1() { } return m1_c1; - })(); + }()); exports.m1_c1 = m1_c1; exports.m1_instance1 = new m1_c1(); function m1_f1() { @@ -20,7 +20,7 @@ define("outputdir_module_multifolder_ref/m2", ["require", "exports"], function ( function m2_c1() { } return m2_c1; - })(); + }()); exports.m2_c1 = m2_c1; exports.m2_instance1 = new m2_c1(); function m2_f1() { @@ -35,7 +35,7 @@ define("outputdir_module_multifolder/test", ["require", "exports", "outputdir_mo function c1() { } return c1; - })(); + }()); exports.c1 = c1; exports.instance1 = new c1(); function f1() { diff --git a/tests/baselines/reference/project/sourcemapModuleMultifolderSpecifyOutputFile/amd/sourcemapModuleMultifolderSpecifyOutputFile.sourcemap.txt b/tests/baselines/reference/project/sourcemapModuleMultifolderSpecifyOutputFile/amd/sourcemapModuleMultifolderSpecifyOutputFile.sourcemap.txt index 6a48a2b7d8d..5b31e410aaf 100644 --- a/tests/baselines/reference/project/sourcemapModuleMultifolderSpecifyOutputFile/amd/sourcemapModuleMultifolderSpecifyOutputFile.sourcemap.txt +++ b/tests/baselines/reference/project/sourcemapModuleMultifolderSpecifyOutputFile/amd/sourcemapModuleMultifolderSpecifyOutputFile.sourcemap.txt @@ -60,7 +60,7 @@ sourceFile:../ref/m1.ts 1->Emitted(7, 9) Source(4, 1) + SourceIndex(0) 2 >Emitted(7, 21) Source(4, 2) + SourceIndex(0) --- ->>> })(); +>>> }()); 1 >^^^^ 2 > ^ 3 > @@ -227,7 +227,7 @@ sourceFile:../../outputdir_module_multifolder_ref/m2.ts 1->Emitted(22, 9) Source(4, 1) + SourceIndex(1) 2 >Emitted(22, 21) Source(4, 2) + SourceIndex(1) --- ->>> })(); +>>> }()); 1 >^^^^ 2 > ^ 3 > @@ -396,7 +396,7 @@ sourceFile:../test.ts 1->Emitted(37, 9) Source(6, 1) + SourceIndex(2) 2 >Emitted(37, 18) Source(6, 2) + SourceIndex(2) --- ->>> })(); +>>> }()); 1 >^^^^ 2 > ^ 3 > diff --git a/tests/baselines/reference/project/sourcemapModuleSimpleNoOutdir/amd/m1.js b/tests/baselines/reference/project/sourcemapModuleSimpleNoOutdir/amd/m1.js index 25001d63d84..bb59c6fbd90 100644 --- a/tests/baselines/reference/project/sourcemapModuleSimpleNoOutdir/amd/m1.js +++ b/tests/baselines/reference/project/sourcemapModuleSimpleNoOutdir/amd/m1.js @@ -5,7 +5,7 @@ define(["require", "exports"], function (require, exports) { function m1_c1() { } return m1_c1; - })(); + }()); exports.m1_c1 = m1_c1; exports.m1_instance1 = new m1_c1(); function m1_f1() { diff --git a/tests/baselines/reference/project/sourcemapModuleSimpleNoOutdir/amd/sourcemapModuleSimpleNoOutdir.sourcemap.txt b/tests/baselines/reference/project/sourcemapModuleSimpleNoOutdir/amd/sourcemapModuleSimpleNoOutdir.sourcemap.txt index bba2edd1001..56b251ecb62 100644 --- a/tests/baselines/reference/project/sourcemapModuleSimpleNoOutdir/amd/sourcemapModuleSimpleNoOutdir.sourcemap.txt +++ b/tests/baselines/reference/project/sourcemapModuleSimpleNoOutdir/amd/sourcemapModuleSimpleNoOutdir.sourcemap.txt @@ -60,7 +60,7 @@ sourceFile:m1.ts 1->Emitted(7, 9) Source(4, 1) + SourceIndex(0) 2 >Emitted(7, 21) Source(4, 2) + SourceIndex(0) --- ->>> })(); +>>> }()); 1 >^^^^ 2 > ^ 3 > @@ -234,7 +234,7 @@ sourceFile:test.ts 1->Emitted(7, 9) Source(5, 1) + SourceIndex(0) 2 >Emitted(7, 18) Source(5, 2) + SourceIndex(0) --- ->>> })(); +>>> }()); 1 >^^^^ 2 > ^ 3 > diff --git a/tests/baselines/reference/project/sourcemapModuleSimpleNoOutdir/node/m1.js b/tests/baselines/reference/project/sourcemapModuleSimpleNoOutdir/node/m1.js index 3bc07083900..121a089af23 100644 --- a/tests/baselines/reference/project/sourcemapModuleSimpleNoOutdir/node/m1.js +++ b/tests/baselines/reference/project/sourcemapModuleSimpleNoOutdir/node/m1.js @@ -4,7 +4,7 @@ var m1_c1 = (function () { function m1_c1() { } return m1_c1; -})(); +}()); exports.m1_c1 = m1_c1; exports.m1_instance1 = new m1_c1(); function m1_f1() { diff --git a/tests/baselines/reference/project/sourcemapModuleSimpleNoOutdir/node/sourcemapModuleSimpleNoOutdir.sourcemap.txt b/tests/baselines/reference/project/sourcemapModuleSimpleNoOutdir/node/sourcemapModuleSimpleNoOutdir.sourcemap.txt index e5eb42814b0..412e5a18c8e 100644 --- a/tests/baselines/reference/project/sourcemapModuleSimpleNoOutdir/node/sourcemapModuleSimpleNoOutdir.sourcemap.txt +++ b/tests/baselines/reference/project/sourcemapModuleSimpleNoOutdir/node/sourcemapModuleSimpleNoOutdir.sourcemap.txt @@ -59,7 +59,7 @@ sourceFile:m1.ts 1->Emitted(6, 5) Source(4, 1) + SourceIndex(0) 2 >Emitted(6, 17) Source(4, 2) + SourceIndex(0) --- ->>>})(); +>>>}()); 1 > 2 >^ 3 > @@ -255,7 +255,7 @@ sourceFile:test.ts 1->Emitted(7, 5) Source(5, 1) + SourceIndex(0) 2 >Emitted(7, 14) Source(5, 2) + SourceIndex(0) --- ->>>})(); +>>>}()); 1 > 2 >^ 3 > diff --git a/tests/baselines/reference/project/sourcemapModuleSimpleSpecifyOutputDirectory/amd/outdir/simple/m1.js b/tests/baselines/reference/project/sourcemapModuleSimpleSpecifyOutputDirectory/amd/outdir/simple/m1.js index 25001d63d84..bb59c6fbd90 100644 --- a/tests/baselines/reference/project/sourcemapModuleSimpleSpecifyOutputDirectory/amd/outdir/simple/m1.js +++ b/tests/baselines/reference/project/sourcemapModuleSimpleSpecifyOutputDirectory/amd/outdir/simple/m1.js @@ -5,7 +5,7 @@ define(["require", "exports"], function (require, exports) { function m1_c1() { } return m1_c1; - })(); + }()); exports.m1_c1 = m1_c1; exports.m1_instance1 = new m1_c1(); function m1_f1() { diff --git a/tests/baselines/reference/project/sourcemapModuleSimpleSpecifyOutputDirectory/amd/sourcemapModuleSimpleSpecifyOutputDirectory.sourcemap.txt b/tests/baselines/reference/project/sourcemapModuleSimpleSpecifyOutputDirectory/amd/sourcemapModuleSimpleSpecifyOutputDirectory.sourcemap.txt index ff95cc13340..beebbe16454 100644 --- a/tests/baselines/reference/project/sourcemapModuleSimpleSpecifyOutputDirectory/amd/sourcemapModuleSimpleSpecifyOutputDirectory.sourcemap.txt +++ b/tests/baselines/reference/project/sourcemapModuleSimpleSpecifyOutputDirectory/amd/sourcemapModuleSimpleSpecifyOutputDirectory.sourcemap.txt @@ -60,7 +60,7 @@ sourceFile:../../m1.ts 1->Emitted(7, 9) Source(4, 1) + SourceIndex(0) 2 >Emitted(7, 21) Source(4, 2) + SourceIndex(0) --- ->>> })(); +>>> }()); 1 >^^^^ 2 > ^ 3 > @@ -234,7 +234,7 @@ sourceFile:../../test.ts 1->Emitted(7, 9) Source(5, 1) + SourceIndex(0) 2 >Emitted(7, 18) Source(5, 2) + SourceIndex(0) --- ->>> })(); +>>> }()); 1 >^^^^ 2 > ^ 3 > diff --git a/tests/baselines/reference/project/sourcemapModuleSimpleSpecifyOutputDirectory/node/outdir/simple/m1.js b/tests/baselines/reference/project/sourcemapModuleSimpleSpecifyOutputDirectory/node/outdir/simple/m1.js index 3bc07083900..121a089af23 100644 --- a/tests/baselines/reference/project/sourcemapModuleSimpleSpecifyOutputDirectory/node/outdir/simple/m1.js +++ b/tests/baselines/reference/project/sourcemapModuleSimpleSpecifyOutputDirectory/node/outdir/simple/m1.js @@ -4,7 +4,7 @@ var m1_c1 = (function () { function m1_c1() { } return m1_c1; -})(); +}()); exports.m1_c1 = m1_c1; exports.m1_instance1 = new m1_c1(); function m1_f1() { diff --git a/tests/baselines/reference/project/sourcemapModuleSimpleSpecifyOutputDirectory/node/sourcemapModuleSimpleSpecifyOutputDirectory.sourcemap.txt b/tests/baselines/reference/project/sourcemapModuleSimpleSpecifyOutputDirectory/node/sourcemapModuleSimpleSpecifyOutputDirectory.sourcemap.txt index a98cd950b0f..8afcfe6117a 100644 --- a/tests/baselines/reference/project/sourcemapModuleSimpleSpecifyOutputDirectory/node/sourcemapModuleSimpleSpecifyOutputDirectory.sourcemap.txt +++ b/tests/baselines/reference/project/sourcemapModuleSimpleSpecifyOutputDirectory/node/sourcemapModuleSimpleSpecifyOutputDirectory.sourcemap.txt @@ -59,7 +59,7 @@ sourceFile:../../m1.ts 1->Emitted(6, 5) Source(4, 1) + SourceIndex(0) 2 >Emitted(6, 17) Source(4, 2) + SourceIndex(0) --- ->>>})(); +>>>}()); 1 > 2 >^ 3 > @@ -255,7 +255,7 @@ sourceFile:../../test.ts 1->Emitted(7, 5) Source(5, 1) + SourceIndex(0) 2 >Emitted(7, 14) Source(5, 2) + SourceIndex(0) --- ->>>})(); +>>>}()); 1 > 2 >^ 3 > diff --git a/tests/baselines/reference/project/sourcemapModuleSimpleSpecifyOutputFile/amd/bin/test.js b/tests/baselines/reference/project/sourcemapModuleSimpleSpecifyOutputFile/amd/bin/test.js index cc73ea698fe..d650b20ae5f 100644 --- a/tests/baselines/reference/project/sourcemapModuleSimpleSpecifyOutputFile/amd/bin/test.js +++ b/tests/baselines/reference/project/sourcemapModuleSimpleSpecifyOutputFile/amd/bin/test.js @@ -5,7 +5,7 @@ define("m1", ["require", "exports"], function (require, exports) { function m1_c1() { } return m1_c1; - })(); + }()); exports.m1_c1 = m1_c1; exports.m1_instance1 = new m1_c1(); function m1_f1() { @@ -20,7 +20,7 @@ define("test", ["require", "exports", "m1"], function (require, exports, m1) { function c1() { } return c1; - })(); + }()); exports.c1 = c1; exports.instance1 = new c1(); function f1() { diff --git a/tests/baselines/reference/project/sourcemapModuleSimpleSpecifyOutputFile/amd/sourcemapModuleSimpleSpecifyOutputFile.sourcemap.txt b/tests/baselines/reference/project/sourcemapModuleSimpleSpecifyOutputFile/amd/sourcemapModuleSimpleSpecifyOutputFile.sourcemap.txt index a5c116d00e4..2d14a8364a9 100644 --- a/tests/baselines/reference/project/sourcemapModuleSimpleSpecifyOutputFile/amd/sourcemapModuleSimpleSpecifyOutputFile.sourcemap.txt +++ b/tests/baselines/reference/project/sourcemapModuleSimpleSpecifyOutputFile/amd/sourcemapModuleSimpleSpecifyOutputFile.sourcemap.txt @@ -60,7 +60,7 @@ sourceFile:../m1.ts 1->Emitted(7, 9) Source(4, 1) + SourceIndex(0) 2 >Emitted(7, 21) Source(4, 2) + SourceIndex(0) --- ->>> })(); +>>> }()); 1 >^^^^ 2 > ^ 3 > @@ -228,7 +228,7 @@ sourceFile:../test.ts 1->Emitted(22, 9) Source(5, 1) + SourceIndex(1) 2 >Emitted(22, 18) Source(5, 2) + SourceIndex(1) --- ->>> })(); +>>> }()); 1 >^^^^ 2 > ^ 3 > diff --git a/tests/baselines/reference/project/sourcemapModuleSubfolderNoOutdir/amd/ref/m1.js b/tests/baselines/reference/project/sourcemapModuleSubfolderNoOutdir/amd/ref/m1.js index 25001d63d84..bb59c6fbd90 100644 --- a/tests/baselines/reference/project/sourcemapModuleSubfolderNoOutdir/amd/ref/m1.js +++ b/tests/baselines/reference/project/sourcemapModuleSubfolderNoOutdir/amd/ref/m1.js @@ -5,7 +5,7 @@ define(["require", "exports"], function (require, exports) { function m1_c1() { } return m1_c1; - })(); + }()); exports.m1_c1 = m1_c1; exports.m1_instance1 = new m1_c1(); function m1_f1() { diff --git a/tests/baselines/reference/project/sourcemapModuleSubfolderNoOutdir/amd/sourcemapModuleSubfolderNoOutdir.sourcemap.txt b/tests/baselines/reference/project/sourcemapModuleSubfolderNoOutdir/amd/sourcemapModuleSubfolderNoOutdir.sourcemap.txt index 8489469d29a..3a561ae023a 100644 --- a/tests/baselines/reference/project/sourcemapModuleSubfolderNoOutdir/amd/sourcemapModuleSubfolderNoOutdir.sourcemap.txt +++ b/tests/baselines/reference/project/sourcemapModuleSubfolderNoOutdir/amd/sourcemapModuleSubfolderNoOutdir.sourcemap.txt @@ -60,7 +60,7 @@ sourceFile:m1.ts 1->Emitted(7, 9) Source(4, 1) + SourceIndex(0) 2 >Emitted(7, 21) Source(4, 2) + SourceIndex(0) --- ->>> })(); +>>> }()); 1 >^^^^ 2 > ^ 3 > @@ -234,7 +234,7 @@ sourceFile:test.ts 1->Emitted(7, 9) Source(5, 1) + SourceIndex(0) 2 >Emitted(7, 18) Source(5, 2) + SourceIndex(0) --- ->>> })(); +>>> }()); 1 >^^^^ 2 > ^ 3 > diff --git a/tests/baselines/reference/project/sourcemapModuleSubfolderNoOutdir/node/ref/m1.js b/tests/baselines/reference/project/sourcemapModuleSubfolderNoOutdir/node/ref/m1.js index 3bc07083900..121a089af23 100644 --- a/tests/baselines/reference/project/sourcemapModuleSubfolderNoOutdir/node/ref/m1.js +++ b/tests/baselines/reference/project/sourcemapModuleSubfolderNoOutdir/node/ref/m1.js @@ -4,7 +4,7 @@ var m1_c1 = (function () { function m1_c1() { } return m1_c1; -})(); +}()); exports.m1_c1 = m1_c1; exports.m1_instance1 = new m1_c1(); function m1_f1() { diff --git a/tests/baselines/reference/project/sourcemapModuleSubfolderNoOutdir/node/sourcemapModuleSubfolderNoOutdir.sourcemap.txt b/tests/baselines/reference/project/sourcemapModuleSubfolderNoOutdir/node/sourcemapModuleSubfolderNoOutdir.sourcemap.txt index dcbc990a084..4565660454d 100644 --- a/tests/baselines/reference/project/sourcemapModuleSubfolderNoOutdir/node/sourcemapModuleSubfolderNoOutdir.sourcemap.txt +++ b/tests/baselines/reference/project/sourcemapModuleSubfolderNoOutdir/node/sourcemapModuleSubfolderNoOutdir.sourcemap.txt @@ -59,7 +59,7 @@ sourceFile:m1.ts 1->Emitted(6, 5) Source(4, 1) + SourceIndex(0) 2 >Emitted(6, 17) Source(4, 2) + SourceIndex(0) --- ->>>})(); +>>>}()); 1 > 2 >^ 3 > @@ -255,7 +255,7 @@ sourceFile:test.ts 1->Emitted(7, 5) Source(5, 1) + SourceIndex(0) 2 >Emitted(7, 14) Source(5, 2) + SourceIndex(0) --- ->>>})(); +>>>}()); 1 > 2 >^ 3 > diff --git a/tests/baselines/reference/project/sourcemapModuleSubfolderSpecifyOutputDirectory/amd/outdir/simple/ref/m1.js b/tests/baselines/reference/project/sourcemapModuleSubfolderSpecifyOutputDirectory/amd/outdir/simple/ref/m1.js index 25001d63d84..bb59c6fbd90 100644 --- a/tests/baselines/reference/project/sourcemapModuleSubfolderSpecifyOutputDirectory/amd/outdir/simple/ref/m1.js +++ b/tests/baselines/reference/project/sourcemapModuleSubfolderSpecifyOutputDirectory/amd/outdir/simple/ref/m1.js @@ -5,7 +5,7 @@ define(["require", "exports"], function (require, exports) { function m1_c1() { } return m1_c1; - })(); + }()); exports.m1_c1 = m1_c1; exports.m1_instance1 = new m1_c1(); function m1_f1() { diff --git a/tests/baselines/reference/project/sourcemapModuleSubfolderSpecifyOutputDirectory/amd/sourcemapModuleSubfolderSpecifyOutputDirectory.sourcemap.txt b/tests/baselines/reference/project/sourcemapModuleSubfolderSpecifyOutputDirectory/amd/sourcemapModuleSubfolderSpecifyOutputDirectory.sourcemap.txt index ed6c818fda5..4b55b597fc6 100644 --- a/tests/baselines/reference/project/sourcemapModuleSubfolderSpecifyOutputDirectory/amd/sourcemapModuleSubfolderSpecifyOutputDirectory.sourcemap.txt +++ b/tests/baselines/reference/project/sourcemapModuleSubfolderSpecifyOutputDirectory/amd/sourcemapModuleSubfolderSpecifyOutputDirectory.sourcemap.txt @@ -60,7 +60,7 @@ sourceFile:../../../ref/m1.ts 1->Emitted(7, 9) Source(4, 1) + SourceIndex(0) 2 >Emitted(7, 21) Source(4, 2) + SourceIndex(0) --- ->>> })(); +>>> }()); 1 >^^^^ 2 > ^ 3 > @@ -234,7 +234,7 @@ sourceFile:../../test.ts 1->Emitted(7, 9) Source(5, 1) + SourceIndex(0) 2 >Emitted(7, 18) Source(5, 2) + SourceIndex(0) --- ->>> })(); +>>> }()); 1 >^^^^ 2 > ^ 3 > diff --git a/tests/baselines/reference/project/sourcemapModuleSubfolderSpecifyOutputDirectory/node/outdir/simple/ref/m1.js b/tests/baselines/reference/project/sourcemapModuleSubfolderSpecifyOutputDirectory/node/outdir/simple/ref/m1.js index 3bc07083900..121a089af23 100644 --- a/tests/baselines/reference/project/sourcemapModuleSubfolderSpecifyOutputDirectory/node/outdir/simple/ref/m1.js +++ b/tests/baselines/reference/project/sourcemapModuleSubfolderSpecifyOutputDirectory/node/outdir/simple/ref/m1.js @@ -4,7 +4,7 @@ var m1_c1 = (function () { function m1_c1() { } return m1_c1; -})(); +}()); exports.m1_c1 = m1_c1; exports.m1_instance1 = new m1_c1(); function m1_f1() { diff --git a/tests/baselines/reference/project/sourcemapModuleSubfolderSpecifyOutputDirectory/node/sourcemapModuleSubfolderSpecifyOutputDirectory.sourcemap.txt b/tests/baselines/reference/project/sourcemapModuleSubfolderSpecifyOutputDirectory/node/sourcemapModuleSubfolderSpecifyOutputDirectory.sourcemap.txt index 88e2ff35ec1..d0115edec0c 100644 --- a/tests/baselines/reference/project/sourcemapModuleSubfolderSpecifyOutputDirectory/node/sourcemapModuleSubfolderSpecifyOutputDirectory.sourcemap.txt +++ b/tests/baselines/reference/project/sourcemapModuleSubfolderSpecifyOutputDirectory/node/sourcemapModuleSubfolderSpecifyOutputDirectory.sourcemap.txt @@ -59,7 +59,7 @@ sourceFile:../../../ref/m1.ts 1->Emitted(6, 5) Source(4, 1) + SourceIndex(0) 2 >Emitted(6, 17) Source(4, 2) + SourceIndex(0) --- ->>>})(); +>>>}()); 1 > 2 >^ 3 > @@ -255,7 +255,7 @@ sourceFile:../../test.ts 1->Emitted(7, 5) Source(5, 1) + SourceIndex(0) 2 >Emitted(7, 14) Source(5, 2) + SourceIndex(0) --- ->>>})(); +>>>}()); 1 > 2 >^ 3 > diff --git a/tests/baselines/reference/project/sourcemapModuleSubfolderSpecifyOutputFile/amd/bin/test.js b/tests/baselines/reference/project/sourcemapModuleSubfolderSpecifyOutputFile/amd/bin/test.js index 93a25f7ef19..f55492f4b49 100644 --- a/tests/baselines/reference/project/sourcemapModuleSubfolderSpecifyOutputFile/amd/bin/test.js +++ b/tests/baselines/reference/project/sourcemapModuleSubfolderSpecifyOutputFile/amd/bin/test.js @@ -5,7 +5,7 @@ define("ref/m1", ["require", "exports"], function (require, exports) { function m1_c1() { } return m1_c1; - })(); + }()); exports.m1_c1 = m1_c1; exports.m1_instance1 = new m1_c1(); function m1_f1() { @@ -20,7 +20,7 @@ define("test", ["require", "exports", "ref/m1"], function (require, exports, m1) function c1() { } return c1; - })(); + }()); exports.c1 = c1; exports.instance1 = new c1(); function f1() { diff --git a/tests/baselines/reference/project/sourcemapModuleSubfolderSpecifyOutputFile/amd/sourcemapModuleSubfolderSpecifyOutputFile.sourcemap.txt b/tests/baselines/reference/project/sourcemapModuleSubfolderSpecifyOutputFile/amd/sourcemapModuleSubfolderSpecifyOutputFile.sourcemap.txt index b7c6dfd3fdd..8ed04c04575 100644 --- a/tests/baselines/reference/project/sourcemapModuleSubfolderSpecifyOutputFile/amd/sourcemapModuleSubfolderSpecifyOutputFile.sourcemap.txt +++ b/tests/baselines/reference/project/sourcemapModuleSubfolderSpecifyOutputFile/amd/sourcemapModuleSubfolderSpecifyOutputFile.sourcemap.txt @@ -60,7 +60,7 @@ sourceFile:../ref/m1.ts 1->Emitted(7, 9) Source(4, 1) + SourceIndex(0) 2 >Emitted(7, 21) Source(4, 2) + SourceIndex(0) --- ->>> })(); +>>> }()); 1 >^^^^ 2 > ^ 3 > @@ -228,7 +228,7 @@ sourceFile:../test.ts 1->Emitted(22, 9) Source(5, 1) + SourceIndex(1) 2 >Emitted(22, 18) Source(5, 2) + SourceIndex(1) --- ->>> })(); +>>> }()); 1 >^^^^ 2 > ^ 3 > diff --git a/tests/baselines/reference/project/sourcemapMultifolderNoOutdir/amd/ref/m1.js b/tests/baselines/reference/project/sourcemapMultifolderNoOutdir/amd/ref/m1.js index f6b169662c9..b7283f7fd88 100644 --- a/tests/baselines/reference/project/sourcemapMultifolderNoOutdir/amd/ref/m1.js +++ b/tests/baselines/reference/project/sourcemapMultifolderNoOutdir/amd/ref/m1.js @@ -3,7 +3,7 @@ var m1_c1 = (function () { function m1_c1() { } return m1_c1; -})(); +}()); var m1_instance1 = new m1_c1(); function m1_f1() { return m1_instance1; diff --git a/tests/baselines/reference/project/sourcemapMultifolderNoOutdir/amd/sourcemapMultifolderNoOutdir.sourcemap.txt b/tests/baselines/reference/project/sourcemapMultifolderNoOutdir/amd/sourcemapMultifolderNoOutdir.sourcemap.txt index fae25202ebf..10eebf86ef0 100644 --- a/tests/baselines/reference/project/sourcemapMultifolderNoOutdir/amd/sourcemapMultifolderNoOutdir.sourcemap.txt +++ b/tests/baselines/reference/project/sourcemapMultifolderNoOutdir/amd/sourcemapMultifolderNoOutdir.sourcemap.txt @@ -61,7 +61,7 @@ sourceFile:m1.ts 1->Emitted(5, 5) Source(4, 1) + SourceIndex(0) 2 >Emitted(5, 17) Source(4, 2) + SourceIndex(0) --- ->>>})(); +>>>}()); 1 > 2 >^ 3 > @@ -204,7 +204,7 @@ sourceFile:m2.ts 1->Emitted(5, 5) Source(4, 1) + SourceIndex(0) 2 >Emitted(5, 17) Source(4, 2) + SourceIndex(0) --- ->>>})(); +>>>}()); 1 > 2 >^ 3 > @@ -366,7 +366,7 @@ sourceFile:test.ts 1->Emitted(7, 5) Source(6, 1) + SourceIndex(0) 2 >Emitted(7, 14) Source(6, 2) + SourceIndex(0) --- ->>>})(); +>>>}()); 1 > 2 >^ 3 > diff --git a/tests/baselines/reference/project/sourcemapMultifolderNoOutdir/node/ref/m1.js b/tests/baselines/reference/project/sourcemapMultifolderNoOutdir/node/ref/m1.js index f6b169662c9..b7283f7fd88 100644 --- a/tests/baselines/reference/project/sourcemapMultifolderNoOutdir/node/ref/m1.js +++ b/tests/baselines/reference/project/sourcemapMultifolderNoOutdir/node/ref/m1.js @@ -3,7 +3,7 @@ var m1_c1 = (function () { function m1_c1() { } return m1_c1; -})(); +}()); var m1_instance1 = new m1_c1(); function m1_f1() { return m1_instance1; diff --git a/tests/baselines/reference/project/sourcemapMultifolderNoOutdir/node/sourcemapMultifolderNoOutdir.sourcemap.txt b/tests/baselines/reference/project/sourcemapMultifolderNoOutdir/node/sourcemapMultifolderNoOutdir.sourcemap.txt index fae25202ebf..10eebf86ef0 100644 --- a/tests/baselines/reference/project/sourcemapMultifolderNoOutdir/node/sourcemapMultifolderNoOutdir.sourcemap.txt +++ b/tests/baselines/reference/project/sourcemapMultifolderNoOutdir/node/sourcemapMultifolderNoOutdir.sourcemap.txt @@ -61,7 +61,7 @@ sourceFile:m1.ts 1->Emitted(5, 5) Source(4, 1) + SourceIndex(0) 2 >Emitted(5, 17) Source(4, 2) + SourceIndex(0) --- ->>>})(); +>>>}()); 1 > 2 >^ 3 > @@ -204,7 +204,7 @@ sourceFile:m2.ts 1->Emitted(5, 5) Source(4, 1) + SourceIndex(0) 2 >Emitted(5, 17) Source(4, 2) + SourceIndex(0) --- ->>>})(); +>>>}()); 1 > 2 >^ 3 > @@ -366,7 +366,7 @@ sourceFile:test.ts 1->Emitted(7, 5) Source(6, 1) + SourceIndex(0) 2 >Emitted(7, 14) Source(6, 2) + SourceIndex(0) --- ->>>})(); +>>>}()); 1 > 2 >^ 3 > diff --git a/tests/baselines/reference/project/sourcemapMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_multifolder/ref/m1.js b/tests/baselines/reference/project/sourcemapMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_multifolder/ref/m1.js index f6b169662c9..b7283f7fd88 100644 --- a/tests/baselines/reference/project/sourcemapMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_multifolder/ref/m1.js +++ b/tests/baselines/reference/project/sourcemapMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_multifolder/ref/m1.js @@ -3,7 +3,7 @@ var m1_c1 = (function () { function m1_c1() { } return m1_c1; -})(); +}()); var m1_instance1 = new m1_c1(); function m1_f1() { return m1_instance1; diff --git a/tests/baselines/reference/project/sourcemapMultifolderSpecifyOutputDirectory/amd/sourcemapMultifolderSpecifyOutputDirectory.sourcemap.txt b/tests/baselines/reference/project/sourcemapMultifolderSpecifyOutputDirectory/amd/sourcemapMultifolderSpecifyOutputDirectory.sourcemap.txt index b638e890cfc..d7d0942b868 100644 --- a/tests/baselines/reference/project/sourcemapMultifolderSpecifyOutputDirectory/amd/sourcemapMultifolderSpecifyOutputDirectory.sourcemap.txt +++ b/tests/baselines/reference/project/sourcemapMultifolderSpecifyOutputDirectory/amd/sourcemapMultifolderSpecifyOutputDirectory.sourcemap.txt @@ -61,7 +61,7 @@ sourceFile:../../../../ref/m1.ts 1->Emitted(5, 5) Source(4, 1) + SourceIndex(0) 2 >Emitted(5, 17) Source(4, 2) + SourceIndex(0) --- ->>>})(); +>>>}()); 1 > 2 >^ 3 > @@ -204,7 +204,7 @@ sourceFile:../../../../outputdir_multifolder_ref/m2.ts 1->Emitted(5, 5) Source(4, 1) + SourceIndex(0) 2 >Emitted(5, 17) Source(4, 2) + SourceIndex(0) --- ->>>})(); +>>>}()); 1 > 2 >^ 3 > @@ -366,7 +366,7 @@ sourceFile:../../../test.ts 1->Emitted(7, 5) Source(6, 1) + SourceIndex(0) 2 >Emitted(7, 14) Source(6, 2) + SourceIndex(0) --- ->>>})(); +>>>}()); 1 > 2 >^ 3 > diff --git a/tests/baselines/reference/project/sourcemapMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_multifolder/ref/m1.js b/tests/baselines/reference/project/sourcemapMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_multifolder/ref/m1.js index f6b169662c9..b7283f7fd88 100644 --- a/tests/baselines/reference/project/sourcemapMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_multifolder/ref/m1.js +++ b/tests/baselines/reference/project/sourcemapMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_multifolder/ref/m1.js @@ -3,7 +3,7 @@ var m1_c1 = (function () { function m1_c1() { } return m1_c1; -})(); +}()); var m1_instance1 = new m1_c1(); function m1_f1() { return m1_instance1; diff --git a/tests/baselines/reference/project/sourcemapMultifolderSpecifyOutputDirectory/node/sourcemapMultifolderSpecifyOutputDirectory.sourcemap.txt b/tests/baselines/reference/project/sourcemapMultifolderSpecifyOutputDirectory/node/sourcemapMultifolderSpecifyOutputDirectory.sourcemap.txt index b638e890cfc..d7d0942b868 100644 --- a/tests/baselines/reference/project/sourcemapMultifolderSpecifyOutputDirectory/node/sourcemapMultifolderSpecifyOutputDirectory.sourcemap.txt +++ b/tests/baselines/reference/project/sourcemapMultifolderSpecifyOutputDirectory/node/sourcemapMultifolderSpecifyOutputDirectory.sourcemap.txt @@ -61,7 +61,7 @@ sourceFile:../../../../ref/m1.ts 1->Emitted(5, 5) Source(4, 1) + SourceIndex(0) 2 >Emitted(5, 17) Source(4, 2) + SourceIndex(0) --- ->>>})(); +>>>}()); 1 > 2 >^ 3 > @@ -204,7 +204,7 @@ sourceFile:../../../../outputdir_multifolder_ref/m2.ts 1->Emitted(5, 5) Source(4, 1) + SourceIndex(0) 2 >Emitted(5, 17) Source(4, 2) + SourceIndex(0) --- ->>>})(); +>>>}()); 1 > 2 >^ 3 > @@ -366,7 +366,7 @@ sourceFile:../../../test.ts 1->Emitted(7, 5) Source(6, 1) + SourceIndex(0) 2 >Emitted(7, 14) Source(6, 2) + SourceIndex(0) --- ->>>})(); +>>>}()); 1 > 2 >^ 3 > diff --git a/tests/baselines/reference/project/sourcemapMultifolderSpecifyOutputFile/amd/bin/test.js b/tests/baselines/reference/project/sourcemapMultifolderSpecifyOutputFile/amd/bin/test.js index e6b143a110a..ad96cca3d79 100644 --- a/tests/baselines/reference/project/sourcemapMultifolderSpecifyOutputFile/amd/bin/test.js +++ b/tests/baselines/reference/project/sourcemapMultifolderSpecifyOutputFile/amd/bin/test.js @@ -3,7 +3,7 @@ var m1_c1 = (function () { function m1_c1() { } return m1_c1; -})(); +}()); var m1_instance1 = new m1_c1(); function m1_f1() { return m1_instance1; @@ -13,7 +13,7 @@ var m2_c1 = (function () { function m2_c1() { } return m2_c1; -})(); +}()); var m2_instance1 = new m2_c1(); function m2_f1() { return m2_instance1; @@ -25,7 +25,7 @@ var c1 = (function () { function c1() { } return c1; -})(); +}()); var instance1 = new c1(); function f1() { return instance1; diff --git a/tests/baselines/reference/project/sourcemapMultifolderSpecifyOutputFile/amd/sourcemapMultifolderSpecifyOutputFile.sourcemap.txt b/tests/baselines/reference/project/sourcemapMultifolderSpecifyOutputFile/amd/sourcemapMultifolderSpecifyOutputFile.sourcemap.txt index efde82f881c..c4c69a0ea78 100644 --- a/tests/baselines/reference/project/sourcemapMultifolderSpecifyOutputFile/amd/sourcemapMultifolderSpecifyOutputFile.sourcemap.txt +++ b/tests/baselines/reference/project/sourcemapMultifolderSpecifyOutputFile/amd/sourcemapMultifolderSpecifyOutputFile.sourcemap.txt @@ -61,7 +61,7 @@ sourceFile:../ref/m1.ts 1->Emitted(5, 5) Source(4, 1) + SourceIndex(0) 2 >Emitted(5, 17) Source(4, 2) + SourceIndex(0) --- ->>>})(); +>>>}()); 1 > 2 >^ 3 > @@ -198,7 +198,7 @@ sourceFile:../../outputdir_multifolder_ref/m2.ts 1->Emitted(15, 5) Source(4, 1) + SourceIndex(1) 2 >Emitted(15, 17) Source(4, 2) + SourceIndex(1) --- ->>>})(); +>>>}()); 1 > 2 >^ 3 > @@ -354,7 +354,7 @@ sourceFile:../test.ts 1->Emitted(27, 5) Source(6, 1) + SourceIndex(2) 2 >Emitted(27, 14) Source(6, 2) + SourceIndex(2) --- ->>>})(); +>>>}()); 1 > 2 >^ 3 > diff --git a/tests/baselines/reference/project/sourcemapMultifolderSpecifyOutputFile/node/bin/test.js b/tests/baselines/reference/project/sourcemapMultifolderSpecifyOutputFile/node/bin/test.js index e6b143a110a..ad96cca3d79 100644 --- a/tests/baselines/reference/project/sourcemapMultifolderSpecifyOutputFile/node/bin/test.js +++ b/tests/baselines/reference/project/sourcemapMultifolderSpecifyOutputFile/node/bin/test.js @@ -3,7 +3,7 @@ var m1_c1 = (function () { function m1_c1() { } return m1_c1; -})(); +}()); var m1_instance1 = new m1_c1(); function m1_f1() { return m1_instance1; @@ -13,7 +13,7 @@ var m2_c1 = (function () { function m2_c1() { } return m2_c1; -})(); +}()); var m2_instance1 = new m2_c1(); function m2_f1() { return m2_instance1; @@ -25,7 +25,7 @@ var c1 = (function () { function c1() { } return c1; -})(); +}()); var instance1 = new c1(); function f1() { return instance1; diff --git a/tests/baselines/reference/project/sourcemapMultifolderSpecifyOutputFile/node/sourcemapMultifolderSpecifyOutputFile.sourcemap.txt b/tests/baselines/reference/project/sourcemapMultifolderSpecifyOutputFile/node/sourcemapMultifolderSpecifyOutputFile.sourcemap.txt index efde82f881c..c4c69a0ea78 100644 --- a/tests/baselines/reference/project/sourcemapMultifolderSpecifyOutputFile/node/sourcemapMultifolderSpecifyOutputFile.sourcemap.txt +++ b/tests/baselines/reference/project/sourcemapMultifolderSpecifyOutputFile/node/sourcemapMultifolderSpecifyOutputFile.sourcemap.txt @@ -61,7 +61,7 @@ sourceFile:../ref/m1.ts 1->Emitted(5, 5) Source(4, 1) + SourceIndex(0) 2 >Emitted(5, 17) Source(4, 2) + SourceIndex(0) --- ->>>})(); +>>>}()); 1 > 2 >^ 3 > @@ -198,7 +198,7 @@ sourceFile:../../outputdir_multifolder_ref/m2.ts 1->Emitted(15, 5) Source(4, 1) + SourceIndex(1) 2 >Emitted(15, 17) Source(4, 2) + SourceIndex(1) --- ->>>})(); +>>>}()); 1 > 2 >^ 3 > @@ -354,7 +354,7 @@ sourceFile:../test.ts 1->Emitted(27, 5) Source(6, 1) + SourceIndex(2) 2 >Emitted(27, 14) Source(6, 2) + SourceIndex(2) --- ->>>})(); +>>>}()); 1 > 2 >^ 3 > diff --git a/tests/baselines/reference/project/sourcemapSimpleNoOutdir/amd/m1.js b/tests/baselines/reference/project/sourcemapSimpleNoOutdir/amd/m1.js index f6b169662c9..b7283f7fd88 100644 --- a/tests/baselines/reference/project/sourcemapSimpleNoOutdir/amd/m1.js +++ b/tests/baselines/reference/project/sourcemapSimpleNoOutdir/amd/m1.js @@ -3,7 +3,7 @@ var m1_c1 = (function () { function m1_c1() { } return m1_c1; -})(); +}()); var m1_instance1 = new m1_c1(); function m1_f1() { return m1_instance1; diff --git a/tests/baselines/reference/project/sourcemapSimpleNoOutdir/amd/sourcemapSimpleNoOutdir.sourcemap.txt b/tests/baselines/reference/project/sourcemapSimpleNoOutdir/amd/sourcemapSimpleNoOutdir.sourcemap.txt index 2eb83abfe6a..1a11ea635c6 100644 --- a/tests/baselines/reference/project/sourcemapSimpleNoOutdir/amd/sourcemapSimpleNoOutdir.sourcemap.txt +++ b/tests/baselines/reference/project/sourcemapSimpleNoOutdir/amd/sourcemapSimpleNoOutdir.sourcemap.txt @@ -61,7 +61,7 @@ sourceFile:m1.ts 1->Emitted(5, 5) Source(4, 1) + SourceIndex(0) 2 >Emitted(5, 17) Source(4, 2) + SourceIndex(0) --- ->>>})(); +>>>}()); 1 > 2 >^ 3 > @@ -213,7 +213,7 @@ sourceFile:test.ts 1->Emitted(6, 5) Source(5, 1) + SourceIndex(0) 2 >Emitted(6, 14) Source(5, 2) + SourceIndex(0) --- ->>>})(); +>>>}()); 1 > 2 >^ 3 > diff --git a/tests/baselines/reference/project/sourcemapSimpleNoOutdir/node/m1.js b/tests/baselines/reference/project/sourcemapSimpleNoOutdir/node/m1.js index f6b169662c9..b7283f7fd88 100644 --- a/tests/baselines/reference/project/sourcemapSimpleNoOutdir/node/m1.js +++ b/tests/baselines/reference/project/sourcemapSimpleNoOutdir/node/m1.js @@ -3,7 +3,7 @@ var m1_c1 = (function () { function m1_c1() { } return m1_c1; -})(); +}()); var m1_instance1 = new m1_c1(); function m1_f1() { return m1_instance1; diff --git a/tests/baselines/reference/project/sourcemapSimpleNoOutdir/node/sourcemapSimpleNoOutdir.sourcemap.txt b/tests/baselines/reference/project/sourcemapSimpleNoOutdir/node/sourcemapSimpleNoOutdir.sourcemap.txt index 2eb83abfe6a..1a11ea635c6 100644 --- a/tests/baselines/reference/project/sourcemapSimpleNoOutdir/node/sourcemapSimpleNoOutdir.sourcemap.txt +++ b/tests/baselines/reference/project/sourcemapSimpleNoOutdir/node/sourcemapSimpleNoOutdir.sourcemap.txt @@ -61,7 +61,7 @@ sourceFile:m1.ts 1->Emitted(5, 5) Source(4, 1) + SourceIndex(0) 2 >Emitted(5, 17) Source(4, 2) + SourceIndex(0) --- ->>>})(); +>>>}()); 1 > 2 >^ 3 > @@ -213,7 +213,7 @@ sourceFile:test.ts 1->Emitted(6, 5) Source(5, 1) + SourceIndex(0) 2 >Emitted(6, 14) Source(5, 2) + SourceIndex(0) --- ->>>})(); +>>>}()); 1 > 2 >^ 3 > diff --git a/tests/baselines/reference/project/sourcemapSimpleSpecifyOutputDirectory/amd/outdir/simple/m1.js b/tests/baselines/reference/project/sourcemapSimpleSpecifyOutputDirectory/amd/outdir/simple/m1.js index f6b169662c9..b7283f7fd88 100644 --- a/tests/baselines/reference/project/sourcemapSimpleSpecifyOutputDirectory/amd/outdir/simple/m1.js +++ b/tests/baselines/reference/project/sourcemapSimpleSpecifyOutputDirectory/amd/outdir/simple/m1.js @@ -3,7 +3,7 @@ var m1_c1 = (function () { function m1_c1() { } return m1_c1; -})(); +}()); var m1_instance1 = new m1_c1(); function m1_f1() { return m1_instance1; diff --git a/tests/baselines/reference/project/sourcemapSimpleSpecifyOutputDirectory/amd/sourcemapSimpleSpecifyOutputDirectory.sourcemap.txt b/tests/baselines/reference/project/sourcemapSimpleSpecifyOutputDirectory/amd/sourcemapSimpleSpecifyOutputDirectory.sourcemap.txt index afe348176d3..66616a905f2 100644 --- a/tests/baselines/reference/project/sourcemapSimpleSpecifyOutputDirectory/amd/sourcemapSimpleSpecifyOutputDirectory.sourcemap.txt +++ b/tests/baselines/reference/project/sourcemapSimpleSpecifyOutputDirectory/amd/sourcemapSimpleSpecifyOutputDirectory.sourcemap.txt @@ -61,7 +61,7 @@ sourceFile:../../m1.ts 1->Emitted(5, 5) Source(4, 1) + SourceIndex(0) 2 >Emitted(5, 17) Source(4, 2) + SourceIndex(0) --- ->>>})(); +>>>}()); 1 > 2 >^ 3 > @@ -213,7 +213,7 @@ sourceFile:../../test.ts 1->Emitted(6, 5) Source(5, 1) + SourceIndex(0) 2 >Emitted(6, 14) Source(5, 2) + SourceIndex(0) --- ->>>})(); +>>>}()); 1 > 2 >^ 3 > diff --git a/tests/baselines/reference/project/sourcemapSimpleSpecifyOutputDirectory/node/outdir/simple/m1.js b/tests/baselines/reference/project/sourcemapSimpleSpecifyOutputDirectory/node/outdir/simple/m1.js index f6b169662c9..b7283f7fd88 100644 --- a/tests/baselines/reference/project/sourcemapSimpleSpecifyOutputDirectory/node/outdir/simple/m1.js +++ b/tests/baselines/reference/project/sourcemapSimpleSpecifyOutputDirectory/node/outdir/simple/m1.js @@ -3,7 +3,7 @@ var m1_c1 = (function () { function m1_c1() { } return m1_c1; -})(); +}()); var m1_instance1 = new m1_c1(); function m1_f1() { return m1_instance1; diff --git a/tests/baselines/reference/project/sourcemapSimpleSpecifyOutputDirectory/node/sourcemapSimpleSpecifyOutputDirectory.sourcemap.txt b/tests/baselines/reference/project/sourcemapSimpleSpecifyOutputDirectory/node/sourcemapSimpleSpecifyOutputDirectory.sourcemap.txt index afe348176d3..66616a905f2 100644 --- a/tests/baselines/reference/project/sourcemapSimpleSpecifyOutputDirectory/node/sourcemapSimpleSpecifyOutputDirectory.sourcemap.txt +++ b/tests/baselines/reference/project/sourcemapSimpleSpecifyOutputDirectory/node/sourcemapSimpleSpecifyOutputDirectory.sourcemap.txt @@ -61,7 +61,7 @@ sourceFile:../../m1.ts 1->Emitted(5, 5) Source(4, 1) + SourceIndex(0) 2 >Emitted(5, 17) Source(4, 2) + SourceIndex(0) --- ->>>})(); +>>>}()); 1 > 2 >^ 3 > @@ -213,7 +213,7 @@ sourceFile:../../test.ts 1->Emitted(6, 5) Source(5, 1) + SourceIndex(0) 2 >Emitted(6, 14) Source(5, 2) + SourceIndex(0) --- ->>>})(); +>>>}()); 1 > 2 >^ 3 > diff --git a/tests/baselines/reference/project/sourcemapSimpleSpecifyOutputFile/amd/bin/test.js b/tests/baselines/reference/project/sourcemapSimpleSpecifyOutputFile/amd/bin/test.js index 10bcbf92a21..481c10d1a06 100644 --- a/tests/baselines/reference/project/sourcemapSimpleSpecifyOutputFile/amd/bin/test.js +++ b/tests/baselines/reference/project/sourcemapSimpleSpecifyOutputFile/amd/bin/test.js @@ -3,7 +3,7 @@ var m1_c1 = (function () { function m1_c1() { } return m1_c1; -})(); +}()); var m1_instance1 = new m1_c1(); function m1_f1() { return m1_instance1; @@ -14,7 +14,7 @@ var c1 = (function () { function c1() { } return c1; -})(); +}()); var instance1 = new c1(); function f1() { return instance1; diff --git a/tests/baselines/reference/project/sourcemapSimpleSpecifyOutputFile/amd/sourcemapSimpleSpecifyOutputFile.sourcemap.txt b/tests/baselines/reference/project/sourcemapSimpleSpecifyOutputFile/amd/sourcemapSimpleSpecifyOutputFile.sourcemap.txt index 246480ea6fb..d61cb327bd4 100644 --- a/tests/baselines/reference/project/sourcemapSimpleSpecifyOutputFile/amd/sourcemapSimpleSpecifyOutputFile.sourcemap.txt +++ b/tests/baselines/reference/project/sourcemapSimpleSpecifyOutputFile/amd/sourcemapSimpleSpecifyOutputFile.sourcemap.txt @@ -61,7 +61,7 @@ sourceFile:../m1.ts 1->Emitted(5, 5) Source(4, 1) + SourceIndex(0) 2 >Emitted(5, 17) Source(4, 2) + SourceIndex(0) --- ->>>})(); +>>>}()); 1 > 2 >^ 3 > @@ -207,7 +207,7 @@ sourceFile:../test.ts 1->Emitted(16, 5) Source(5, 1) + SourceIndex(1) 2 >Emitted(16, 14) Source(5, 2) + SourceIndex(1) --- ->>>})(); +>>>}()); 1 > 2 >^ 3 > diff --git a/tests/baselines/reference/project/sourcemapSimpleSpecifyOutputFile/node/bin/test.js b/tests/baselines/reference/project/sourcemapSimpleSpecifyOutputFile/node/bin/test.js index 10bcbf92a21..481c10d1a06 100644 --- a/tests/baselines/reference/project/sourcemapSimpleSpecifyOutputFile/node/bin/test.js +++ b/tests/baselines/reference/project/sourcemapSimpleSpecifyOutputFile/node/bin/test.js @@ -3,7 +3,7 @@ var m1_c1 = (function () { function m1_c1() { } return m1_c1; -})(); +}()); var m1_instance1 = new m1_c1(); function m1_f1() { return m1_instance1; @@ -14,7 +14,7 @@ var c1 = (function () { function c1() { } return c1; -})(); +}()); var instance1 = new c1(); function f1() { return instance1; diff --git a/tests/baselines/reference/project/sourcemapSimpleSpecifyOutputFile/node/sourcemapSimpleSpecifyOutputFile.sourcemap.txt b/tests/baselines/reference/project/sourcemapSimpleSpecifyOutputFile/node/sourcemapSimpleSpecifyOutputFile.sourcemap.txt index 246480ea6fb..d61cb327bd4 100644 --- a/tests/baselines/reference/project/sourcemapSimpleSpecifyOutputFile/node/sourcemapSimpleSpecifyOutputFile.sourcemap.txt +++ b/tests/baselines/reference/project/sourcemapSimpleSpecifyOutputFile/node/sourcemapSimpleSpecifyOutputFile.sourcemap.txt @@ -61,7 +61,7 @@ sourceFile:../m1.ts 1->Emitted(5, 5) Source(4, 1) + SourceIndex(0) 2 >Emitted(5, 17) Source(4, 2) + SourceIndex(0) --- ->>>})(); +>>>}()); 1 > 2 >^ 3 > @@ -207,7 +207,7 @@ sourceFile:../test.ts 1->Emitted(16, 5) Source(5, 1) + SourceIndex(1) 2 >Emitted(16, 14) Source(5, 2) + SourceIndex(1) --- ->>>})(); +>>>}()); 1 > 2 >^ 3 > diff --git a/tests/baselines/reference/project/sourcemapSingleFileNoOutdir/amd/sourcemapSingleFileNoOutdir.sourcemap.txt b/tests/baselines/reference/project/sourcemapSingleFileNoOutdir/amd/sourcemapSingleFileNoOutdir.sourcemap.txt index 662bee468cd..a46d487d932 100644 --- a/tests/baselines/reference/project/sourcemapSingleFileNoOutdir/amd/sourcemapSingleFileNoOutdir.sourcemap.txt +++ b/tests/baselines/reference/project/sourcemapSingleFileNoOutdir/amd/sourcemapSingleFileNoOutdir.sourcemap.txt @@ -61,7 +61,7 @@ sourceFile:test.ts 1->Emitted(5, 5) Source(4, 1) + SourceIndex(0) 2 >Emitted(5, 14) Source(4, 2) + SourceIndex(0) --- ->>>})(); +>>>}()); 1 > 2 >^ 3 > diff --git a/tests/baselines/reference/project/sourcemapSingleFileNoOutdir/amd/test.js b/tests/baselines/reference/project/sourcemapSingleFileNoOutdir/amd/test.js index 335d79c01c6..e5a1c12a732 100644 --- a/tests/baselines/reference/project/sourcemapSingleFileNoOutdir/amd/test.js +++ b/tests/baselines/reference/project/sourcemapSingleFileNoOutdir/amd/test.js @@ -3,7 +3,7 @@ var c1 = (function () { function c1() { } return c1; -})(); +}()); var instance1 = new c1(); function f1() { return instance1; diff --git a/tests/baselines/reference/project/sourcemapSingleFileNoOutdir/node/sourcemapSingleFileNoOutdir.sourcemap.txt b/tests/baselines/reference/project/sourcemapSingleFileNoOutdir/node/sourcemapSingleFileNoOutdir.sourcemap.txt index 662bee468cd..a46d487d932 100644 --- a/tests/baselines/reference/project/sourcemapSingleFileNoOutdir/node/sourcemapSingleFileNoOutdir.sourcemap.txt +++ b/tests/baselines/reference/project/sourcemapSingleFileNoOutdir/node/sourcemapSingleFileNoOutdir.sourcemap.txt @@ -61,7 +61,7 @@ sourceFile:test.ts 1->Emitted(5, 5) Source(4, 1) + SourceIndex(0) 2 >Emitted(5, 14) Source(4, 2) + SourceIndex(0) --- ->>>})(); +>>>}()); 1 > 2 >^ 3 > diff --git a/tests/baselines/reference/project/sourcemapSingleFileNoOutdir/node/test.js b/tests/baselines/reference/project/sourcemapSingleFileNoOutdir/node/test.js index 335d79c01c6..e5a1c12a732 100644 --- a/tests/baselines/reference/project/sourcemapSingleFileNoOutdir/node/test.js +++ b/tests/baselines/reference/project/sourcemapSingleFileNoOutdir/node/test.js @@ -3,7 +3,7 @@ var c1 = (function () { function c1() { } return c1; -})(); +}()); var instance1 = new c1(); function f1() { return instance1; diff --git a/tests/baselines/reference/project/sourcemapSingleFileSpecifyOutputDirectory/amd/outdir/simple/test.js b/tests/baselines/reference/project/sourcemapSingleFileSpecifyOutputDirectory/amd/outdir/simple/test.js index 335d79c01c6..e5a1c12a732 100644 --- a/tests/baselines/reference/project/sourcemapSingleFileSpecifyOutputDirectory/amd/outdir/simple/test.js +++ b/tests/baselines/reference/project/sourcemapSingleFileSpecifyOutputDirectory/amd/outdir/simple/test.js @@ -3,7 +3,7 @@ var c1 = (function () { function c1() { } return c1; -})(); +}()); var instance1 = new c1(); function f1() { return instance1; diff --git a/tests/baselines/reference/project/sourcemapSingleFileSpecifyOutputDirectory/amd/sourcemapSingleFileSpecifyOutputDirectory.sourcemap.txt b/tests/baselines/reference/project/sourcemapSingleFileSpecifyOutputDirectory/amd/sourcemapSingleFileSpecifyOutputDirectory.sourcemap.txt index 2b86d9f6822..e408c9f1014 100644 --- a/tests/baselines/reference/project/sourcemapSingleFileSpecifyOutputDirectory/amd/sourcemapSingleFileSpecifyOutputDirectory.sourcemap.txt +++ b/tests/baselines/reference/project/sourcemapSingleFileSpecifyOutputDirectory/amd/sourcemapSingleFileSpecifyOutputDirectory.sourcemap.txt @@ -61,7 +61,7 @@ sourceFile:../../test.ts 1->Emitted(5, 5) Source(4, 1) + SourceIndex(0) 2 >Emitted(5, 14) Source(4, 2) + SourceIndex(0) --- ->>>})(); +>>>}()); 1 > 2 >^ 3 > diff --git a/tests/baselines/reference/project/sourcemapSingleFileSpecifyOutputDirectory/node/outdir/simple/test.js b/tests/baselines/reference/project/sourcemapSingleFileSpecifyOutputDirectory/node/outdir/simple/test.js index 335d79c01c6..e5a1c12a732 100644 --- a/tests/baselines/reference/project/sourcemapSingleFileSpecifyOutputDirectory/node/outdir/simple/test.js +++ b/tests/baselines/reference/project/sourcemapSingleFileSpecifyOutputDirectory/node/outdir/simple/test.js @@ -3,7 +3,7 @@ var c1 = (function () { function c1() { } return c1; -})(); +}()); var instance1 = new c1(); function f1() { return instance1; diff --git a/tests/baselines/reference/project/sourcemapSingleFileSpecifyOutputDirectory/node/sourcemapSingleFileSpecifyOutputDirectory.sourcemap.txt b/tests/baselines/reference/project/sourcemapSingleFileSpecifyOutputDirectory/node/sourcemapSingleFileSpecifyOutputDirectory.sourcemap.txt index 2b86d9f6822..e408c9f1014 100644 --- a/tests/baselines/reference/project/sourcemapSingleFileSpecifyOutputDirectory/node/sourcemapSingleFileSpecifyOutputDirectory.sourcemap.txt +++ b/tests/baselines/reference/project/sourcemapSingleFileSpecifyOutputDirectory/node/sourcemapSingleFileSpecifyOutputDirectory.sourcemap.txt @@ -61,7 +61,7 @@ sourceFile:../../test.ts 1->Emitted(5, 5) Source(4, 1) + SourceIndex(0) 2 >Emitted(5, 14) Source(4, 2) + SourceIndex(0) --- ->>>})(); +>>>}()); 1 > 2 >^ 3 > diff --git a/tests/baselines/reference/project/sourcemapSingleFileSpecifyOutputFile/amd/bin/test.js b/tests/baselines/reference/project/sourcemapSingleFileSpecifyOutputFile/amd/bin/test.js index 335d79c01c6..e5a1c12a732 100644 --- a/tests/baselines/reference/project/sourcemapSingleFileSpecifyOutputFile/amd/bin/test.js +++ b/tests/baselines/reference/project/sourcemapSingleFileSpecifyOutputFile/amd/bin/test.js @@ -3,7 +3,7 @@ var c1 = (function () { function c1() { } return c1; -})(); +}()); var instance1 = new c1(); function f1() { return instance1; diff --git a/tests/baselines/reference/project/sourcemapSingleFileSpecifyOutputFile/amd/sourcemapSingleFileSpecifyOutputFile.sourcemap.txt b/tests/baselines/reference/project/sourcemapSingleFileSpecifyOutputFile/amd/sourcemapSingleFileSpecifyOutputFile.sourcemap.txt index 8dcf4e9b928..abee977af4c 100644 --- a/tests/baselines/reference/project/sourcemapSingleFileSpecifyOutputFile/amd/sourcemapSingleFileSpecifyOutputFile.sourcemap.txt +++ b/tests/baselines/reference/project/sourcemapSingleFileSpecifyOutputFile/amd/sourcemapSingleFileSpecifyOutputFile.sourcemap.txt @@ -61,7 +61,7 @@ sourceFile:../test.ts 1->Emitted(5, 5) Source(4, 1) + SourceIndex(0) 2 >Emitted(5, 14) Source(4, 2) + SourceIndex(0) --- ->>>})(); +>>>}()); 1 > 2 >^ 3 > diff --git a/tests/baselines/reference/project/sourcemapSingleFileSpecifyOutputFile/node/bin/test.js b/tests/baselines/reference/project/sourcemapSingleFileSpecifyOutputFile/node/bin/test.js index 335d79c01c6..e5a1c12a732 100644 --- a/tests/baselines/reference/project/sourcemapSingleFileSpecifyOutputFile/node/bin/test.js +++ b/tests/baselines/reference/project/sourcemapSingleFileSpecifyOutputFile/node/bin/test.js @@ -3,7 +3,7 @@ var c1 = (function () { function c1() { } return c1; -})(); +}()); var instance1 = new c1(); function f1() { return instance1; diff --git a/tests/baselines/reference/project/sourcemapSingleFileSpecifyOutputFile/node/sourcemapSingleFileSpecifyOutputFile.sourcemap.txt b/tests/baselines/reference/project/sourcemapSingleFileSpecifyOutputFile/node/sourcemapSingleFileSpecifyOutputFile.sourcemap.txt index 8dcf4e9b928..abee977af4c 100644 --- a/tests/baselines/reference/project/sourcemapSingleFileSpecifyOutputFile/node/sourcemapSingleFileSpecifyOutputFile.sourcemap.txt +++ b/tests/baselines/reference/project/sourcemapSingleFileSpecifyOutputFile/node/sourcemapSingleFileSpecifyOutputFile.sourcemap.txt @@ -61,7 +61,7 @@ sourceFile:../test.ts 1->Emitted(5, 5) Source(4, 1) + SourceIndex(0) 2 >Emitted(5, 14) Source(4, 2) + SourceIndex(0) --- ->>>})(); +>>>}()); 1 > 2 >^ 3 > diff --git a/tests/baselines/reference/project/sourcemapSubfolderNoOutdir/amd/ref/m1.js b/tests/baselines/reference/project/sourcemapSubfolderNoOutdir/amd/ref/m1.js index f6b169662c9..b7283f7fd88 100644 --- a/tests/baselines/reference/project/sourcemapSubfolderNoOutdir/amd/ref/m1.js +++ b/tests/baselines/reference/project/sourcemapSubfolderNoOutdir/amd/ref/m1.js @@ -3,7 +3,7 @@ var m1_c1 = (function () { function m1_c1() { } return m1_c1; -})(); +}()); var m1_instance1 = new m1_c1(); function m1_f1() { return m1_instance1; diff --git a/tests/baselines/reference/project/sourcemapSubfolderNoOutdir/amd/sourcemapSubfolderNoOutdir.sourcemap.txt b/tests/baselines/reference/project/sourcemapSubfolderNoOutdir/amd/sourcemapSubfolderNoOutdir.sourcemap.txt index e9fd62ee40d..13e2e393c73 100644 --- a/tests/baselines/reference/project/sourcemapSubfolderNoOutdir/amd/sourcemapSubfolderNoOutdir.sourcemap.txt +++ b/tests/baselines/reference/project/sourcemapSubfolderNoOutdir/amd/sourcemapSubfolderNoOutdir.sourcemap.txt @@ -61,7 +61,7 @@ sourceFile:m1.ts 1->Emitted(5, 5) Source(4, 1) + SourceIndex(0) 2 >Emitted(5, 17) Source(4, 2) + SourceIndex(0) --- ->>>})(); +>>>}()); 1 > 2 >^ 3 > @@ -213,7 +213,7 @@ sourceFile:test.ts 1->Emitted(6, 5) Source(5, 1) + SourceIndex(0) 2 >Emitted(6, 14) Source(5, 2) + SourceIndex(0) --- ->>>})(); +>>>}()); 1 > 2 >^ 3 > diff --git a/tests/baselines/reference/project/sourcemapSubfolderNoOutdir/node/ref/m1.js b/tests/baselines/reference/project/sourcemapSubfolderNoOutdir/node/ref/m1.js index f6b169662c9..b7283f7fd88 100644 --- a/tests/baselines/reference/project/sourcemapSubfolderNoOutdir/node/ref/m1.js +++ b/tests/baselines/reference/project/sourcemapSubfolderNoOutdir/node/ref/m1.js @@ -3,7 +3,7 @@ var m1_c1 = (function () { function m1_c1() { } return m1_c1; -})(); +}()); var m1_instance1 = new m1_c1(); function m1_f1() { return m1_instance1; diff --git a/tests/baselines/reference/project/sourcemapSubfolderNoOutdir/node/sourcemapSubfolderNoOutdir.sourcemap.txt b/tests/baselines/reference/project/sourcemapSubfolderNoOutdir/node/sourcemapSubfolderNoOutdir.sourcemap.txt index e9fd62ee40d..13e2e393c73 100644 --- a/tests/baselines/reference/project/sourcemapSubfolderNoOutdir/node/sourcemapSubfolderNoOutdir.sourcemap.txt +++ b/tests/baselines/reference/project/sourcemapSubfolderNoOutdir/node/sourcemapSubfolderNoOutdir.sourcemap.txt @@ -61,7 +61,7 @@ sourceFile:m1.ts 1->Emitted(5, 5) Source(4, 1) + SourceIndex(0) 2 >Emitted(5, 17) Source(4, 2) + SourceIndex(0) --- ->>>})(); +>>>}()); 1 > 2 >^ 3 > @@ -213,7 +213,7 @@ sourceFile:test.ts 1->Emitted(6, 5) Source(5, 1) + SourceIndex(0) 2 >Emitted(6, 14) Source(5, 2) + SourceIndex(0) --- ->>>})(); +>>>}()); 1 > 2 >^ 3 > diff --git a/tests/baselines/reference/project/sourcemapSubfolderSpecifyOutputDirectory/amd/outdir/simple/ref/m1.js b/tests/baselines/reference/project/sourcemapSubfolderSpecifyOutputDirectory/amd/outdir/simple/ref/m1.js index f6b169662c9..b7283f7fd88 100644 --- a/tests/baselines/reference/project/sourcemapSubfolderSpecifyOutputDirectory/amd/outdir/simple/ref/m1.js +++ b/tests/baselines/reference/project/sourcemapSubfolderSpecifyOutputDirectory/amd/outdir/simple/ref/m1.js @@ -3,7 +3,7 @@ var m1_c1 = (function () { function m1_c1() { } return m1_c1; -})(); +}()); var m1_instance1 = new m1_c1(); function m1_f1() { return m1_instance1; diff --git a/tests/baselines/reference/project/sourcemapSubfolderSpecifyOutputDirectory/amd/sourcemapSubfolderSpecifyOutputDirectory.sourcemap.txt b/tests/baselines/reference/project/sourcemapSubfolderSpecifyOutputDirectory/amd/sourcemapSubfolderSpecifyOutputDirectory.sourcemap.txt index fd9ac18f508..661399a1d42 100644 --- a/tests/baselines/reference/project/sourcemapSubfolderSpecifyOutputDirectory/amd/sourcemapSubfolderSpecifyOutputDirectory.sourcemap.txt +++ b/tests/baselines/reference/project/sourcemapSubfolderSpecifyOutputDirectory/amd/sourcemapSubfolderSpecifyOutputDirectory.sourcemap.txt @@ -61,7 +61,7 @@ sourceFile:../../../ref/m1.ts 1->Emitted(5, 5) Source(4, 1) + SourceIndex(0) 2 >Emitted(5, 17) Source(4, 2) + SourceIndex(0) --- ->>>})(); +>>>}()); 1 > 2 >^ 3 > @@ -213,7 +213,7 @@ sourceFile:../../test.ts 1->Emitted(6, 5) Source(5, 1) + SourceIndex(0) 2 >Emitted(6, 14) Source(5, 2) + SourceIndex(0) --- ->>>})(); +>>>}()); 1 > 2 >^ 3 > diff --git a/tests/baselines/reference/project/sourcemapSubfolderSpecifyOutputDirectory/node/outdir/simple/ref/m1.js b/tests/baselines/reference/project/sourcemapSubfolderSpecifyOutputDirectory/node/outdir/simple/ref/m1.js index f6b169662c9..b7283f7fd88 100644 --- a/tests/baselines/reference/project/sourcemapSubfolderSpecifyOutputDirectory/node/outdir/simple/ref/m1.js +++ b/tests/baselines/reference/project/sourcemapSubfolderSpecifyOutputDirectory/node/outdir/simple/ref/m1.js @@ -3,7 +3,7 @@ var m1_c1 = (function () { function m1_c1() { } return m1_c1; -})(); +}()); var m1_instance1 = new m1_c1(); function m1_f1() { return m1_instance1; diff --git a/tests/baselines/reference/project/sourcemapSubfolderSpecifyOutputDirectory/node/sourcemapSubfolderSpecifyOutputDirectory.sourcemap.txt b/tests/baselines/reference/project/sourcemapSubfolderSpecifyOutputDirectory/node/sourcemapSubfolderSpecifyOutputDirectory.sourcemap.txt index fd9ac18f508..661399a1d42 100644 --- a/tests/baselines/reference/project/sourcemapSubfolderSpecifyOutputDirectory/node/sourcemapSubfolderSpecifyOutputDirectory.sourcemap.txt +++ b/tests/baselines/reference/project/sourcemapSubfolderSpecifyOutputDirectory/node/sourcemapSubfolderSpecifyOutputDirectory.sourcemap.txt @@ -61,7 +61,7 @@ sourceFile:../../../ref/m1.ts 1->Emitted(5, 5) Source(4, 1) + SourceIndex(0) 2 >Emitted(5, 17) Source(4, 2) + SourceIndex(0) --- ->>>})(); +>>>}()); 1 > 2 >^ 3 > @@ -213,7 +213,7 @@ sourceFile:../../test.ts 1->Emitted(6, 5) Source(5, 1) + SourceIndex(0) 2 >Emitted(6, 14) Source(5, 2) + SourceIndex(0) --- ->>>})(); +>>>}()); 1 > 2 >^ 3 > diff --git a/tests/baselines/reference/project/sourcemapSubfolderSpecifyOutputFile/amd/bin/test.js b/tests/baselines/reference/project/sourcemapSubfolderSpecifyOutputFile/amd/bin/test.js index c82993389bf..a4566036746 100644 --- a/tests/baselines/reference/project/sourcemapSubfolderSpecifyOutputFile/amd/bin/test.js +++ b/tests/baselines/reference/project/sourcemapSubfolderSpecifyOutputFile/amd/bin/test.js @@ -3,7 +3,7 @@ var m1_c1 = (function () { function m1_c1() { } return m1_c1; -})(); +}()); var m1_instance1 = new m1_c1(); function m1_f1() { return m1_instance1; @@ -14,7 +14,7 @@ var c1 = (function () { function c1() { } return c1; -})(); +}()); var instance1 = new c1(); function f1() { return instance1; diff --git a/tests/baselines/reference/project/sourcemapSubfolderSpecifyOutputFile/amd/sourcemapSubfolderSpecifyOutputFile.sourcemap.txt b/tests/baselines/reference/project/sourcemapSubfolderSpecifyOutputFile/amd/sourcemapSubfolderSpecifyOutputFile.sourcemap.txt index 09d4554b318..4aec10765d4 100644 --- a/tests/baselines/reference/project/sourcemapSubfolderSpecifyOutputFile/amd/sourcemapSubfolderSpecifyOutputFile.sourcemap.txt +++ b/tests/baselines/reference/project/sourcemapSubfolderSpecifyOutputFile/amd/sourcemapSubfolderSpecifyOutputFile.sourcemap.txt @@ -61,7 +61,7 @@ sourceFile:../ref/m1.ts 1->Emitted(5, 5) Source(4, 1) + SourceIndex(0) 2 >Emitted(5, 17) Source(4, 2) + SourceIndex(0) --- ->>>})(); +>>>}()); 1 > 2 >^ 3 > @@ -207,7 +207,7 @@ sourceFile:../test.ts 1->Emitted(16, 5) Source(5, 1) + SourceIndex(1) 2 >Emitted(16, 14) Source(5, 2) + SourceIndex(1) --- ->>>})(); +>>>}()); 1 > 2 >^ 3 > diff --git a/tests/baselines/reference/project/sourcemapSubfolderSpecifyOutputFile/node/bin/test.js b/tests/baselines/reference/project/sourcemapSubfolderSpecifyOutputFile/node/bin/test.js index c82993389bf..a4566036746 100644 --- a/tests/baselines/reference/project/sourcemapSubfolderSpecifyOutputFile/node/bin/test.js +++ b/tests/baselines/reference/project/sourcemapSubfolderSpecifyOutputFile/node/bin/test.js @@ -3,7 +3,7 @@ var m1_c1 = (function () { function m1_c1() { } return m1_c1; -})(); +}()); var m1_instance1 = new m1_c1(); function m1_f1() { return m1_instance1; @@ -14,7 +14,7 @@ var c1 = (function () { function c1() { } return c1; -})(); +}()); var instance1 = new c1(); function f1() { return instance1; diff --git a/tests/baselines/reference/project/sourcemapSubfolderSpecifyOutputFile/node/sourcemapSubfolderSpecifyOutputFile.sourcemap.txt b/tests/baselines/reference/project/sourcemapSubfolderSpecifyOutputFile/node/sourcemapSubfolderSpecifyOutputFile.sourcemap.txt index 09d4554b318..4aec10765d4 100644 --- a/tests/baselines/reference/project/sourcemapSubfolderSpecifyOutputFile/node/sourcemapSubfolderSpecifyOutputFile.sourcemap.txt +++ b/tests/baselines/reference/project/sourcemapSubfolderSpecifyOutputFile/node/sourcemapSubfolderSpecifyOutputFile.sourcemap.txt @@ -61,7 +61,7 @@ sourceFile:../ref/m1.ts 1->Emitted(5, 5) Source(4, 1) + SourceIndex(0) 2 >Emitted(5, 17) Source(4, 2) + SourceIndex(0) --- ->>>})(); +>>>}()); 1 > 2 >^ 3 > @@ -207,7 +207,7 @@ sourceFile:../test.ts 1->Emitted(16, 5) Source(5, 1) + SourceIndex(1) 2 >Emitted(16, 14) Source(5, 2) + SourceIndex(1) --- ->>>})(); +>>>}()); 1 > 2 >^ 3 > diff --git a/tests/baselines/reference/project/sourcerootUrlMixedSubfolderNoOutdir/amd/ref/m1.js b/tests/baselines/reference/project/sourcerootUrlMixedSubfolderNoOutdir/amd/ref/m1.js index f6b169662c9..b7283f7fd88 100644 --- a/tests/baselines/reference/project/sourcerootUrlMixedSubfolderNoOutdir/amd/ref/m1.js +++ b/tests/baselines/reference/project/sourcerootUrlMixedSubfolderNoOutdir/amd/ref/m1.js @@ -3,7 +3,7 @@ var m1_c1 = (function () { function m1_c1() { } return m1_c1; -})(); +}()); var m1_instance1 = new m1_c1(); function m1_f1() { return m1_instance1; diff --git a/tests/baselines/reference/project/sourcerootUrlMixedSubfolderNoOutdir/amd/sourcerootUrlMixedSubfolderNoOutdir.sourcemap.txt b/tests/baselines/reference/project/sourcerootUrlMixedSubfolderNoOutdir/amd/sourcerootUrlMixedSubfolderNoOutdir.sourcemap.txt index c07300abf91..7c7845dc4d7 100644 --- a/tests/baselines/reference/project/sourcerootUrlMixedSubfolderNoOutdir/amd/sourcerootUrlMixedSubfolderNoOutdir.sourcemap.txt +++ b/tests/baselines/reference/project/sourcerootUrlMixedSubfolderNoOutdir/amd/sourcerootUrlMixedSubfolderNoOutdir.sourcemap.txt @@ -61,7 +61,7 @@ sourceFile:ref/m1.ts 1->Emitted(5, 5) Source(4, 1) + SourceIndex(0) 2 >Emitted(5, 17) Source(4, 2) + SourceIndex(0) --- ->>>})(); +>>>}()); 1 > 2 >^ 3 > @@ -203,7 +203,7 @@ sourceFile:ref/m2.ts 1->Emitted(7, 9) Source(4, 1) + SourceIndex(0) 2 >Emitted(7, 21) Source(4, 2) + SourceIndex(0) --- ->>> })(); +>>> }()); 1 >^^^^ 2 > ^ 3 > @@ -396,7 +396,7 @@ sourceFile:test.ts 1->Emitted(7, 5) Source(6, 1) + SourceIndex(0) 2 >Emitted(7, 14) Source(6, 2) + SourceIndex(0) --- ->>>})(); +>>>}()); 1 > 2 >^ 3 > diff --git a/tests/baselines/reference/project/sourcerootUrlMixedSubfolderNoOutdir/node/ref/m1.js b/tests/baselines/reference/project/sourcerootUrlMixedSubfolderNoOutdir/node/ref/m1.js index f6b169662c9..b7283f7fd88 100644 --- a/tests/baselines/reference/project/sourcerootUrlMixedSubfolderNoOutdir/node/ref/m1.js +++ b/tests/baselines/reference/project/sourcerootUrlMixedSubfolderNoOutdir/node/ref/m1.js @@ -3,7 +3,7 @@ var m1_c1 = (function () { function m1_c1() { } return m1_c1; -})(); +}()); var m1_instance1 = new m1_c1(); function m1_f1() { return m1_instance1; diff --git a/tests/baselines/reference/project/sourcerootUrlMixedSubfolderNoOutdir/node/sourcerootUrlMixedSubfolderNoOutdir.sourcemap.txt b/tests/baselines/reference/project/sourcerootUrlMixedSubfolderNoOutdir/node/sourcerootUrlMixedSubfolderNoOutdir.sourcemap.txt index 072b66be998..dacb09a48ca 100644 --- a/tests/baselines/reference/project/sourcerootUrlMixedSubfolderNoOutdir/node/sourcerootUrlMixedSubfolderNoOutdir.sourcemap.txt +++ b/tests/baselines/reference/project/sourcerootUrlMixedSubfolderNoOutdir/node/sourcerootUrlMixedSubfolderNoOutdir.sourcemap.txt @@ -61,7 +61,7 @@ sourceFile:ref/m1.ts 1->Emitted(5, 5) Source(4, 1) + SourceIndex(0) 2 >Emitted(5, 17) Source(4, 2) + SourceIndex(0) --- ->>>})(); +>>>}()); 1 > 2 >^ 3 > @@ -202,7 +202,7 @@ sourceFile:ref/m2.ts 1->Emitted(6, 5) Source(4, 1) + SourceIndex(0) 2 >Emitted(6, 17) Source(4, 2) + SourceIndex(0) --- ->>>})(); +>>>}()); 1 > 2 >^ 3 > @@ -395,7 +395,7 @@ sourceFile:test.ts 1->Emitted(7, 5) Source(6, 1) + SourceIndex(0) 2 >Emitted(7, 14) Source(6, 2) + SourceIndex(0) --- ->>>})(); +>>>}()); 1 > 2 >^ 3 > diff --git a/tests/baselines/reference/project/sourcerootUrlMixedSubfolderSpecifyOutputDirectory/amd/outdir/simple/ref/m1.js b/tests/baselines/reference/project/sourcerootUrlMixedSubfolderSpecifyOutputDirectory/amd/outdir/simple/ref/m1.js index f6b169662c9..b7283f7fd88 100644 --- a/tests/baselines/reference/project/sourcerootUrlMixedSubfolderSpecifyOutputDirectory/amd/outdir/simple/ref/m1.js +++ b/tests/baselines/reference/project/sourcerootUrlMixedSubfolderSpecifyOutputDirectory/amd/outdir/simple/ref/m1.js @@ -3,7 +3,7 @@ var m1_c1 = (function () { function m1_c1() { } return m1_c1; -})(); +}()); var m1_instance1 = new m1_c1(); function m1_f1() { return m1_instance1; diff --git a/tests/baselines/reference/project/sourcerootUrlMixedSubfolderSpecifyOutputDirectory/amd/sourcerootUrlMixedSubfolderSpecifyOutputDirectory.sourcemap.txt b/tests/baselines/reference/project/sourcerootUrlMixedSubfolderSpecifyOutputDirectory/amd/sourcerootUrlMixedSubfolderSpecifyOutputDirectory.sourcemap.txt index 51667d9da48..c5dc52b94a3 100644 --- a/tests/baselines/reference/project/sourcerootUrlMixedSubfolderSpecifyOutputDirectory/amd/sourcerootUrlMixedSubfolderSpecifyOutputDirectory.sourcemap.txt +++ b/tests/baselines/reference/project/sourcerootUrlMixedSubfolderSpecifyOutputDirectory/amd/sourcerootUrlMixedSubfolderSpecifyOutputDirectory.sourcemap.txt @@ -61,7 +61,7 @@ sourceFile:ref/m1.ts 1->Emitted(5, 5) Source(4, 1) + SourceIndex(0) 2 >Emitted(5, 17) Source(4, 2) + SourceIndex(0) --- ->>>})(); +>>>}()); 1 > 2 >^ 3 > @@ -203,7 +203,7 @@ sourceFile:ref/m2.ts 1->Emitted(7, 9) Source(4, 1) + SourceIndex(0) 2 >Emitted(7, 21) Source(4, 2) + SourceIndex(0) --- ->>> })(); +>>> }()); 1 >^^^^ 2 > ^ 3 > @@ -396,7 +396,7 @@ sourceFile:test.ts 1->Emitted(7, 5) Source(6, 1) + SourceIndex(0) 2 >Emitted(7, 14) Source(6, 2) + SourceIndex(0) --- ->>>})(); +>>>}()); 1 > 2 >^ 3 > diff --git a/tests/baselines/reference/project/sourcerootUrlMixedSubfolderSpecifyOutputDirectory/node/outdir/simple/ref/m1.js b/tests/baselines/reference/project/sourcerootUrlMixedSubfolderSpecifyOutputDirectory/node/outdir/simple/ref/m1.js index f6b169662c9..b7283f7fd88 100644 --- a/tests/baselines/reference/project/sourcerootUrlMixedSubfolderSpecifyOutputDirectory/node/outdir/simple/ref/m1.js +++ b/tests/baselines/reference/project/sourcerootUrlMixedSubfolderSpecifyOutputDirectory/node/outdir/simple/ref/m1.js @@ -3,7 +3,7 @@ var m1_c1 = (function () { function m1_c1() { } return m1_c1; -})(); +}()); var m1_instance1 = new m1_c1(); function m1_f1() { return m1_instance1; diff --git a/tests/baselines/reference/project/sourcerootUrlMixedSubfolderSpecifyOutputDirectory/node/sourcerootUrlMixedSubfolderSpecifyOutputDirectory.sourcemap.txt b/tests/baselines/reference/project/sourcerootUrlMixedSubfolderSpecifyOutputDirectory/node/sourcerootUrlMixedSubfolderSpecifyOutputDirectory.sourcemap.txt index eceffcab6bc..21a6509ddd4 100644 --- a/tests/baselines/reference/project/sourcerootUrlMixedSubfolderSpecifyOutputDirectory/node/sourcerootUrlMixedSubfolderSpecifyOutputDirectory.sourcemap.txt +++ b/tests/baselines/reference/project/sourcerootUrlMixedSubfolderSpecifyOutputDirectory/node/sourcerootUrlMixedSubfolderSpecifyOutputDirectory.sourcemap.txt @@ -61,7 +61,7 @@ sourceFile:ref/m1.ts 1->Emitted(5, 5) Source(4, 1) + SourceIndex(0) 2 >Emitted(5, 17) Source(4, 2) + SourceIndex(0) --- ->>>})(); +>>>}()); 1 > 2 >^ 3 > @@ -202,7 +202,7 @@ sourceFile:ref/m2.ts 1->Emitted(6, 5) Source(4, 1) + SourceIndex(0) 2 >Emitted(6, 17) Source(4, 2) + SourceIndex(0) --- ->>>})(); +>>>}()); 1 > 2 >^ 3 > @@ -395,7 +395,7 @@ sourceFile:test.ts 1->Emitted(7, 5) Source(6, 1) + SourceIndex(0) 2 >Emitted(7, 14) Source(6, 2) + SourceIndex(0) --- ->>>})(); +>>>}()); 1 > 2 >^ 3 > diff --git a/tests/baselines/reference/project/sourcerootUrlMixedSubfolderSpecifyOutputFile/amd/bin/test.js b/tests/baselines/reference/project/sourcerootUrlMixedSubfolderSpecifyOutputFile/amd/bin/test.js index a480aa83e80..25cfe0fccb5 100644 --- a/tests/baselines/reference/project/sourcerootUrlMixedSubfolderSpecifyOutputFile/amd/bin/test.js +++ b/tests/baselines/reference/project/sourcerootUrlMixedSubfolderSpecifyOutputFile/amd/bin/test.js @@ -3,7 +3,7 @@ var m1_c1 = (function () { function m1_c1() { } return m1_c1; -})(); +}()); var m1_instance1 = new m1_c1(); function m1_f1() { return m1_instance1; @@ -15,7 +15,7 @@ define("ref/m2", ["require", "exports"], function (require, exports) { function m2_c1() { } return m2_c1; - })(); + }()); exports.m2_c1 = m2_c1; exports.m2_instance1 = new m2_c1(); function m2_f1() { @@ -30,7 +30,7 @@ var c1 = (function () { function c1() { } return c1; -})(); +}()); var instance1 = new c1(); function f1() { return instance1; diff --git a/tests/baselines/reference/project/sourcerootUrlMixedSubfolderSpecifyOutputFile/amd/sourcerootUrlMixedSubfolderSpecifyOutputFile.sourcemap.txt b/tests/baselines/reference/project/sourcerootUrlMixedSubfolderSpecifyOutputFile/amd/sourcerootUrlMixedSubfolderSpecifyOutputFile.sourcemap.txt index b0f81c9a15c..007af88a26a 100644 --- a/tests/baselines/reference/project/sourcerootUrlMixedSubfolderSpecifyOutputFile/amd/sourcerootUrlMixedSubfolderSpecifyOutputFile.sourcemap.txt +++ b/tests/baselines/reference/project/sourcerootUrlMixedSubfolderSpecifyOutputFile/amd/sourcerootUrlMixedSubfolderSpecifyOutputFile.sourcemap.txt @@ -61,7 +61,7 @@ sourceFile:ref/m1.ts 1->Emitted(5, 5) Source(4, 1) + SourceIndex(0) 2 >Emitted(5, 17) Source(4, 2) + SourceIndex(0) --- ->>>})(); +>>>}()); 1 > 2 >^ 3 > @@ -197,7 +197,7 @@ sourceFile:ref/m2.ts 1->Emitted(17, 9) Source(4, 1) + SourceIndex(1) 2 >Emitted(17, 21) Source(4, 2) + SourceIndex(1) --- ->>> })(); +>>> }()); 1 >^^^^ 2 > ^ 3 > @@ -384,7 +384,7 @@ sourceFile:test.ts 1->Emitted(32, 5) Source(6, 1) + SourceIndex(2) 2 >Emitted(32, 14) Source(6, 2) + SourceIndex(2) --- ->>>})(); +>>>}()); 1 > 2 >^ 3 > diff --git a/tests/baselines/reference/project/sourcerootUrlMixedSubfolderSpecifyOutputFile/node/bin/test.js b/tests/baselines/reference/project/sourcerootUrlMixedSubfolderSpecifyOutputFile/node/bin/test.js index 5af28cf8560..5d63d624329 100644 --- a/tests/baselines/reference/project/sourcerootUrlMixedSubfolderSpecifyOutputFile/node/bin/test.js +++ b/tests/baselines/reference/project/sourcerootUrlMixedSubfolderSpecifyOutputFile/node/bin/test.js @@ -3,7 +3,7 @@ var m1_c1 = (function () { function m1_c1() { } return m1_c1; -})(); +}()); var m1_instance1 = new m1_c1(); function m1_f1() { return m1_instance1; @@ -15,7 +15,7 @@ var c1 = (function () { function c1() { } return c1; -})(); +}()); var instance1 = new c1(); function f1() { return instance1; diff --git a/tests/baselines/reference/project/sourcerootUrlMixedSubfolderSpecifyOutputFile/node/sourcerootUrlMixedSubfolderSpecifyOutputFile.sourcemap.txt b/tests/baselines/reference/project/sourcerootUrlMixedSubfolderSpecifyOutputFile/node/sourcerootUrlMixedSubfolderSpecifyOutputFile.sourcemap.txt index c4c07a7d1d0..507fc843895 100644 --- a/tests/baselines/reference/project/sourcerootUrlMixedSubfolderSpecifyOutputFile/node/sourcerootUrlMixedSubfolderSpecifyOutputFile.sourcemap.txt +++ b/tests/baselines/reference/project/sourcerootUrlMixedSubfolderSpecifyOutputFile/node/sourcerootUrlMixedSubfolderSpecifyOutputFile.sourcemap.txt @@ -61,7 +61,7 @@ sourceFile:ref/m1.ts 1->Emitted(5, 5) Source(4, 1) + SourceIndex(0) 2 >Emitted(5, 17) Source(4, 2) + SourceIndex(0) --- ->>>})(); +>>>}()); 1 > 2 >^ 3 > @@ -217,7 +217,7 @@ sourceFile:test.ts 1->Emitted(17, 5) Source(6, 1) + SourceIndex(2) 2 >Emitted(17, 14) Source(6, 2) + SourceIndex(2) --- ->>>})(); +>>>}()); 1 > 2 >^ 3 > diff --git a/tests/baselines/reference/project/sourcerootUrlMixedSubfolderSpecifyOutputFileAndOutputDirectory/amd/bin/outAndOutDirFile.js b/tests/baselines/reference/project/sourcerootUrlMixedSubfolderSpecifyOutputFileAndOutputDirectory/amd/bin/outAndOutDirFile.js index 1ebe03468c7..de21b030c35 100644 --- a/tests/baselines/reference/project/sourcerootUrlMixedSubfolderSpecifyOutputFileAndOutputDirectory/amd/bin/outAndOutDirFile.js +++ b/tests/baselines/reference/project/sourcerootUrlMixedSubfolderSpecifyOutputFileAndOutputDirectory/amd/bin/outAndOutDirFile.js @@ -3,7 +3,7 @@ var m1_c1 = (function () { function m1_c1() { } return m1_c1; -})(); +}()); var m1_instance1 = new m1_c1(); function m1_f1() { return m1_instance1; @@ -15,7 +15,7 @@ define("ref/m2", ["require", "exports"], function (require, exports) { function m2_c1() { } return m2_c1; - })(); + }()); exports.m2_c1 = m2_c1; exports.m2_instance1 = new m2_c1(); function m2_f1() { @@ -30,7 +30,7 @@ var c1 = (function () { function c1() { } return c1; -})(); +}()); var instance1 = new c1(); function f1() { return instance1; diff --git a/tests/baselines/reference/project/sourcerootUrlMixedSubfolderSpecifyOutputFileAndOutputDirectory/amd/sourcerootUrlMixedSubfolderSpecifyOutputFileAndOutputDirectory.sourcemap.txt b/tests/baselines/reference/project/sourcerootUrlMixedSubfolderSpecifyOutputFileAndOutputDirectory/amd/sourcerootUrlMixedSubfolderSpecifyOutputFileAndOutputDirectory.sourcemap.txt index 0f23121a493..22bd3570486 100644 --- a/tests/baselines/reference/project/sourcerootUrlMixedSubfolderSpecifyOutputFileAndOutputDirectory/amd/sourcerootUrlMixedSubfolderSpecifyOutputFileAndOutputDirectory.sourcemap.txt +++ b/tests/baselines/reference/project/sourcerootUrlMixedSubfolderSpecifyOutputFileAndOutputDirectory/amd/sourcerootUrlMixedSubfolderSpecifyOutputFileAndOutputDirectory.sourcemap.txt @@ -61,7 +61,7 @@ sourceFile:ref/m1.ts 1->Emitted(5, 5) Source(4, 1) + SourceIndex(0) 2 >Emitted(5, 17) Source(4, 2) + SourceIndex(0) --- ->>>})(); +>>>}()); 1 > 2 >^ 3 > @@ -197,7 +197,7 @@ sourceFile:ref/m2.ts 1->Emitted(17, 9) Source(4, 1) + SourceIndex(1) 2 >Emitted(17, 21) Source(4, 2) + SourceIndex(1) --- ->>> })(); +>>> }()); 1 >^^^^ 2 > ^ 3 > @@ -384,7 +384,7 @@ sourceFile:test.ts 1->Emitted(32, 5) Source(6, 1) + SourceIndex(2) 2 >Emitted(32, 14) Source(6, 2) + SourceIndex(2) --- ->>>})(); +>>>}()); 1 > 2 >^ 3 > diff --git a/tests/baselines/reference/project/sourcerootUrlMixedSubfolderSpecifyOutputFileAndOutputDirectory/node/bin/outAndOutDirFile.js b/tests/baselines/reference/project/sourcerootUrlMixedSubfolderSpecifyOutputFileAndOutputDirectory/node/bin/outAndOutDirFile.js index 1750a5975ae..da6a2015143 100644 --- a/tests/baselines/reference/project/sourcerootUrlMixedSubfolderSpecifyOutputFileAndOutputDirectory/node/bin/outAndOutDirFile.js +++ b/tests/baselines/reference/project/sourcerootUrlMixedSubfolderSpecifyOutputFileAndOutputDirectory/node/bin/outAndOutDirFile.js @@ -3,7 +3,7 @@ var m1_c1 = (function () { function m1_c1() { } return m1_c1; -})(); +}()); var m1_instance1 = new m1_c1(); function m1_f1() { return m1_instance1; @@ -15,7 +15,7 @@ var c1 = (function () { function c1() { } return c1; -})(); +}()); var instance1 = new c1(); function f1() { return instance1; diff --git a/tests/baselines/reference/project/sourcerootUrlMixedSubfolderSpecifyOutputFileAndOutputDirectory/node/sourcerootUrlMixedSubfolderSpecifyOutputFileAndOutputDirectory.sourcemap.txt b/tests/baselines/reference/project/sourcerootUrlMixedSubfolderSpecifyOutputFileAndOutputDirectory/node/sourcerootUrlMixedSubfolderSpecifyOutputFileAndOutputDirectory.sourcemap.txt index 2d42454f204..1b656424d2c 100644 --- a/tests/baselines/reference/project/sourcerootUrlMixedSubfolderSpecifyOutputFileAndOutputDirectory/node/sourcerootUrlMixedSubfolderSpecifyOutputFileAndOutputDirectory.sourcemap.txt +++ b/tests/baselines/reference/project/sourcerootUrlMixedSubfolderSpecifyOutputFileAndOutputDirectory/node/sourcerootUrlMixedSubfolderSpecifyOutputFileAndOutputDirectory.sourcemap.txt @@ -61,7 +61,7 @@ sourceFile:ref/m1.ts 1->Emitted(5, 5) Source(4, 1) + SourceIndex(0) 2 >Emitted(5, 17) Source(4, 2) + SourceIndex(0) --- ->>>})(); +>>>}()); 1 > 2 >^ 3 > @@ -217,7 +217,7 @@ sourceFile:test.ts 1->Emitted(17, 5) Source(6, 1) + SourceIndex(2) 2 >Emitted(17, 14) Source(6, 2) + SourceIndex(2) --- ->>>})(); +>>>}()); 1 > 2 >^ 3 > diff --git a/tests/baselines/reference/project/sourcerootUrlModuleMultifolderNoOutdir/amd/ref/m1.js b/tests/baselines/reference/project/sourcerootUrlModuleMultifolderNoOutdir/amd/ref/m1.js index 25001d63d84..bb59c6fbd90 100644 --- a/tests/baselines/reference/project/sourcerootUrlModuleMultifolderNoOutdir/amd/ref/m1.js +++ b/tests/baselines/reference/project/sourcerootUrlModuleMultifolderNoOutdir/amd/ref/m1.js @@ -5,7 +5,7 @@ define(["require", "exports"], function (require, exports) { function m1_c1() { } return m1_c1; - })(); + }()); exports.m1_c1 = m1_c1; exports.m1_instance1 = new m1_c1(); function m1_f1() { diff --git a/tests/baselines/reference/project/sourcerootUrlModuleMultifolderNoOutdir/amd/sourcerootUrlModuleMultifolderNoOutdir.sourcemap.txt b/tests/baselines/reference/project/sourcerootUrlModuleMultifolderNoOutdir/amd/sourcerootUrlModuleMultifolderNoOutdir.sourcemap.txt index 00f645f2eac..a7a75d094b0 100644 --- a/tests/baselines/reference/project/sourcerootUrlModuleMultifolderNoOutdir/amd/sourcerootUrlModuleMultifolderNoOutdir.sourcemap.txt +++ b/tests/baselines/reference/project/sourcerootUrlModuleMultifolderNoOutdir/amd/sourcerootUrlModuleMultifolderNoOutdir.sourcemap.txt @@ -60,7 +60,7 @@ sourceFile:outputdir_module_multifolder/ref/m1.ts 1->Emitted(7, 9) Source(4, 1) + SourceIndex(0) 2 >Emitted(7, 21) Source(4, 2) + SourceIndex(0) --- ->>> })(); +>>> }()); 1 >^^^^ 2 > ^ 3 > @@ -233,7 +233,7 @@ sourceFile:outputdir_module_multifolder_ref/m2.ts 1->Emitted(7, 9) Source(4, 1) + SourceIndex(0) 2 >Emitted(7, 21) Source(4, 2) + SourceIndex(0) --- ->>> })(); +>>> }()); 1 >^^^^ 2 > ^ 3 > @@ -408,7 +408,7 @@ sourceFile:outputdir_module_multifolder/test.ts 1->Emitted(7, 9) Source(6, 1) + SourceIndex(0) 2 >Emitted(7, 18) Source(6, 2) + SourceIndex(0) --- ->>> })(); +>>> }()); 1 >^^^^ 2 > ^ 3 > diff --git a/tests/baselines/reference/project/sourcerootUrlModuleMultifolderNoOutdir/node/ref/m1.js b/tests/baselines/reference/project/sourcerootUrlModuleMultifolderNoOutdir/node/ref/m1.js index 3bc07083900..121a089af23 100644 --- a/tests/baselines/reference/project/sourcerootUrlModuleMultifolderNoOutdir/node/ref/m1.js +++ b/tests/baselines/reference/project/sourcerootUrlModuleMultifolderNoOutdir/node/ref/m1.js @@ -4,7 +4,7 @@ var m1_c1 = (function () { function m1_c1() { } return m1_c1; -})(); +}()); exports.m1_c1 = m1_c1; exports.m1_instance1 = new m1_c1(); function m1_f1() { diff --git a/tests/baselines/reference/project/sourcerootUrlModuleMultifolderNoOutdir/node/sourcerootUrlModuleMultifolderNoOutdir.sourcemap.txt b/tests/baselines/reference/project/sourcerootUrlModuleMultifolderNoOutdir/node/sourcerootUrlModuleMultifolderNoOutdir.sourcemap.txt index b2dad692820..657327684ad 100644 --- a/tests/baselines/reference/project/sourcerootUrlModuleMultifolderNoOutdir/node/sourcerootUrlModuleMultifolderNoOutdir.sourcemap.txt +++ b/tests/baselines/reference/project/sourcerootUrlModuleMultifolderNoOutdir/node/sourcerootUrlModuleMultifolderNoOutdir.sourcemap.txt @@ -59,7 +59,7 @@ sourceFile:outputdir_module_multifolder/ref/m1.ts 1->Emitted(6, 5) Source(4, 1) + SourceIndex(0) 2 >Emitted(6, 17) Source(4, 2) + SourceIndex(0) --- ->>>})(); +>>>}()); 1 > 2 >^ 3 > @@ -231,7 +231,7 @@ sourceFile:outputdir_module_multifolder_ref/m2.ts 1->Emitted(6, 5) Source(4, 1) + SourceIndex(0) 2 >Emitted(6, 17) Source(4, 2) + SourceIndex(0) --- ->>>})(); +>>>}()); 1 > 2 >^ 3 > @@ -452,7 +452,7 @@ sourceFile:outputdir_module_multifolder/test.ts 1->Emitted(8, 5) Source(6, 1) + SourceIndex(0) 2 >Emitted(8, 14) Source(6, 2) + SourceIndex(0) --- ->>>})(); +>>>}()); 1 > 2 >^ 3 > diff --git a/tests/baselines/reference/project/sourcerootUrlModuleMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_module_multifolder/ref/m1.js b/tests/baselines/reference/project/sourcerootUrlModuleMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_module_multifolder/ref/m1.js index 25001d63d84..bb59c6fbd90 100644 --- a/tests/baselines/reference/project/sourcerootUrlModuleMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_module_multifolder/ref/m1.js +++ b/tests/baselines/reference/project/sourcerootUrlModuleMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_module_multifolder/ref/m1.js @@ -5,7 +5,7 @@ define(["require", "exports"], function (require, exports) { function m1_c1() { } return m1_c1; - })(); + }()); exports.m1_c1 = m1_c1; exports.m1_instance1 = new m1_c1(); function m1_f1() { diff --git a/tests/baselines/reference/project/sourcerootUrlModuleMultifolderSpecifyOutputDirectory/amd/sourcerootUrlModuleMultifolderSpecifyOutputDirectory.sourcemap.txt b/tests/baselines/reference/project/sourcerootUrlModuleMultifolderSpecifyOutputDirectory/amd/sourcerootUrlModuleMultifolderSpecifyOutputDirectory.sourcemap.txt index 19c0e53aa0c..a3aaf686945 100644 --- a/tests/baselines/reference/project/sourcerootUrlModuleMultifolderSpecifyOutputDirectory/amd/sourcerootUrlModuleMultifolderSpecifyOutputDirectory.sourcemap.txt +++ b/tests/baselines/reference/project/sourcerootUrlModuleMultifolderSpecifyOutputDirectory/amd/sourcerootUrlModuleMultifolderSpecifyOutputDirectory.sourcemap.txt @@ -60,7 +60,7 @@ sourceFile:outputdir_module_multifolder/ref/m1.ts 1->Emitted(7, 9) Source(4, 1) + SourceIndex(0) 2 >Emitted(7, 21) Source(4, 2) + SourceIndex(0) --- ->>> })(); +>>> }()); 1 >^^^^ 2 > ^ 3 > @@ -233,7 +233,7 @@ sourceFile:outputdir_module_multifolder_ref/m2.ts 1->Emitted(7, 9) Source(4, 1) + SourceIndex(0) 2 >Emitted(7, 21) Source(4, 2) + SourceIndex(0) --- ->>> })(); +>>> }()); 1 >^^^^ 2 > ^ 3 > @@ -408,7 +408,7 @@ sourceFile:outputdir_module_multifolder/test.ts 1->Emitted(7, 9) Source(6, 1) + SourceIndex(0) 2 >Emitted(7, 18) Source(6, 2) + SourceIndex(0) --- ->>> })(); +>>> }()); 1 >^^^^ 2 > ^ 3 > diff --git a/tests/baselines/reference/project/sourcerootUrlModuleMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_module_multifolder/ref/m1.js b/tests/baselines/reference/project/sourcerootUrlModuleMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_module_multifolder/ref/m1.js index 3bc07083900..121a089af23 100644 --- a/tests/baselines/reference/project/sourcerootUrlModuleMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_module_multifolder/ref/m1.js +++ b/tests/baselines/reference/project/sourcerootUrlModuleMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_module_multifolder/ref/m1.js @@ -4,7 +4,7 @@ var m1_c1 = (function () { function m1_c1() { } return m1_c1; -})(); +}()); exports.m1_c1 = m1_c1; exports.m1_instance1 = new m1_c1(); function m1_f1() { diff --git a/tests/baselines/reference/project/sourcerootUrlModuleMultifolderSpecifyOutputDirectory/node/sourcerootUrlModuleMultifolderSpecifyOutputDirectory.sourcemap.txt b/tests/baselines/reference/project/sourcerootUrlModuleMultifolderSpecifyOutputDirectory/node/sourcerootUrlModuleMultifolderSpecifyOutputDirectory.sourcemap.txt index 296dcf75dc7..5b61d42875b 100644 --- a/tests/baselines/reference/project/sourcerootUrlModuleMultifolderSpecifyOutputDirectory/node/sourcerootUrlModuleMultifolderSpecifyOutputDirectory.sourcemap.txt +++ b/tests/baselines/reference/project/sourcerootUrlModuleMultifolderSpecifyOutputDirectory/node/sourcerootUrlModuleMultifolderSpecifyOutputDirectory.sourcemap.txt @@ -59,7 +59,7 @@ sourceFile:outputdir_module_multifolder/ref/m1.ts 1->Emitted(6, 5) Source(4, 1) + SourceIndex(0) 2 >Emitted(6, 17) Source(4, 2) + SourceIndex(0) --- ->>>})(); +>>>}()); 1 > 2 >^ 3 > @@ -231,7 +231,7 @@ sourceFile:outputdir_module_multifolder_ref/m2.ts 1->Emitted(6, 5) Source(4, 1) + SourceIndex(0) 2 >Emitted(6, 17) Source(4, 2) + SourceIndex(0) --- ->>>})(); +>>>}()); 1 > 2 >^ 3 > @@ -452,7 +452,7 @@ sourceFile:outputdir_module_multifolder/test.ts 1->Emitted(8, 5) Source(6, 1) + SourceIndex(0) 2 >Emitted(8, 14) Source(6, 2) + SourceIndex(0) --- ->>>})(); +>>>}()); 1 > 2 >^ 3 > diff --git a/tests/baselines/reference/project/sourcerootUrlModuleMultifolderSpecifyOutputFile/amd/bin/test.js b/tests/baselines/reference/project/sourcerootUrlModuleMultifolderSpecifyOutputFile/amd/bin/test.js index 5db4d6336f1..37064fb583b 100644 --- a/tests/baselines/reference/project/sourcerootUrlModuleMultifolderSpecifyOutputFile/amd/bin/test.js +++ b/tests/baselines/reference/project/sourcerootUrlModuleMultifolderSpecifyOutputFile/amd/bin/test.js @@ -5,7 +5,7 @@ define("outputdir_module_multifolder/ref/m1", ["require", "exports"], function ( function m1_c1() { } return m1_c1; - })(); + }()); exports.m1_c1 = m1_c1; exports.m1_instance1 = new m1_c1(); function m1_f1() { @@ -20,7 +20,7 @@ define("outputdir_module_multifolder_ref/m2", ["require", "exports"], function ( function m2_c1() { } return m2_c1; - })(); + }()); exports.m2_c1 = m2_c1; exports.m2_instance1 = new m2_c1(); function m2_f1() { @@ -35,7 +35,7 @@ define("outputdir_module_multifolder/test", ["require", "exports", "outputdir_mo function c1() { } return c1; - })(); + }()); exports.c1 = c1; exports.instance1 = new c1(); function f1() { diff --git a/tests/baselines/reference/project/sourcerootUrlModuleMultifolderSpecifyOutputFile/amd/sourcerootUrlModuleMultifolderSpecifyOutputFile.sourcemap.txt b/tests/baselines/reference/project/sourcerootUrlModuleMultifolderSpecifyOutputFile/amd/sourcerootUrlModuleMultifolderSpecifyOutputFile.sourcemap.txt index e4b0a3e7496..ee3c5a5ca71 100644 --- a/tests/baselines/reference/project/sourcerootUrlModuleMultifolderSpecifyOutputFile/amd/sourcerootUrlModuleMultifolderSpecifyOutputFile.sourcemap.txt +++ b/tests/baselines/reference/project/sourcerootUrlModuleMultifolderSpecifyOutputFile/amd/sourcerootUrlModuleMultifolderSpecifyOutputFile.sourcemap.txt @@ -60,7 +60,7 @@ sourceFile:outputdir_module_multifolder/ref/m1.ts 1->Emitted(7, 9) Source(4, 1) + SourceIndex(0) 2 >Emitted(7, 21) Source(4, 2) + SourceIndex(0) --- ->>> })(); +>>> }()); 1 >^^^^ 2 > ^ 3 > @@ -227,7 +227,7 @@ sourceFile:outputdir_module_multifolder_ref/m2.ts 1->Emitted(22, 9) Source(4, 1) + SourceIndex(1) 2 >Emitted(22, 21) Source(4, 2) + SourceIndex(1) --- ->>> })(); +>>> }()); 1 >^^^^ 2 > ^ 3 > @@ -396,7 +396,7 @@ sourceFile:outputdir_module_multifolder/test.ts 1->Emitted(37, 9) Source(6, 1) + SourceIndex(2) 2 >Emitted(37, 18) Source(6, 2) + SourceIndex(2) --- ->>> })(); +>>> }()); 1 >^^^^ 2 > ^ 3 > diff --git a/tests/baselines/reference/project/sourcerootUrlModuleSimpleNoOutdir/amd/m1.js b/tests/baselines/reference/project/sourcerootUrlModuleSimpleNoOutdir/amd/m1.js index 25001d63d84..bb59c6fbd90 100644 --- a/tests/baselines/reference/project/sourcerootUrlModuleSimpleNoOutdir/amd/m1.js +++ b/tests/baselines/reference/project/sourcerootUrlModuleSimpleNoOutdir/amd/m1.js @@ -5,7 +5,7 @@ define(["require", "exports"], function (require, exports) { function m1_c1() { } return m1_c1; - })(); + }()); exports.m1_c1 = m1_c1; exports.m1_instance1 = new m1_c1(); function m1_f1() { diff --git a/tests/baselines/reference/project/sourcerootUrlModuleSimpleNoOutdir/amd/sourcerootUrlModuleSimpleNoOutdir.sourcemap.txt b/tests/baselines/reference/project/sourcerootUrlModuleSimpleNoOutdir/amd/sourcerootUrlModuleSimpleNoOutdir.sourcemap.txt index d5d3573d71e..ac92d511dce 100644 --- a/tests/baselines/reference/project/sourcerootUrlModuleSimpleNoOutdir/amd/sourcerootUrlModuleSimpleNoOutdir.sourcemap.txt +++ b/tests/baselines/reference/project/sourcerootUrlModuleSimpleNoOutdir/amd/sourcerootUrlModuleSimpleNoOutdir.sourcemap.txt @@ -60,7 +60,7 @@ sourceFile:m1.ts 1->Emitted(7, 9) Source(4, 1) + SourceIndex(0) 2 >Emitted(7, 21) Source(4, 2) + SourceIndex(0) --- ->>> })(); +>>> }()); 1 >^^^^ 2 > ^ 3 > @@ -234,7 +234,7 @@ sourceFile:test.ts 1->Emitted(7, 9) Source(5, 1) + SourceIndex(0) 2 >Emitted(7, 18) Source(5, 2) + SourceIndex(0) --- ->>> })(); +>>> }()); 1 >^^^^ 2 > ^ 3 > diff --git a/tests/baselines/reference/project/sourcerootUrlModuleSimpleNoOutdir/node/m1.js b/tests/baselines/reference/project/sourcerootUrlModuleSimpleNoOutdir/node/m1.js index 3bc07083900..121a089af23 100644 --- a/tests/baselines/reference/project/sourcerootUrlModuleSimpleNoOutdir/node/m1.js +++ b/tests/baselines/reference/project/sourcerootUrlModuleSimpleNoOutdir/node/m1.js @@ -4,7 +4,7 @@ var m1_c1 = (function () { function m1_c1() { } return m1_c1; -})(); +}()); exports.m1_c1 = m1_c1; exports.m1_instance1 = new m1_c1(); function m1_f1() { diff --git a/tests/baselines/reference/project/sourcerootUrlModuleSimpleNoOutdir/node/sourcerootUrlModuleSimpleNoOutdir.sourcemap.txt b/tests/baselines/reference/project/sourcerootUrlModuleSimpleNoOutdir/node/sourcerootUrlModuleSimpleNoOutdir.sourcemap.txt index 379d118fec0..6ab1c1d6310 100644 --- a/tests/baselines/reference/project/sourcerootUrlModuleSimpleNoOutdir/node/sourcerootUrlModuleSimpleNoOutdir.sourcemap.txt +++ b/tests/baselines/reference/project/sourcerootUrlModuleSimpleNoOutdir/node/sourcerootUrlModuleSimpleNoOutdir.sourcemap.txt @@ -59,7 +59,7 @@ sourceFile:m1.ts 1->Emitted(6, 5) Source(4, 1) + SourceIndex(0) 2 >Emitted(6, 17) Source(4, 2) + SourceIndex(0) --- ->>>})(); +>>>}()); 1 > 2 >^ 3 > @@ -255,7 +255,7 @@ sourceFile:test.ts 1->Emitted(7, 5) Source(5, 1) + SourceIndex(0) 2 >Emitted(7, 14) Source(5, 2) + SourceIndex(0) --- ->>>})(); +>>>}()); 1 > 2 >^ 3 > diff --git a/tests/baselines/reference/project/sourcerootUrlModuleSimpleSpecifyOutputDirectory/amd/outdir/simple/m1.js b/tests/baselines/reference/project/sourcerootUrlModuleSimpleSpecifyOutputDirectory/amd/outdir/simple/m1.js index 25001d63d84..bb59c6fbd90 100644 --- a/tests/baselines/reference/project/sourcerootUrlModuleSimpleSpecifyOutputDirectory/amd/outdir/simple/m1.js +++ b/tests/baselines/reference/project/sourcerootUrlModuleSimpleSpecifyOutputDirectory/amd/outdir/simple/m1.js @@ -5,7 +5,7 @@ define(["require", "exports"], function (require, exports) { function m1_c1() { } return m1_c1; - })(); + }()); exports.m1_c1 = m1_c1; exports.m1_instance1 = new m1_c1(); function m1_f1() { diff --git a/tests/baselines/reference/project/sourcerootUrlModuleSimpleSpecifyOutputDirectory/amd/sourcerootUrlModuleSimpleSpecifyOutputDirectory.sourcemap.txt b/tests/baselines/reference/project/sourcerootUrlModuleSimpleSpecifyOutputDirectory/amd/sourcerootUrlModuleSimpleSpecifyOutputDirectory.sourcemap.txt index 7df1b9ec85b..c29900cfdc9 100644 --- a/tests/baselines/reference/project/sourcerootUrlModuleSimpleSpecifyOutputDirectory/amd/sourcerootUrlModuleSimpleSpecifyOutputDirectory.sourcemap.txt +++ b/tests/baselines/reference/project/sourcerootUrlModuleSimpleSpecifyOutputDirectory/amd/sourcerootUrlModuleSimpleSpecifyOutputDirectory.sourcemap.txt @@ -60,7 +60,7 @@ sourceFile:m1.ts 1->Emitted(7, 9) Source(4, 1) + SourceIndex(0) 2 >Emitted(7, 21) Source(4, 2) + SourceIndex(0) --- ->>> })(); +>>> }()); 1 >^^^^ 2 > ^ 3 > @@ -234,7 +234,7 @@ sourceFile:test.ts 1->Emitted(7, 9) Source(5, 1) + SourceIndex(0) 2 >Emitted(7, 18) Source(5, 2) + SourceIndex(0) --- ->>> })(); +>>> }()); 1 >^^^^ 2 > ^ 3 > diff --git a/tests/baselines/reference/project/sourcerootUrlModuleSimpleSpecifyOutputDirectory/node/outdir/simple/m1.js b/tests/baselines/reference/project/sourcerootUrlModuleSimpleSpecifyOutputDirectory/node/outdir/simple/m1.js index 3bc07083900..121a089af23 100644 --- a/tests/baselines/reference/project/sourcerootUrlModuleSimpleSpecifyOutputDirectory/node/outdir/simple/m1.js +++ b/tests/baselines/reference/project/sourcerootUrlModuleSimpleSpecifyOutputDirectory/node/outdir/simple/m1.js @@ -4,7 +4,7 @@ var m1_c1 = (function () { function m1_c1() { } return m1_c1; -})(); +}()); exports.m1_c1 = m1_c1; exports.m1_instance1 = new m1_c1(); function m1_f1() { diff --git a/tests/baselines/reference/project/sourcerootUrlModuleSimpleSpecifyOutputDirectory/node/sourcerootUrlModuleSimpleSpecifyOutputDirectory.sourcemap.txt b/tests/baselines/reference/project/sourcerootUrlModuleSimpleSpecifyOutputDirectory/node/sourcerootUrlModuleSimpleSpecifyOutputDirectory.sourcemap.txt index cd4d334d3e2..f4c1f40d95b 100644 --- a/tests/baselines/reference/project/sourcerootUrlModuleSimpleSpecifyOutputDirectory/node/sourcerootUrlModuleSimpleSpecifyOutputDirectory.sourcemap.txt +++ b/tests/baselines/reference/project/sourcerootUrlModuleSimpleSpecifyOutputDirectory/node/sourcerootUrlModuleSimpleSpecifyOutputDirectory.sourcemap.txt @@ -59,7 +59,7 @@ sourceFile:m1.ts 1->Emitted(6, 5) Source(4, 1) + SourceIndex(0) 2 >Emitted(6, 17) Source(4, 2) + SourceIndex(0) --- ->>>})(); +>>>}()); 1 > 2 >^ 3 > @@ -255,7 +255,7 @@ sourceFile:test.ts 1->Emitted(7, 5) Source(5, 1) + SourceIndex(0) 2 >Emitted(7, 14) Source(5, 2) + SourceIndex(0) --- ->>>})(); +>>>}()); 1 > 2 >^ 3 > diff --git a/tests/baselines/reference/project/sourcerootUrlModuleSimpleSpecifyOutputFile/amd/bin/test.js b/tests/baselines/reference/project/sourcerootUrlModuleSimpleSpecifyOutputFile/amd/bin/test.js index cc73ea698fe..d650b20ae5f 100644 --- a/tests/baselines/reference/project/sourcerootUrlModuleSimpleSpecifyOutputFile/amd/bin/test.js +++ b/tests/baselines/reference/project/sourcerootUrlModuleSimpleSpecifyOutputFile/amd/bin/test.js @@ -5,7 +5,7 @@ define("m1", ["require", "exports"], function (require, exports) { function m1_c1() { } return m1_c1; - })(); + }()); exports.m1_c1 = m1_c1; exports.m1_instance1 = new m1_c1(); function m1_f1() { @@ -20,7 +20,7 @@ define("test", ["require", "exports", "m1"], function (require, exports, m1) { function c1() { } return c1; - })(); + }()); exports.c1 = c1; exports.instance1 = new c1(); function f1() { diff --git a/tests/baselines/reference/project/sourcerootUrlModuleSimpleSpecifyOutputFile/amd/sourcerootUrlModuleSimpleSpecifyOutputFile.sourcemap.txt b/tests/baselines/reference/project/sourcerootUrlModuleSimpleSpecifyOutputFile/amd/sourcerootUrlModuleSimpleSpecifyOutputFile.sourcemap.txt index 1288ae58ca5..adb1e2c76b3 100644 --- a/tests/baselines/reference/project/sourcerootUrlModuleSimpleSpecifyOutputFile/amd/sourcerootUrlModuleSimpleSpecifyOutputFile.sourcemap.txt +++ b/tests/baselines/reference/project/sourcerootUrlModuleSimpleSpecifyOutputFile/amd/sourcerootUrlModuleSimpleSpecifyOutputFile.sourcemap.txt @@ -60,7 +60,7 @@ sourceFile:m1.ts 1->Emitted(7, 9) Source(4, 1) + SourceIndex(0) 2 >Emitted(7, 21) Source(4, 2) + SourceIndex(0) --- ->>> })(); +>>> }()); 1 >^^^^ 2 > ^ 3 > @@ -228,7 +228,7 @@ sourceFile:test.ts 1->Emitted(22, 9) Source(5, 1) + SourceIndex(1) 2 >Emitted(22, 18) Source(5, 2) + SourceIndex(1) --- ->>> })(); +>>> }()); 1 >^^^^ 2 > ^ 3 > diff --git a/tests/baselines/reference/project/sourcerootUrlModuleSubfolderNoOutdir/amd/ref/m1.js b/tests/baselines/reference/project/sourcerootUrlModuleSubfolderNoOutdir/amd/ref/m1.js index 25001d63d84..bb59c6fbd90 100644 --- a/tests/baselines/reference/project/sourcerootUrlModuleSubfolderNoOutdir/amd/ref/m1.js +++ b/tests/baselines/reference/project/sourcerootUrlModuleSubfolderNoOutdir/amd/ref/m1.js @@ -5,7 +5,7 @@ define(["require", "exports"], function (require, exports) { function m1_c1() { } return m1_c1; - })(); + }()); exports.m1_c1 = m1_c1; exports.m1_instance1 = new m1_c1(); function m1_f1() { diff --git a/tests/baselines/reference/project/sourcerootUrlModuleSubfolderNoOutdir/amd/sourcerootUrlModuleSubfolderNoOutdir.sourcemap.txt b/tests/baselines/reference/project/sourcerootUrlModuleSubfolderNoOutdir/amd/sourcerootUrlModuleSubfolderNoOutdir.sourcemap.txt index 94f188a5e3d..cb3f179fd1b 100644 --- a/tests/baselines/reference/project/sourcerootUrlModuleSubfolderNoOutdir/amd/sourcerootUrlModuleSubfolderNoOutdir.sourcemap.txt +++ b/tests/baselines/reference/project/sourcerootUrlModuleSubfolderNoOutdir/amd/sourcerootUrlModuleSubfolderNoOutdir.sourcemap.txt @@ -60,7 +60,7 @@ sourceFile:ref/m1.ts 1->Emitted(7, 9) Source(4, 1) + SourceIndex(0) 2 >Emitted(7, 21) Source(4, 2) + SourceIndex(0) --- ->>> })(); +>>> }()); 1 >^^^^ 2 > ^ 3 > @@ -234,7 +234,7 @@ sourceFile:test.ts 1->Emitted(7, 9) Source(5, 1) + SourceIndex(0) 2 >Emitted(7, 18) Source(5, 2) + SourceIndex(0) --- ->>> })(); +>>> }()); 1 >^^^^ 2 > ^ 3 > diff --git a/tests/baselines/reference/project/sourcerootUrlModuleSubfolderNoOutdir/node/ref/m1.js b/tests/baselines/reference/project/sourcerootUrlModuleSubfolderNoOutdir/node/ref/m1.js index 3bc07083900..121a089af23 100644 --- a/tests/baselines/reference/project/sourcerootUrlModuleSubfolderNoOutdir/node/ref/m1.js +++ b/tests/baselines/reference/project/sourcerootUrlModuleSubfolderNoOutdir/node/ref/m1.js @@ -4,7 +4,7 @@ var m1_c1 = (function () { function m1_c1() { } return m1_c1; -})(); +}()); exports.m1_c1 = m1_c1; exports.m1_instance1 = new m1_c1(); function m1_f1() { diff --git a/tests/baselines/reference/project/sourcerootUrlModuleSubfolderNoOutdir/node/sourcerootUrlModuleSubfolderNoOutdir.sourcemap.txt b/tests/baselines/reference/project/sourcerootUrlModuleSubfolderNoOutdir/node/sourcerootUrlModuleSubfolderNoOutdir.sourcemap.txt index 63883498454..5073fc7ce1c 100644 --- a/tests/baselines/reference/project/sourcerootUrlModuleSubfolderNoOutdir/node/sourcerootUrlModuleSubfolderNoOutdir.sourcemap.txt +++ b/tests/baselines/reference/project/sourcerootUrlModuleSubfolderNoOutdir/node/sourcerootUrlModuleSubfolderNoOutdir.sourcemap.txt @@ -59,7 +59,7 @@ sourceFile:ref/m1.ts 1->Emitted(6, 5) Source(4, 1) + SourceIndex(0) 2 >Emitted(6, 17) Source(4, 2) + SourceIndex(0) --- ->>>})(); +>>>}()); 1 > 2 >^ 3 > @@ -255,7 +255,7 @@ sourceFile:test.ts 1->Emitted(7, 5) Source(5, 1) + SourceIndex(0) 2 >Emitted(7, 14) Source(5, 2) + SourceIndex(0) --- ->>>})(); +>>>}()); 1 > 2 >^ 3 > diff --git a/tests/baselines/reference/project/sourcerootUrlModuleSubfolderSpecifyOutputDirectory/amd/outdir/simple/ref/m1.js b/tests/baselines/reference/project/sourcerootUrlModuleSubfolderSpecifyOutputDirectory/amd/outdir/simple/ref/m1.js index 25001d63d84..bb59c6fbd90 100644 --- a/tests/baselines/reference/project/sourcerootUrlModuleSubfolderSpecifyOutputDirectory/amd/outdir/simple/ref/m1.js +++ b/tests/baselines/reference/project/sourcerootUrlModuleSubfolderSpecifyOutputDirectory/amd/outdir/simple/ref/m1.js @@ -5,7 +5,7 @@ define(["require", "exports"], function (require, exports) { function m1_c1() { } return m1_c1; - })(); + }()); exports.m1_c1 = m1_c1; exports.m1_instance1 = new m1_c1(); function m1_f1() { diff --git a/tests/baselines/reference/project/sourcerootUrlModuleSubfolderSpecifyOutputDirectory/amd/sourcerootUrlModuleSubfolderSpecifyOutputDirectory.sourcemap.txt b/tests/baselines/reference/project/sourcerootUrlModuleSubfolderSpecifyOutputDirectory/amd/sourcerootUrlModuleSubfolderSpecifyOutputDirectory.sourcemap.txt index aae97adf33f..6c57ae57e72 100644 --- a/tests/baselines/reference/project/sourcerootUrlModuleSubfolderSpecifyOutputDirectory/amd/sourcerootUrlModuleSubfolderSpecifyOutputDirectory.sourcemap.txt +++ b/tests/baselines/reference/project/sourcerootUrlModuleSubfolderSpecifyOutputDirectory/amd/sourcerootUrlModuleSubfolderSpecifyOutputDirectory.sourcemap.txt @@ -60,7 +60,7 @@ sourceFile:ref/m1.ts 1->Emitted(7, 9) Source(4, 1) + SourceIndex(0) 2 >Emitted(7, 21) Source(4, 2) + SourceIndex(0) --- ->>> })(); +>>> }()); 1 >^^^^ 2 > ^ 3 > @@ -234,7 +234,7 @@ sourceFile:test.ts 1->Emitted(7, 9) Source(5, 1) + SourceIndex(0) 2 >Emitted(7, 18) Source(5, 2) + SourceIndex(0) --- ->>> })(); +>>> }()); 1 >^^^^ 2 > ^ 3 > diff --git a/tests/baselines/reference/project/sourcerootUrlModuleSubfolderSpecifyOutputDirectory/node/outdir/simple/ref/m1.js b/tests/baselines/reference/project/sourcerootUrlModuleSubfolderSpecifyOutputDirectory/node/outdir/simple/ref/m1.js index 3bc07083900..121a089af23 100644 --- a/tests/baselines/reference/project/sourcerootUrlModuleSubfolderSpecifyOutputDirectory/node/outdir/simple/ref/m1.js +++ b/tests/baselines/reference/project/sourcerootUrlModuleSubfolderSpecifyOutputDirectory/node/outdir/simple/ref/m1.js @@ -4,7 +4,7 @@ var m1_c1 = (function () { function m1_c1() { } return m1_c1; -})(); +}()); exports.m1_c1 = m1_c1; exports.m1_instance1 = new m1_c1(); function m1_f1() { diff --git a/tests/baselines/reference/project/sourcerootUrlModuleSubfolderSpecifyOutputDirectory/node/sourcerootUrlModuleSubfolderSpecifyOutputDirectory.sourcemap.txt b/tests/baselines/reference/project/sourcerootUrlModuleSubfolderSpecifyOutputDirectory/node/sourcerootUrlModuleSubfolderSpecifyOutputDirectory.sourcemap.txt index 556733c18c6..db57e7cba0c 100644 --- a/tests/baselines/reference/project/sourcerootUrlModuleSubfolderSpecifyOutputDirectory/node/sourcerootUrlModuleSubfolderSpecifyOutputDirectory.sourcemap.txt +++ b/tests/baselines/reference/project/sourcerootUrlModuleSubfolderSpecifyOutputDirectory/node/sourcerootUrlModuleSubfolderSpecifyOutputDirectory.sourcemap.txt @@ -59,7 +59,7 @@ sourceFile:ref/m1.ts 1->Emitted(6, 5) Source(4, 1) + SourceIndex(0) 2 >Emitted(6, 17) Source(4, 2) + SourceIndex(0) --- ->>>})(); +>>>}()); 1 > 2 >^ 3 > @@ -255,7 +255,7 @@ sourceFile:test.ts 1->Emitted(7, 5) Source(5, 1) + SourceIndex(0) 2 >Emitted(7, 14) Source(5, 2) + SourceIndex(0) --- ->>>})(); +>>>}()); 1 > 2 >^ 3 > diff --git a/tests/baselines/reference/project/sourcerootUrlModuleSubfolderSpecifyOutputFile/amd/bin/test.js b/tests/baselines/reference/project/sourcerootUrlModuleSubfolderSpecifyOutputFile/amd/bin/test.js index 93a25f7ef19..f55492f4b49 100644 --- a/tests/baselines/reference/project/sourcerootUrlModuleSubfolderSpecifyOutputFile/amd/bin/test.js +++ b/tests/baselines/reference/project/sourcerootUrlModuleSubfolderSpecifyOutputFile/amd/bin/test.js @@ -5,7 +5,7 @@ define("ref/m1", ["require", "exports"], function (require, exports) { function m1_c1() { } return m1_c1; - })(); + }()); exports.m1_c1 = m1_c1; exports.m1_instance1 = new m1_c1(); function m1_f1() { @@ -20,7 +20,7 @@ define("test", ["require", "exports", "ref/m1"], function (require, exports, m1) function c1() { } return c1; - })(); + }()); exports.c1 = c1; exports.instance1 = new c1(); function f1() { diff --git a/tests/baselines/reference/project/sourcerootUrlModuleSubfolderSpecifyOutputFile/amd/sourcerootUrlModuleSubfolderSpecifyOutputFile.sourcemap.txt b/tests/baselines/reference/project/sourcerootUrlModuleSubfolderSpecifyOutputFile/amd/sourcerootUrlModuleSubfolderSpecifyOutputFile.sourcemap.txt index 72a52b8ab97..edca6852f84 100644 --- a/tests/baselines/reference/project/sourcerootUrlModuleSubfolderSpecifyOutputFile/amd/sourcerootUrlModuleSubfolderSpecifyOutputFile.sourcemap.txt +++ b/tests/baselines/reference/project/sourcerootUrlModuleSubfolderSpecifyOutputFile/amd/sourcerootUrlModuleSubfolderSpecifyOutputFile.sourcemap.txt @@ -60,7 +60,7 @@ sourceFile:ref/m1.ts 1->Emitted(7, 9) Source(4, 1) + SourceIndex(0) 2 >Emitted(7, 21) Source(4, 2) + SourceIndex(0) --- ->>> })(); +>>> }()); 1 >^^^^ 2 > ^ 3 > @@ -228,7 +228,7 @@ sourceFile:test.ts 1->Emitted(22, 9) Source(5, 1) + SourceIndex(1) 2 >Emitted(22, 18) Source(5, 2) + SourceIndex(1) --- ->>> })(); +>>> }()); 1 >^^^^ 2 > ^ 3 > diff --git a/tests/baselines/reference/project/sourcerootUrlMultifolderNoOutdir/amd/ref/m1.js b/tests/baselines/reference/project/sourcerootUrlMultifolderNoOutdir/amd/ref/m1.js index f6b169662c9..b7283f7fd88 100644 --- a/tests/baselines/reference/project/sourcerootUrlMultifolderNoOutdir/amd/ref/m1.js +++ b/tests/baselines/reference/project/sourcerootUrlMultifolderNoOutdir/amd/ref/m1.js @@ -3,7 +3,7 @@ var m1_c1 = (function () { function m1_c1() { } return m1_c1; -})(); +}()); var m1_instance1 = new m1_c1(); function m1_f1() { return m1_instance1; diff --git a/tests/baselines/reference/project/sourcerootUrlMultifolderNoOutdir/amd/sourcerootUrlMultifolderNoOutdir.sourcemap.txt b/tests/baselines/reference/project/sourcerootUrlMultifolderNoOutdir/amd/sourcerootUrlMultifolderNoOutdir.sourcemap.txt index fb198e5f490..97837265fad 100644 --- a/tests/baselines/reference/project/sourcerootUrlMultifolderNoOutdir/amd/sourcerootUrlMultifolderNoOutdir.sourcemap.txt +++ b/tests/baselines/reference/project/sourcerootUrlMultifolderNoOutdir/amd/sourcerootUrlMultifolderNoOutdir.sourcemap.txt @@ -61,7 +61,7 @@ sourceFile:outputdir_multifolder/ref/m1.ts 1->Emitted(5, 5) Source(4, 1) + SourceIndex(0) 2 >Emitted(5, 17) Source(4, 2) + SourceIndex(0) --- ->>>})(); +>>>}()); 1 > 2 >^ 3 > @@ -204,7 +204,7 @@ sourceFile:outputdir_multifolder_ref/m2.ts 1->Emitted(5, 5) Source(4, 1) + SourceIndex(0) 2 >Emitted(5, 17) Source(4, 2) + SourceIndex(0) --- ->>>})(); +>>>}()); 1 > 2 >^ 3 > @@ -366,7 +366,7 @@ sourceFile:outputdir_multifolder/test.ts 1->Emitted(7, 5) Source(6, 1) + SourceIndex(0) 2 >Emitted(7, 14) Source(6, 2) + SourceIndex(0) --- ->>>})(); +>>>}()); 1 > 2 >^ 3 > diff --git a/tests/baselines/reference/project/sourcerootUrlMultifolderNoOutdir/node/ref/m1.js b/tests/baselines/reference/project/sourcerootUrlMultifolderNoOutdir/node/ref/m1.js index f6b169662c9..b7283f7fd88 100644 --- a/tests/baselines/reference/project/sourcerootUrlMultifolderNoOutdir/node/ref/m1.js +++ b/tests/baselines/reference/project/sourcerootUrlMultifolderNoOutdir/node/ref/m1.js @@ -3,7 +3,7 @@ var m1_c1 = (function () { function m1_c1() { } return m1_c1; -})(); +}()); var m1_instance1 = new m1_c1(); function m1_f1() { return m1_instance1; diff --git a/tests/baselines/reference/project/sourcerootUrlMultifolderNoOutdir/node/sourcerootUrlMultifolderNoOutdir.sourcemap.txt b/tests/baselines/reference/project/sourcerootUrlMultifolderNoOutdir/node/sourcerootUrlMultifolderNoOutdir.sourcemap.txt index fb198e5f490..97837265fad 100644 --- a/tests/baselines/reference/project/sourcerootUrlMultifolderNoOutdir/node/sourcerootUrlMultifolderNoOutdir.sourcemap.txt +++ b/tests/baselines/reference/project/sourcerootUrlMultifolderNoOutdir/node/sourcerootUrlMultifolderNoOutdir.sourcemap.txt @@ -61,7 +61,7 @@ sourceFile:outputdir_multifolder/ref/m1.ts 1->Emitted(5, 5) Source(4, 1) + SourceIndex(0) 2 >Emitted(5, 17) Source(4, 2) + SourceIndex(0) --- ->>>})(); +>>>}()); 1 > 2 >^ 3 > @@ -204,7 +204,7 @@ sourceFile:outputdir_multifolder_ref/m2.ts 1->Emitted(5, 5) Source(4, 1) + SourceIndex(0) 2 >Emitted(5, 17) Source(4, 2) + SourceIndex(0) --- ->>>})(); +>>>}()); 1 > 2 >^ 3 > @@ -366,7 +366,7 @@ sourceFile:outputdir_multifolder/test.ts 1->Emitted(7, 5) Source(6, 1) + SourceIndex(0) 2 >Emitted(7, 14) Source(6, 2) + SourceIndex(0) --- ->>>})(); +>>>}()); 1 > 2 >^ 3 > diff --git a/tests/baselines/reference/project/sourcerootUrlMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_multifolder/ref/m1.js b/tests/baselines/reference/project/sourcerootUrlMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_multifolder/ref/m1.js index f6b169662c9..b7283f7fd88 100644 --- a/tests/baselines/reference/project/sourcerootUrlMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_multifolder/ref/m1.js +++ b/tests/baselines/reference/project/sourcerootUrlMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_multifolder/ref/m1.js @@ -3,7 +3,7 @@ var m1_c1 = (function () { function m1_c1() { } return m1_c1; -})(); +}()); var m1_instance1 = new m1_c1(); function m1_f1() { return m1_instance1; diff --git a/tests/baselines/reference/project/sourcerootUrlMultifolderSpecifyOutputDirectory/amd/sourcerootUrlMultifolderSpecifyOutputDirectory.sourcemap.txt b/tests/baselines/reference/project/sourcerootUrlMultifolderSpecifyOutputDirectory/amd/sourcerootUrlMultifolderSpecifyOutputDirectory.sourcemap.txt index ff2fee631b4..66f7557a512 100644 --- a/tests/baselines/reference/project/sourcerootUrlMultifolderSpecifyOutputDirectory/amd/sourcerootUrlMultifolderSpecifyOutputDirectory.sourcemap.txt +++ b/tests/baselines/reference/project/sourcerootUrlMultifolderSpecifyOutputDirectory/amd/sourcerootUrlMultifolderSpecifyOutputDirectory.sourcemap.txt @@ -61,7 +61,7 @@ sourceFile:outputdir_multifolder/ref/m1.ts 1->Emitted(5, 5) Source(4, 1) + SourceIndex(0) 2 >Emitted(5, 17) Source(4, 2) + SourceIndex(0) --- ->>>})(); +>>>}()); 1 > 2 >^ 3 > @@ -204,7 +204,7 @@ sourceFile:outputdir_multifolder_ref/m2.ts 1->Emitted(5, 5) Source(4, 1) + SourceIndex(0) 2 >Emitted(5, 17) Source(4, 2) + SourceIndex(0) --- ->>>})(); +>>>}()); 1 > 2 >^ 3 > @@ -366,7 +366,7 @@ sourceFile:outputdir_multifolder/test.ts 1->Emitted(7, 5) Source(6, 1) + SourceIndex(0) 2 >Emitted(7, 14) Source(6, 2) + SourceIndex(0) --- ->>>})(); +>>>}()); 1 > 2 >^ 3 > diff --git a/tests/baselines/reference/project/sourcerootUrlMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_multifolder/ref/m1.js b/tests/baselines/reference/project/sourcerootUrlMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_multifolder/ref/m1.js index f6b169662c9..b7283f7fd88 100644 --- a/tests/baselines/reference/project/sourcerootUrlMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_multifolder/ref/m1.js +++ b/tests/baselines/reference/project/sourcerootUrlMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_multifolder/ref/m1.js @@ -3,7 +3,7 @@ var m1_c1 = (function () { function m1_c1() { } return m1_c1; -})(); +}()); var m1_instance1 = new m1_c1(); function m1_f1() { return m1_instance1; diff --git a/tests/baselines/reference/project/sourcerootUrlMultifolderSpecifyOutputDirectory/node/sourcerootUrlMultifolderSpecifyOutputDirectory.sourcemap.txt b/tests/baselines/reference/project/sourcerootUrlMultifolderSpecifyOutputDirectory/node/sourcerootUrlMultifolderSpecifyOutputDirectory.sourcemap.txt index ff2fee631b4..66f7557a512 100644 --- a/tests/baselines/reference/project/sourcerootUrlMultifolderSpecifyOutputDirectory/node/sourcerootUrlMultifolderSpecifyOutputDirectory.sourcemap.txt +++ b/tests/baselines/reference/project/sourcerootUrlMultifolderSpecifyOutputDirectory/node/sourcerootUrlMultifolderSpecifyOutputDirectory.sourcemap.txt @@ -61,7 +61,7 @@ sourceFile:outputdir_multifolder/ref/m1.ts 1->Emitted(5, 5) Source(4, 1) + SourceIndex(0) 2 >Emitted(5, 17) Source(4, 2) + SourceIndex(0) --- ->>>})(); +>>>}()); 1 > 2 >^ 3 > @@ -204,7 +204,7 @@ sourceFile:outputdir_multifolder_ref/m2.ts 1->Emitted(5, 5) Source(4, 1) + SourceIndex(0) 2 >Emitted(5, 17) Source(4, 2) + SourceIndex(0) --- ->>>})(); +>>>}()); 1 > 2 >^ 3 > @@ -366,7 +366,7 @@ sourceFile:outputdir_multifolder/test.ts 1->Emitted(7, 5) Source(6, 1) + SourceIndex(0) 2 >Emitted(7, 14) Source(6, 2) + SourceIndex(0) --- ->>>})(); +>>>}()); 1 > 2 >^ 3 > diff --git a/tests/baselines/reference/project/sourcerootUrlMultifolderSpecifyOutputFile/amd/bin/test.js b/tests/baselines/reference/project/sourcerootUrlMultifolderSpecifyOutputFile/amd/bin/test.js index e6b143a110a..ad96cca3d79 100644 --- a/tests/baselines/reference/project/sourcerootUrlMultifolderSpecifyOutputFile/amd/bin/test.js +++ b/tests/baselines/reference/project/sourcerootUrlMultifolderSpecifyOutputFile/amd/bin/test.js @@ -3,7 +3,7 @@ var m1_c1 = (function () { function m1_c1() { } return m1_c1; -})(); +}()); var m1_instance1 = new m1_c1(); function m1_f1() { return m1_instance1; @@ -13,7 +13,7 @@ var m2_c1 = (function () { function m2_c1() { } return m2_c1; -})(); +}()); var m2_instance1 = new m2_c1(); function m2_f1() { return m2_instance1; @@ -25,7 +25,7 @@ var c1 = (function () { function c1() { } return c1; -})(); +}()); var instance1 = new c1(); function f1() { return instance1; diff --git a/tests/baselines/reference/project/sourcerootUrlMultifolderSpecifyOutputFile/amd/sourcerootUrlMultifolderSpecifyOutputFile.sourcemap.txt b/tests/baselines/reference/project/sourcerootUrlMultifolderSpecifyOutputFile/amd/sourcerootUrlMultifolderSpecifyOutputFile.sourcemap.txt index 16d11d70bbf..6d3d1d19d8e 100644 --- a/tests/baselines/reference/project/sourcerootUrlMultifolderSpecifyOutputFile/amd/sourcerootUrlMultifolderSpecifyOutputFile.sourcemap.txt +++ b/tests/baselines/reference/project/sourcerootUrlMultifolderSpecifyOutputFile/amd/sourcerootUrlMultifolderSpecifyOutputFile.sourcemap.txt @@ -61,7 +61,7 @@ sourceFile:outputdir_multifolder/ref/m1.ts 1->Emitted(5, 5) Source(4, 1) + SourceIndex(0) 2 >Emitted(5, 17) Source(4, 2) + SourceIndex(0) --- ->>>})(); +>>>}()); 1 > 2 >^ 3 > @@ -198,7 +198,7 @@ sourceFile:outputdir_multifolder_ref/m2.ts 1->Emitted(15, 5) Source(4, 1) + SourceIndex(1) 2 >Emitted(15, 17) Source(4, 2) + SourceIndex(1) --- ->>>})(); +>>>}()); 1 > 2 >^ 3 > @@ -354,7 +354,7 @@ sourceFile:outputdir_multifolder/test.ts 1->Emitted(27, 5) Source(6, 1) + SourceIndex(2) 2 >Emitted(27, 14) Source(6, 2) + SourceIndex(2) --- ->>>})(); +>>>}()); 1 > 2 >^ 3 > diff --git a/tests/baselines/reference/project/sourcerootUrlMultifolderSpecifyOutputFile/node/bin/test.js b/tests/baselines/reference/project/sourcerootUrlMultifolderSpecifyOutputFile/node/bin/test.js index e6b143a110a..ad96cca3d79 100644 --- a/tests/baselines/reference/project/sourcerootUrlMultifolderSpecifyOutputFile/node/bin/test.js +++ b/tests/baselines/reference/project/sourcerootUrlMultifolderSpecifyOutputFile/node/bin/test.js @@ -3,7 +3,7 @@ var m1_c1 = (function () { function m1_c1() { } return m1_c1; -})(); +}()); var m1_instance1 = new m1_c1(); function m1_f1() { return m1_instance1; @@ -13,7 +13,7 @@ var m2_c1 = (function () { function m2_c1() { } return m2_c1; -})(); +}()); var m2_instance1 = new m2_c1(); function m2_f1() { return m2_instance1; @@ -25,7 +25,7 @@ var c1 = (function () { function c1() { } return c1; -})(); +}()); var instance1 = new c1(); function f1() { return instance1; diff --git a/tests/baselines/reference/project/sourcerootUrlMultifolderSpecifyOutputFile/node/sourcerootUrlMultifolderSpecifyOutputFile.sourcemap.txt b/tests/baselines/reference/project/sourcerootUrlMultifolderSpecifyOutputFile/node/sourcerootUrlMultifolderSpecifyOutputFile.sourcemap.txt index 16d11d70bbf..6d3d1d19d8e 100644 --- a/tests/baselines/reference/project/sourcerootUrlMultifolderSpecifyOutputFile/node/sourcerootUrlMultifolderSpecifyOutputFile.sourcemap.txt +++ b/tests/baselines/reference/project/sourcerootUrlMultifolderSpecifyOutputFile/node/sourcerootUrlMultifolderSpecifyOutputFile.sourcemap.txt @@ -61,7 +61,7 @@ sourceFile:outputdir_multifolder/ref/m1.ts 1->Emitted(5, 5) Source(4, 1) + SourceIndex(0) 2 >Emitted(5, 17) Source(4, 2) + SourceIndex(0) --- ->>>})(); +>>>}()); 1 > 2 >^ 3 > @@ -198,7 +198,7 @@ sourceFile:outputdir_multifolder_ref/m2.ts 1->Emitted(15, 5) Source(4, 1) + SourceIndex(1) 2 >Emitted(15, 17) Source(4, 2) + SourceIndex(1) --- ->>>})(); +>>>}()); 1 > 2 >^ 3 > @@ -354,7 +354,7 @@ sourceFile:outputdir_multifolder/test.ts 1->Emitted(27, 5) Source(6, 1) + SourceIndex(2) 2 >Emitted(27, 14) Source(6, 2) + SourceIndex(2) --- ->>>})(); +>>>}()); 1 > 2 >^ 3 > diff --git a/tests/baselines/reference/project/sourcerootUrlSimpleNoOutdir/amd/m1.js b/tests/baselines/reference/project/sourcerootUrlSimpleNoOutdir/amd/m1.js index f6b169662c9..b7283f7fd88 100644 --- a/tests/baselines/reference/project/sourcerootUrlSimpleNoOutdir/amd/m1.js +++ b/tests/baselines/reference/project/sourcerootUrlSimpleNoOutdir/amd/m1.js @@ -3,7 +3,7 @@ var m1_c1 = (function () { function m1_c1() { } return m1_c1; -})(); +}()); var m1_instance1 = new m1_c1(); function m1_f1() { return m1_instance1; diff --git a/tests/baselines/reference/project/sourcerootUrlSimpleNoOutdir/amd/sourcerootUrlSimpleNoOutdir.sourcemap.txt b/tests/baselines/reference/project/sourcerootUrlSimpleNoOutdir/amd/sourcerootUrlSimpleNoOutdir.sourcemap.txt index bd47f942319..8613693d6fd 100644 --- a/tests/baselines/reference/project/sourcerootUrlSimpleNoOutdir/amd/sourcerootUrlSimpleNoOutdir.sourcemap.txt +++ b/tests/baselines/reference/project/sourcerootUrlSimpleNoOutdir/amd/sourcerootUrlSimpleNoOutdir.sourcemap.txt @@ -61,7 +61,7 @@ sourceFile:m1.ts 1->Emitted(5, 5) Source(4, 1) + SourceIndex(0) 2 >Emitted(5, 17) Source(4, 2) + SourceIndex(0) --- ->>>})(); +>>>}()); 1 > 2 >^ 3 > @@ -213,7 +213,7 @@ sourceFile:test.ts 1->Emitted(6, 5) Source(5, 1) + SourceIndex(0) 2 >Emitted(6, 14) Source(5, 2) + SourceIndex(0) --- ->>>})(); +>>>}()); 1 > 2 >^ 3 > diff --git a/tests/baselines/reference/project/sourcerootUrlSimpleNoOutdir/node/m1.js b/tests/baselines/reference/project/sourcerootUrlSimpleNoOutdir/node/m1.js index f6b169662c9..b7283f7fd88 100644 --- a/tests/baselines/reference/project/sourcerootUrlSimpleNoOutdir/node/m1.js +++ b/tests/baselines/reference/project/sourcerootUrlSimpleNoOutdir/node/m1.js @@ -3,7 +3,7 @@ var m1_c1 = (function () { function m1_c1() { } return m1_c1; -})(); +}()); var m1_instance1 = new m1_c1(); function m1_f1() { return m1_instance1; diff --git a/tests/baselines/reference/project/sourcerootUrlSimpleNoOutdir/node/sourcerootUrlSimpleNoOutdir.sourcemap.txt b/tests/baselines/reference/project/sourcerootUrlSimpleNoOutdir/node/sourcerootUrlSimpleNoOutdir.sourcemap.txt index bd47f942319..8613693d6fd 100644 --- a/tests/baselines/reference/project/sourcerootUrlSimpleNoOutdir/node/sourcerootUrlSimpleNoOutdir.sourcemap.txt +++ b/tests/baselines/reference/project/sourcerootUrlSimpleNoOutdir/node/sourcerootUrlSimpleNoOutdir.sourcemap.txt @@ -61,7 +61,7 @@ sourceFile:m1.ts 1->Emitted(5, 5) Source(4, 1) + SourceIndex(0) 2 >Emitted(5, 17) Source(4, 2) + SourceIndex(0) --- ->>>})(); +>>>}()); 1 > 2 >^ 3 > @@ -213,7 +213,7 @@ sourceFile:test.ts 1->Emitted(6, 5) Source(5, 1) + SourceIndex(0) 2 >Emitted(6, 14) Source(5, 2) + SourceIndex(0) --- ->>>})(); +>>>}()); 1 > 2 >^ 3 > diff --git a/tests/baselines/reference/project/sourcerootUrlSimpleSpecifyOutputDirectory/amd/outdir/simple/m1.js b/tests/baselines/reference/project/sourcerootUrlSimpleSpecifyOutputDirectory/amd/outdir/simple/m1.js index f6b169662c9..b7283f7fd88 100644 --- a/tests/baselines/reference/project/sourcerootUrlSimpleSpecifyOutputDirectory/amd/outdir/simple/m1.js +++ b/tests/baselines/reference/project/sourcerootUrlSimpleSpecifyOutputDirectory/amd/outdir/simple/m1.js @@ -3,7 +3,7 @@ var m1_c1 = (function () { function m1_c1() { } return m1_c1; -})(); +}()); var m1_instance1 = new m1_c1(); function m1_f1() { return m1_instance1; diff --git a/tests/baselines/reference/project/sourcerootUrlSimpleSpecifyOutputDirectory/amd/sourcerootUrlSimpleSpecifyOutputDirectory.sourcemap.txt b/tests/baselines/reference/project/sourcerootUrlSimpleSpecifyOutputDirectory/amd/sourcerootUrlSimpleSpecifyOutputDirectory.sourcemap.txt index 9ae5029e13b..6b974c689f5 100644 --- a/tests/baselines/reference/project/sourcerootUrlSimpleSpecifyOutputDirectory/amd/sourcerootUrlSimpleSpecifyOutputDirectory.sourcemap.txt +++ b/tests/baselines/reference/project/sourcerootUrlSimpleSpecifyOutputDirectory/amd/sourcerootUrlSimpleSpecifyOutputDirectory.sourcemap.txt @@ -61,7 +61,7 @@ sourceFile:m1.ts 1->Emitted(5, 5) Source(4, 1) + SourceIndex(0) 2 >Emitted(5, 17) Source(4, 2) + SourceIndex(0) --- ->>>})(); +>>>}()); 1 > 2 >^ 3 > @@ -213,7 +213,7 @@ sourceFile:test.ts 1->Emitted(6, 5) Source(5, 1) + SourceIndex(0) 2 >Emitted(6, 14) Source(5, 2) + SourceIndex(0) --- ->>>})(); +>>>}()); 1 > 2 >^ 3 > diff --git a/tests/baselines/reference/project/sourcerootUrlSimpleSpecifyOutputDirectory/node/outdir/simple/m1.js b/tests/baselines/reference/project/sourcerootUrlSimpleSpecifyOutputDirectory/node/outdir/simple/m1.js index f6b169662c9..b7283f7fd88 100644 --- a/tests/baselines/reference/project/sourcerootUrlSimpleSpecifyOutputDirectory/node/outdir/simple/m1.js +++ b/tests/baselines/reference/project/sourcerootUrlSimpleSpecifyOutputDirectory/node/outdir/simple/m1.js @@ -3,7 +3,7 @@ var m1_c1 = (function () { function m1_c1() { } return m1_c1; -})(); +}()); var m1_instance1 = new m1_c1(); function m1_f1() { return m1_instance1; diff --git a/tests/baselines/reference/project/sourcerootUrlSimpleSpecifyOutputDirectory/node/sourcerootUrlSimpleSpecifyOutputDirectory.sourcemap.txt b/tests/baselines/reference/project/sourcerootUrlSimpleSpecifyOutputDirectory/node/sourcerootUrlSimpleSpecifyOutputDirectory.sourcemap.txt index 9ae5029e13b..6b974c689f5 100644 --- a/tests/baselines/reference/project/sourcerootUrlSimpleSpecifyOutputDirectory/node/sourcerootUrlSimpleSpecifyOutputDirectory.sourcemap.txt +++ b/tests/baselines/reference/project/sourcerootUrlSimpleSpecifyOutputDirectory/node/sourcerootUrlSimpleSpecifyOutputDirectory.sourcemap.txt @@ -61,7 +61,7 @@ sourceFile:m1.ts 1->Emitted(5, 5) Source(4, 1) + SourceIndex(0) 2 >Emitted(5, 17) Source(4, 2) + SourceIndex(0) --- ->>>})(); +>>>}()); 1 > 2 >^ 3 > @@ -213,7 +213,7 @@ sourceFile:test.ts 1->Emitted(6, 5) Source(5, 1) + SourceIndex(0) 2 >Emitted(6, 14) Source(5, 2) + SourceIndex(0) --- ->>>})(); +>>>}()); 1 > 2 >^ 3 > diff --git a/tests/baselines/reference/project/sourcerootUrlSimpleSpecifyOutputFile/amd/bin/test.js b/tests/baselines/reference/project/sourcerootUrlSimpleSpecifyOutputFile/amd/bin/test.js index 10bcbf92a21..481c10d1a06 100644 --- a/tests/baselines/reference/project/sourcerootUrlSimpleSpecifyOutputFile/amd/bin/test.js +++ b/tests/baselines/reference/project/sourcerootUrlSimpleSpecifyOutputFile/amd/bin/test.js @@ -3,7 +3,7 @@ var m1_c1 = (function () { function m1_c1() { } return m1_c1; -})(); +}()); var m1_instance1 = new m1_c1(); function m1_f1() { return m1_instance1; @@ -14,7 +14,7 @@ var c1 = (function () { function c1() { } return c1; -})(); +}()); var instance1 = new c1(); function f1() { return instance1; diff --git a/tests/baselines/reference/project/sourcerootUrlSimpleSpecifyOutputFile/amd/sourcerootUrlSimpleSpecifyOutputFile.sourcemap.txt b/tests/baselines/reference/project/sourcerootUrlSimpleSpecifyOutputFile/amd/sourcerootUrlSimpleSpecifyOutputFile.sourcemap.txt index 5c296085774..1b93109c406 100644 --- a/tests/baselines/reference/project/sourcerootUrlSimpleSpecifyOutputFile/amd/sourcerootUrlSimpleSpecifyOutputFile.sourcemap.txt +++ b/tests/baselines/reference/project/sourcerootUrlSimpleSpecifyOutputFile/amd/sourcerootUrlSimpleSpecifyOutputFile.sourcemap.txt @@ -61,7 +61,7 @@ sourceFile:m1.ts 1->Emitted(5, 5) Source(4, 1) + SourceIndex(0) 2 >Emitted(5, 17) Source(4, 2) + SourceIndex(0) --- ->>>})(); +>>>}()); 1 > 2 >^ 3 > @@ -207,7 +207,7 @@ sourceFile:test.ts 1->Emitted(16, 5) Source(5, 1) + SourceIndex(1) 2 >Emitted(16, 14) Source(5, 2) + SourceIndex(1) --- ->>>})(); +>>>}()); 1 > 2 >^ 3 > diff --git a/tests/baselines/reference/project/sourcerootUrlSimpleSpecifyOutputFile/node/bin/test.js b/tests/baselines/reference/project/sourcerootUrlSimpleSpecifyOutputFile/node/bin/test.js index 10bcbf92a21..481c10d1a06 100644 --- a/tests/baselines/reference/project/sourcerootUrlSimpleSpecifyOutputFile/node/bin/test.js +++ b/tests/baselines/reference/project/sourcerootUrlSimpleSpecifyOutputFile/node/bin/test.js @@ -3,7 +3,7 @@ var m1_c1 = (function () { function m1_c1() { } return m1_c1; -})(); +}()); var m1_instance1 = new m1_c1(); function m1_f1() { return m1_instance1; @@ -14,7 +14,7 @@ var c1 = (function () { function c1() { } return c1; -})(); +}()); var instance1 = new c1(); function f1() { return instance1; diff --git a/tests/baselines/reference/project/sourcerootUrlSimpleSpecifyOutputFile/node/sourcerootUrlSimpleSpecifyOutputFile.sourcemap.txt b/tests/baselines/reference/project/sourcerootUrlSimpleSpecifyOutputFile/node/sourcerootUrlSimpleSpecifyOutputFile.sourcemap.txt index 5c296085774..1b93109c406 100644 --- a/tests/baselines/reference/project/sourcerootUrlSimpleSpecifyOutputFile/node/sourcerootUrlSimpleSpecifyOutputFile.sourcemap.txt +++ b/tests/baselines/reference/project/sourcerootUrlSimpleSpecifyOutputFile/node/sourcerootUrlSimpleSpecifyOutputFile.sourcemap.txt @@ -61,7 +61,7 @@ sourceFile:m1.ts 1->Emitted(5, 5) Source(4, 1) + SourceIndex(0) 2 >Emitted(5, 17) Source(4, 2) + SourceIndex(0) --- ->>>})(); +>>>}()); 1 > 2 >^ 3 > @@ -207,7 +207,7 @@ sourceFile:test.ts 1->Emitted(16, 5) Source(5, 1) + SourceIndex(1) 2 >Emitted(16, 14) Source(5, 2) + SourceIndex(1) --- ->>>})(); +>>>}()); 1 > 2 >^ 3 > diff --git a/tests/baselines/reference/project/sourcerootUrlSingleFileNoOutdir/amd/sourcerootUrlSingleFileNoOutdir.sourcemap.txt b/tests/baselines/reference/project/sourcerootUrlSingleFileNoOutdir/amd/sourcerootUrlSingleFileNoOutdir.sourcemap.txt index 640e894b53c..4c207cb647b 100644 --- a/tests/baselines/reference/project/sourcerootUrlSingleFileNoOutdir/amd/sourcerootUrlSingleFileNoOutdir.sourcemap.txt +++ b/tests/baselines/reference/project/sourcerootUrlSingleFileNoOutdir/amd/sourcerootUrlSingleFileNoOutdir.sourcemap.txt @@ -61,7 +61,7 @@ sourceFile:test.ts 1->Emitted(5, 5) Source(4, 1) + SourceIndex(0) 2 >Emitted(5, 14) Source(4, 2) + SourceIndex(0) --- ->>>})(); +>>>}()); 1 > 2 >^ 3 > diff --git a/tests/baselines/reference/project/sourcerootUrlSingleFileNoOutdir/amd/test.js b/tests/baselines/reference/project/sourcerootUrlSingleFileNoOutdir/amd/test.js index 335d79c01c6..e5a1c12a732 100644 --- a/tests/baselines/reference/project/sourcerootUrlSingleFileNoOutdir/amd/test.js +++ b/tests/baselines/reference/project/sourcerootUrlSingleFileNoOutdir/amd/test.js @@ -3,7 +3,7 @@ var c1 = (function () { function c1() { } return c1; -})(); +}()); var instance1 = new c1(); function f1() { return instance1; diff --git a/tests/baselines/reference/project/sourcerootUrlSingleFileNoOutdir/node/sourcerootUrlSingleFileNoOutdir.sourcemap.txt b/tests/baselines/reference/project/sourcerootUrlSingleFileNoOutdir/node/sourcerootUrlSingleFileNoOutdir.sourcemap.txt index 640e894b53c..4c207cb647b 100644 --- a/tests/baselines/reference/project/sourcerootUrlSingleFileNoOutdir/node/sourcerootUrlSingleFileNoOutdir.sourcemap.txt +++ b/tests/baselines/reference/project/sourcerootUrlSingleFileNoOutdir/node/sourcerootUrlSingleFileNoOutdir.sourcemap.txt @@ -61,7 +61,7 @@ sourceFile:test.ts 1->Emitted(5, 5) Source(4, 1) + SourceIndex(0) 2 >Emitted(5, 14) Source(4, 2) + SourceIndex(0) --- ->>>})(); +>>>}()); 1 > 2 >^ 3 > diff --git a/tests/baselines/reference/project/sourcerootUrlSingleFileNoOutdir/node/test.js b/tests/baselines/reference/project/sourcerootUrlSingleFileNoOutdir/node/test.js index 335d79c01c6..e5a1c12a732 100644 --- a/tests/baselines/reference/project/sourcerootUrlSingleFileNoOutdir/node/test.js +++ b/tests/baselines/reference/project/sourcerootUrlSingleFileNoOutdir/node/test.js @@ -3,7 +3,7 @@ var c1 = (function () { function c1() { } return c1; -})(); +}()); var instance1 = new c1(); function f1() { return instance1; diff --git a/tests/baselines/reference/project/sourcerootUrlSingleFileSpecifyOutputDirectory/amd/outdir/simple/test.js b/tests/baselines/reference/project/sourcerootUrlSingleFileSpecifyOutputDirectory/amd/outdir/simple/test.js index 335d79c01c6..e5a1c12a732 100644 --- a/tests/baselines/reference/project/sourcerootUrlSingleFileSpecifyOutputDirectory/amd/outdir/simple/test.js +++ b/tests/baselines/reference/project/sourcerootUrlSingleFileSpecifyOutputDirectory/amd/outdir/simple/test.js @@ -3,7 +3,7 @@ var c1 = (function () { function c1() { } return c1; -})(); +}()); var instance1 = new c1(); function f1() { return instance1; diff --git a/tests/baselines/reference/project/sourcerootUrlSingleFileSpecifyOutputDirectory/amd/sourcerootUrlSingleFileSpecifyOutputDirectory.sourcemap.txt b/tests/baselines/reference/project/sourcerootUrlSingleFileSpecifyOutputDirectory/amd/sourcerootUrlSingleFileSpecifyOutputDirectory.sourcemap.txt index 8a280e118e5..04204fceadc 100644 --- a/tests/baselines/reference/project/sourcerootUrlSingleFileSpecifyOutputDirectory/amd/sourcerootUrlSingleFileSpecifyOutputDirectory.sourcemap.txt +++ b/tests/baselines/reference/project/sourcerootUrlSingleFileSpecifyOutputDirectory/amd/sourcerootUrlSingleFileSpecifyOutputDirectory.sourcemap.txt @@ -61,7 +61,7 @@ sourceFile:test.ts 1->Emitted(5, 5) Source(4, 1) + SourceIndex(0) 2 >Emitted(5, 14) Source(4, 2) + SourceIndex(0) --- ->>>})(); +>>>}()); 1 > 2 >^ 3 > diff --git a/tests/baselines/reference/project/sourcerootUrlSingleFileSpecifyOutputDirectory/node/outdir/simple/test.js b/tests/baselines/reference/project/sourcerootUrlSingleFileSpecifyOutputDirectory/node/outdir/simple/test.js index 335d79c01c6..e5a1c12a732 100644 --- a/tests/baselines/reference/project/sourcerootUrlSingleFileSpecifyOutputDirectory/node/outdir/simple/test.js +++ b/tests/baselines/reference/project/sourcerootUrlSingleFileSpecifyOutputDirectory/node/outdir/simple/test.js @@ -3,7 +3,7 @@ var c1 = (function () { function c1() { } return c1; -})(); +}()); var instance1 = new c1(); function f1() { return instance1; diff --git a/tests/baselines/reference/project/sourcerootUrlSingleFileSpecifyOutputDirectory/node/sourcerootUrlSingleFileSpecifyOutputDirectory.sourcemap.txt b/tests/baselines/reference/project/sourcerootUrlSingleFileSpecifyOutputDirectory/node/sourcerootUrlSingleFileSpecifyOutputDirectory.sourcemap.txt index 8a280e118e5..04204fceadc 100644 --- a/tests/baselines/reference/project/sourcerootUrlSingleFileSpecifyOutputDirectory/node/sourcerootUrlSingleFileSpecifyOutputDirectory.sourcemap.txt +++ b/tests/baselines/reference/project/sourcerootUrlSingleFileSpecifyOutputDirectory/node/sourcerootUrlSingleFileSpecifyOutputDirectory.sourcemap.txt @@ -61,7 +61,7 @@ sourceFile:test.ts 1->Emitted(5, 5) Source(4, 1) + SourceIndex(0) 2 >Emitted(5, 14) Source(4, 2) + SourceIndex(0) --- ->>>})(); +>>>}()); 1 > 2 >^ 3 > diff --git a/tests/baselines/reference/project/sourcerootUrlSingleFileSpecifyOutputFile/amd/bin/test.js b/tests/baselines/reference/project/sourcerootUrlSingleFileSpecifyOutputFile/amd/bin/test.js index 335d79c01c6..e5a1c12a732 100644 --- a/tests/baselines/reference/project/sourcerootUrlSingleFileSpecifyOutputFile/amd/bin/test.js +++ b/tests/baselines/reference/project/sourcerootUrlSingleFileSpecifyOutputFile/amd/bin/test.js @@ -3,7 +3,7 @@ var c1 = (function () { function c1() { } return c1; -})(); +}()); var instance1 = new c1(); function f1() { return instance1; diff --git a/tests/baselines/reference/project/sourcerootUrlSingleFileSpecifyOutputFile/amd/sourcerootUrlSingleFileSpecifyOutputFile.sourcemap.txt b/tests/baselines/reference/project/sourcerootUrlSingleFileSpecifyOutputFile/amd/sourcerootUrlSingleFileSpecifyOutputFile.sourcemap.txt index cb0dcfb8a0c..2f5fa2e9cbd 100644 --- a/tests/baselines/reference/project/sourcerootUrlSingleFileSpecifyOutputFile/amd/sourcerootUrlSingleFileSpecifyOutputFile.sourcemap.txt +++ b/tests/baselines/reference/project/sourcerootUrlSingleFileSpecifyOutputFile/amd/sourcerootUrlSingleFileSpecifyOutputFile.sourcemap.txt @@ -61,7 +61,7 @@ sourceFile:test.ts 1->Emitted(5, 5) Source(4, 1) + SourceIndex(0) 2 >Emitted(5, 14) Source(4, 2) + SourceIndex(0) --- ->>>})(); +>>>}()); 1 > 2 >^ 3 > diff --git a/tests/baselines/reference/project/sourcerootUrlSingleFileSpecifyOutputFile/node/bin/test.js b/tests/baselines/reference/project/sourcerootUrlSingleFileSpecifyOutputFile/node/bin/test.js index 335d79c01c6..e5a1c12a732 100644 --- a/tests/baselines/reference/project/sourcerootUrlSingleFileSpecifyOutputFile/node/bin/test.js +++ b/tests/baselines/reference/project/sourcerootUrlSingleFileSpecifyOutputFile/node/bin/test.js @@ -3,7 +3,7 @@ var c1 = (function () { function c1() { } return c1; -})(); +}()); var instance1 = new c1(); function f1() { return instance1; diff --git a/tests/baselines/reference/project/sourcerootUrlSingleFileSpecifyOutputFile/node/sourcerootUrlSingleFileSpecifyOutputFile.sourcemap.txt b/tests/baselines/reference/project/sourcerootUrlSingleFileSpecifyOutputFile/node/sourcerootUrlSingleFileSpecifyOutputFile.sourcemap.txt index cb0dcfb8a0c..2f5fa2e9cbd 100644 --- a/tests/baselines/reference/project/sourcerootUrlSingleFileSpecifyOutputFile/node/sourcerootUrlSingleFileSpecifyOutputFile.sourcemap.txt +++ b/tests/baselines/reference/project/sourcerootUrlSingleFileSpecifyOutputFile/node/sourcerootUrlSingleFileSpecifyOutputFile.sourcemap.txt @@ -61,7 +61,7 @@ sourceFile:test.ts 1->Emitted(5, 5) Source(4, 1) + SourceIndex(0) 2 >Emitted(5, 14) Source(4, 2) + SourceIndex(0) --- ->>>})(); +>>>}()); 1 > 2 >^ 3 > diff --git a/tests/baselines/reference/project/sourcerootUrlSubfolderNoOutdir/amd/ref/m1.js b/tests/baselines/reference/project/sourcerootUrlSubfolderNoOutdir/amd/ref/m1.js index f6b169662c9..b7283f7fd88 100644 --- a/tests/baselines/reference/project/sourcerootUrlSubfolderNoOutdir/amd/ref/m1.js +++ b/tests/baselines/reference/project/sourcerootUrlSubfolderNoOutdir/amd/ref/m1.js @@ -3,7 +3,7 @@ var m1_c1 = (function () { function m1_c1() { } return m1_c1; -})(); +}()); var m1_instance1 = new m1_c1(); function m1_f1() { return m1_instance1; diff --git a/tests/baselines/reference/project/sourcerootUrlSubfolderNoOutdir/amd/sourcerootUrlSubfolderNoOutdir.sourcemap.txt b/tests/baselines/reference/project/sourcerootUrlSubfolderNoOutdir/amd/sourcerootUrlSubfolderNoOutdir.sourcemap.txt index 2b19f844ec0..2e2cd5bb0c9 100644 --- a/tests/baselines/reference/project/sourcerootUrlSubfolderNoOutdir/amd/sourcerootUrlSubfolderNoOutdir.sourcemap.txt +++ b/tests/baselines/reference/project/sourcerootUrlSubfolderNoOutdir/amd/sourcerootUrlSubfolderNoOutdir.sourcemap.txt @@ -61,7 +61,7 @@ sourceFile:ref/m1.ts 1->Emitted(5, 5) Source(4, 1) + SourceIndex(0) 2 >Emitted(5, 17) Source(4, 2) + SourceIndex(0) --- ->>>})(); +>>>}()); 1 > 2 >^ 3 > @@ -213,7 +213,7 @@ sourceFile:test.ts 1->Emitted(6, 5) Source(5, 1) + SourceIndex(0) 2 >Emitted(6, 14) Source(5, 2) + SourceIndex(0) --- ->>>})(); +>>>}()); 1 > 2 >^ 3 > diff --git a/tests/baselines/reference/project/sourcerootUrlSubfolderNoOutdir/node/ref/m1.js b/tests/baselines/reference/project/sourcerootUrlSubfolderNoOutdir/node/ref/m1.js index f6b169662c9..b7283f7fd88 100644 --- a/tests/baselines/reference/project/sourcerootUrlSubfolderNoOutdir/node/ref/m1.js +++ b/tests/baselines/reference/project/sourcerootUrlSubfolderNoOutdir/node/ref/m1.js @@ -3,7 +3,7 @@ var m1_c1 = (function () { function m1_c1() { } return m1_c1; -})(); +}()); var m1_instance1 = new m1_c1(); function m1_f1() { return m1_instance1; diff --git a/tests/baselines/reference/project/sourcerootUrlSubfolderNoOutdir/node/sourcerootUrlSubfolderNoOutdir.sourcemap.txt b/tests/baselines/reference/project/sourcerootUrlSubfolderNoOutdir/node/sourcerootUrlSubfolderNoOutdir.sourcemap.txt index 2b19f844ec0..2e2cd5bb0c9 100644 --- a/tests/baselines/reference/project/sourcerootUrlSubfolderNoOutdir/node/sourcerootUrlSubfolderNoOutdir.sourcemap.txt +++ b/tests/baselines/reference/project/sourcerootUrlSubfolderNoOutdir/node/sourcerootUrlSubfolderNoOutdir.sourcemap.txt @@ -61,7 +61,7 @@ sourceFile:ref/m1.ts 1->Emitted(5, 5) Source(4, 1) + SourceIndex(0) 2 >Emitted(5, 17) Source(4, 2) + SourceIndex(0) --- ->>>})(); +>>>}()); 1 > 2 >^ 3 > @@ -213,7 +213,7 @@ sourceFile:test.ts 1->Emitted(6, 5) Source(5, 1) + SourceIndex(0) 2 >Emitted(6, 14) Source(5, 2) + SourceIndex(0) --- ->>>})(); +>>>}()); 1 > 2 >^ 3 > diff --git a/tests/baselines/reference/project/sourcerootUrlSubfolderSpecifyOutputDirectory/amd/outdir/simple/ref/m1.js b/tests/baselines/reference/project/sourcerootUrlSubfolderSpecifyOutputDirectory/amd/outdir/simple/ref/m1.js index f6b169662c9..b7283f7fd88 100644 --- a/tests/baselines/reference/project/sourcerootUrlSubfolderSpecifyOutputDirectory/amd/outdir/simple/ref/m1.js +++ b/tests/baselines/reference/project/sourcerootUrlSubfolderSpecifyOutputDirectory/amd/outdir/simple/ref/m1.js @@ -3,7 +3,7 @@ var m1_c1 = (function () { function m1_c1() { } return m1_c1; -})(); +}()); var m1_instance1 = new m1_c1(); function m1_f1() { return m1_instance1; diff --git a/tests/baselines/reference/project/sourcerootUrlSubfolderSpecifyOutputDirectory/amd/sourcerootUrlSubfolderSpecifyOutputDirectory.sourcemap.txt b/tests/baselines/reference/project/sourcerootUrlSubfolderSpecifyOutputDirectory/amd/sourcerootUrlSubfolderSpecifyOutputDirectory.sourcemap.txt index f607f1f5438..4ca0340ebfd 100644 --- a/tests/baselines/reference/project/sourcerootUrlSubfolderSpecifyOutputDirectory/amd/sourcerootUrlSubfolderSpecifyOutputDirectory.sourcemap.txt +++ b/tests/baselines/reference/project/sourcerootUrlSubfolderSpecifyOutputDirectory/amd/sourcerootUrlSubfolderSpecifyOutputDirectory.sourcemap.txt @@ -61,7 +61,7 @@ sourceFile:ref/m1.ts 1->Emitted(5, 5) Source(4, 1) + SourceIndex(0) 2 >Emitted(5, 17) Source(4, 2) + SourceIndex(0) --- ->>>})(); +>>>}()); 1 > 2 >^ 3 > @@ -213,7 +213,7 @@ sourceFile:test.ts 1->Emitted(6, 5) Source(5, 1) + SourceIndex(0) 2 >Emitted(6, 14) Source(5, 2) + SourceIndex(0) --- ->>>})(); +>>>}()); 1 > 2 >^ 3 > diff --git a/tests/baselines/reference/project/sourcerootUrlSubfolderSpecifyOutputDirectory/node/outdir/simple/ref/m1.js b/tests/baselines/reference/project/sourcerootUrlSubfolderSpecifyOutputDirectory/node/outdir/simple/ref/m1.js index f6b169662c9..b7283f7fd88 100644 --- a/tests/baselines/reference/project/sourcerootUrlSubfolderSpecifyOutputDirectory/node/outdir/simple/ref/m1.js +++ b/tests/baselines/reference/project/sourcerootUrlSubfolderSpecifyOutputDirectory/node/outdir/simple/ref/m1.js @@ -3,7 +3,7 @@ var m1_c1 = (function () { function m1_c1() { } return m1_c1; -})(); +}()); var m1_instance1 = new m1_c1(); function m1_f1() { return m1_instance1; diff --git a/tests/baselines/reference/project/sourcerootUrlSubfolderSpecifyOutputDirectory/node/sourcerootUrlSubfolderSpecifyOutputDirectory.sourcemap.txt b/tests/baselines/reference/project/sourcerootUrlSubfolderSpecifyOutputDirectory/node/sourcerootUrlSubfolderSpecifyOutputDirectory.sourcemap.txt index f607f1f5438..4ca0340ebfd 100644 --- a/tests/baselines/reference/project/sourcerootUrlSubfolderSpecifyOutputDirectory/node/sourcerootUrlSubfolderSpecifyOutputDirectory.sourcemap.txt +++ b/tests/baselines/reference/project/sourcerootUrlSubfolderSpecifyOutputDirectory/node/sourcerootUrlSubfolderSpecifyOutputDirectory.sourcemap.txt @@ -61,7 +61,7 @@ sourceFile:ref/m1.ts 1->Emitted(5, 5) Source(4, 1) + SourceIndex(0) 2 >Emitted(5, 17) Source(4, 2) + SourceIndex(0) --- ->>>})(); +>>>}()); 1 > 2 >^ 3 > @@ -213,7 +213,7 @@ sourceFile:test.ts 1->Emitted(6, 5) Source(5, 1) + SourceIndex(0) 2 >Emitted(6, 14) Source(5, 2) + SourceIndex(0) --- ->>>})(); +>>>}()); 1 > 2 >^ 3 > diff --git a/tests/baselines/reference/project/sourcerootUrlSubfolderSpecifyOutputFile/amd/bin/test.js b/tests/baselines/reference/project/sourcerootUrlSubfolderSpecifyOutputFile/amd/bin/test.js index c82993389bf..a4566036746 100644 --- a/tests/baselines/reference/project/sourcerootUrlSubfolderSpecifyOutputFile/amd/bin/test.js +++ b/tests/baselines/reference/project/sourcerootUrlSubfolderSpecifyOutputFile/amd/bin/test.js @@ -3,7 +3,7 @@ var m1_c1 = (function () { function m1_c1() { } return m1_c1; -})(); +}()); var m1_instance1 = new m1_c1(); function m1_f1() { return m1_instance1; @@ -14,7 +14,7 @@ var c1 = (function () { function c1() { } return c1; -})(); +}()); var instance1 = new c1(); function f1() { return instance1; diff --git a/tests/baselines/reference/project/sourcerootUrlSubfolderSpecifyOutputFile/amd/sourcerootUrlSubfolderSpecifyOutputFile.sourcemap.txt b/tests/baselines/reference/project/sourcerootUrlSubfolderSpecifyOutputFile/amd/sourcerootUrlSubfolderSpecifyOutputFile.sourcemap.txt index 30aa681bfd2..14787fa8576 100644 --- a/tests/baselines/reference/project/sourcerootUrlSubfolderSpecifyOutputFile/amd/sourcerootUrlSubfolderSpecifyOutputFile.sourcemap.txt +++ b/tests/baselines/reference/project/sourcerootUrlSubfolderSpecifyOutputFile/amd/sourcerootUrlSubfolderSpecifyOutputFile.sourcemap.txt @@ -61,7 +61,7 @@ sourceFile:ref/m1.ts 1->Emitted(5, 5) Source(4, 1) + SourceIndex(0) 2 >Emitted(5, 17) Source(4, 2) + SourceIndex(0) --- ->>>})(); +>>>}()); 1 > 2 >^ 3 > @@ -207,7 +207,7 @@ sourceFile:test.ts 1->Emitted(16, 5) Source(5, 1) + SourceIndex(1) 2 >Emitted(16, 14) Source(5, 2) + SourceIndex(1) --- ->>>})(); +>>>}()); 1 > 2 >^ 3 > diff --git a/tests/baselines/reference/project/sourcerootUrlSubfolderSpecifyOutputFile/node/bin/test.js b/tests/baselines/reference/project/sourcerootUrlSubfolderSpecifyOutputFile/node/bin/test.js index c82993389bf..a4566036746 100644 --- a/tests/baselines/reference/project/sourcerootUrlSubfolderSpecifyOutputFile/node/bin/test.js +++ b/tests/baselines/reference/project/sourcerootUrlSubfolderSpecifyOutputFile/node/bin/test.js @@ -3,7 +3,7 @@ var m1_c1 = (function () { function m1_c1() { } return m1_c1; -})(); +}()); var m1_instance1 = new m1_c1(); function m1_f1() { return m1_instance1; @@ -14,7 +14,7 @@ var c1 = (function () { function c1() { } return c1; -})(); +}()); var instance1 = new c1(); function f1() { return instance1; diff --git a/tests/baselines/reference/project/sourcerootUrlSubfolderSpecifyOutputFile/node/sourcerootUrlSubfolderSpecifyOutputFile.sourcemap.txt b/tests/baselines/reference/project/sourcerootUrlSubfolderSpecifyOutputFile/node/sourcerootUrlSubfolderSpecifyOutputFile.sourcemap.txt index 30aa681bfd2..14787fa8576 100644 --- a/tests/baselines/reference/project/sourcerootUrlSubfolderSpecifyOutputFile/node/sourcerootUrlSubfolderSpecifyOutputFile.sourcemap.txt +++ b/tests/baselines/reference/project/sourcerootUrlSubfolderSpecifyOutputFile/node/sourcerootUrlSubfolderSpecifyOutputFile.sourcemap.txt @@ -61,7 +61,7 @@ sourceFile:ref/m1.ts 1->Emitted(5, 5) Source(4, 1) + SourceIndex(0) 2 >Emitted(5, 17) Source(4, 2) + SourceIndex(0) --- ->>>})(); +>>>}()); 1 > 2 >^ 3 > @@ -207,7 +207,7 @@ sourceFile:test.ts 1->Emitted(16, 5) Source(5, 1) + SourceIndex(1) 2 >Emitted(16, 14) Source(5, 2) + SourceIndex(1) --- ->>>})(); +>>>}()); 1 > 2 >^ 3 > diff --git a/tests/baselines/reference/project/visibilityOfTypeUsedAcrossModules/amd/fs.js b/tests/baselines/reference/project/visibilityOfTypeUsedAcrossModules/amd/fs.js index 63344d14b54..a40f7b2f9cd 100644 --- a/tests/baselines/reference/project/visibilityOfTypeUsedAcrossModules/amd/fs.js +++ b/tests/baselines/reference/project/visibilityOfTypeUsedAcrossModules/amd/fs.js @@ -13,6 +13,6 @@ define(["require", "exports"], function (require, exports) { var absoluteWorkspacePath = configuration.workspace.toAbsolutePath(configuration.server); }; return RM; - })(); + }()); exports.RM = RM; }); diff --git a/tests/baselines/reference/project/visibilityOfTypeUsedAcrossModules/node/fs.js b/tests/baselines/reference/project/visibilityOfTypeUsedAcrossModules/node/fs.js index b238334b7be..c537ef54352 100644 --- a/tests/baselines/reference/project/visibilityOfTypeUsedAcrossModules/node/fs.js +++ b/tests/baselines/reference/project/visibilityOfTypeUsedAcrossModules/node/fs.js @@ -12,5 +12,5 @@ var RM = (function () { var absoluteWorkspacePath = configuration.workspace.toAbsolutePath(configuration.server); }; return RM; -})(); +}()); exports.RM = RM; From e4c5676f2e812b0d58ab2e5bd0962ea1f7e649af Mon Sep 17 00:00:00 2001 From: Daniel Rosenwasser Date: Tue, 8 Dec 2015 17:54:33 -0800 Subject: [PATCH 066/177] Added test for immediately invoked class expression. --- .../conformance/classes/classExpressions/classExpression5.ts | 5 +++++ 1 file changed, 5 insertions(+) create mode 100644 tests/cases/conformance/classes/classExpressions/classExpression5.ts diff --git a/tests/cases/conformance/classes/classExpressions/classExpression5.ts b/tests/cases/conformance/classes/classExpressions/classExpression5.ts new file mode 100644 index 00000000000..be2483ade4d --- /dev/null +++ b/tests/cases/conformance/classes/classExpressions/classExpression5.ts @@ -0,0 +1,5 @@ +new class { + hi() { + return "Hi!"; + } +}().hi(); \ No newline at end of file From dc765b8b5af963f7e7fd7eeb7a4c85cdc375a8f6 Mon Sep 17 00:00:00 2001 From: Wesley Wigham Date: Tue, 8 Dec 2015 17:55:05 -0800 Subject: [PATCH 067/177] accept new baseline --- tests/baselines/reference/unionAndIntersectionInference1.types | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tests/baselines/reference/unionAndIntersectionInference1.types b/tests/baselines/reference/unionAndIntersectionInference1.types index 3de2514a2fa..073a677b659 100644 --- a/tests/baselines/reference/unionAndIntersectionInference1.types +++ b/tests/baselines/reference/unionAndIntersectionInference1.types @@ -130,7 +130,7 @@ function baz1(value: void|a): void { >a : a if (isNonVoid(value)) { ->isNonVoid(value) : value is {} +>isNonVoid(value) : value is a >isNonVoid : (value: void | a) => value is a >value : void | a From 222cd8e5fc0f54689cc456fbc806e2d5a46387d7 Mon Sep 17 00:00:00 2001 From: Daniel Rosenwasser Date: Tue, 8 Dec 2015 17:57:41 -0800 Subject: [PATCH 068/177] Accepted baselines. --- tests/baselines/reference/classExpression5.js | 16 ++++++++++++++++ .../baselines/reference/classExpression5.symbols | 12 ++++++++++++ tests/baselines/reference/classExpression5.types | 16 ++++++++++++++++ 3 files changed, 44 insertions(+) create mode 100644 tests/baselines/reference/classExpression5.js create mode 100644 tests/baselines/reference/classExpression5.symbols create mode 100644 tests/baselines/reference/classExpression5.types diff --git a/tests/baselines/reference/classExpression5.js b/tests/baselines/reference/classExpression5.js new file mode 100644 index 00000000000..fae615d3a55 --- /dev/null +++ b/tests/baselines/reference/classExpression5.js @@ -0,0 +1,16 @@ +//// [classExpression5.ts] +new class { + hi() { + return "Hi!"; + } +}().hi(); + +//// [classExpression5.js] +new (function () { + function class_1() { + } + class_1.prototype.hi = function () { + return "Hi!"; + }; + return class_1; +}())().hi(); diff --git a/tests/baselines/reference/classExpression5.symbols b/tests/baselines/reference/classExpression5.symbols new file mode 100644 index 00000000000..17899f51ea4 --- /dev/null +++ b/tests/baselines/reference/classExpression5.symbols @@ -0,0 +1,12 @@ +=== tests/cases/conformance/classes/classExpressions/classExpression5.ts === +new class { +>new class { hi() { return "Hi!"; }}().hi : Symbol((Anonymous class).hi, Decl(classExpression5.ts, 0, 11)) + + hi() { +>hi : Symbol((Anonymous class).hi, Decl(classExpression5.ts, 0, 11)) + + return "Hi!"; + } +}().hi(); +>hi : Symbol((Anonymous class).hi, Decl(classExpression5.ts, 0, 11)) + diff --git a/tests/baselines/reference/classExpression5.types b/tests/baselines/reference/classExpression5.types new file mode 100644 index 00000000000..25c4b66b8f3 --- /dev/null +++ b/tests/baselines/reference/classExpression5.types @@ -0,0 +1,16 @@ +=== tests/cases/conformance/classes/classExpressions/classExpression5.ts === +new class { +>new class { hi() { return "Hi!"; }}().hi() : string +>new class { hi() { return "Hi!"; }}().hi : () => string +>new class { hi() { return "Hi!"; }}() : (Anonymous class) +>class { hi() { return "Hi!"; }} : typeof (Anonymous class) + + hi() { +>hi : () => string + + return "Hi!"; +>"Hi!" : string + } +}().hi(); +>hi : () => string + From 025210058b58b21986dca5b5822d4a959b39d782 Mon Sep 17 00:00:00 2001 From: Daniel Rosenwasser Date: Tue, 8 Dec 2015 18:13:51 -0800 Subject: [PATCH 069/177] Accepted project baselines over and over until I hit a fixed point where everything passes. --- .../mapRootAbsolutePathMixedSubfolderNoOutdir/amd/ref/m2.js | 2 +- .../mapRootAbsolutePathMixedSubfolderNoOutdir/amd/test.js | 2 +- .../mapRootAbsolutePathMixedSubfolderNoOutdir/node/ref/m2.js | 2 +- .../mapRootAbsolutePathMixedSubfolderNoOutdir/node/test.js | 2 +- .../amd/outdir/simple/ref/m2.js | 2 +- .../amd/outdir/simple/test.js | 2 +- .../node/outdir/simple/ref/m2.js | 2 +- .../node/outdir/simple/test.js | 2 +- .../amd/diskFile1.js | 2 +- .../mapRootAbsolutePathModuleMultifolderNoOutdir/amd/test.js | 2 +- .../node/diskFile1.js | 2 +- .../mapRootAbsolutePathModuleMultifolderNoOutdir/node/test.js | 2 +- .../amd/outdir/simple/outputdir_module_multifolder/test.js | 2 +- .../amd/outdir/simple/outputdir_module_multifolder_ref/m2.js | 2 +- .../node/outdir/simple/outputdir_module_multifolder/test.js | 2 +- .../node/outdir/simple/outputdir_module_multifolder_ref/m2.js | 2 +- .../project/mapRootAbsolutePathModuleSimpleNoOutdir/amd/test.js | 2 +- .../mapRootAbsolutePathModuleSimpleNoOutdir/node/test.js | 2 +- .../amd/outdir/simple/test.js | 2 +- .../node/outdir/simple/test.js | 2 +- .../mapRootAbsolutePathModuleSubfolderNoOutdir/amd/test.js | 2 +- .../mapRootAbsolutePathModuleSubfolderNoOutdir/node/test.js | 2 +- .../amd/outdir/simple/test.js | 2 +- .../node/outdir/simple/test.js | 2 +- .../mapRootAbsolutePathMultifolderNoOutdir/amd/diskFile1.js | 2 +- .../project/mapRootAbsolutePathMultifolderNoOutdir/amd/test.js | 2 +- .../mapRootAbsolutePathMultifolderNoOutdir/node/diskFile1.js | 2 +- .../project/mapRootAbsolutePathMultifolderNoOutdir/node/test.js | 2 +- .../amd/outdir/simple/outputdir_multifolder/test.js | 2 +- .../amd/outdir/simple/outputdir_multifolder_ref/m2.js | 2 +- .../node/outdir/simple/outputdir_multifolder/test.js | 2 +- .../node/outdir/simple/outputdir_multifolder_ref/m2.js | 2 +- .../project/mapRootAbsolutePathSimpleNoOutdir/amd/test.js | 2 +- .../project/mapRootAbsolutePathSimpleNoOutdir/node/test.js | 2 +- .../amd/outdir/simple/test.js | 2 +- .../node/outdir/simple/test.js | 2 +- .../project/mapRootAbsolutePathSubfolderNoOutdir/amd/test.js | 2 +- .../project/mapRootAbsolutePathSubfolderNoOutdir/node/test.js | 2 +- .../amd/outdir/simple/test.js | 2 +- .../node/outdir/simple/test.js | 2 +- .../mapRootRelativePathMixedSubfolderNoOutdir/amd/ref/m2.js | 2 +- .../mapRootRelativePathMixedSubfolderNoOutdir/amd/test.js | 2 +- .../mapRootRelativePathMixedSubfolderNoOutdir/node/ref/m2.js | 2 +- .../mapRootRelativePathMixedSubfolderNoOutdir/node/test.js | 2 +- .../amd/outdir/simple/ref/m2.js | 2 +- .../amd/outdir/simple/test.js | 2 +- .../node/outdir/simple/ref/m2.js | 2 +- .../node/outdir/simple/test.js | 2 +- .../amd/diskFile1.js | 2 +- .../mapRootRelativePathModuleMultifolderNoOutdir/amd/test.js | 2 +- .../node/diskFile1.js | 2 +- .../mapRootRelativePathModuleMultifolderNoOutdir/node/test.js | 2 +- .../amd/outdir/simple/outputdir_module_multifolder/test.js | 2 +- .../amd/outdir/simple/outputdir_module_multifolder_ref/m2.js | 2 +- .../node/outdir/simple/outputdir_module_multifolder/test.js | 2 +- .../node/outdir/simple/outputdir_module_multifolder_ref/m2.js | 2 +- .../project/mapRootRelativePathModuleSimpleNoOutdir/amd/test.js | 2 +- .../mapRootRelativePathModuleSimpleNoOutdir/node/test.js | 2 +- .../amd/outdir/simple/test.js | 2 +- .../node/outdir/simple/test.js | 2 +- .../mapRootRelativePathModuleSubfolderNoOutdir/amd/test.js | 2 +- .../mapRootRelativePathModuleSubfolderNoOutdir/node/test.js | 2 +- .../amd/outdir/simple/test.js | 2 +- .../node/outdir/simple/test.js | 2 +- .../mapRootRelativePathMultifolderNoOutdir/amd/diskFile1.js | 2 +- .../project/mapRootRelativePathMultifolderNoOutdir/amd/test.js | 2 +- .../mapRootRelativePathMultifolderNoOutdir/node/diskFile1.js | 2 +- .../project/mapRootRelativePathMultifolderNoOutdir/node/test.js | 2 +- .../amd/outdir/simple/outputdir_multifolder/test.js | 2 +- .../amd/outdir/simple/outputdir_multifolder_ref/m2.js | 2 +- .../node/outdir/simple/outputdir_multifolder/test.js | 2 +- .../node/outdir/simple/outputdir_multifolder_ref/m2.js | 2 +- .../project/mapRootRelativePathSimpleNoOutdir/amd/test.js | 2 +- .../project/mapRootRelativePathSimpleNoOutdir/node/test.js | 2 +- .../amd/outdir/simple/test.js | 2 +- .../node/outdir/simple/test.js | 2 +- .../project/mapRootRelativePathSubfolderNoOutdir/amd/test.js | 2 +- .../project/mapRootRelativePathSubfolderNoOutdir/node/test.js | 2 +- .../amd/outdir/simple/test.js | 2 +- .../node/outdir/simple/test.js | 2 +- .../project/maprootUrlMixedSubfolderNoOutdir/amd/ref/m2.js | 2 +- .../project/maprootUrlMixedSubfolderNoOutdir/amd/test.js | 2 +- .../project/maprootUrlMixedSubfolderNoOutdir/node/ref/m2.js | 2 +- .../project/maprootUrlMixedSubfolderNoOutdir/node/test.js | 2 +- .../amd/outdir/simple/ref/m2.js | 2 +- .../amd/outdir/simple/test.js | 2 +- .../node/outdir/simple/ref/m2.js | 2 +- .../node/outdir/simple/test.js | 2 +- .../maprootUrlModuleMultifolderNoOutdir/amd/diskFile1.js | 2 +- .../project/maprootUrlModuleMultifolderNoOutdir/amd/test.js | 2 +- .../maprootUrlModuleMultifolderNoOutdir/node/diskFile1.js | 2 +- .../project/maprootUrlModuleMultifolderNoOutdir/node/test.js | 2 +- .../amd/outdir/simple/outputdir_module_multifolder/test.js | 2 +- .../amd/outdir/simple/outputdir_module_multifolder_ref/m2.js | 2 +- .../node/outdir/simple/outputdir_module_multifolder/test.js | 2 +- .../node/outdir/simple/outputdir_module_multifolder_ref/m2.js | 2 +- .../project/maprootUrlModuleSimpleNoOutdir/amd/test.js | 2 +- .../project/maprootUrlModuleSimpleNoOutdir/node/test.js | 2 +- .../amd/outdir/simple/test.js | 2 +- .../node/outdir/simple/test.js | 2 +- .../project/maprootUrlModuleSubfolderNoOutdir/amd/test.js | 2 +- .../project/maprootUrlModuleSubfolderNoOutdir/node/test.js | 2 +- .../amd/outdir/simple/test.js | 2 +- .../node/outdir/simple/test.js | 2 +- .../project/maprootUrlMultifolderNoOutdir/amd/diskFile1.js | 2 +- .../reference/project/maprootUrlMultifolderNoOutdir/amd/test.js | 2 +- .../project/maprootUrlMultifolderNoOutdir/node/diskFile1.js | 2 +- .../project/maprootUrlMultifolderNoOutdir/node/test.js | 2 +- .../amd/outdir/simple/outputdir_multifolder/test.js | 2 +- .../amd/outdir/simple/outputdir_multifolder_ref/m2.js | 2 +- .../node/outdir/simple/outputdir_multifolder/test.js | 2 +- .../node/outdir/simple/outputdir_multifolder_ref/m2.js | 2 +- .../reference/project/maprootUrlSimpleNoOutdir/amd/test.js | 2 +- .../reference/project/maprootUrlSimpleNoOutdir/node/test.js | 2 +- .../amd/outdir/simple/test.js | 2 +- .../node/outdir/simple/test.js | 2 +- .../reference/project/maprootUrlSubfolderNoOutdir/amd/test.js | 2 +- .../reference/project/maprootUrlSubfolderNoOutdir/node/test.js | 2 +- .../amd/outdir/simple/test.js | 2 +- .../node/outdir/simple/test.js | 2 +- .../maprootUrlsourcerootUrlMixedSubfolderNoOutdir/amd/ref/m2.js | 2 +- .../maprootUrlsourcerootUrlMixedSubfolderNoOutdir/amd/test.js | 2 +- .../node/ref/m2.js | 2 +- .../maprootUrlsourcerootUrlMixedSubfolderNoOutdir/node/test.js | 2 +- .../amd/outdir/simple/ref/m2.js | 2 +- .../amd/outdir/simple/test.js | 2 +- .../node/outdir/simple/ref/m2.js | 2 +- .../node/outdir/simple/test.js | 2 +- .../amd/diskFile1.js | 2 +- .../amd/test.js | 2 +- .../node/diskFile1.js | 2 +- .../node/test.js | 2 +- .../amd/outdir/simple/outputdir_module_multifolder/test.js | 2 +- .../amd/outdir/simple/outputdir_module_multifolder_ref/m2.js | 2 +- .../node/outdir/simple/outputdir_module_multifolder/test.js | 2 +- .../node/outdir/simple/outputdir_module_multifolder_ref/m2.js | 2 +- .../maprootUrlsourcerootUrlModuleSimpleNoOutdir/amd/test.js | 2 +- .../maprootUrlsourcerootUrlModuleSimpleNoOutdir/node/test.js | 2 +- .../amd/outdir/simple/test.js | 2 +- .../node/outdir/simple/test.js | 2 +- .../maprootUrlsourcerootUrlModuleSubfolderNoOutdir/amd/test.js | 2 +- .../maprootUrlsourcerootUrlModuleSubfolderNoOutdir/node/test.js | 2 +- .../amd/outdir/simple/test.js | 2 +- .../node/outdir/simple/test.js | 2 +- .../maprootUrlsourcerootUrlMultifolderNoOutdir/amd/diskFile1.js | 2 +- .../maprootUrlsourcerootUrlMultifolderNoOutdir/amd/test.js | 2 +- .../node/diskFile1.js | 2 +- .../maprootUrlsourcerootUrlMultifolderNoOutdir/node/test.js | 2 +- .../amd/outdir/simple/outputdir_multifolder/test.js | 2 +- .../amd/outdir/simple/outputdir_multifolder_ref/m2.js | 2 +- .../node/outdir/simple/outputdir_multifolder/test.js | 2 +- .../node/outdir/simple/outputdir_multifolder_ref/m2.js | 2 +- .../project/maprootUrlsourcerootUrlSimpleNoOutdir/amd/test.js | 2 +- .../project/maprootUrlsourcerootUrlSimpleNoOutdir/node/test.js | 2 +- .../amd/outdir/simple/test.js | 2 +- .../node/outdir/simple/test.js | 2 +- .../maprootUrlsourcerootUrlSubfolderNoOutdir/amd/test.js | 2 +- .../maprootUrlsourcerootUrlSubfolderNoOutdir/node/test.js | 2 +- .../amd/outdir/simple/test.js | 2 +- .../node/outdir/simple/test.js | 2 +- .../reference/project/outMixedSubfolderNoOutdir/amd/ref/m2.js | 2 +- .../reference/project/outMixedSubfolderNoOutdir/amd/test.js | 2 +- .../reference/project/outMixedSubfolderNoOutdir/node/ref/m2.js | 2 +- .../reference/project/outMixedSubfolderNoOutdir/node/test.js | 2 +- .../amd/outdir/simple/ref/m2.js | 2 +- .../amd/outdir/simple/test.js | 2 +- .../node/outdir/simple/ref/m2.js | 2 +- .../node/outdir/simple/test.js | 2 +- .../project/outModuleMultifolderNoOutdir/amd/diskFile0.js | 2 +- .../reference/project/outModuleMultifolderNoOutdir/amd/test.js | 2 +- .../project/outModuleMultifolderNoOutdir/node/diskFile0.js | 2 +- .../reference/project/outModuleMultifolderNoOutdir/node/test.js | 2 +- .../amd/outdir/simple/outputdir_module_multifolder/test.js | 2 +- .../amd/outdir/simple/outputdir_module_multifolder_ref/m2.js | 2 +- .../node/outdir/simple/outputdir_module_multifolder/test.js | 2 +- .../node/outdir/simple/outputdir_module_multifolder_ref/m2.js | 2 +- .../reference/project/outModuleSimpleNoOutdir/amd/test.js | 2 +- .../reference/project/outModuleSimpleNoOutdir/node/test.js | 2 +- .../amd/outdir/simple/test.js | 2 +- .../node/outdir/simple/test.js | 2 +- .../reference/project/outModuleSubfolderNoOutdir/amd/test.js | 2 +- .../reference/project/outModuleSubfolderNoOutdir/node/test.js | 2 +- .../amd/outdir/simple/test.js | 2 +- .../node/outdir/simple/test.js | 2 +- .../reference/project/outMultifolderNoOutdir/amd/diskFile0.js | 2 +- .../reference/project/outMultifolderNoOutdir/amd/test.js | 2 +- .../reference/project/outMultifolderNoOutdir/node/diskFile0.js | 2 +- .../reference/project/outMultifolderNoOutdir/node/test.js | 2 +- .../amd/outdir/simple/outputdir_multifolder/test.js | 2 +- .../amd/outdir/simple/outputdir_multifolder_ref/m2.js | 2 +- .../node/outdir/simple/outputdir_multifolder/test.js | 2 +- .../node/outdir/simple/outputdir_multifolder_ref/m2.js | 2 +- tests/baselines/reference/project/outSimpleNoOutdir/amd/test.js | 2 +- .../baselines/reference/project/outSimpleNoOutdir/node/test.js | 2 +- .../outSimpleSpecifyOutputDirectory/amd/outdir/simple/test.js | 2 +- .../outSimpleSpecifyOutputDirectory/node/outdir/simple/test.js | 2 +- .../reference/project/outSubfolderNoOutdir/amd/test.js | 2 +- .../reference/project/outSubfolderNoOutdir/node/test.js | 2 +- .../amd/outdir/simple/test.js | 2 +- .../node/outdir/simple/test.js | 2 +- .../project/quotesInFileAndDirectoryNames/amd/m'ain.js | 2 +- .../project/quotesInFileAndDirectoryNames/node/m'ain.js | 2 +- .../project/referenceResolutionRelativePaths/amd/foo.js | 2 +- .../project/referenceResolutionRelativePaths/node/foo.js | 2 +- .../amd/src/ts/foo/foo.js | 2 +- .../node/src/ts/foo/foo.js | 2 +- .../referenceResolutionRelativePathsNoResolve/amd/diskFile0.js | 2 +- .../referenceResolutionRelativePathsNoResolve/node/diskFile0.js | 2 +- .../amd/foo.js | 2 +- .../node/foo.js | 2 +- .../project/rootDirectory/amd/outdir/simple/FolderB/fileB.js | 2 +- .../project/rootDirectory/node/outdir/simple/FolderB/fileB.js | 2 +- .../project/rootDirectoryErrors/amd/outdir/simple/fileB.js | 2 +- .../project/rootDirectoryErrors/node/outdir/simple/fileB.js | 2 +- .../amd/outdir/simple/FolderB/fileB.js | 2 +- .../node/outdir/simple/FolderB/fileB.js | 2 +- .../sourceRootAbsolutePathMixedSubfolderNoOutdir/amd/ref/m2.js | 2 +- .../sourceRootAbsolutePathMixedSubfolderNoOutdir/amd/test.js | 2 +- .../sourceRootAbsolutePathMixedSubfolderNoOutdir/node/ref/m2.js | 2 +- .../sourceRootAbsolutePathMixedSubfolderNoOutdir/node/test.js | 2 +- .../amd/outdir/simple/ref/m2.js | 2 +- .../amd/outdir/simple/test.js | 2 +- .../node/outdir/simple/ref/m2.js | 2 +- .../node/outdir/simple/test.js | 2 +- .../amd/diskFile1.js | 2 +- .../sourceRootAbsolutePathModuleMultifolderNoOutdir/amd/test.js | 2 +- .../node/diskFile1.js | 2 +- .../node/test.js | 2 +- .../amd/outdir/simple/outputdir_module_multifolder/test.js | 2 +- .../amd/outdir/simple/outputdir_module_multifolder_ref/m2.js | 2 +- .../node/outdir/simple/outputdir_module_multifolder/test.js | 2 +- .../node/outdir/simple/outputdir_module_multifolder_ref/m2.js | 2 +- .../sourceRootAbsolutePathModuleSimpleNoOutdir/amd/test.js | 2 +- .../sourceRootAbsolutePathModuleSimpleNoOutdir/node/test.js | 2 +- .../amd/outdir/simple/test.js | 2 +- .../node/outdir/simple/test.js | 2 +- .../sourceRootAbsolutePathModuleSubfolderNoOutdir/amd/test.js | 2 +- .../sourceRootAbsolutePathModuleSubfolderNoOutdir/node/test.js | 2 +- .../amd/outdir/simple/test.js | 2 +- .../node/outdir/simple/test.js | 2 +- .../sourceRootAbsolutePathMultifolderNoOutdir/amd/diskFile1.js | 2 +- .../sourceRootAbsolutePathMultifolderNoOutdir/amd/test.js | 2 +- .../sourceRootAbsolutePathMultifolderNoOutdir/node/diskFile1.js | 2 +- .../sourceRootAbsolutePathMultifolderNoOutdir/node/test.js | 2 +- .../amd/outdir/simple/outputdir_multifolder/test.js | 2 +- .../amd/outdir/simple/outputdir_multifolder_ref/m2.js | 2 +- .../node/outdir/simple/outputdir_multifolder/test.js | 2 +- .../node/outdir/simple/outputdir_multifolder_ref/m2.js | 2 +- .../project/sourceRootAbsolutePathSimpleNoOutdir/amd/test.js | 2 +- .../project/sourceRootAbsolutePathSimpleNoOutdir/node/test.js | 2 +- .../amd/outdir/simple/test.js | 2 +- .../node/outdir/simple/test.js | 2 +- .../project/sourceRootAbsolutePathSubfolderNoOutdir/amd/test.js | 2 +- .../sourceRootAbsolutePathSubfolderNoOutdir/node/test.js | 2 +- .../amd/outdir/simple/test.js | 2 +- .../node/outdir/simple/test.js | 2 +- .../sourceRootRelativePathMixedSubfolderNoOutdir/amd/ref/m2.js | 2 +- .../sourceRootRelativePathMixedSubfolderNoOutdir/amd/test.js | 2 +- .../sourceRootRelativePathMixedSubfolderNoOutdir/node/ref/m2.js | 2 +- .../sourceRootRelativePathMixedSubfolderNoOutdir/node/test.js | 2 +- .../amd/outdir/simple/ref/m2.js | 2 +- .../amd/outdir/simple/test.js | 2 +- .../node/outdir/simple/ref/m2.js | 2 +- .../node/outdir/simple/test.js | 2 +- .../amd/diskFile1.js | 2 +- .../sourceRootRelativePathModuleMultifolderNoOutdir/amd/test.js | 2 +- .../node/diskFile1.js | 2 +- .../node/test.js | 2 +- .../amd/outdir/simple/outputdir_module_multifolder/test.js | 2 +- .../amd/outdir/simple/outputdir_module_multifolder_ref/m2.js | 2 +- .../node/outdir/simple/outputdir_module_multifolder/test.js | 2 +- .../node/outdir/simple/outputdir_module_multifolder_ref/m2.js | 2 +- .../sourceRootRelativePathModuleSimpleNoOutdir/amd/test.js | 2 +- .../sourceRootRelativePathModuleSimpleNoOutdir/node/test.js | 2 +- .../amd/outdir/simple/test.js | 2 +- .../node/outdir/simple/test.js | 2 +- .../sourceRootRelativePathModuleSubfolderNoOutdir/amd/test.js | 2 +- .../sourceRootRelativePathModuleSubfolderNoOutdir/node/test.js | 2 +- .../amd/outdir/simple/test.js | 2 +- .../node/outdir/simple/test.js | 2 +- .../sourceRootRelativePathMultifolderNoOutdir/amd/diskFile1.js | 2 +- .../sourceRootRelativePathMultifolderNoOutdir/amd/test.js | 2 +- .../sourceRootRelativePathMultifolderNoOutdir/node/diskFile1.js | 2 +- .../sourceRootRelativePathMultifolderNoOutdir/node/test.js | 2 +- .../amd/outdir/simple/outputdir_multifolder/test.js | 2 +- .../amd/outdir/simple/outputdir_multifolder_ref/m2.js | 2 +- .../node/outdir/simple/outputdir_multifolder/test.js | 2 +- .../node/outdir/simple/outputdir_multifolder_ref/m2.js | 2 +- .../project/sourceRootRelativePathSimpleNoOutdir/amd/test.js | 2 +- .../project/sourceRootRelativePathSimpleNoOutdir/node/test.js | 2 +- .../amd/outdir/simple/test.js | 2 +- .../node/outdir/simple/test.js | 2 +- .../project/sourceRootRelativePathSubfolderNoOutdir/amd/test.js | 2 +- .../sourceRootRelativePathSubfolderNoOutdir/node/test.js | 2 +- .../amd/outdir/simple/test.js | 2 +- .../node/outdir/simple/test.js | 2 +- .../project/sourcemapMixedSubfolderNoOutdir/amd/ref/m2.js | 2 +- .../project/sourcemapMixedSubfolderNoOutdir/amd/test.js | 2 +- .../project/sourcemapMixedSubfolderNoOutdir/node/ref/m2.js | 2 +- .../project/sourcemapMixedSubfolderNoOutdir/node/test.js | 2 +- .../amd/outdir/simple/ref/m2.js | 2 +- .../amd/outdir/simple/test.js | 2 +- .../node/outdir/simple/ref/m2.js | 2 +- .../node/outdir/simple/test.js | 2 +- .../project/sourcemapModuleMultifolderNoOutdir/amd/diskFile1.js | 2 +- .../project/sourcemapModuleMultifolderNoOutdir/amd/test.js | 2 +- .../sourcemapModuleMultifolderNoOutdir/node/diskFile1.js | 2 +- .../project/sourcemapModuleMultifolderNoOutdir/node/test.js | 2 +- .../amd/outdir/simple/outputdir_module_multifolder/test.js | 2 +- .../amd/outdir/simple/outputdir_module_multifolder_ref/m2.js | 2 +- .../node/outdir/simple/outputdir_module_multifolder/test.js | 2 +- .../node/outdir/simple/outputdir_module_multifolder_ref/m2.js | 2 +- .../reference/project/sourcemapModuleSimpleNoOutdir/amd/test.js | 2 +- .../project/sourcemapModuleSimpleNoOutdir/node/test.js | 2 +- .../amd/outdir/simple/test.js | 2 +- .../node/outdir/simple/test.js | 2 +- .../project/sourcemapModuleSubfolderNoOutdir/amd/test.js | 2 +- .../project/sourcemapModuleSubfolderNoOutdir/node/test.js | 2 +- .../amd/outdir/simple/test.js | 2 +- .../node/outdir/simple/test.js | 2 +- .../project/sourcemapMultifolderNoOutdir/amd/diskFile1.js | 2 +- .../reference/project/sourcemapMultifolderNoOutdir/amd/test.js | 2 +- .../project/sourcemapMultifolderNoOutdir/node/diskFile1.js | 2 +- .../reference/project/sourcemapMultifolderNoOutdir/node/test.js | 2 +- .../amd/outdir/simple/outputdir_multifolder/test.js | 2 +- .../amd/outdir/simple/outputdir_multifolder_ref/m2.js | 2 +- .../node/outdir/simple/outputdir_multifolder/test.js | 2 +- .../node/outdir/simple/outputdir_multifolder_ref/m2.js | 2 +- .../reference/project/sourcemapSimpleNoOutdir/amd/test.js | 2 +- .../reference/project/sourcemapSimpleNoOutdir/node/test.js | 2 +- .../amd/outdir/simple/test.js | 2 +- .../node/outdir/simple/test.js | 2 +- .../reference/project/sourcemapSubfolderNoOutdir/amd/test.js | 2 +- .../reference/project/sourcemapSubfolderNoOutdir/node/test.js | 2 +- .../amd/outdir/simple/test.js | 2 +- .../node/outdir/simple/test.js | 2 +- .../project/sourcerootUrlMixedSubfolderNoOutdir/amd/ref/m2.js | 2 +- .../project/sourcerootUrlMixedSubfolderNoOutdir/amd/test.js | 2 +- .../project/sourcerootUrlMixedSubfolderNoOutdir/node/ref/m2.js | 2 +- .../project/sourcerootUrlMixedSubfolderNoOutdir/node/test.js | 2 +- .../amd/outdir/simple/ref/m2.js | 2 +- .../amd/outdir/simple/test.js | 2 +- .../node/outdir/simple/ref/m2.js | 2 +- .../node/outdir/simple/test.js | 2 +- .../sourcerootUrlModuleMultifolderNoOutdir/amd/diskFile1.js | 2 +- .../project/sourcerootUrlModuleMultifolderNoOutdir/amd/test.js | 2 +- .../sourcerootUrlModuleMultifolderNoOutdir/node/diskFile1.js | 2 +- .../project/sourcerootUrlModuleMultifolderNoOutdir/node/test.js | 2 +- .../amd/outdir/simple/outputdir_module_multifolder/test.js | 2 +- .../amd/outdir/simple/outputdir_module_multifolder_ref/m2.js | 2 +- .../node/outdir/simple/outputdir_module_multifolder/test.js | 2 +- .../node/outdir/simple/outputdir_module_multifolder_ref/m2.js | 2 +- .../project/sourcerootUrlModuleSimpleNoOutdir/amd/test.js | 2 +- .../project/sourcerootUrlModuleSimpleNoOutdir/node/test.js | 2 +- .../amd/outdir/simple/test.js | 2 +- .../node/outdir/simple/test.js | 2 +- .../project/sourcerootUrlModuleSubfolderNoOutdir/amd/test.js | 2 +- .../project/sourcerootUrlModuleSubfolderNoOutdir/node/test.js | 2 +- .../amd/outdir/simple/test.js | 2 +- .../node/outdir/simple/test.js | 2 +- .../project/sourcerootUrlMultifolderNoOutdir/amd/diskFile1.js | 2 +- .../project/sourcerootUrlMultifolderNoOutdir/amd/test.js | 2 +- .../project/sourcerootUrlMultifolderNoOutdir/node/diskFile1.js | 2 +- .../project/sourcerootUrlMultifolderNoOutdir/node/test.js | 2 +- .../amd/outdir/simple/outputdir_multifolder/test.js | 2 +- .../amd/outdir/simple/outputdir_multifolder_ref/m2.js | 2 +- .../node/outdir/simple/outputdir_multifolder/test.js | 2 +- .../node/outdir/simple/outputdir_multifolder_ref/m2.js | 2 +- .../reference/project/sourcerootUrlSimpleNoOutdir/amd/test.js | 2 +- .../reference/project/sourcerootUrlSimpleNoOutdir/node/test.js | 2 +- .../amd/outdir/simple/test.js | 2 +- .../node/outdir/simple/test.js | 2 +- .../project/sourcerootUrlSubfolderNoOutdir/amd/test.js | 2 +- .../project/sourcerootUrlSubfolderNoOutdir/node/test.js | 2 +- .../amd/outdir/simple/test.js | 2 +- .../node/outdir/simple/test.js | 2 +- 376 files changed, 376 insertions(+), 376 deletions(-) diff --git a/tests/baselines/reference/project/mapRootAbsolutePathMixedSubfolderNoOutdir/amd/ref/m2.js b/tests/baselines/reference/project/mapRootAbsolutePathMixedSubfolderNoOutdir/amd/ref/m2.js index fa0eb43e98e..2ccb7d6f77a 100644 --- a/tests/baselines/reference/project/mapRootAbsolutePathMixedSubfolderNoOutdir/amd/ref/m2.js +++ b/tests/baselines/reference/project/mapRootAbsolutePathMixedSubfolderNoOutdir/amd/ref/m2.js @@ -5,7 +5,7 @@ define(["require", "exports"], function (require, exports) { function m2_c1() { } return m2_c1; - })(); + }()); exports.m2_c1 = m2_c1; exports.m2_instance1 = new m2_c1(); function m2_f1() { diff --git a/tests/baselines/reference/project/mapRootAbsolutePathMixedSubfolderNoOutdir/amd/test.js b/tests/baselines/reference/project/mapRootAbsolutePathMixedSubfolderNoOutdir/amd/test.js index c664292eca3..2e104772c57 100644 --- a/tests/baselines/reference/project/mapRootAbsolutePathMixedSubfolderNoOutdir/amd/test.js +++ b/tests/baselines/reference/project/mapRootAbsolutePathMixedSubfolderNoOutdir/amd/test.js @@ -5,7 +5,7 @@ var c1 = (function () { function c1() { } return c1; -})(); +}()); var instance1 = new c1(); function f1() { return instance1; diff --git a/tests/baselines/reference/project/mapRootAbsolutePathMixedSubfolderNoOutdir/node/ref/m2.js b/tests/baselines/reference/project/mapRootAbsolutePathMixedSubfolderNoOutdir/node/ref/m2.js index 991554b2cb3..b991eda4382 100644 --- a/tests/baselines/reference/project/mapRootAbsolutePathMixedSubfolderNoOutdir/node/ref/m2.js +++ b/tests/baselines/reference/project/mapRootAbsolutePathMixedSubfolderNoOutdir/node/ref/m2.js @@ -4,7 +4,7 @@ var m2_c1 = (function () { function m2_c1() { } return m2_c1; -})(); +}()); exports.m2_c1 = m2_c1; exports.m2_instance1 = new m2_c1(); function m2_f1() { diff --git a/tests/baselines/reference/project/mapRootAbsolutePathMixedSubfolderNoOutdir/node/test.js b/tests/baselines/reference/project/mapRootAbsolutePathMixedSubfolderNoOutdir/node/test.js index c664292eca3..2e104772c57 100644 --- a/tests/baselines/reference/project/mapRootAbsolutePathMixedSubfolderNoOutdir/node/test.js +++ b/tests/baselines/reference/project/mapRootAbsolutePathMixedSubfolderNoOutdir/node/test.js @@ -5,7 +5,7 @@ var c1 = (function () { function c1() { } return c1; -})(); +}()); var instance1 = new c1(); function f1() { return instance1; diff --git a/tests/baselines/reference/project/mapRootAbsolutePathMixedSubfolderSpecifyOutputDirectory/amd/outdir/simple/ref/m2.js b/tests/baselines/reference/project/mapRootAbsolutePathMixedSubfolderSpecifyOutputDirectory/amd/outdir/simple/ref/m2.js index fa0eb43e98e..2ccb7d6f77a 100644 --- a/tests/baselines/reference/project/mapRootAbsolutePathMixedSubfolderSpecifyOutputDirectory/amd/outdir/simple/ref/m2.js +++ b/tests/baselines/reference/project/mapRootAbsolutePathMixedSubfolderSpecifyOutputDirectory/amd/outdir/simple/ref/m2.js @@ -5,7 +5,7 @@ define(["require", "exports"], function (require, exports) { function m2_c1() { } return m2_c1; - })(); + }()); exports.m2_c1 = m2_c1; exports.m2_instance1 = new m2_c1(); function m2_f1() { diff --git a/tests/baselines/reference/project/mapRootAbsolutePathMixedSubfolderSpecifyOutputDirectory/amd/outdir/simple/test.js b/tests/baselines/reference/project/mapRootAbsolutePathMixedSubfolderSpecifyOutputDirectory/amd/outdir/simple/test.js index c664292eca3..2e104772c57 100644 --- a/tests/baselines/reference/project/mapRootAbsolutePathMixedSubfolderSpecifyOutputDirectory/amd/outdir/simple/test.js +++ b/tests/baselines/reference/project/mapRootAbsolutePathMixedSubfolderSpecifyOutputDirectory/amd/outdir/simple/test.js @@ -5,7 +5,7 @@ var c1 = (function () { function c1() { } return c1; -})(); +}()); var instance1 = new c1(); function f1() { return instance1; diff --git a/tests/baselines/reference/project/mapRootAbsolutePathMixedSubfolderSpecifyOutputDirectory/node/outdir/simple/ref/m2.js b/tests/baselines/reference/project/mapRootAbsolutePathMixedSubfolderSpecifyOutputDirectory/node/outdir/simple/ref/m2.js index 991554b2cb3..b991eda4382 100644 --- a/tests/baselines/reference/project/mapRootAbsolutePathMixedSubfolderSpecifyOutputDirectory/node/outdir/simple/ref/m2.js +++ b/tests/baselines/reference/project/mapRootAbsolutePathMixedSubfolderSpecifyOutputDirectory/node/outdir/simple/ref/m2.js @@ -4,7 +4,7 @@ var m2_c1 = (function () { function m2_c1() { } return m2_c1; -})(); +}()); exports.m2_c1 = m2_c1; exports.m2_instance1 = new m2_c1(); function m2_f1() { diff --git a/tests/baselines/reference/project/mapRootAbsolutePathMixedSubfolderSpecifyOutputDirectory/node/outdir/simple/test.js b/tests/baselines/reference/project/mapRootAbsolutePathMixedSubfolderSpecifyOutputDirectory/node/outdir/simple/test.js index c664292eca3..2e104772c57 100644 --- a/tests/baselines/reference/project/mapRootAbsolutePathMixedSubfolderSpecifyOutputDirectory/node/outdir/simple/test.js +++ b/tests/baselines/reference/project/mapRootAbsolutePathMixedSubfolderSpecifyOutputDirectory/node/outdir/simple/test.js @@ -5,7 +5,7 @@ var c1 = (function () { function c1() { } return c1; -})(); +}()); var instance1 = new c1(); function f1() { return instance1; diff --git a/tests/baselines/reference/project/mapRootAbsolutePathModuleMultifolderNoOutdir/amd/diskFile1.js b/tests/baselines/reference/project/mapRootAbsolutePathModuleMultifolderNoOutdir/amd/diskFile1.js index b2d0711042a..d77e78e3751 100644 --- a/tests/baselines/reference/project/mapRootAbsolutePathModuleMultifolderNoOutdir/amd/diskFile1.js +++ b/tests/baselines/reference/project/mapRootAbsolutePathModuleMultifolderNoOutdir/amd/diskFile1.js @@ -5,7 +5,7 @@ define(["require", "exports"], function (require, exports) { function m2_c1() { } return m2_c1; - })(); + }()); exports.m2_c1 = m2_c1; exports.m2_instance1 = new m2_c1(); function m2_f1() { diff --git a/tests/baselines/reference/project/mapRootAbsolutePathModuleMultifolderNoOutdir/amd/test.js b/tests/baselines/reference/project/mapRootAbsolutePathModuleMultifolderNoOutdir/amd/test.js index d046b77d327..550fa7b9564 100644 --- a/tests/baselines/reference/project/mapRootAbsolutePathModuleMultifolderNoOutdir/amd/test.js +++ b/tests/baselines/reference/project/mapRootAbsolutePathModuleMultifolderNoOutdir/amd/test.js @@ -5,7 +5,7 @@ define(["require", "exports", "ref/m1", "../outputdir_module_multifolder_ref/m2" function c1() { } return c1; - })(); + }()); exports.c1 = c1; exports.instance1 = new c1(); function f1() { diff --git a/tests/baselines/reference/project/mapRootAbsolutePathModuleMultifolderNoOutdir/node/diskFile1.js b/tests/baselines/reference/project/mapRootAbsolutePathModuleMultifolderNoOutdir/node/diskFile1.js index bb70e1342a1..76a761b602d 100644 --- a/tests/baselines/reference/project/mapRootAbsolutePathModuleMultifolderNoOutdir/node/diskFile1.js +++ b/tests/baselines/reference/project/mapRootAbsolutePathModuleMultifolderNoOutdir/node/diskFile1.js @@ -4,7 +4,7 @@ var m2_c1 = (function () { function m2_c1() { } return m2_c1; -})(); +}()); exports.m2_c1 = m2_c1; exports.m2_instance1 = new m2_c1(); function m2_f1() { diff --git a/tests/baselines/reference/project/mapRootAbsolutePathModuleMultifolderNoOutdir/node/test.js b/tests/baselines/reference/project/mapRootAbsolutePathModuleMultifolderNoOutdir/node/test.js index 99285ad2e58..033b046cfe0 100644 --- a/tests/baselines/reference/project/mapRootAbsolutePathModuleMultifolderNoOutdir/node/test.js +++ b/tests/baselines/reference/project/mapRootAbsolutePathModuleMultifolderNoOutdir/node/test.js @@ -6,7 +6,7 @@ var c1 = (function () { function c1() { } return c1; -})(); +}()); exports.c1 = c1; exports.instance1 = new c1(); function f1() { diff --git a/tests/baselines/reference/project/mapRootAbsolutePathModuleMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_module_multifolder/test.js b/tests/baselines/reference/project/mapRootAbsolutePathModuleMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_module_multifolder/test.js index d046b77d327..550fa7b9564 100644 --- a/tests/baselines/reference/project/mapRootAbsolutePathModuleMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_module_multifolder/test.js +++ b/tests/baselines/reference/project/mapRootAbsolutePathModuleMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_module_multifolder/test.js @@ -5,7 +5,7 @@ define(["require", "exports", "ref/m1", "../outputdir_module_multifolder_ref/m2" function c1() { } return c1; - })(); + }()); exports.c1 = c1; exports.instance1 = new c1(); function f1() { diff --git a/tests/baselines/reference/project/mapRootAbsolutePathModuleMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_module_multifolder_ref/m2.js b/tests/baselines/reference/project/mapRootAbsolutePathModuleMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_module_multifolder_ref/m2.js index b2d0711042a..d77e78e3751 100644 --- a/tests/baselines/reference/project/mapRootAbsolutePathModuleMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_module_multifolder_ref/m2.js +++ b/tests/baselines/reference/project/mapRootAbsolutePathModuleMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_module_multifolder_ref/m2.js @@ -5,7 +5,7 @@ define(["require", "exports"], function (require, exports) { function m2_c1() { } return m2_c1; - })(); + }()); exports.m2_c1 = m2_c1; exports.m2_instance1 = new m2_c1(); function m2_f1() { diff --git a/tests/baselines/reference/project/mapRootAbsolutePathModuleMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_module_multifolder/test.js b/tests/baselines/reference/project/mapRootAbsolutePathModuleMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_module_multifolder/test.js index 99285ad2e58..033b046cfe0 100644 --- a/tests/baselines/reference/project/mapRootAbsolutePathModuleMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_module_multifolder/test.js +++ b/tests/baselines/reference/project/mapRootAbsolutePathModuleMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_module_multifolder/test.js @@ -6,7 +6,7 @@ var c1 = (function () { function c1() { } return c1; -})(); +}()); exports.c1 = c1; exports.instance1 = new c1(); function f1() { diff --git a/tests/baselines/reference/project/mapRootAbsolutePathModuleMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_module_multifolder_ref/m2.js b/tests/baselines/reference/project/mapRootAbsolutePathModuleMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_module_multifolder_ref/m2.js index bb70e1342a1..76a761b602d 100644 --- a/tests/baselines/reference/project/mapRootAbsolutePathModuleMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_module_multifolder_ref/m2.js +++ b/tests/baselines/reference/project/mapRootAbsolutePathModuleMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_module_multifolder_ref/m2.js @@ -4,7 +4,7 @@ var m2_c1 = (function () { function m2_c1() { } return m2_c1; -})(); +}()); exports.m2_c1 = m2_c1; exports.m2_instance1 = new m2_c1(); function m2_f1() { diff --git a/tests/baselines/reference/project/mapRootAbsolutePathModuleSimpleNoOutdir/amd/test.js b/tests/baselines/reference/project/mapRootAbsolutePathModuleSimpleNoOutdir/amd/test.js index 44e408fb39b..81972e29958 100644 --- a/tests/baselines/reference/project/mapRootAbsolutePathModuleSimpleNoOutdir/amd/test.js +++ b/tests/baselines/reference/project/mapRootAbsolutePathModuleSimpleNoOutdir/amd/test.js @@ -5,7 +5,7 @@ define(["require", "exports", "m1"], function (require, exports, m1) { function c1() { } return c1; - })(); + }()); exports.c1 = c1; exports.instance1 = new c1(); function f1() { diff --git a/tests/baselines/reference/project/mapRootAbsolutePathModuleSimpleNoOutdir/node/test.js b/tests/baselines/reference/project/mapRootAbsolutePathModuleSimpleNoOutdir/node/test.js index 3a438f0255b..5bc656a7470 100644 --- a/tests/baselines/reference/project/mapRootAbsolutePathModuleSimpleNoOutdir/node/test.js +++ b/tests/baselines/reference/project/mapRootAbsolutePathModuleSimpleNoOutdir/node/test.js @@ -5,7 +5,7 @@ var c1 = (function () { function c1() { } return c1; -})(); +}()); exports.c1 = c1; exports.instance1 = new c1(); function f1() { diff --git a/tests/baselines/reference/project/mapRootAbsolutePathModuleSimpleSpecifyOutputDirectory/amd/outdir/simple/test.js b/tests/baselines/reference/project/mapRootAbsolutePathModuleSimpleSpecifyOutputDirectory/amd/outdir/simple/test.js index 44e408fb39b..81972e29958 100644 --- a/tests/baselines/reference/project/mapRootAbsolutePathModuleSimpleSpecifyOutputDirectory/amd/outdir/simple/test.js +++ b/tests/baselines/reference/project/mapRootAbsolutePathModuleSimpleSpecifyOutputDirectory/amd/outdir/simple/test.js @@ -5,7 +5,7 @@ define(["require", "exports", "m1"], function (require, exports, m1) { function c1() { } return c1; - })(); + }()); exports.c1 = c1; exports.instance1 = new c1(); function f1() { diff --git a/tests/baselines/reference/project/mapRootAbsolutePathModuleSimpleSpecifyOutputDirectory/node/outdir/simple/test.js b/tests/baselines/reference/project/mapRootAbsolutePathModuleSimpleSpecifyOutputDirectory/node/outdir/simple/test.js index 3a438f0255b..5bc656a7470 100644 --- a/tests/baselines/reference/project/mapRootAbsolutePathModuleSimpleSpecifyOutputDirectory/node/outdir/simple/test.js +++ b/tests/baselines/reference/project/mapRootAbsolutePathModuleSimpleSpecifyOutputDirectory/node/outdir/simple/test.js @@ -5,7 +5,7 @@ var c1 = (function () { function c1() { } return c1; -})(); +}()); exports.c1 = c1; exports.instance1 = new c1(); function f1() { diff --git a/tests/baselines/reference/project/mapRootAbsolutePathModuleSubfolderNoOutdir/amd/test.js b/tests/baselines/reference/project/mapRootAbsolutePathModuleSubfolderNoOutdir/amd/test.js index f1d1c605eb4..cc32d33f88f 100644 --- a/tests/baselines/reference/project/mapRootAbsolutePathModuleSubfolderNoOutdir/amd/test.js +++ b/tests/baselines/reference/project/mapRootAbsolutePathModuleSubfolderNoOutdir/amd/test.js @@ -5,7 +5,7 @@ define(["require", "exports", "ref/m1"], function (require, exports, m1) { function c1() { } return c1; - })(); + }()); exports.c1 = c1; exports.instance1 = new c1(); function f1() { diff --git a/tests/baselines/reference/project/mapRootAbsolutePathModuleSubfolderNoOutdir/node/test.js b/tests/baselines/reference/project/mapRootAbsolutePathModuleSubfolderNoOutdir/node/test.js index 884fc07b341..69051eba247 100644 --- a/tests/baselines/reference/project/mapRootAbsolutePathModuleSubfolderNoOutdir/node/test.js +++ b/tests/baselines/reference/project/mapRootAbsolutePathModuleSubfolderNoOutdir/node/test.js @@ -5,7 +5,7 @@ var c1 = (function () { function c1() { } return c1; -})(); +}()); exports.c1 = c1; exports.instance1 = new c1(); function f1() { diff --git a/tests/baselines/reference/project/mapRootAbsolutePathModuleSubfolderSpecifyOutputDirectory/amd/outdir/simple/test.js b/tests/baselines/reference/project/mapRootAbsolutePathModuleSubfolderSpecifyOutputDirectory/amd/outdir/simple/test.js index f1d1c605eb4..cc32d33f88f 100644 --- a/tests/baselines/reference/project/mapRootAbsolutePathModuleSubfolderSpecifyOutputDirectory/amd/outdir/simple/test.js +++ b/tests/baselines/reference/project/mapRootAbsolutePathModuleSubfolderSpecifyOutputDirectory/amd/outdir/simple/test.js @@ -5,7 +5,7 @@ define(["require", "exports", "ref/m1"], function (require, exports, m1) { function c1() { } return c1; - })(); + }()); exports.c1 = c1; exports.instance1 = new c1(); function f1() { diff --git a/tests/baselines/reference/project/mapRootAbsolutePathModuleSubfolderSpecifyOutputDirectory/node/outdir/simple/test.js b/tests/baselines/reference/project/mapRootAbsolutePathModuleSubfolderSpecifyOutputDirectory/node/outdir/simple/test.js index 884fc07b341..69051eba247 100644 --- a/tests/baselines/reference/project/mapRootAbsolutePathModuleSubfolderSpecifyOutputDirectory/node/outdir/simple/test.js +++ b/tests/baselines/reference/project/mapRootAbsolutePathModuleSubfolderSpecifyOutputDirectory/node/outdir/simple/test.js @@ -5,7 +5,7 @@ var c1 = (function () { function c1() { } return c1; -})(); +}()); exports.c1 = c1; exports.instance1 = new c1(); function f1() { diff --git a/tests/baselines/reference/project/mapRootAbsolutePathMultifolderNoOutdir/amd/diskFile1.js b/tests/baselines/reference/project/mapRootAbsolutePathMultifolderNoOutdir/amd/diskFile1.js index 8dc7c506cd6..23caea4d958 100644 --- a/tests/baselines/reference/project/mapRootAbsolutePathMultifolderNoOutdir/amd/diskFile1.js +++ b/tests/baselines/reference/project/mapRootAbsolutePathMultifolderNoOutdir/amd/diskFile1.js @@ -3,7 +3,7 @@ var m2_c1 = (function () { function m2_c1() { } return m2_c1; -})(); +}()); var m2_instance1 = new m2_c1(); function m2_f1() { return m2_instance1; diff --git a/tests/baselines/reference/project/mapRootAbsolutePathMultifolderNoOutdir/amd/test.js b/tests/baselines/reference/project/mapRootAbsolutePathMultifolderNoOutdir/amd/test.js index 4ea192ec827..a15b4c334cf 100644 --- a/tests/baselines/reference/project/mapRootAbsolutePathMultifolderNoOutdir/amd/test.js +++ b/tests/baselines/reference/project/mapRootAbsolutePathMultifolderNoOutdir/amd/test.js @@ -5,7 +5,7 @@ var c1 = (function () { function c1() { } return c1; -})(); +}()); var instance1 = new c1(); function f1() { return instance1; diff --git a/tests/baselines/reference/project/mapRootAbsolutePathMultifolderNoOutdir/node/diskFile1.js b/tests/baselines/reference/project/mapRootAbsolutePathMultifolderNoOutdir/node/diskFile1.js index 8dc7c506cd6..23caea4d958 100644 --- a/tests/baselines/reference/project/mapRootAbsolutePathMultifolderNoOutdir/node/diskFile1.js +++ b/tests/baselines/reference/project/mapRootAbsolutePathMultifolderNoOutdir/node/diskFile1.js @@ -3,7 +3,7 @@ var m2_c1 = (function () { function m2_c1() { } return m2_c1; -})(); +}()); var m2_instance1 = new m2_c1(); function m2_f1() { return m2_instance1; diff --git a/tests/baselines/reference/project/mapRootAbsolutePathMultifolderNoOutdir/node/test.js b/tests/baselines/reference/project/mapRootAbsolutePathMultifolderNoOutdir/node/test.js index 4ea192ec827..a15b4c334cf 100644 --- a/tests/baselines/reference/project/mapRootAbsolutePathMultifolderNoOutdir/node/test.js +++ b/tests/baselines/reference/project/mapRootAbsolutePathMultifolderNoOutdir/node/test.js @@ -5,7 +5,7 @@ var c1 = (function () { function c1() { } return c1; -})(); +}()); var instance1 = new c1(); function f1() { return instance1; diff --git a/tests/baselines/reference/project/mapRootAbsolutePathMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_multifolder/test.js b/tests/baselines/reference/project/mapRootAbsolutePathMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_multifolder/test.js index 4ea192ec827..a15b4c334cf 100644 --- a/tests/baselines/reference/project/mapRootAbsolutePathMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_multifolder/test.js +++ b/tests/baselines/reference/project/mapRootAbsolutePathMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_multifolder/test.js @@ -5,7 +5,7 @@ var c1 = (function () { function c1() { } return c1; -})(); +}()); var instance1 = new c1(); function f1() { return instance1; diff --git a/tests/baselines/reference/project/mapRootAbsolutePathMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_multifolder_ref/m2.js b/tests/baselines/reference/project/mapRootAbsolutePathMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_multifolder_ref/m2.js index 8dc7c506cd6..23caea4d958 100644 --- a/tests/baselines/reference/project/mapRootAbsolutePathMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_multifolder_ref/m2.js +++ b/tests/baselines/reference/project/mapRootAbsolutePathMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_multifolder_ref/m2.js @@ -3,7 +3,7 @@ var m2_c1 = (function () { function m2_c1() { } return m2_c1; -})(); +}()); var m2_instance1 = new m2_c1(); function m2_f1() { return m2_instance1; diff --git a/tests/baselines/reference/project/mapRootAbsolutePathMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_multifolder/test.js b/tests/baselines/reference/project/mapRootAbsolutePathMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_multifolder/test.js index 4ea192ec827..a15b4c334cf 100644 --- a/tests/baselines/reference/project/mapRootAbsolutePathMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_multifolder/test.js +++ b/tests/baselines/reference/project/mapRootAbsolutePathMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_multifolder/test.js @@ -5,7 +5,7 @@ var c1 = (function () { function c1() { } return c1; -})(); +}()); var instance1 = new c1(); function f1() { return instance1; diff --git a/tests/baselines/reference/project/mapRootAbsolutePathMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_multifolder_ref/m2.js b/tests/baselines/reference/project/mapRootAbsolutePathMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_multifolder_ref/m2.js index 8dc7c506cd6..23caea4d958 100644 --- a/tests/baselines/reference/project/mapRootAbsolutePathMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_multifolder_ref/m2.js +++ b/tests/baselines/reference/project/mapRootAbsolutePathMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_multifolder_ref/m2.js @@ -3,7 +3,7 @@ var m2_c1 = (function () { function m2_c1() { } return m2_c1; -})(); +}()); var m2_instance1 = new m2_c1(); function m2_f1() { return m2_instance1; diff --git a/tests/baselines/reference/project/mapRootAbsolutePathSimpleNoOutdir/amd/test.js b/tests/baselines/reference/project/mapRootAbsolutePathSimpleNoOutdir/amd/test.js index 477ab9b9bd5..907727092db 100644 --- a/tests/baselines/reference/project/mapRootAbsolutePathSimpleNoOutdir/amd/test.js +++ b/tests/baselines/reference/project/mapRootAbsolutePathSimpleNoOutdir/amd/test.js @@ -4,7 +4,7 @@ var c1 = (function () { function c1() { } return c1; -})(); +}()); var instance1 = new c1(); function f1() { return instance1; diff --git a/tests/baselines/reference/project/mapRootAbsolutePathSimpleNoOutdir/node/test.js b/tests/baselines/reference/project/mapRootAbsolutePathSimpleNoOutdir/node/test.js index 477ab9b9bd5..907727092db 100644 --- a/tests/baselines/reference/project/mapRootAbsolutePathSimpleNoOutdir/node/test.js +++ b/tests/baselines/reference/project/mapRootAbsolutePathSimpleNoOutdir/node/test.js @@ -4,7 +4,7 @@ var c1 = (function () { function c1() { } return c1; -})(); +}()); var instance1 = new c1(); function f1() { return instance1; diff --git a/tests/baselines/reference/project/mapRootAbsolutePathSimpleSpecifyOutputDirectory/amd/outdir/simple/test.js b/tests/baselines/reference/project/mapRootAbsolutePathSimpleSpecifyOutputDirectory/amd/outdir/simple/test.js index 477ab9b9bd5..907727092db 100644 --- a/tests/baselines/reference/project/mapRootAbsolutePathSimpleSpecifyOutputDirectory/amd/outdir/simple/test.js +++ b/tests/baselines/reference/project/mapRootAbsolutePathSimpleSpecifyOutputDirectory/amd/outdir/simple/test.js @@ -4,7 +4,7 @@ var c1 = (function () { function c1() { } return c1; -})(); +}()); var instance1 = new c1(); function f1() { return instance1; diff --git a/tests/baselines/reference/project/mapRootAbsolutePathSimpleSpecifyOutputDirectory/node/outdir/simple/test.js b/tests/baselines/reference/project/mapRootAbsolutePathSimpleSpecifyOutputDirectory/node/outdir/simple/test.js index 477ab9b9bd5..907727092db 100644 --- a/tests/baselines/reference/project/mapRootAbsolutePathSimpleSpecifyOutputDirectory/node/outdir/simple/test.js +++ b/tests/baselines/reference/project/mapRootAbsolutePathSimpleSpecifyOutputDirectory/node/outdir/simple/test.js @@ -4,7 +4,7 @@ var c1 = (function () { function c1() { } return c1; -})(); +}()); var instance1 = new c1(); function f1() { return instance1; diff --git a/tests/baselines/reference/project/mapRootAbsolutePathSubfolderNoOutdir/amd/test.js b/tests/baselines/reference/project/mapRootAbsolutePathSubfolderNoOutdir/amd/test.js index 7661081c85c..2ca0fd71dde 100644 --- a/tests/baselines/reference/project/mapRootAbsolutePathSubfolderNoOutdir/amd/test.js +++ b/tests/baselines/reference/project/mapRootAbsolutePathSubfolderNoOutdir/amd/test.js @@ -4,7 +4,7 @@ var c1 = (function () { function c1() { } return c1; -})(); +}()); var instance1 = new c1(); function f1() { return instance1; diff --git a/tests/baselines/reference/project/mapRootAbsolutePathSubfolderNoOutdir/node/test.js b/tests/baselines/reference/project/mapRootAbsolutePathSubfolderNoOutdir/node/test.js index 7661081c85c..2ca0fd71dde 100644 --- a/tests/baselines/reference/project/mapRootAbsolutePathSubfolderNoOutdir/node/test.js +++ b/tests/baselines/reference/project/mapRootAbsolutePathSubfolderNoOutdir/node/test.js @@ -4,7 +4,7 @@ var c1 = (function () { function c1() { } return c1; -})(); +}()); var instance1 = new c1(); function f1() { return instance1; diff --git a/tests/baselines/reference/project/mapRootAbsolutePathSubfolderSpecifyOutputDirectory/amd/outdir/simple/test.js b/tests/baselines/reference/project/mapRootAbsolutePathSubfolderSpecifyOutputDirectory/amd/outdir/simple/test.js index 7661081c85c..2ca0fd71dde 100644 --- a/tests/baselines/reference/project/mapRootAbsolutePathSubfolderSpecifyOutputDirectory/amd/outdir/simple/test.js +++ b/tests/baselines/reference/project/mapRootAbsolutePathSubfolderSpecifyOutputDirectory/amd/outdir/simple/test.js @@ -4,7 +4,7 @@ var c1 = (function () { function c1() { } return c1; -})(); +}()); var instance1 = new c1(); function f1() { return instance1; diff --git a/tests/baselines/reference/project/mapRootAbsolutePathSubfolderSpecifyOutputDirectory/node/outdir/simple/test.js b/tests/baselines/reference/project/mapRootAbsolutePathSubfolderSpecifyOutputDirectory/node/outdir/simple/test.js index 7661081c85c..2ca0fd71dde 100644 --- a/tests/baselines/reference/project/mapRootAbsolutePathSubfolderSpecifyOutputDirectory/node/outdir/simple/test.js +++ b/tests/baselines/reference/project/mapRootAbsolutePathSubfolderSpecifyOutputDirectory/node/outdir/simple/test.js @@ -4,7 +4,7 @@ var c1 = (function () { function c1() { } return c1; -})(); +}()); var instance1 = new c1(); function f1() { return instance1; diff --git a/tests/baselines/reference/project/mapRootRelativePathMixedSubfolderNoOutdir/amd/ref/m2.js b/tests/baselines/reference/project/mapRootRelativePathMixedSubfolderNoOutdir/amd/ref/m2.js index 22446a62021..d0a6c1f583f 100644 --- a/tests/baselines/reference/project/mapRootRelativePathMixedSubfolderNoOutdir/amd/ref/m2.js +++ b/tests/baselines/reference/project/mapRootRelativePathMixedSubfolderNoOutdir/amd/ref/m2.js @@ -5,7 +5,7 @@ define(["require", "exports"], function (require, exports) { function m2_c1() { } return m2_c1; - })(); + }()); exports.m2_c1 = m2_c1; exports.m2_instance1 = new m2_c1(); function m2_f1() { diff --git a/tests/baselines/reference/project/mapRootRelativePathMixedSubfolderNoOutdir/amd/test.js b/tests/baselines/reference/project/mapRootRelativePathMixedSubfolderNoOutdir/amd/test.js index 15ea98ef7ed..f6f5af1aced 100644 --- a/tests/baselines/reference/project/mapRootRelativePathMixedSubfolderNoOutdir/amd/test.js +++ b/tests/baselines/reference/project/mapRootRelativePathMixedSubfolderNoOutdir/amd/test.js @@ -5,7 +5,7 @@ var c1 = (function () { function c1() { } return c1; -})(); +}()); var instance1 = new c1(); function f1() { return instance1; diff --git a/tests/baselines/reference/project/mapRootRelativePathMixedSubfolderNoOutdir/node/ref/m2.js b/tests/baselines/reference/project/mapRootRelativePathMixedSubfolderNoOutdir/node/ref/m2.js index 83c26797422..b5c226692a0 100644 --- a/tests/baselines/reference/project/mapRootRelativePathMixedSubfolderNoOutdir/node/ref/m2.js +++ b/tests/baselines/reference/project/mapRootRelativePathMixedSubfolderNoOutdir/node/ref/m2.js @@ -4,7 +4,7 @@ var m2_c1 = (function () { function m2_c1() { } return m2_c1; -})(); +}()); exports.m2_c1 = m2_c1; exports.m2_instance1 = new m2_c1(); function m2_f1() { diff --git a/tests/baselines/reference/project/mapRootRelativePathMixedSubfolderNoOutdir/node/test.js b/tests/baselines/reference/project/mapRootRelativePathMixedSubfolderNoOutdir/node/test.js index 15ea98ef7ed..f6f5af1aced 100644 --- a/tests/baselines/reference/project/mapRootRelativePathMixedSubfolderNoOutdir/node/test.js +++ b/tests/baselines/reference/project/mapRootRelativePathMixedSubfolderNoOutdir/node/test.js @@ -5,7 +5,7 @@ var c1 = (function () { function c1() { } return c1; -})(); +}()); var instance1 = new c1(); function f1() { return instance1; diff --git a/tests/baselines/reference/project/mapRootRelativePathMixedSubfolderSpecifyOutputDirectory/amd/outdir/simple/ref/m2.js b/tests/baselines/reference/project/mapRootRelativePathMixedSubfolderSpecifyOutputDirectory/amd/outdir/simple/ref/m2.js index 8135743efbb..961737d6acf 100644 --- a/tests/baselines/reference/project/mapRootRelativePathMixedSubfolderSpecifyOutputDirectory/amd/outdir/simple/ref/m2.js +++ b/tests/baselines/reference/project/mapRootRelativePathMixedSubfolderSpecifyOutputDirectory/amd/outdir/simple/ref/m2.js @@ -5,7 +5,7 @@ define(["require", "exports"], function (require, exports) { function m2_c1() { } return m2_c1; - })(); + }()); exports.m2_c1 = m2_c1; exports.m2_instance1 = new m2_c1(); function m2_f1() { diff --git a/tests/baselines/reference/project/mapRootRelativePathMixedSubfolderSpecifyOutputDirectory/amd/outdir/simple/test.js b/tests/baselines/reference/project/mapRootRelativePathMixedSubfolderSpecifyOutputDirectory/amd/outdir/simple/test.js index ce180d55323..347c791053c 100644 --- a/tests/baselines/reference/project/mapRootRelativePathMixedSubfolderSpecifyOutputDirectory/amd/outdir/simple/test.js +++ b/tests/baselines/reference/project/mapRootRelativePathMixedSubfolderSpecifyOutputDirectory/amd/outdir/simple/test.js @@ -5,7 +5,7 @@ var c1 = (function () { function c1() { } return c1; -})(); +}()); var instance1 = new c1(); function f1() { return instance1; diff --git a/tests/baselines/reference/project/mapRootRelativePathMixedSubfolderSpecifyOutputDirectory/node/outdir/simple/ref/m2.js b/tests/baselines/reference/project/mapRootRelativePathMixedSubfolderSpecifyOutputDirectory/node/outdir/simple/ref/m2.js index dd1d86b1336..d078a80e31c 100644 --- a/tests/baselines/reference/project/mapRootRelativePathMixedSubfolderSpecifyOutputDirectory/node/outdir/simple/ref/m2.js +++ b/tests/baselines/reference/project/mapRootRelativePathMixedSubfolderSpecifyOutputDirectory/node/outdir/simple/ref/m2.js @@ -4,7 +4,7 @@ var m2_c1 = (function () { function m2_c1() { } return m2_c1; -})(); +}()); exports.m2_c1 = m2_c1; exports.m2_instance1 = new m2_c1(); function m2_f1() { diff --git a/tests/baselines/reference/project/mapRootRelativePathMixedSubfolderSpecifyOutputDirectory/node/outdir/simple/test.js b/tests/baselines/reference/project/mapRootRelativePathMixedSubfolderSpecifyOutputDirectory/node/outdir/simple/test.js index ce180d55323..347c791053c 100644 --- a/tests/baselines/reference/project/mapRootRelativePathMixedSubfolderSpecifyOutputDirectory/node/outdir/simple/test.js +++ b/tests/baselines/reference/project/mapRootRelativePathMixedSubfolderSpecifyOutputDirectory/node/outdir/simple/test.js @@ -5,7 +5,7 @@ var c1 = (function () { function c1() { } return c1; -})(); +}()); var instance1 = new c1(); function f1() { return instance1; diff --git a/tests/baselines/reference/project/mapRootRelativePathModuleMultifolderNoOutdir/amd/diskFile1.js b/tests/baselines/reference/project/mapRootRelativePathModuleMultifolderNoOutdir/amd/diskFile1.js index efc54df85c4..bbbb972580d 100644 --- a/tests/baselines/reference/project/mapRootRelativePathModuleMultifolderNoOutdir/amd/diskFile1.js +++ b/tests/baselines/reference/project/mapRootRelativePathModuleMultifolderNoOutdir/amd/diskFile1.js @@ -5,7 +5,7 @@ define(["require", "exports"], function (require, exports) { function m2_c1() { } return m2_c1; - })(); + }()); exports.m2_c1 = m2_c1; exports.m2_instance1 = new m2_c1(); function m2_f1() { diff --git a/tests/baselines/reference/project/mapRootRelativePathModuleMultifolderNoOutdir/amd/test.js b/tests/baselines/reference/project/mapRootRelativePathModuleMultifolderNoOutdir/amd/test.js index e368bc35b24..b40eb0dad12 100644 --- a/tests/baselines/reference/project/mapRootRelativePathModuleMultifolderNoOutdir/amd/test.js +++ b/tests/baselines/reference/project/mapRootRelativePathModuleMultifolderNoOutdir/amd/test.js @@ -5,7 +5,7 @@ define(["require", "exports", "ref/m1", "../outputdir_module_multifolder_ref/m2" function c1() { } return c1; - })(); + }()); exports.c1 = c1; exports.instance1 = new c1(); function f1() { diff --git a/tests/baselines/reference/project/mapRootRelativePathModuleMultifolderNoOutdir/node/diskFile1.js b/tests/baselines/reference/project/mapRootRelativePathModuleMultifolderNoOutdir/node/diskFile1.js index d6279c6e1b8..338d724fe93 100644 --- a/tests/baselines/reference/project/mapRootRelativePathModuleMultifolderNoOutdir/node/diskFile1.js +++ b/tests/baselines/reference/project/mapRootRelativePathModuleMultifolderNoOutdir/node/diskFile1.js @@ -4,7 +4,7 @@ var m2_c1 = (function () { function m2_c1() { } return m2_c1; -})(); +}()); exports.m2_c1 = m2_c1; exports.m2_instance1 = new m2_c1(); function m2_f1() { diff --git a/tests/baselines/reference/project/mapRootRelativePathModuleMultifolderNoOutdir/node/test.js b/tests/baselines/reference/project/mapRootRelativePathModuleMultifolderNoOutdir/node/test.js index fbdb77f2d25..2786dcd54f3 100644 --- a/tests/baselines/reference/project/mapRootRelativePathModuleMultifolderNoOutdir/node/test.js +++ b/tests/baselines/reference/project/mapRootRelativePathModuleMultifolderNoOutdir/node/test.js @@ -6,7 +6,7 @@ var c1 = (function () { function c1() { } return c1; -})(); +}()); exports.c1 = c1; exports.instance1 = new c1(); function f1() { diff --git a/tests/baselines/reference/project/mapRootRelativePathModuleMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_module_multifolder/test.js b/tests/baselines/reference/project/mapRootRelativePathModuleMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_module_multifolder/test.js index 3431f8ce475..6c23883b7ab 100644 --- a/tests/baselines/reference/project/mapRootRelativePathModuleMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_module_multifolder/test.js +++ b/tests/baselines/reference/project/mapRootRelativePathModuleMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_module_multifolder/test.js @@ -5,7 +5,7 @@ define(["require", "exports", "ref/m1", "../outputdir_module_multifolder_ref/m2" function c1() { } return c1; - })(); + }()); exports.c1 = c1; exports.instance1 = new c1(); function f1() { diff --git a/tests/baselines/reference/project/mapRootRelativePathModuleMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_module_multifolder_ref/m2.js b/tests/baselines/reference/project/mapRootRelativePathModuleMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_module_multifolder_ref/m2.js index f6f3df3a777..a654db8e087 100644 --- a/tests/baselines/reference/project/mapRootRelativePathModuleMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_module_multifolder_ref/m2.js +++ b/tests/baselines/reference/project/mapRootRelativePathModuleMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_module_multifolder_ref/m2.js @@ -5,7 +5,7 @@ define(["require", "exports"], function (require, exports) { function m2_c1() { } return m2_c1; - })(); + }()); exports.m2_c1 = m2_c1; exports.m2_instance1 = new m2_c1(); function m2_f1() { diff --git a/tests/baselines/reference/project/mapRootRelativePathModuleMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_module_multifolder/test.js b/tests/baselines/reference/project/mapRootRelativePathModuleMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_module_multifolder/test.js index 27d8b15a593..76f1ae7fa80 100644 --- a/tests/baselines/reference/project/mapRootRelativePathModuleMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_module_multifolder/test.js +++ b/tests/baselines/reference/project/mapRootRelativePathModuleMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_module_multifolder/test.js @@ -6,7 +6,7 @@ var c1 = (function () { function c1() { } return c1; -})(); +}()); exports.c1 = c1; exports.instance1 = new c1(); function f1() { diff --git a/tests/baselines/reference/project/mapRootRelativePathModuleMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_module_multifolder_ref/m2.js b/tests/baselines/reference/project/mapRootRelativePathModuleMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_module_multifolder_ref/m2.js index 971843479a5..a98ecd6f1c3 100644 --- a/tests/baselines/reference/project/mapRootRelativePathModuleMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_module_multifolder_ref/m2.js +++ b/tests/baselines/reference/project/mapRootRelativePathModuleMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_module_multifolder_ref/m2.js @@ -4,7 +4,7 @@ var m2_c1 = (function () { function m2_c1() { } return m2_c1; -})(); +}()); exports.m2_c1 = m2_c1; exports.m2_instance1 = new m2_c1(); function m2_f1() { diff --git a/tests/baselines/reference/project/mapRootRelativePathModuleSimpleNoOutdir/amd/test.js b/tests/baselines/reference/project/mapRootRelativePathModuleSimpleNoOutdir/amd/test.js index 8205a698b72..f6ab0afdc94 100644 --- a/tests/baselines/reference/project/mapRootRelativePathModuleSimpleNoOutdir/amd/test.js +++ b/tests/baselines/reference/project/mapRootRelativePathModuleSimpleNoOutdir/amd/test.js @@ -5,7 +5,7 @@ define(["require", "exports", "m1"], function (require, exports, m1) { function c1() { } return c1; - })(); + }()); exports.c1 = c1; exports.instance1 = new c1(); function f1() { diff --git a/tests/baselines/reference/project/mapRootRelativePathModuleSimpleNoOutdir/node/test.js b/tests/baselines/reference/project/mapRootRelativePathModuleSimpleNoOutdir/node/test.js index a5faaf288bb..d96b6cae463 100644 --- a/tests/baselines/reference/project/mapRootRelativePathModuleSimpleNoOutdir/node/test.js +++ b/tests/baselines/reference/project/mapRootRelativePathModuleSimpleNoOutdir/node/test.js @@ -5,7 +5,7 @@ var c1 = (function () { function c1() { } return c1; -})(); +}()); exports.c1 = c1; exports.instance1 = new c1(); function f1() { diff --git a/tests/baselines/reference/project/mapRootRelativePathModuleSimpleSpecifyOutputDirectory/amd/outdir/simple/test.js b/tests/baselines/reference/project/mapRootRelativePathModuleSimpleSpecifyOutputDirectory/amd/outdir/simple/test.js index 0189f9ede63..88661b25d1d 100644 --- a/tests/baselines/reference/project/mapRootRelativePathModuleSimpleSpecifyOutputDirectory/amd/outdir/simple/test.js +++ b/tests/baselines/reference/project/mapRootRelativePathModuleSimpleSpecifyOutputDirectory/amd/outdir/simple/test.js @@ -5,7 +5,7 @@ define(["require", "exports", "m1"], function (require, exports, m1) { function c1() { } return c1; - })(); + }()); exports.c1 = c1; exports.instance1 = new c1(); function f1() { diff --git a/tests/baselines/reference/project/mapRootRelativePathModuleSimpleSpecifyOutputDirectory/node/outdir/simple/test.js b/tests/baselines/reference/project/mapRootRelativePathModuleSimpleSpecifyOutputDirectory/node/outdir/simple/test.js index 9264af81d31..2e487817c4e 100644 --- a/tests/baselines/reference/project/mapRootRelativePathModuleSimpleSpecifyOutputDirectory/node/outdir/simple/test.js +++ b/tests/baselines/reference/project/mapRootRelativePathModuleSimpleSpecifyOutputDirectory/node/outdir/simple/test.js @@ -5,7 +5,7 @@ var c1 = (function () { function c1() { } return c1; -})(); +}()); exports.c1 = c1; exports.instance1 = new c1(); function f1() { diff --git a/tests/baselines/reference/project/mapRootRelativePathModuleSubfolderNoOutdir/amd/test.js b/tests/baselines/reference/project/mapRootRelativePathModuleSubfolderNoOutdir/amd/test.js index cc3fde39a75..a9c2e2c5462 100644 --- a/tests/baselines/reference/project/mapRootRelativePathModuleSubfolderNoOutdir/amd/test.js +++ b/tests/baselines/reference/project/mapRootRelativePathModuleSubfolderNoOutdir/amd/test.js @@ -5,7 +5,7 @@ define(["require", "exports", "ref/m1"], function (require, exports, m1) { function c1() { } return c1; - })(); + }()); exports.c1 = c1; exports.instance1 = new c1(); function f1() { diff --git a/tests/baselines/reference/project/mapRootRelativePathModuleSubfolderNoOutdir/node/test.js b/tests/baselines/reference/project/mapRootRelativePathModuleSubfolderNoOutdir/node/test.js index d2c56e1b169..291a3630b3e 100644 --- a/tests/baselines/reference/project/mapRootRelativePathModuleSubfolderNoOutdir/node/test.js +++ b/tests/baselines/reference/project/mapRootRelativePathModuleSubfolderNoOutdir/node/test.js @@ -5,7 +5,7 @@ var c1 = (function () { function c1() { } return c1; -})(); +}()); exports.c1 = c1; exports.instance1 = new c1(); function f1() { diff --git a/tests/baselines/reference/project/mapRootRelativePathModuleSubfolderSpecifyOutputDirectory/amd/outdir/simple/test.js b/tests/baselines/reference/project/mapRootRelativePathModuleSubfolderSpecifyOutputDirectory/amd/outdir/simple/test.js index 529760ec895..bd2c181d29e 100644 --- a/tests/baselines/reference/project/mapRootRelativePathModuleSubfolderSpecifyOutputDirectory/amd/outdir/simple/test.js +++ b/tests/baselines/reference/project/mapRootRelativePathModuleSubfolderSpecifyOutputDirectory/amd/outdir/simple/test.js @@ -5,7 +5,7 @@ define(["require", "exports", "ref/m1"], function (require, exports, m1) { function c1() { } return c1; - })(); + }()); exports.c1 = c1; exports.instance1 = new c1(); function f1() { diff --git a/tests/baselines/reference/project/mapRootRelativePathModuleSubfolderSpecifyOutputDirectory/node/outdir/simple/test.js b/tests/baselines/reference/project/mapRootRelativePathModuleSubfolderSpecifyOutputDirectory/node/outdir/simple/test.js index 535ac2c9706..c162eaa3671 100644 --- a/tests/baselines/reference/project/mapRootRelativePathModuleSubfolderSpecifyOutputDirectory/node/outdir/simple/test.js +++ b/tests/baselines/reference/project/mapRootRelativePathModuleSubfolderSpecifyOutputDirectory/node/outdir/simple/test.js @@ -5,7 +5,7 @@ var c1 = (function () { function c1() { } return c1; -})(); +}()); exports.c1 = c1; exports.instance1 = new c1(); function f1() { diff --git a/tests/baselines/reference/project/mapRootRelativePathMultifolderNoOutdir/amd/diskFile1.js b/tests/baselines/reference/project/mapRootRelativePathMultifolderNoOutdir/amd/diskFile1.js index c257072707f..4e041c379d0 100644 --- a/tests/baselines/reference/project/mapRootRelativePathMultifolderNoOutdir/amd/diskFile1.js +++ b/tests/baselines/reference/project/mapRootRelativePathMultifolderNoOutdir/amd/diskFile1.js @@ -3,7 +3,7 @@ var m2_c1 = (function () { function m2_c1() { } return m2_c1; -})(); +}()); var m2_instance1 = new m2_c1(); function m2_f1() { return m2_instance1; diff --git a/tests/baselines/reference/project/mapRootRelativePathMultifolderNoOutdir/amd/test.js b/tests/baselines/reference/project/mapRootRelativePathMultifolderNoOutdir/amd/test.js index 3a5f36cd163..5359f020354 100644 --- a/tests/baselines/reference/project/mapRootRelativePathMultifolderNoOutdir/amd/test.js +++ b/tests/baselines/reference/project/mapRootRelativePathMultifolderNoOutdir/amd/test.js @@ -5,7 +5,7 @@ var c1 = (function () { function c1() { } return c1; -})(); +}()); var instance1 = new c1(); function f1() { return instance1; diff --git a/tests/baselines/reference/project/mapRootRelativePathMultifolderNoOutdir/node/diskFile1.js b/tests/baselines/reference/project/mapRootRelativePathMultifolderNoOutdir/node/diskFile1.js index c257072707f..4e041c379d0 100644 --- a/tests/baselines/reference/project/mapRootRelativePathMultifolderNoOutdir/node/diskFile1.js +++ b/tests/baselines/reference/project/mapRootRelativePathMultifolderNoOutdir/node/diskFile1.js @@ -3,7 +3,7 @@ var m2_c1 = (function () { function m2_c1() { } return m2_c1; -})(); +}()); var m2_instance1 = new m2_c1(); function m2_f1() { return m2_instance1; diff --git a/tests/baselines/reference/project/mapRootRelativePathMultifolderNoOutdir/node/test.js b/tests/baselines/reference/project/mapRootRelativePathMultifolderNoOutdir/node/test.js index 3a5f36cd163..5359f020354 100644 --- a/tests/baselines/reference/project/mapRootRelativePathMultifolderNoOutdir/node/test.js +++ b/tests/baselines/reference/project/mapRootRelativePathMultifolderNoOutdir/node/test.js @@ -5,7 +5,7 @@ var c1 = (function () { function c1() { } return c1; -})(); +}()); var instance1 = new c1(); function f1() { return instance1; diff --git a/tests/baselines/reference/project/mapRootRelativePathMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_multifolder/test.js b/tests/baselines/reference/project/mapRootRelativePathMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_multifolder/test.js index 4823d597b6b..36efd820540 100644 --- a/tests/baselines/reference/project/mapRootRelativePathMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_multifolder/test.js +++ b/tests/baselines/reference/project/mapRootRelativePathMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_multifolder/test.js @@ -5,7 +5,7 @@ var c1 = (function () { function c1() { } return c1; -})(); +}()); var instance1 = new c1(); function f1() { return instance1; diff --git a/tests/baselines/reference/project/mapRootRelativePathMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_multifolder_ref/m2.js b/tests/baselines/reference/project/mapRootRelativePathMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_multifolder_ref/m2.js index 500879e7bb9..5e8ad54c27b 100644 --- a/tests/baselines/reference/project/mapRootRelativePathMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_multifolder_ref/m2.js +++ b/tests/baselines/reference/project/mapRootRelativePathMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_multifolder_ref/m2.js @@ -3,7 +3,7 @@ var m2_c1 = (function () { function m2_c1() { } return m2_c1; -})(); +}()); var m2_instance1 = new m2_c1(); function m2_f1() { return m2_instance1; diff --git a/tests/baselines/reference/project/mapRootRelativePathMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_multifolder/test.js b/tests/baselines/reference/project/mapRootRelativePathMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_multifolder/test.js index 4823d597b6b..36efd820540 100644 --- a/tests/baselines/reference/project/mapRootRelativePathMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_multifolder/test.js +++ b/tests/baselines/reference/project/mapRootRelativePathMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_multifolder/test.js @@ -5,7 +5,7 @@ var c1 = (function () { function c1() { } return c1; -})(); +}()); var instance1 = new c1(); function f1() { return instance1; diff --git a/tests/baselines/reference/project/mapRootRelativePathMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_multifolder_ref/m2.js b/tests/baselines/reference/project/mapRootRelativePathMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_multifolder_ref/m2.js index 500879e7bb9..5e8ad54c27b 100644 --- a/tests/baselines/reference/project/mapRootRelativePathMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_multifolder_ref/m2.js +++ b/tests/baselines/reference/project/mapRootRelativePathMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_multifolder_ref/m2.js @@ -3,7 +3,7 @@ var m2_c1 = (function () { function m2_c1() { } return m2_c1; -})(); +}()); var m2_instance1 = new m2_c1(); function m2_f1() { return m2_instance1; diff --git a/tests/baselines/reference/project/mapRootRelativePathSimpleNoOutdir/amd/test.js b/tests/baselines/reference/project/mapRootRelativePathSimpleNoOutdir/amd/test.js index 3eb5d7bae1c..c3a81b7d67d 100644 --- a/tests/baselines/reference/project/mapRootRelativePathSimpleNoOutdir/amd/test.js +++ b/tests/baselines/reference/project/mapRootRelativePathSimpleNoOutdir/amd/test.js @@ -4,7 +4,7 @@ var c1 = (function () { function c1() { } return c1; -})(); +}()); var instance1 = new c1(); function f1() { return instance1; diff --git a/tests/baselines/reference/project/mapRootRelativePathSimpleNoOutdir/node/test.js b/tests/baselines/reference/project/mapRootRelativePathSimpleNoOutdir/node/test.js index 3eb5d7bae1c..c3a81b7d67d 100644 --- a/tests/baselines/reference/project/mapRootRelativePathSimpleNoOutdir/node/test.js +++ b/tests/baselines/reference/project/mapRootRelativePathSimpleNoOutdir/node/test.js @@ -4,7 +4,7 @@ var c1 = (function () { function c1() { } return c1; -})(); +}()); var instance1 = new c1(); function f1() { return instance1; diff --git a/tests/baselines/reference/project/mapRootRelativePathSimpleSpecifyOutputDirectory/amd/outdir/simple/test.js b/tests/baselines/reference/project/mapRootRelativePathSimpleSpecifyOutputDirectory/amd/outdir/simple/test.js index ee8fc06b62f..730a04c3d7f 100644 --- a/tests/baselines/reference/project/mapRootRelativePathSimpleSpecifyOutputDirectory/amd/outdir/simple/test.js +++ b/tests/baselines/reference/project/mapRootRelativePathSimpleSpecifyOutputDirectory/amd/outdir/simple/test.js @@ -4,7 +4,7 @@ var c1 = (function () { function c1() { } return c1; -})(); +}()); var instance1 = new c1(); function f1() { return instance1; diff --git a/tests/baselines/reference/project/mapRootRelativePathSimpleSpecifyOutputDirectory/node/outdir/simple/test.js b/tests/baselines/reference/project/mapRootRelativePathSimpleSpecifyOutputDirectory/node/outdir/simple/test.js index ee8fc06b62f..730a04c3d7f 100644 --- a/tests/baselines/reference/project/mapRootRelativePathSimpleSpecifyOutputDirectory/node/outdir/simple/test.js +++ b/tests/baselines/reference/project/mapRootRelativePathSimpleSpecifyOutputDirectory/node/outdir/simple/test.js @@ -4,7 +4,7 @@ var c1 = (function () { function c1() { } return c1; -})(); +}()); var instance1 = new c1(); function f1() { return instance1; diff --git a/tests/baselines/reference/project/mapRootRelativePathSubfolderNoOutdir/amd/test.js b/tests/baselines/reference/project/mapRootRelativePathSubfolderNoOutdir/amd/test.js index cca8db1b548..6d7f75fbf9a 100644 --- a/tests/baselines/reference/project/mapRootRelativePathSubfolderNoOutdir/amd/test.js +++ b/tests/baselines/reference/project/mapRootRelativePathSubfolderNoOutdir/amd/test.js @@ -4,7 +4,7 @@ var c1 = (function () { function c1() { } return c1; -})(); +}()); var instance1 = new c1(); function f1() { return instance1; diff --git a/tests/baselines/reference/project/mapRootRelativePathSubfolderNoOutdir/node/test.js b/tests/baselines/reference/project/mapRootRelativePathSubfolderNoOutdir/node/test.js index cca8db1b548..6d7f75fbf9a 100644 --- a/tests/baselines/reference/project/mapRootRelativePathSubfolderNoOutdir/node/test.js +++ b/tests/baselines/reference/project/mapRootRelativePathSubfolderNoOutdir/node/test.js @@ -4,7 +4,7 @@ var c1 = (function () { function c1() { } return c1; -})(); +}()); var instance1 = new c1(); function f1() { return instance1; diff --git a/tests/baselines/reference/project/mapRootRelativePathSubfolderSpecifyOutputDirectory/amd/outdir/simple/test.js b/tests/baselines/reference/project/mapRootRelativePathSubfolderSpecifyOutputDirectory/amd/outdir/simple/test.js index 3325bc2ccfb..d48af1d07cc 100644 --- a/tests/baselines/reference/project/mapRootRelativePathSubfolderSpecifyOutputDirectory/amd/outdir/simple/test.js +++ b/tests/baselines/reference/project/mapRootRelativePathSubfolderSpecifyOutputDirectory/amd/outdir/simple/test.js @@ -4,7 +4,7 @@ var c1 = (function () { function c1() { } return c1; -})(); +}()); var instance1 = new c1(); function f1() { return instance1; diff --git a/tests/baselines/reference/project/mapRootRelativePathSubfolderSpecifyOutputDirectory/node/outdir/simple/test.js b/tests/baselines/reference/project/mapRootRelativePathSubfolderSpecifyOutputDirectory/node/outdir/simple/test.js index 3325bc2ccfb..d48af1d07cc 100644 --- a/tests/baselines/reference/project/mapRootRelativePathSubfolderSpecifyOutputDirectory/node/outdir/simple/test.js +++ b/tests/baselines/reference/project/mapRootRelativePathSubfolderSpecifyOutputDirectory/node/outdir/simple/test.js @@ -4,7 +4,7 @@ var c1 = (function () { function c1() { } return c1; -})(); +}()); var instance1 = new c1(); function f1() { return instance1; diff --git a/tests/baselines/reference/project/maprootUrlMixedSubfolderNoOutdir/amd/ref/m2.js b/tests/baselines/reference/project/maprootUrlMixedSubfolderNoOutdir/amd/ref/m2.js index 2f22bba7566..70911579465 100644 --- a/tests/baselines/reference/project/maprootUrlMixedSubfolderNoOutdir/amd/ref/m2.js +++ b/tests/baselines/reference/project/maprootUrlMixedSubfolderNoOutdir/amd/ref/m2.js @@ -5,7 +5,7 @@ define(["require", "exports"], function (require, exports) { function m2_c1() { } return m2_c1; - })(); + }()); exports.m2_c1 = m2_c1; exports.m2_instance1 = new m2_c1(); function m2_f1() { diff --git a/tests/baselines/reference/project/maprootUrlMixedSubfolderNoOutdir/amd/test.js b/tests/baselines/reference/project/maprootUrlMixedSubfolderNoOutdir/amd/test.js index d346b13ac18..a7248649dc7 100644 --- a/tests/baselines/reference/project/maprootUrlMixedSubfolderNoOutdir/amd/test.js +++ b/tests/baselines/reference/project/maprootUrlMixedSubfolderNoOutdir/amd/test.js @@ -5,7 +5,7 @@ var c1 = (function () { function c1() { } return c1; -})(); +}()); var instance1 = new c1(); function f1() { return instance1; diff --git a/tests/baselines/reference/project/maprootUrlMixedSubfolderNoOutdir/node/ref/m2.js b/tests/baselines/reference/project/maprootUrlMixedSubfolderNoOutdir/node/ref/m2.js index e542958a410..e4c76ba72e2 100644 --- a/tests/baselines/reference/project/maprootUrlMixedSubfolderNoOutdir/node/ref/m2.js +++ b/tests/baselines/reference/project/maprootUrlMixedSubfolderNoOutdir/node/ref/m2.js @@ -4,7 +4,7 @@ var m2_c1 = (function () { function m2_c1() { } return m2_c1; -})(); +}()); exports.m2_c1 = m2_c1; exports.m2_instance1 = new m2_c1(); function m2_f1() { diff --git a/tests/baselines/reference/project/maprootUrlMixedSubfolderNoOutdir/node/test.js b/tests/baselines/reference/project/maprootUrlMixedSubfolderNoOutdir/node/test.js index d346b13ac18..a7248649dc7 100644 --- a/tests/baselines/reference/project/maprootUrlMixedSubfolderNoOutdir/node/test.js +++ b/tests/baselines/reference/project/maprootUrlMixedSubfolderNoOutdir/node/test.js @@ -5,7 +5,7 @@ var c1 = (function () { function c1() { } return c1; -})(); +}()); var instance1 = new c1(); function f1() { return instance1; diff --git a/tests/baselines/reference/project/maprootUrlMixedSubfolderSpecifyOutputDirectory/amd/outdir/simple/ref/m2.js b/tests/baselines/reference/project/maprootUrlMixedSubfolderSpecifyOutputDirectory/amd/outdir/simple/ref/m2.js index 2f22bba7566..70911579465 100644 --- a/tests/baselines/reference/project/maprootUrlMixedSubfolderSpecifyOutputDirectory/amd/outdir/simple/ref/m2.js +++ b/tests/baselines/reference/project/maprootUrlMixedSubfolderSpecifyOutputDirectory/amd/outdir/simple/ref/m2.js @@ -5,7 +5,7 @@ define(["require", "exports"], function (require, exports) { function m2_c1() { } return m2_c1; - })(); + }()); exports.m2_c1 = m2_c1; exports.m2_instance1 = new m2_c1(); function m2_f1() { diff --git a/tests/baselines/reference/project/maprootUrlMixedSubfolderSpecifyOutputDirectory/amd/outdir/simple/test.js b/tests/baselines/reference/project/maprootUrlMixedSubfolderSpecifyOutputDirectory/amd/outdir/simple/test.js index d346b13ac18..a7248649dc7 100644 --- a/tests/baselines/reference/project/maprootUrlMixedSubfolderSpecifyOutputDirectory/amd/outdir/simple/test.js +++ b/tests/baselines/reference/project/maprootUrlMixedSubfolderSpecifyOutputDirectory/amd/outdir/simple/test.js @@ -5,7 +5,7 @@ var c1 = (function () { function c1() { } return c1; -})(); +}()); var instance1 = new c1(); function f1() { return instance1; diff --git a/tests/baselines/reference/project/maprootUrlMixedSubfolderSpecifyOutputDirectory/node/outdir/simple/ref/m2.js b/tests/baselines/reference/project/maprootUrlMixedSubfolderSpecifyOutputDirectory/node/outdir/simple/ref/m2.js index e542958a410..e4c76ba72e2 100644 --- a/tests/baselines/reference/project/maprootUrlMixedSubfolderSpecifyOutputDirectory/node/outdir/simple/ref/m2.js +++ b/tests/baselines/reference/project/maprootUrlMixedSubfolderSpecifyOutputDirectory/node/outdir/simple/ref/m2.js @@ -4,7 +4,7 @@ var m2_c1 = (function () { function m2_c1() { } return m2_c1; -})(); +}()); exports.m2_c1 = m2_c1; exports.m2_instance1 = new m2_c1(); function m2_f1() { diff --git a/tests/baselines/reference/project/maprootUrlMixedSubfolderSpecifyOutputDirectory/node/outdir/simple/test.js b/tests/baselines/reference/project/maprootUrlMixedSubfolderSpecifyOutputDirectory/node/outdir/simple/test.js index d346b13ac18..a7248649dc7 100644 --- a/tests/baselines/reference/project/maprootUrlMixedSubfolderSpecifyOutputDirectory/node/outdir/simple/test.js +++ b/tests/baselines/reference/project/maprootUrlMixedSubfolderSpecifyOutputDirectory/node/outdir/simple/test.js @@ -5,7 +5,7 @@ var c1 = (function () { function c1() { } return c1; -})(); +}()); var instance1 = new c1(); function f1() { return instance1; diff --git a/tests/baselines/reference/project/maprootUrlModuleMultifolderNoOutdir/amd/diskFile1.js b/tests/baselines/reference/project/maprootUrlModuleMultifolderNoOutdir/amd/diskFile1.js index 3a0f016c568..1e006b165b9 100644 --- a/tests/baselines/reference/project/maprootUrlModuleMultifolderNoOutdir/amd/diskFile1.js +++ b/tests/baselines/reference/project/maprootUrlModuleMultifolderNoOutdir/amd/diskFile1.js @@ -5,7 +5,7 @@ define(["require", "exports"], function (require, exports) { function m2_c1() { } return m2_c1; - })(); + }()); exports.m2_c1 = m2_c1; exports.m2_instance1 = new m2_c1(); function m2_f1() { diff --git a/tests/baselines/reference/project/maprootUrlModuleMultifolderNoOutdir/amd/test.js b/tests/baselines/reference/project/maprootUrlModuleMultifolderNoOutdir/amd/test.js index 40f17b7a6cc..149e213901a 100644 --- a/tests/baselines/reference/project/maprootUrlModuleMultifolderNoOutdir/amd/test.js +++ b/tests/baselines/reference/project/maprootUrlModuleMultifolderNoOutdir/amd/test.js @@ -5,7 +5,7 @@ define(["require", "exports", "ref/m1", "../outputdir_module_multifolder_ref/m2" function c1() { } return c1; - })(); + }()); exports.c1 = c1; exports.instance1 = new c1(); function f1() { diff --git a/tests/baselines/reference/project/maprootUrlModuleMultifolderNoOutdir/node/diskFile1.js b/tests/baselines/reference/project/maprootUrlModuleMultifolderNoOutdir/node/diskFile1.js index 94c4edd0289..2e93a073415 100644 --- a/tests/baselines/reference/project/maprootUrlModuleMultifolderNoOutdir/node/diskFile1.js +++ b/tests/baselines/reference/project/maprootUrlModuleMultifolderNoOutdir/node/diskFile1.js @@ -4,7 +4,7 @@ var m2_c1 = (function () { function m2_c1() { } return m2_c1; -})(); +}()); exports.m2_c1 = m2_c1; exports.m2_instance1 = new m2_c1(); function m2_f1() { diff --git a/tests/baselines/reference/project/maprootUrlModuleMultifolderNoOutdir/node/test.js b/tests/baselines/reference/project/maprootUrlModuleMultifolderNoOutdir/node/test.js index 866997ceee0..99135b7b275 100644 --- a/tests/baselines/reference/project/maprootUrlModuleMultifolderNoOutdir/node/test.js +++ b/tests/baselines/reference/project/maprootUrlModuleMultifolderNoOutdir/node/test.js @@ -6,7 +6,7 @@ var c1 = (function () { function c1() { } return c1; -})(); +}()); exports.c1 = c1; exports.instance1 = new c1(); function f1() { diff --git a/tests/baselines/reference/project/maprootUrlModuleMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_module_multifolder/test.js b/tests/baselines/reference/project/maprootUrlModuleMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_module_multifolder/test.js index 40f17b7a6cc..149e213901a 100644 --- a/tests/baselines/reference/project/maprootUrlModuleMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_module_multifolder/test.js +++ b/tests/baselines/reference/project/maprootUrlModuleMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_module_multifolder/test.js @@ -5,7 +5,7 @@ define(["require", "exports", "ref/m1", "../outputdir_module_multifolder_ref/m2" function c1() { } return c1; - })(); + }()); exports.c1 = c1; exports.instance1 = new c1(); function f1() { diff --git a/tests/baselines/reference/project/maprootUrlModuleMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_module_multifolder_ref/m2.js b/tests/baselines/reference/project/maprootUrlModuleMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_module_multifolder_ref/m2.js index 3a0f016c568..1e006b165b9 100644 --- a/tests/baselines/reference/project/maprootUrlModuleMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_module_multifolder_ref/m2.js +++ b/tests/baselines/reference/project/maprootUrlModuleMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_module_multifolder_ref/m2.js @@ -5,7 +5,7 @@ define(["require", "exports"], function (require, exports) { function m2_c1() { } return m2_c1; - })(); + }()); exports.m2_c1 = m2_c1; exports.m2_instance1 = new m2_c1(); function m2_f1() { diff --git a/tests/baselines/reference/project/maprootUrlModuleMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_module_multifolder/test.js b/tests/baselines/reference/project/maprootUrlModuleMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_module_multifolder/test.js index 866997ceee0..99135b7b275 100644 --- a/tests/baselines/reference/project/maprootUrlModuleMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_module_multifolder/test.js +++ b/tests/baselines/reference/project/maprootUrlModuleMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_module_multifolder/test.js @@ -6,7 +6,7 @@ var c1 = (function () { function c1() { } return c1; -})(); +}()); exports.c1 = c1; exports.instance1 = new c1(); function f1() { diff --git a/tests/baselines/reference/project/maprootUrlModuleMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_module_multifolder_ref/m2.js b/tests/baselines/reference/project/maprootUrlModuleMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_module_multifolder_ref/m2.js index 94c4edd0289..2e93a073415 100644 --- a/tests/baselines/reference/project/maprootUrlModuleMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_module_multifolder_ref/m2.js +++ b/tests/baselines/reference/project/maprootUrlModuleMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_module_multifolder_ref/m2.js @@ -4,7 +4,7 @@ var m2_c1 = (function () { function m2_c1() { } return m2_c1; -})(); +}()); exports.m2_c1 = m2_c1; exports.m2_instance1 = new m2_c1(); function m2_f1() { diff --git a/tests/baselines/reference/project/maprootUrlModuleSimpleNoOutdir/amd/test.js b/tests/baselines/reference/project/maprootUrlModuleSimpleNoOutdir/amd/test.js index e5120428e51..c3300bc7998 100644 --- a/tests/baselines/reference/project/maprootUrlModuleSimpleNoOutdir/amd/test.js +++ b/tests/baselines/reference/project/maprootUrlModuleSimpleNoOutdir/amd/test.js @@ -5,7 +5,7 @@ define(["require", "exports", "m1"], function (require, exports, m1) { function c1() { } return c1; - })(); + }()); exports.c1 = c1; exports.instance1 = new c1(); function f1() { diff --git a/tests/baselines/reference/project/maprootUrlModuleSimpleNoOutdir/node/test.js b/tests/baselines/reference/project/maprootUrlModuleSimpleNoOutdir/node/test.js index 2e158a0284f..29b6fee1d66 100644 --- a/tests/baselines/reference/project/maprootUrlModuleSimpleNoOutdir/node/test.js +++ b/tests/baselines/reference/project/maprootUrlModuleSimpleNoOutdir/node/test.js @@ -5,7 +5,7 @@ var c1 = (function () { function c1() { } return c1; -})(); +}()); exports.c1 = c1; exports.instance1 = new c1(); function f1() { diff --git a/tests/baselines/reference/project/maprootUrlModuleSimpleSpecifyOutputDirectory/amd/outdir/simple/test.js b/tests/baselines/reference/project/maprootUrlModuleSimpleSpecifyOutputDirectory/amd/outdir/simple/test.js index e5120428e51..c3300bc7998 100644 --- a/tests/baselines/reference/project/maprootUrlModuleSimpleSpecifyOutputDirectory/amd/outdir/simple/test.js +++ b/tests/baselines/reference/project/maprootUrlModuleSimpleSpecifyOutputDirectory/amd/outdir/simple/test.js @@ -5,7 +5,7 @@ define(["require", "exports", "m1"], function (require, exports, m1) { function c1() { } return c1; - })(); + }()); exports.c1 = c1; exports.instance1 = new c1(); function f1() { diff --git a/tests/baselines/reference/project/maprootUrlModuleSimpleSpecifyOutputDirectory/node/outdir/simple/test.js b/tests/baselines/reference/project/maprootUrlModuleSimpleSpecifyOutputDirectory/node/outdir/simple/test.js index 2e158a0284f..29b6fee1d66 100644 --- a/tests/baselines/reference/project/maprootUrlModuleSimpleSpecifyOutputDirectory/node/outdir/simple/test.js +++ b/tests/baselines/reference/project/maprootUrlModuleSimpleSpecifyOutputDirectory/node/outdir/simple/test.js @@ -5,7 +5,7 @@ var c1 = (function () { function c1() { } return c1; -})(); +}()); exports.c1 = c1; exports.instance1 = new c1(); function f1() { diff --git a/tests/baselines/reference/project/maprootUrlModuleSubfolderNoOutdir/amd/test.js b/tests/baselines/reference/project/maprootUrlModuleSubfolderNoOutdir/amd/test.js index 9ff0c2c90ff..5ec4a043557 100644 --- a/tests/baselines/reference/project/maprootUrlModuleSubfolderNoOutdir/amd/test.js +++ b/tests/baselines/reference/project/maprootUrlModuleSubfolderNoOutdir/amd/test.js @@ -5,7 +5,7 @@ define(["require", "exports", "ref/m1"], function (require, exports, m1) { function c1() { } return c1; - })(); + }()); exports.c1 = c1; exports.instance1 = new c1(); function f1() { diff --git a/tests/baselines/reference/project/maprootUrlModuleSubfolderNoOutdir/node/test.js b/tests/baselines/reference/project/maprootUrlModuleSubfolderNoOutdir/node/test.js index 1a8413b6601..0b258a0b620 100644 --- a/tests/baselines/reference/project/maprootUrlModuleSubfolderNoOutdir/node/test.js +++ b/tests/baselines/reference/project/maprootUrlModuleSubfolderNoOutdir/node/test.js @@ -5,7 +5,7 @@ var c1 = (function () { function c1() { } return c1; -})(); +}()); exports.c1 = c1; exports.instance1 = new c1(); function f1() { diff --git a/tests/baselines/reference/project/maprootUrlModuleSubfolderSpecifyOutputDirectory/amd/outdir/simple/test.js b/tests/baselines/reference/project/maprootUrlModuleSubfolderSpecifyOutputDirectory/amd/outdir/simple/test.js index 9ff0c2c90ff..5ec4a043557 100644 --- a/tests/baselines/reference/project/maprootUrlModuleSubfolderSpecifyOutputDirectory/amd/outdir/simple/test.js +++ b/tests/baselines/reference/project/maprootUrlModuleSubfolderSpecifyOutputDirectory/amd/outdir/simple/test.js @@ -5,7 +5,7 @@ define(["require", "exports", "ref/m1"], function (require, exports, m1) { function c1() { } return c1; - })(); + }()); exports.c1 = c1; exports.instance1 = new c1(); function f1() { diff --git a/tests/baselines/reference/project/maprootUrlModuleSubfolderSpecifyOutputDirectory/node/outdir/simple/test.js b/tests/baselines/reference/project/maprootUrlModuleSubfolderSpecifyOutputDirectory/node/outdir/simple/test.js index 1a8413b6601..0b258a0b620 100644 --- a/tests/baselines/reference/project/maprootUrlModuleSubfolderSpecifyOutputDirectory/node/outdir/simple/test.js +++ b/tests/baselines/reference/project/maprootUrlModuleSubfolderSpecifyOutputDirectory/node/outdir/simple/test.js @@ -5,7 +5,7 @@ var c1 = (function () { function c1() { } return c1; -})(); +}()); exports.c1 = c1; exports.instance1 = new c1(); function f1() { diff --git a/tests/baselines/reference/project/maprootUrlMultifolderNoOutdir/amd/diskFile1.js b/tests/baselines/reference/project/maprootUrlMultifolderNoOutdir/amd/diskFile1.js index 8c28bf7d9ab..d8a933fca96 100644 --- a/tests/baselines/reference/project/maprootUrlMultifolderNoOutdir/amd/diskFile1.js +++ b/tests/baselines/reference/project/maprootUrlMultifolderNoOutdir/amd/diskFile1.js @@ -3,7 +3,7 @@ var m2_c1 = (function () { function m2_c1() { } return m2_c1; -})(); +}()); var m2_instance1 = new m2_c1(); function m2_f1() { return m2_instance1; diff --git a/tests/baselines/reference/project/maprootUrlMultifolderNoOutdir/amd/test.js b/tests/baselines/reference/project/maprootUrlMultifolderNoOutdir/amd/test.js index ea17b21a537..c41870d0f8f 100644 --- a/tests/baselines/reference/project/maprootUrlMultifolderNoOutdir/amd/test.js +++ b/tests/baselines/reference/project/maprootUrlMultifolderNoOutdir/amd/test.js @@ -5,7 +5,7 @@ var c1 = (function () { function c1() { } return c1; -})(); +}()); var instance1 = new c1(); function f1() { return instance1; diff --git a/tests/baselines/reference/project/maprootUrlMultifolderNoOutdir/node/diskFile1.js b/tests/baselines/reference/project/maprootUrlMultifolderNoOutdir/node/diskFile1.js index 8c28bf7d9ab..d8a933fca96 100644 --- a/tests/baselines/reference/project/maprootUrlMultifolderNoOutdir/node/diskFile1.js +++ b/tests/baselines/reference/project/maprootUrlMultifolderNoOutdir/node/diskFile1.js @@ -3,7 +3,7 @@ var m2_c1 = (function () { function m2_c1() { } return m2_c1; -})(); +}()); var m2_instance1 = new m2_c1(); function m2_f1() { return m2_instance1; diff --git a/tests/baselines/reference/project/maprootUrlMultifolderNoOutdir/node/test.js b/tests/baselines/reference/project/maprootUrlMultifolderNoOutdir/node/test.js index ea17b21a537..c41870d0f8f 100644 --- a/tests/baselines/reference/project/maprootUrlMultifolderNoOutdir/node/test.js +++ b/tests/baselines/reference/project/maprootUrlMultifolderNoOutdir/node/test.js @@ -5,7 +5,7 @@ var c1 = (function () { function c1() { } return c1; -})(); +}()); var instance1 = new c1(); function f1() { return instance1; diff --git a/tests/baselines/reference/project/maprootUrlMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_multifolder/test.js b/tests/baselines/reference/project/maprootUrlMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_multifolder/test.js index ea17b21a537..c41870d0f8f 100644 --- a/tests/baselines/reference/project/maprootUrlMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_multifolder/test.js +++ b/tests/baselines/reference/project/maprootUrlMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_multifolder/test.js @@ -5,7 +5,7 @@ var c1 = (function () { function c1() { } return c1; -})(); +}()); var instance1 = new c1(); function f1() { return instance1; diff --git a/tests/baselines/reference/project/maprootUrlMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_multifolder_ref/m2.js b/tests/baselines/reference/project/maprootUrlMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_multifolder_ref/m2.js index 8c28bf7d9ab..d8a933fca96 100644 --- a/tests/baselines/reference/project/maprootUrlMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_multifolder_ref/m2.js +++ b/tests/baselines/reference/project/maprootUrlMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_multifolder_ref/m2.js @@ -3,7 +3,7 @@ var m2_c1 = (function () { function m2_c1() { } return m2_c1; -})(); +}()); var m2_instance1 = new m2_c1(); function m2_f1() { return m2_instance1; diff --git a/tests/baselines/reference/project/maprootUrlMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_multifolder/test.js b/tests/baselines/reference/project/maprootUrlMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_multifolder/test.js index ea17b21a537..c41870d0f8f 100644 --- a/tests/baselines/reference/project/maprootUrlMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_multifolder/test.js +++ b/tests/baselines/reference/project/maprootUrlMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_multifolder/test.js @@ -5,7 +5,7 @@ var c1 = (function () { function c1() { } return c1; -})(); +}()); var instance1 = new c1(); function f1() { return instance1; diff --git a/tests/baselines/reference/project/maprootUrlMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_multifolder_ref/m2.js b/tests/baselines/reference/project/maprootUrlMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_multifolder_ref/m2.js index 8c28bf7d9ab..d8a933fca96 100644 --- a/tests/baselines/reference/project/maprootUrlMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_multifolder_ref/m2.js +++ b/tests/baselines/reference/project/maprootUrlMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_multifolder_ref/m2.js @@ -3,7 +3,7 @@ var m2_c1 = (function () { function m2_c1() { } return m2_c1; -})(); +}()); var m2_instance1 = new m2_c1(); function m2_f1() { return m2_instance1; diff --git a/tests/baselines/reference/project/maprootUrlSimpleNoOutdir/amd/test.js b/tests/baselines/reference/project/maprootUrlSimpleNoOutdir/amd/test.js index 168ab13ecd8..300e7663c47 100644 --- a/tests/baselines/reference/project/maprootUrlSimpleNoOutdir/amd/test.js +++ b/tests/baselines/reference/project/maprootUrlSimpleNoOutdir/amd/test.js @@ -4,7 +4,7 @@ var c1 = (function () { function c1() { } return c1; -})(); +}()); var instance1 = new c1(); function f1() { return instance1; diff --git a/tests/baselines/reference/project/maprootUrlSimpleNoOutdir/node/test.js b/tests/baselines/reference/project/maprootUrlSimpleNoOutdir/node/test.js index 168ab13ecd8..300e7663c47 100644 --- a/tests/baselines/reference/project/maprootUrlSimpleNoOutdir/node/test.js +++ b/tests/baselines/reference/project/maprootUrlSimpleNoOutdir/node/test.js @@ -4,7 +4,7 @@ var c1 = (function () { function c1() { } return c1; -})(); +}()); var instance1 = new c1(); function f1() { return instance1; diff --git a/tests/baselines/reference/project/maprootUrlSimpleSpecifyOutputDirectory/amd/outdir/simple/test.js b/tests/baselines/reference/project/maprootUrlSimpleSpecifyOutputDirectory/amd/outdir/simple/test.js index 168ab13ecd8..300e7663c47 100644 --- a/tests/baselines/reference/project/maprootUrlSimpleSpecifyOutputDirectory/amd/outdir/simple/test.js +++ b/tests/baselines/reference/project/maprootUrlSimpleSpecifyOutputDirectory/amd/outdir/simple/test.js @@ -4,7 +4,7 @@ var c1 = (function () { function c1() { } return c1; -})(); +}()); var instance1 = new c1(); function f1() { return instance1; diff --git a/tests/baselines/reference/project/maprootUrlSimpleSpecifyOutputDirectory/node/outdir/simple/test.js b/tests/baselines/reference/project/maprootUrlSimpleSpecifyOutputDirectory/node/outdir/simple/test.js index 168ab13ecd8..300e7663c47 100644 --- a/tests/baselines/reference/project/maprootUrlSimpleSpecifyOutputDirectory/node/outdir/simple/test.js +++ b/tests/baselines/reference/project/maprootUrlSimpleSpecifyOutputDirectory/node/outdir/simple/test.js @@ -4,7 +4,7 @@ var c1 = (function () { function c1() { } return c1; -})(); +}()); var instance1 = new c1(); function f1() { return instance1; diff --git a/tests/baselines/reference/project/maprootUrlSubfolderNoOutdir/amd/test.js b/tests/baselines/reference/project/maprootUrlSubfolderNoOutdir/amd/test.js index 78b49c056c9..b268cd98e41 100644 --- a/tests/baselines/reference/project/maprootUrlSubfolderNoOutdir/amd/test.js +++ b/tests/baselines/reference/project/maprootUrlSubfolderNoOutdir/amd/test.js @@ -4,7 +4,7 @@ var c1 = (function () { function c1() { } return c1; -})(); +}()); var instance1 = new c1(); function f1() { return instance1; diff --git a/tests/baselines/reference/project/maprootUrlSubfolderNoOutdir/node/test.js b/tests/baselines/reference/project/maprootUrlSubfolderNoOutdir/node/test.js index 78b49c056c9..b268cd98e41 100644 --- a/tests/baselines/reference/project/maprootUrlSubfolderNoOutdir/node/test.js +++ b/tests/baselines/reference/project/maprootUrlSubfolderNoOutdir/node/test.js @@ -4,7 +4,7 @@ var c1 = (function () { function c1() { } return c1; -})(); +}()); var instance1 = new c1(); function f1() { return instance1; diff --git a/tests/baselines/reference/project/maprootUrlSubfolderSpecifyOutputDirectory/amd/outdir/simple/test.js b/tests/baselines/reference/project/maprootUrlSubfolderSpecifyOutputDirectory/amd/outdir/simple/test.js index 78b49c056c9..b268cd98e41 100644 --- a/tests/baselines/reference/project/maprootUrlSubfolderSpecifyOutputDirectory/amd/outdir/simple/test.js +++ b/tests/baselines/reference/project/maprootUrlSubfolderSpecifyOutputDirectory/amd/outdir/simple/test.js @@ -4,7 +4,7 @@ var c1 = (function () { function c1() { } return c1; -})(); +}()); var instance1 = new c1(); function f1() { return instance1; diff --git a/tests/baselines/reference/project/maprootUrlSubfolderSpecifyOutputDirectory/node/outdir/simple/test.js b/tests/baselines/reference/project/maprootUrlSubfolderSpecifyOutputDirectory/node/outdir/simple/test.js index 78b49c056c9..b268cd98e41 100644 --- a/tests/baselines/reference/project/maprootUrlSubfolderSpecifyOutputDirectory/node/outdir/simple/test.js +++ b/tests/baselines/reference/project/maprootUrlSubfolderSpecifyOutputDirectory/node/outdir/simple/test.js @@ -4,7 +4,7 @@ var c1 = (function () { function c1() { } return c1; -})(); +}()); var instance1 = new c1(); function f1() { return instance1; diff --git a/tests/baselines/reference/project/maprootUrlsourcerootUrlMixedSubfolderNoOutdir/amd/ref/m2.js b/tests/baselines/reference/project/maprootUrlsourcerootUrlMixedSubfolderNoOutdir/amd/ref/m2.js index 2f22bba7566..70911579465 100644 --- a/tests/baselines/reference/project/maprootUrlsourcerootUrlMixedSubfolderNoOutdir/amd/ref/m2.js +++ b/tests/baselines/reference/project/maprootUrlsourcerootUrlMixedSubfolderNoOutdir/amd/ref/m2.js @@ -5,7 +5,7 @@ define(["require", "exports"], function (require, exports) { function m2_c1() { } return m2_c1; - })(); + }()); exports.m2_c1 = m2_c1; exports.m2_instance1 = new m2_c1(); function m2_f1() { diff --git a/tests/baselines/reference/project/maprootUrlsourcerootUrlMixedSubfolderNoOutdir/amd/test.js b/tests/baselines/reference/project/maprootUrlsourcerootUrlMixedSubfolderNoOutdir/amd/test.js index d346b13ac18..a7248649dc7 100644 --- a/tests/baselines/reference/project/maprootUrlsourcerootUrlMixedSubfolderNoOutdir/amd/test.js +++ b/tests/baselines/reference/project/maprootUrlsourcerootUrlMixedSubfolderNoOutdir/amd/test.js @@ -5,7 +5,7 @@ var c1 = (function () { function c1() { } return c1; -})(); +}()); var instance1 = new c1(); function f1() { return instance1; diff --git a/tests/baselines/reference/project/maprootUrlsourcerootUrlMixedSubfolderNoOutdir/node/ref/m2.js b/tests/baselines/reference/project/maprootUrlsourcerootUrlMixedSubfolderNoOutdir/node/ref/m2.js index e542958a410..e4c76ba72e2 100644 --- a/tests/baselines/reference/project/maprootUrlsourcerootUrlMixedSubfolderNoOutdir/node/ref/m2.js +++ b/tests/baselines/reference/project/maprootUrlsourcerootUrlMixedSubfolderNoOutdir/node/ref/m2.js @@ -4,7 +4,7 @@ var m2_c1 = (function () { function m2_c1() { } return m2_c1; -})(); +}()); exports.m2_c1 = m2_c1; exports.m2_instance1 = new m2_c1(); function m2_f1() { diff --git a/tests/baselines/reference/project/maprootUrlsourcerootUrlMixedSubfolderNoOutdir/node/test.js b/tests/baselines/reference/project/maprootUrlsourcerootUrlMixedSubfolderNoOutdir/node/test.js index d346b13ac18..a7248649dc7 100644 --- a/tests/baselines/reference/project/maprootUrlsourcerootUrlMixedSubfolderNoOutdir/node/test.js +++ b/tests/baselines/reference/project/maprootUrlsourcerootUrlMixedSubfolderNoOutdir/node/test.js @@ -5,7 +5,7 @@ var c1 = (function () { function c1() { } return c1; -})(); +}()); var instance1 = new c1(); function f1() { return instance1; diff --git a/tests/baselines/reference/project/maprootUrlsourcerootUrlMixedSubfolderSpecifyOutputDirectory/amd/outdir/simple/ref/m2.js b/tests/baselines/reference/project/maprootUrlsourcerootUrlMixedSubfolderSpecifyOutputDirectory/amd/outdir/simple/ref/m2.js index 2f22bba7566..70911579465 100644 --- a/tests/baselines/reference/project/maprootUrlsourcerootUrlMixedSubfolderSpecifyOutputDirectory/amd/outdir/simple/ref/m2.js +++ b/tests/baselines/reference/project/maprootUrlsourcerootUrlMixedSubfolderSpecifyOutputDirectory/amd/outdir/simple/ref/m2.js @@ -5,7 +5,7 @@ define(["require", "exports"], function (require, exports) { function m2_c1() { } return m2_c1; - })(); + }()); exports.m2_c1 = m2_c1; exports.m2_instance1 = new m2_c1(); function m2_f1() { diff --git a/tests/baselines/reference/project/maprootUrlsourcerootUrlMixedSubfolderSpecifyOutputDirectory/amd/outdir/simple/test.js b/tests/baselines/reference/project/maprootUrlsourcerootUrlMixedSubfolderSpecifyOutputDirectory/amd/outdir/simple/test.js index d346b13ac18..a7248649dc7 100644 --- a/tests/baselines/reference/project/maprootUrlsourcerootUrlMixedSubfolderSpecifyOutputDirectory/amd/outdir/simple/test.js +++ b/tests/baselines/reference/project/maprootUrlsourcerootUrlMixedSubfolderSpecifyOutputDirectory/amd/outdir/simple/test.js @@ -5,7 +5,7 @@ var c1 = (function () { function c1() { } return c1; -})(); +}()); var instance1 = new c1(); function f1() { return instance1; diff --git a/tests/baselines/reference/project/maprootUrlsourcerootUrlMixedSubfolderSpecifyOutputDirectory/node/outdir/simple/ref/m2.js b/tests/baselines/reference/project/maprootUrlsourcerootUrlMixedSubfolderSpecifyOutputDirectory/node/outdir/simple/ref/m2.js index e542958a410..e4c76ba72e2 100644 --- a/tests/baselines/reference/project/maprootUrlsourcerootUrlMixedSubfolderSpecifyOutputDirectory/node/outdir/simple/ref/m2.js +++ b/tests/baselines/reference/project/maprootUrlsourcerootUrlMixedSubfolderSpecifyOutputDirectory/node/outdir/simple/ref/m2.js @@ -4,7 +4,7 @@ var m2_c1 = (function () { function m2_c1() { } return m2_c1; -})(); +}()); exports.m2_c1 = m2_c1; exports.m2_instance1 = new m2_c1(); function m2_f1() { diff --git a/tests/baselines/reference/project/maprootUrlsourcerootUrlMixedSubfolderSpecifyOutputDirectory/node/outdir/simple/test.js b/tests/baselines/reference/project/maprootUrlsourcerootUrlMixedSubfolderSpecifyOutputDirectory/node/outdir/simple/test.js index d346b13ac18..a7248649dc7 100644 --- a/tests/baselines/reference/project/maprootUrlsourcerootUrlMixedSubfolderSpecifyOutputDirectory/node/outdir/simple/test.js +++ b/tests/baselines/reference/project/maprootUrlsourcerootUrlMixedSubfolderSpecifyOutputDirectory/node/outdir/simple/test.js @@ -5,7 +5,7 @@ var c1 = (function () { function c1() { } return c1; -})(); +}()); var instance1 = new c1(); function f1() { return instance1; diff --git a/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleMultifolderNoOutdir/amd/diskFile1.js b/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleMultifolderNoOutdir/amd/diskFile1.js index 3a0f016c568..1e006b165b9 100644 --- a/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleMultifolderNoOutdir/amd/diskFile1.js +++ b/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleMultifolderNoOutdir/amd/diskFile1.js @@ -5,7 +5,7 @@ define(["require", "exports"], function (require, exports) { function m2_c1() { } return m2_c1; - })(); + }()); exports.m2_c1 = m2_c1; exports.m2_instance1 = new m2_c1(); function m2_f1() { diff --git a/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleMultifolderNoOutdir/amd/test.js b/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleMultifolderNoOutdir/amd/test.js index 40f17b7a6cc..149e213901a 100644 --- a/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleMultifolderNoOutdir/amd/test.js +++ b/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleMultifolderNoOutdir/amd/test.js @@ -5,7 +5,7 @@ define(["require", "exports", "ref/m1", "../outputdir_module_multifolder_ref/m2" function c1() { } return c1; - })(); + }()); exports.c1 = c1; exports.instance1 = new c1(); function f1() { diff --git a/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleMultifolderNoOutdir/node/diskFile1.js b/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleMultifolderNoOutdir/node/diskFile1.js index 94c4edd0289..2e93a073415 100644 --- a/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleMultifolderNoOutdir/node/diskFile1.js +++ b/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleMultifolderNoOutdir/node/diskFile1.js @@ -4,7 +4,7 @@ var m2_c1 = (function () { function m2_c1() { } return m2_c1; -})(); +}()); exports.m2_c1 = m2_c1; exports.m2_instance1 = new m2_c1(); function m2_f1() { diff --git a/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleMultifolderNoOutdir/node/test.js b/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleMultifolderNoOutdir/node/test.js index 866997ceee0..99135b7b275 100644 --- a/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleMultifolderNoOutdir/node/test.js +++ b/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleMultifolderNoOutdir/node/test.js @@ -6,7 +6,7 @@ var c1 = (function () { function c1() { } return c1; -})(); +}()); exports.c1 = c1; exports.instance1 = new c1(); function f1() { diff --git a/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_module_multifolder/test.js b/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_module_multifolder/test.js index 40f17b7a6cc..149e213901a 100644 --- a/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_module_multifolder/test.js +++ b/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_module_multifolder/test.js @@ -5,7 +5,7 @@ define(["require", "exports", "ref/m1", "../outputdir_module_multifolder_ref/m2" function c1() { } return c1; - })(); + }()); exports.c1 = c1; exports.instance1 = new c1(); function f1() { diff --git a/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_module_multifolder_ref/m2.js b/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_module_multifolder_ref/m2.js index 3a0f016c568..1e006b165b9 100644 --- a/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_module_multifolder_ref/m2.js +++ b/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_module_multifolder_ref/m2.js @@ -5,7 +5,7 @@ define(["require", "exports"], function (require, exports) { function m2_c1() { } return m2_c1; - })(); + }()); exports.m2_c1 = m2_c1; exports.m2_instance1 = new m2_c1(); function m2_f1() { diff --git a/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_module_multifolder/test.js b/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_module_multifolder/test.js index 866997ceee0..99135b7b275 100644 --- a/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_module_multifolder/test.js +++ b/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_module_multifolder/test.js @@ -6,7 +6,7 @@ var c1 = (function () { function c1() { } return c1; -})(); +}()); exports.c1 = c1; exports.instance1 = new c1(); function f1() { diff --git a/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_module_multifolder_ref/m2.js b/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_module_multifolder_ref/m2.js index 94c4edd0289..2e93a073415 100644 --- a/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_module_multifolder_ref/m2.js +++ b/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_module_multifolder_ref/m2.js @@ -4,7 +4,7 @@ var m2_c1 = (function () { function m2_c1() { } return m2_c1; -})(); +}()); exports.m2_c1 = m2_c1; exports.m2_instance1 = new m2_c1(); function m2_f1() { diff --git a/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSimpleNoOutdir/amd/test.js b/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSimpleNoOutdir/amd/test.js index e5120428e51..c3300bc7998 100644 --- a/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSimpleNoOutdir/amd/test.js +++ b/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSimpleNoOutdir/amd/test.js @@ -5,7 +5,7 @@ define(["require", "exports", "m1"], function (require, exports, m1) { function c1() { } return c1; - })(); + }()); exports.c1 = c1; exports.instance1 = new c1(); function f1() { diff --git a/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSimpleNoOutdir/node/test.js b/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSimpleNoOutdir/node/test.js index 2e158a0284f..29b6fee1d66 100644 --- a/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSimpleNoOutdir/node/test.js +++ b/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSimpleNoOutdir/node/test.js @@ -5,7 +5,7 @@ var c1 = (function () { function c1() { } return c1; -})(); +}()); exports.c1 = c1; exports.instance1 = new c1(); function f1() { diff --git a/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSimpleSpecifyOutputDirectory/amd/outdir/simple/test.js b/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSimpleSpecifyOutputDirectory/amd/outdir/simple/test.js index e5120428e51..c3300bc7998 100644 --- a/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSimpleSpecifyOutputDirectory/amd/outdir/simple/test.js +++ b/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSimpleSpecifyOutputDirectory/amd/outdir/simple/test.js @@ -5,7 +5,7 @@ define(["require", "exports", "m1"], function (require, exports, m1) { function c1() { } return c1; - })(); + }()); exports.c1 = c1; exports.instance1 = new c1(); function f1() { diff --git a/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSimpleSpecifyOutputDirectory/node/outdir/simple/test.js b/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSimpleSpecifyOutputDirectory/node/outdir/simple/test.js index 2e158a0284f..29b6fee1d66 100644 --- a/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSimpleSpecifyOutputDirectory/node/outdir/simple/test.js +++ b/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSimpleSpecifyOutputDirectory/node/outdir/simple/test.js @@ -5,7 +5,7 @@ var c1 = (function () { function c1() { } return c1; -})(); +}()); exports.c1 = c1; exports.instance1 = new c1(); function f1() { diff --git a/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSubfolderNoOutdir/amd/test.js b/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSubfolderNoOutdir/amd/test.js index 9ff0c2c90ff..5ec4a043557 100644 --- a/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSubfolderNoOutdir/amd/test.js +++ b/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSubfolderNoOutdir/amd/test.js @@ -5,7 +5,7 @@ define(["require", "exports", "ref/m1"], function (require, exports, m1) { function c1() { } return c1; - })(); + }()); exports.c1 = c1; exports.instance1 = new c1(); function f1() { diff --git a/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSubfolderNoOutdir/node/test.js b/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSubfolderNoOutdir/node/test.js index 1a8413b6601..0b258a0b620 100644 --- a/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSubfolderNoOutdir/node/test.js +++ b/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSubfolderNoOutdir/node/test.js @@ -5,7 +5,7 @@ var c1 = (function () { function c1() { } return c1; -})(); +}()); exports.c1 = c1; exports.instance1 = new c1(); function f1() { diff --git a/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSubfolderSpecifyOutputDirectory/amd/outdir/simple/test.js b/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSubfolderSpecifyOutputDirectory/amd/outdir/simple/test.js index 9ff0c2c90ff..5ec4a043557 100644 --- a/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSubfolderSpecifyOutputDirectory/amd/outdir/simple/test.js +++ b/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSubfolderSpecifyOutputDirectory/amd/outdir/simple/test.js @@ -5,7 +5,7 @@ define(["require", "exports", "ref/m1"], function (require, exports, m1) { function c1() { } return c1; - })(); + }()); exports.c1 = c1; exports.instance1 = new c1(); function f1() { diff --git a/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSubfolderSpecifyOutputDirectory/node/outdir/simple/test.js b/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSubfolderSpecifyOutputDirectory/node/outdir/simple/test.js index 1a8413b6601..0b258a0b620 100644 --- a/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSubfolderSpecifyOutputDirectory/node/outdir/simple/test.js +++ b/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSubfolderSpecifyOutputDirectory/node/outdir/simple/test.js @@ -5,7 +5,7 @@ var c1 = (function () { function c1() { } return c1; -})(); +}()); exports.c1 = c1; exports.instance1 = new c1(); function f1() { diff --git a/tests/baselines/reference/project/maprootUrlsourcerootUrlMultifolderNoOutdir/amd/diskFile1.js b/tests/baselines/reference/project/maprootUrlsourcerootUrlMultifolderNoOutdir/amd/diskFile1.js index 8c28bf7d9ab..d8a933fca96 100644 --- a/tests/baselines/reference/project/maprootUrlsourcerootUrlMultifolderNoOutdir/amd/diskFile1.js +++ b/tests/baselines/reference/project/maprootUrlsourcerootUrlMultifolderNoOutdir/amd/diskFile1.js @@ -3,7 +3,7 @@ var m2_c1 = (function () { function m2_c1() { } return m2_c1; -})(); +}()); var m2_instance1 = new m2_c1(); function m2_f1() { return m2_instance1; diff --git a/tests/baselines/reference/project/maprootUrlsourcerootUrlMultifolderNoOutdir/amd/test.js b/tests/baselines/reference/project/maprootUrlsourcerootUrlMultifolderNoOutdir/amd/test.js index ea17b21a537..c41870d0f8f 100644 --- a/tests/baselines/reference/project/maprootUrlsourcerootUrlMultifolderNoOutdir/amd/test.js +++ b/tests/baselines/reference/project/maprootUrlsourcerootUrlMultifolderNoOutdir/amd/test.js @@ -5,7 +5,7 @@ var c1 = (function () { function c1() { } return c1; -})(); +}()); var instance1 = new c1(); function f1() { return instance1; diff --git a/tests/baselines/reference/project/maprootUrlsourcerootUrlMultifolderNoOutdir/node/diskFile1.js b/tests/baselines/reference/project/maprootUrlsourcerootUrlMultifolderNoOutdir/node/diskFile1.js index 8c28bf7d9ab..d8a933fca96 100644 --- a/tests/baselines/reference/project/maprootUrlsourcerootUrlMultifolderNoOutdir/node/diskFile1.js +++ b/tests/baselines/reference/project/maprootUrlsourcerootUrlMultifolderNoOutdir/node/diskFile1.js @@ -3,7 +3,7 @@ var m2_c1 = (function () { function m2_c1() { } return m2_c1; -})(); +}()); var m2_instance1 = new m2_c1(); function m2_f1() { return m2_instance1; diff --git a/tests/baselines/reference/project/maprootUrlsourcerootUrlMultifolderNoOutdir/node/test.js b/tests/baselines/reference/project/maprootUrlsourcerootUrlMultifolderNoOutdir/node/test.js index ea17b21a537..c41870d0f8f 100644 --- a/tests/baselines/reference/project/maprootUrlsourcerootUrlMultifolderNoOutdir/node/test.js +++ b/tests/baselines/reference/project/maprootUrlsourcerootUrlMultifolderNoOutdir/node/test.js @@ -5,7 +5,7 @@ var c1 = (function () { function c1() { } return c1; -})(); +}()); var instance1 = new c1(); function f1() { return instance1; diff --git a/tests/baselines/reference/project/maprootUrlsourcerootUrlMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_multifolder/test.js b/tests/baselines/reference/project/maprootUrlsourcerootUrlMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_multifolder/test.js index ea17b21a537..c41870d0f8f 100644 --- a/tests/baselines/reference/project/maprootUrlsourcerootUrlMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_multifolder/test.js +++ b/tests/baselines/reference/project/maprootUrlsourcerootUrlMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_multifolder/test.js @@ -5,7 +5,7 @@ var c1 = (function () { function c1() { } return c1; -})(); +}()); var instance1 = new c1(); function f1() { return instance1; diff --git a/tests/baselines/reference/project/maprootUrlsourcerootUrlMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_multifolder_ref/m2.js b/tests/baselines/reference/project/maprootUrlsourcerootUrlMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_multifolder_ref/m2.js index 8c28bf7d9ab..d8a933fca96 100644 --- a/tests/baselines/reference/project/maprootUrlsourcerootUrlMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_multifolder_ref/m2.js +++ b/tests/baselines/reference/project/maprootUrlsourcerootUrlMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_multifolder_ref/m2.js @@ -3,7 +3,7 @@ var m2_c1 = (function () { function m2_c1() { } return m2_c1; -})(); +}()); var m2_instance1 = new m2_c1(); function m2_f1() { return m2_instance1; diff --git a/tests/baselines/reference/project/maprootUrlsourcerootUrlMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_multifolder/test.js b/tests/baselines/reference/project/maprootUrlsourcerootUrlMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_multifolder/test.js index ea17b21a537..c41870d0f8f 100644 --- a/tests/baselines/reference/project/maprootUrlsourcerootUrlMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_multifolder/test.js +++ b/tests/baselines/reference/project/maprootUrlsourcerootUrlMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_multifolder/test.js @@ -5,7 +5,7 @@ var c1 = (function () { function c1() { } return c1; -})(); +}()); var instance1 = new c1(); function f1() { return instance1; diff --git a/tests/baselines/reference/project/maprootUrlsourcerootUrlMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_multifolder_ref/m2.js b/tests/baselines/reference/project/maprootUrlsourcerootUrlMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_multifolder_ref/m2.js index 8c28bf7d9ab..d8a933fca96 100644 --- a/tests/baselines/reference/project/maprootUrlsourcerootUrlMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_multifolder_ref/m2.js +++ b/tests/baselines/reference/project/maprootUrlsourcerootUrlMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_multifolder_ref/m2.js @@ -3,7 +3,7 @@ var m2_c1 = (function () { function m2_c1() { } return m2_c1; -})(); +}()); var m2_instance1 = new m2_c1(); function m2_f1() { return m2_instance1; diff --git a/tests/baselines/reference/project/maprootUrlsourcerootUrlSimpleNoOutdir/amd/test.js b/tests/baselines/reference/project/maprootUrlsourcerootUrlSimpleNoOutdir/amd/test.js index 168ab13ecd8..300e7663c47 100644 --- a/tests/baselines/reference/project/maprootUrlsourcerootUrlSimpleNoOutdir/amd/test.js +++ b/tests/baselines/reference/project/maprootUrlsourcerootUrlSimpleNoOutdir/amd/test.js @@ -4,7 +4,7 @@ var c1 = (function () { function c1() { } return c1; -})(); +}()); var instance1 = new c1(); function f1() { return instance1; diff --git a/tests/baselines/reference/project/maprootUrlsourcerootUrlSimpleNoOutdir/node/test.js b/tests/baselines/reference/project/maprootUrlsourcerootUrlSimpleNoOutdir/node/test.js index 168ab13ecd8..300e7663c47 100644 --- a/tests/baselines/reference/project/maprootUrlsourcerootUrlSimpleNoOutdir/node/test.js +++ b/tests/baselines/reference/project/maprootUrlsourcerootUrlSimpleNoOutdir/node/test.js @@ -4,7 +4,7 @@ var c1 = (function () { function c1() { } return c1; -})(); +}()); var instance1 = new c1(); function f1() { return instance1; diff --git a/tests/baselines/reference/project/maprootUrlsourcerootUrlSimpleSpecifyOutputDirectory/amd/outdir/simple/test.js b/tests/baselines/reference/project/maprootUrlsourcerootUrlSimpleSpecifyOutputDirectory/amd/outdir/simple/test.js index 168ab13ecd8..300e7663c47 100644 --- a/tests/baselines/reference/project/maprootUrlsourcerootUrlSimpleSpecifyOutputDirectory/amd/outdir/simple/test.js +++ b/tests/baselines/reference/project/maprootUrlsourcerootUrlSimpleSpecifyOutputDirectory/amd/outdir/simple/test.js @@ -4,7 +4,7 @@ var c1 = (function () { function c1() { } return c1; -})(); +}()); var instance1 = new c1(); function f1() { return instance1; diff --git a/tests/baselines/reference/project/maprootUrlsourcerootUrlSimpleSpecifyOutputDirectory/node/outdir/simple/test.js b/tests/baselines/reference/project/maprootUrlsourcerootUrlSimpleSpecifyOutputDirectory/node/outdir/simple/test.js index 168ab13ecd8..300e7663c47 100644 --- a/tests/baselines/reference/project/maprootUrlsourcerootUrlSimpleSpecifyOutputDirectory/node/outdir/simple/test.js +++ b/tests/baselines/reference/project/maprootUrlsourcerootUrlSimpleSpecifyOutputDirectory/node/outdir/simple/test.js @@ -4,7 +4,7 @@ var c1 = (function () { function c1() { } return c1; -})(); +}()); var instance1 = new c1(); function f1() { return instance1; diff --git a/tests/baselines/reference/project/maprootUrlsourcerootUrlSubfolderNoOutdir/amd/test.js b/tests/baselines/reference/project/maprootUrlsourcerootUrlSubfolderNoOutdir/amd/test.js index 78b49c056c9..b268cd98e41 100644 --- a/tests/baselines/reference/project/maprootUrlsourcerootUrlSubfolderNoOutdir/amd/test.js +++ b/tests/baselines/reference/project/maprootUrlsourcerootUrlSubfolderNoOutdir/amd/test.js @@ -4,7 +4,7 @@ var c1 = (function () { function c1() { } return c1; -})(); +}()); var instance1 = new c1(); function f1() { return instance1; diff --git a/tests/baselines/reference/project/maprootUrlsourcerootUrlSubfolderNoOutdir/node/test.js b/tests/baselines/reference/project/maprootUrlsourcerootUrlSubfolderNoOutdir/node/test.js index 78b49c056c9..b268cd98e41 100644 --- a/tests/baselines/reference/project/maprootUrlsourcerootUrlSubfolderNoOutdir/node/test.js +++ b/tests/baselines/reference/project/maprootUrlsourcerootUrlSubfolderNoOutdir/node/test.js @@ -4,7 +4,7 @@ var c1 = (function () { function c1() { } return c1; -})(); +}()); var instance1 = new c1(); function f1() { return instance1; diff --git a/tests/baselines/reference/project/maprootUrlsourcerootUrlSubfolderSpecifyOutputDirectory/amd/outdir/simple/test.js b/tests/baselines/reference/project/maprootUrlsourcerootUrlSubfolderSpecifyOutputDirectory/amd/outdir/simple/test.js index 78b49c056c9..b268cd98e41 100644 --- a/tests/baselines/reference/project/maprootUrlsourcerootUrlSubfolderSpecifyOutputDirectory/amd/outdir/simple/test.js +++ b/tests/baselines/reference/project/maprootUrlsourcerootUrlSubfolderSpecifyOutputDirectory/amd/outdir/simple/test.js @@ -4,7 +4,7 @@ var c1 = (function () { function c1() { } return c1; -})(); +}()); var instance1 = new c1(); function f1() { return instance1; diff --git a/tests/baselines/reference/project/maprootUrlsourcerootUrlSubfolderSpecifyOutputDirectory/node/outdir/simple/test.js b/tests/baselines/reference/project/maprootUrlsourcerootUrlSubfolderSpecifyOutputDirectory/node/outdir/simple/test.js index 78b49c056c9..b268cd98e41 100644 --- a/tests/baselines/reference/project/maprootUrlsourcerootUrlSubfolderSpecifyOutputDirectory/node/outdir/simple/test.js +++ b/tests/baselines/reference/project/maprootUrlsourcerootUrlSubfolderSpecifyOutputDirectory/node/outdir/simple/test.js @@ -4,7 +4,7 @@ var c1 = (function () { function c1() { } return c1; -})(); +}()); var instance1 = new c1(); function f1() { return instance1; diff --git a/tests/baselines/reference/project/outMixedSubfolderNoOutdir/amd/ref/m2.js b/tests/baselines/reference/project/outMixedSubfolderNoOutdir/amd/ref/m2.js index 67db806ee95..125abe99f0e 100644 --- a/tests/baselines/reference/project/outMixedSubfolderNoOutdir/amd/ref/m2.js +++ b/tests/baselines/reference/project/outMixedSubfolderNoOutdir/amd/ref/m2.js @@ -5,7 +5,7 @@ define(["require", "exports"], function (require, exports) { function m2_c1() { } return m2_c1; - })(); + }()); exports.m2_c1 = m2_c1; exports.m2_instance1 = new m2_c1(); function m2_f1() { diff --git a/tests/baselines/reference/project/outMixedSubfolderNoOutdir/amd/test.js b/tests/baselines/reference/project/outMixedSubfolderNoOutdir/amd/test.js index 57200235601..82a3d031fce 100644 --- a/tests/baselines/reference/project/outMixedSubfolderNoOutdir/amd/test.js +++ b/tests/baselines/reference/project/outMixedSubfolderNoOutdir/amd/test.js @@ -5,7 +5,7 @@ var c1 = (function () { function c1() { } return c1; -})(); +}()); var instance1 = new c1(); function f1() { return instance1; diff --git a/tests/baselines/reference/project/outMixedSubfolderNoOutdir/node/ref/m2.js b/tests/baselines/reference/project/outMixedSubfolderNoOutdir/node/ref/m2.js index 818f4c9dd06..9fdf5b0ad0f 100644 --- a/tests/baselines/reference/project/outMixedSubfolderNoOutdir/node/ref/m2.js +++ b/tests/baselines/reference/project/outMixedSubfolderNoOutdir/node/ref/m2.js @@ -4,7 +4,7 @@ var m2_c1 = (function () { function m2_c1() { } return m2_c1; -})(); +}()); exports.m2_c1 = m2_c1; exports.m2_instance1 = new m2_c1(); function m2_f1() { diff --git a/tests/baselines/reference/project/outMixedSubfolderNoOutdir/node/test.js b/tests/baselines/reference/project/outMixedSubfolderNoOutdir/node/test.js index 57200235601..82a3d031fce 100644 --- a/tests/baselines/reference/project/outMixedSubfolderNoOutdir/node/test.js +++ b/tests/baselines/reference/project/outMixedSubfolderNoOutdir/node/test.js @@ -5,7 +5,7 @@ var c1 = (function () { function c1() { } return c1; -})(); +}()); var instance1 = new c1(); function f1() { return instance1; diff --git a/tests/baselines/reference/project/outMixedSubfolderSpecifyOutputDirectory/amd/outdir/simple/ref/m2.js b/tests/baselines/reference/project/outMixedSubfolderSpecifyOutputDirectory/amd/outdir/simple/ref/m2.js index 67db806ee95..125abe99f0e 100644 --- a/tests/baselines/reference/project/outMixedSubfolderSpecifyOutputDirectory/amd/outdir/simple/ref/m2.js +++ b/tests/baselines/reference/project/outMixedSubfolderSpecifyOutputDirectory/amd/outdir/simple/ref/m2.js @@ -5,7 +5,7 @@ define(["require", "exports"], function (require, exports) { function m2_c1() { } return m2_c1; - })(); + }()); exports.m2_c1 = m2_c1; exports.m2_instance1 = new m2_c1(); function m2_f1() { diff --git a/tests/baselines/reference/project/outMixedSubfolderSpecifyOutputDirectory/amd/outdir/simple/test.js b/tests/baselines/reference/project/outMixedSubfolderSpecifyOutputDirectory/amd/outdir/simple/test.js index 57200235601..82a3d031fce 100644 --- a/tests/baselines/reference/project/outMixedSubfolderSpecifyOutputDirectory/amd/outdir/simple/test.js +++ b/tests/baselines/reference/project/outMixedSubfolderSpecifyOutputDirectory/amd/outdir/simple/test.js @@ -5,7 +5,7 @@ var c1 = (function () { function c1() { } return c1; -})(); +}()); var instance1 = new c1(); function f1() { return instance1; diff --git a/tests/baselines/reference/project/outMixedSubfolderSpecifyOutputDirectory/node/outdir/simple/ref/m2.js b/tests/baselines/reference/project/outMixedSubfolderSpecifyOutputDirectory/node/outdir/simple/ref/m2.js index 818f4c9dd06..9fdf5b0ad0f 100644 --- a/tests/baselines/reference/project/outMixedSubfolderSpecifyOutputDirectory/node/outdir/simple/ref/m2.js +++ b/tests/baselines/reference/project/outMixedSubfolderSpecifyOutputDirectory/node/outdir/simple/ref/m2.js @@ -4,7 +4,7 @@ var m2_c1 = (function () { function m2_c1() { } return m2_c1; -})(); +}()); exports.m2_c1 = m2_c1; exports.m2_instance1 = new m2_c1(); function m2_f1() { diff --git a/tests/baselines/reference/project/outMixedSubfolderSpecifyOutputDirectory/node/outdir/simple/test.js b/tests/baselines/reference/project/outMixedSubfolderSpecifyOutputDirectory/node/outdir/simple/test.js index 57200235601..82a3d031fce 100644 --- a/tests/baselines/reference/project/outMixedSubfolderSpecifyOutputDirectory/node/outdir/simple/test.js +++ b/tests/baselines/reference/project/outMixedSubfolderSpecifyOutputDirectory/node/outdir/simple/test.js @@ -5,7 +5,7 @@ var c1 = (function () { function c1() { } return c1; -})(); +}()); var instance1 = new c1(); function f1() { return instance1; diff --git a/tests/baselines/reference/project/outModuleMultifolderNoOutdir/amd/diskFile0.js b/tests/baselines/reference/project/outModuleMultifolderNoOutdir/amd/diskFile0.js index 67db806ee95..125abe99f0e 100644 --- a/tests/baselines/reference/project/outModuleMultifolderNoOutdir/amd/diskFile0.js +++ b/tests/baselines/reference/project/outModuleMultifolderNoOutdir/amd/diskFile0.js @@ -5,7 +5,7 @@ define(["require", "exports"], function (require, exports) { function m2_c1() { } return m2_c1; - })(); + }()); exports.m2_c1 = m2_c1; exports.m2_instance1 = new m2_c1(); function m2_f1() { diff --git a/tests/baselines/reference/project/outModuleMultifolderNoOutdir/amd/test.js b/tests/baselines/reference/project/outModuleMultifolderNoOutdir/amd/test.js index 02ee3e86a3a..ddda2e19133 100644 --- a/tests/baselines/reference/project/outModuleMultifolderNoOutdir/amd/test.js +++ b/tests/baselines/reference/project/outModuleMultifolderNoOutdir/amd/test.js @@ -5,7 +5,7 @@ define(["require", "exports", "ref/m1", "../outputdir_module_multifolder_ref/m2" function c1() { } return c1; - })(); + }()); exports.c1 = c1; exports.instance1 = new c1(); function f1() { diff --git a/tests/baselines/reference/project/outModuleMultifolderNoOutdir/node/diskFile0.js b/tests/baselines/reference/project/outModuleMultifolderNoOutdir/node/diskFile0.js index 818f4c9dd06..9fdf5b0ad0f 100644 --- a/tests/baselines/reference/project/outModuleMultifolderNoOutdir/node/diskFile0.js +++ b/tests/baselines/reference/project/outModuleMultifolderNoOutdir/node/diskFile0.js @@ -4,7 +4,7 @@ var m2_c1 = (function () { function m2_c1() { } return m2_c1; -})(); +}()); exports.m2_c1 = m2_c1; exports.m2_instance1 = new m2_c1(); function m2_f1() { diff --git a/tests/baselines/reference/project/outModuleMultifolderNoOutdir/node/test.js b/tests/baselines/reference/project/outModuleMultifolderNoOutdir/node/test.js index f06fba81955..77e6fbe68c1 100644 --- a/tests/baselines/reference/project/outModuleMultifolderNoOutdir/node/test.js +++ b/tests/baselines/reference/project/outModuleMultifolderNoOutdir/node/test.js @@ -6,7 +6,7 @@ var c1 = (function () { function c1() { } return c1; -})(); +}()); exports.c1 = c1; exports.instance1 = new c1(); function f1() { diff --git a/tests/baselines/reference/project/outModuleMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_module_multifolder/test.js b/tests/baselines/reference/project/outModuleMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_module_multifolder/test.js index 02ee3e86a3a..ddda2e19133 100644 --- a/tests/baselines/reference/project/outModuleMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_module_multifolder/test.js +++ b/tests/baselines/reference/project/outModuleMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_module_multifolder/test.js @@ -5,7 +5,7 @@ define(["require", "exports", "ref/m1", "../outputdir_module_multifolder_ref/m2" function c1() { } return c1; - })(); + }()); exports.c1 = c1; exports.instance1 = new c1(); function f1() { diff --git a/tests/baselines/reference/project/outModuleMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_module_multifolder_ref/m2.js b/tests/baselines/reference/project/outModuleMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_module_multifolder_ref/m2.js index 67db806ee95..125abe99f0e 100644 --- a/tests/baselines/reference/project/outModuleMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_module_multifolder_ref/m2.js +++ b/tests/baselines/reference/project/outModuleMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_module_multifolder_ref/m2.js @@ -5,7 +5,7 @@ define(["require", "exports"], function (require, exports) { function m2_c1() { } return m2_c1; - })(); + }()); exports.m2_c1 = m2_c1; exports.m2_instance1 = new m2_c1(); function m2_f1() { diff --git a/tests/baselines/reference/project/outModuleMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_module_multifolder/test.js b/tests/baselines/reference/project/outModuleMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_module_multifolder/test.js index f06fba81955..77e6fbe68c1 100644 --- a/tests/baselines/reference/project/outModuleMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_module_multifolder/test.js +++ b/tests/baselines/reference/project/outModuleMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_module_multifolder/test.js @@ -6,7 +6,7 @@ var c1 = (function () { function c1() { } return c1; -})(); +}()); exports.c1 = c1; exports.instance1 = new c1(); function f1() { diff --git a/tests/baselines/reference/project/outModuleMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_module_multifolder_ref/m2.js b/tests/baselines/reference/project/outModuleMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_module_multifolder_ref/m2.js index 818f4c9dd06..9fdf5b0ad0f 100644 --- a/tests/baselines/reference/project/outModuleMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_module_multifolder_ref/m2.js +++ b/tests/baselines/reference/project/outModuleMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_module_multifolder_ref/m2.js @@ -4,7 +4,7 @@ var m2_c1 = (function () { function m2_c1() { } return m2_c1; -})(); +}()); exports.m2_c1 = m2_c1; exports.m2_instance1 = new m2_c1(); function m2_f1() { diff --git a/tests/baselines/reference/project/outModuleSimpleNoOutdir/amd/test.js b/tests/baselines/reference/project/outModuleSimpleNoOutdir/amd/test.js index bc5eaec25e0..cd107bb32f2 100644 --- a/tests/baselines/reference/project/outModuleSimpleNoOutdir/amd/test.js +++ b/tests/baselines/reference/project/outModuleSimpleNoOutdir/amd/test.js @@ -5,7 +5,7 @@ define(["require", "exports", "m1"], function (require, exports, m1) { function c1() { } return c1; - })(); + }()); exports.c1 = c1; exports.instance1 = new c1(); function f1() { diff --git a/tests/baselines/reference/project/outModuleSimpleNoOutdir/node/test.js b/tests/baselines/reference/project/outModuleSimpleNoOutdir/node/test.js index 147125b61c1..912480b74ce 100644 --- a/tests/baselines/reference/project/outModuleSimpleNoOutdir/node/test.js +++ b/tests/baselines/reference/project/outModuleSimpleNoOutdir/node/test.js @@ -5,7 +5,7 @@ var c1 = (function () { function c1() { } return c1; -})(); +}()); exports.c1 = c1; exports.instance1 = new c1(); function f1() { diff --git a/tests/baselines/reference/project/outModuleSimpleSpecifyOutputDirectory/amd/outdir/simple/test.js b/tests/baselines/reference/project/outModuleSimpleSpecifyOutputDirectory/amd/outdir/simple/test.js index bc5eaec25e0..cd107bb32f2 100644 --- a/tests/baselines/reference/project/outModuleSimpleSpecifyOutputDirectory/amd/outdir/simple/test.js +++ b/tests/baselines/reference/project/outModuleSimpleSpecifyOutputDirectory/amd/outdir/simple/test.js @@ -5,7 +5,7 @@ define(["require", "exports", "m1"], function (require, exports, m1) { function c1() { } return c1; - })(); + }()); exports.c1 = c1; exports.instance1 = new c1(); function f1() { diff --git a/tests/baselines/reference/project/outModuleSimpleSpecifyOutputDirectory/node/outdir/simple/test.js b/tests/baselines/reference/project/outModuleSimpleSpecifyOutputDirectory/node/outdir/simple/test.js index 147125b61c1..912480b74ce 100644 --- a/tests/baselines/reference/project/outModuleSimpleSpecifyOutputDirectory/node/outdir/simple/test.js +++ b/tests/baselines/reference/project/outModuleSimpleSpecifyOutputDirectory/node/outdir/simple/test.js @@ -5,7 +5,7 @@ var c1 = (function () { function c1() { } return c1; -})(); +}()); exports.c1 = c1; exports.instance1 = new c1(); function f1() { diff --git a/tests/baselines/reference/project/outModuleSubfolderNoOutdir/amd/test.js b/tests/baselines/reference/project/outModuleSubfolderNoOutdir/amd/test.js index fca6f6bc913..67c8fedf898 100644 --- a/tests/baselines/reference/project/outModuleSubfolderNoOutdir/amd/test.js +++ b/tests/baselines/reference/project/outModuleSubfolderNoOutdir/amd/test.js @@ -5,7 +5,7 @@ define(["require", "exports", "ref/m1"], function (require, exports, m1) { function c1() { } return c1; - })(); + }()); exports.c1 = c1; exports.instance1 = new c1(); function f1() { diff --git a/tests/baselines/reference/project/outModuleSubfolderNoOutdir/node/test.js b/tests/baselines/reference/project/outModuleSubfolderNoOutdir/node/test.js index e4389a9467b..0dea10818b9 100644 --- a/tests/baselines/reference/project/outModuleSubfolderNoOutdir/node/test.js +++ b/tests/baselines/reference/project/outModuleSubfolderNoOutdir/node/test.js @@ -5,7 +5,7 @@ var c1 = (function () { function c1() { } return c1; -})(); +}()); exports.c1 = c1; exports.instance1 = new c1(); function f1() { diff --git a/tests/baselines/reference/project/outModuleSubfolderSpecifyOutputDirectory/amd/outdir/simple/test.js b/tests/baselines/reference/project/outModuleSubfolderSpecifyOutputDirectory/amd/outdir/simple/test.js index fca6f6bc913..67c8fedf898 100644 --- a/tests/baselines/reference/project/outModuleSubfolderSpecifyOutputDirectory/amd/outdir/simple/test.js +++ b/tests/baselines/reference/project/outModuleSubfolderSpecifyOutputDirectory/amd/outdir/simple/test.js @@ -5,7 +5,7 @@ define(["require", "exports", "ref/m1"], function (require, exports, m1) { function c1() { } return c1; - })(); + }()); exports.c1 = c1; exports.instance1 = new c1(); function f1() { diff --git a/tests/baselines/reference/project/outModuleSubfolderSpecifyOutputDirectory/node/outdir/simple/test.js b/tests/baselines/reference/project/outModuleSubfolderSpecifyOutputDirectory/node/outdir/simple/test.js index e4389a9467b..0dea10818b9 100644 --- a/tests/baselines/reference/project/outModuleSubfolderSpecifyOutputDirectory/node/outdir/simple/test.js +++ b/tests/baselines/reference/project/outModuleSubfolderSpecifyOutputDirectory/node/outdir/simple/test.js @@ -5,7 +5,7 @@ var c1 = (function () { function c1() { } return c1; -})(); +}()); exports.c1 = c1; exports.instance1 = new c1(); function f1() { diff --git a/tests/baselines/reference/project/outMultifolderNoOutdir/amd/diskFile0.js b/tests/baselines/reference/project/outMultifolderNoOutdir/amd/diskFile0.js index d9e010cbef7..f5e38ab560c 100644 --- a/tests/baselines/reference/project/outMultifolderNoOutdir/amd/diskFile0.js +++ b/tests/baselines/reference/project/outMultifolderNoOutdir/amd/diskFile0.js @@ -3,7 +3,7 @@ var m2_c1 = (function () { function m2_c1() { } return m2_c1; -})(); +}()); var m2_instance1 = new m2_c1(); function m2_f1() { return m2_instance1; diff --git a/tests/baselines/reference/project/outMultifolderNoOutdir/amd/test.js b/tests/baselines/reference/project/outMultifolderNoOutdir/amd/test.js index 693aed69734..4a38b6ddd4d 100644 --- a/tests/baselines/reference/project/outMultifolderNoOutdir/amd/test.js +++ b/tests/baselines/reference/project/outMultifolderNoOutdir/amd/test.js @@ -5,7 +5,7 @@ var c1 = (function () { function c1() { } return c1; -})(); +}()); var instance1 = new c1(); function f1() { return instance1; diff --git a/tests/baselines/reference/project/outMultifolderNoOutdir/node/diskFile0.js b/tests/baselines/reference/project/outMultifolderNoOutdir/node/diskFile0.js index d9e010cbef7..f5e38ab560c 100644 --- a/tests/baselines/reference/project/outMultifolderNoOutdir/node/diskFile0.js +++ b/tests/baselines/reference/project/outMultifolderNoOutdir/node/diskFile0.js @@ -3,7 +3,7 @@ var m2_c1 = (function () { function m2_c1() { } return m2_c1; -})(); +}()); var m2_instance1 = new m2_c1(); function m2_f1() { return m2_instance1; diff --git a/tests/baselines/reference/project/outMultifolderNoOutdir/node/test.js b/tests/baselines/reference/project/outMultifolderNoOutdir/node/test.js index 693aed69734..4a38b6ddd4d 100644 --- a/tests/baselines/reference/project/outMultifolderNoOutdir/node/test.js +++ b/tests/baselines/reference/project/outMultifolderNoOutdir/node/test.js @@ -5,7 +5,7 @@ var c1 = (function () { function c1() { } return c1; -})(); +}()); var instance1 = new c1(); function f1() { return instance1; diff --git a/tests/baselines/reference/project/outMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_multifolder/test.js b/tests/baselines/reference/project/outMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_multifolder/test.js index 693aed69734..4a38b6ddd4d 100644 --- a/tests/baselines/reference/project/outMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_multifolder/test.js +++ b/tests/baselines/reference/project/outMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_multifolder/test.js @@ -5,7 +5,7 @@ var c1 = (function () { function c1() { } return c1; -})(); +}()); var instance1 = new c1(); function f1() { return instance1; diff --git a/tests/baselines/reference/project/outMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_multifolder_ref/m2.js b/tests/baselines/reference/project/outMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_multifolder_ref/m2.js index d9e010cbef7..f5e38ab560c 100644 --- a/tests/baselines/reference/project/outMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_multifolder_ref/m2.js +++ b/tests/baselines/reference/project/outMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_multifolder_ref/m2.js @@ -3,7 +3,7 @@ var m2_c1 = (function () { function m2_c1() { } return m2_c1; -})(); +}()); var m2_instance1 = new m2_c1(); function m2_f1() { return m2_instance1; diff --git a/tests/baselines/reference/project/outMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_multifolder/test.js b/tests/baselines/reference/project/outMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_multifolder/test.js index 693aed69734..4a38b6ddd4d 100644 --- a/tests/baselines/reference/project/outMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_multifolder/test.js +++ b/tests/baselines/reference/project/outMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_multifolder/test.js @@ -5,7 +5,7 @@ var c1 = (function () { function c1() { } return c1; -})(); +}()); var instance1 = new c1(); function f1() { return instance1; diff --git a/tests/baselines/reference/project/outMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_multifolder_ref/m2.js b/tests/baselines/reference/project/outMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_multifolder_ref/m2.js index d9e010cbef7..f5e38ab560c 100644 --- a/tests/baselines/reference/project/outMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_multifolder_ref/m2.js +++ b/tests/baselines/reference/project/outMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_multifolder_ref/m2.js @@ -3,7 +3,7 @@ var m2_c1 = (function () { function m2_c1() { } return m2_c1; -})(); +}()); var m2_instance1 = new m2_c1(); function m2_f1() { return m2_instance1; diff --git a/tests/baselines/reference/project/outSimpleNoOutdir/amd/test.js b/tests/baselines/reference/project/outSimpleNoOutdir/amd/test.js index 6b3e0bddbbb..eb02f7a013a 100644 --- a/tests/baselines/reference/project/outSimpleNoOutdir/amd/test.js +++ b/tests/baselines/reference/project/outSimpleNoOutdir/amd/test.js @@ -4,7 +4,7 @@ var c1 = (function () { function c1() { } return c1; -})(); +}()); var instance1 = new c1(); function f1() { return instance1; diff --git a/tests/baselines/reference/project/outSimpleNoOutdir/node/test.js b/tests/baselines/reference/project/outSimpleNoOutdir/node/test.js index 6b3e0bddbbb..eb02f7a013a 100644 --- a/tests/baselines/reference/project/outSimpleNoOutdir/node/test.js +++ b/tests/baselines/reference/project/outSimpleNoOutdir/node/test.js @@ -4,7 +4,7 @@ var c1 = (function () { function c1() { } return c1; -})(); +}()); var instance1 = new c1(); function f1() { return instance1; diff --git a/tests/baselines/reference/project/outSimpleSpecifyOutputDirectory/amd/outdir/simple/test.js b/tests/baselines/reference/project/outSimpleSpecifyOutputDirectory/amd/outdir/simple/test.js index 6b3e0bddbbb..eb02f7a013a 100644 --- a/tests/baselines/reference/project/outSimpleSpecifyOutputDirectory/amd/outdir/simple/test.js +++ b/tests/baselines/reference/project/outSimpleSpecifyOutputDirectory/amd/outdir/simple/test.js @@ -4,7 +4,7 @@ var c1 = (function () { function c1() { } return c1; -})(); +}()); var instance1 = new c1(); function f1() { return instance1; diff --git a/tests/baselines/reference/project/outSimpleSpecifyOutputDirectory/node/outdir/simple/test.js b/tests/baselines/reference/project/outSimpleSpecifyOutputDirectory/node/outdir/simple/test.js index 6b3e0bddbbb..eb02f7a013a 100644 --- a/tests/baselines/reference/project/outSimpleSpecifyOutputDirectory/node/outdir/simple/test.js +++ b/tests/baselines/reference/project/outSimpleSpecifyOutputDirectory/node/outdir/simple/test.js @@ -4,7 +4,7 @@ var c1 = (function () { function c1() { } return c1; -})(); +}()); var instance1 = new c1(); function f1() { return instance1; diff --git a/tests/baselines/reference/project/outSubfolderNoOutdir/amd/test.js b/tests/baselines/reference/project/outSubfolderNoOutdir/amd/test.js index 38f1692117a..d93a6707fdf 100644 --- a/tests/baselines/reference/project/outSubfolderNoOutdir/amd/test.js +++ b/tests/baselines/reference/project/outSubfolderNoOutdir/amd/test.js @@ -4,7 +4,7 @@ var c1 = (function () { function c1() { } return c1; -})(); +}()); var instance1 = new c1(); function f1() { return instance1; diff --git a/tests/baselines/reference/project/outSubfolderNoOutdir/node/test.js b/tests/baselines/reference/project/outSubfolderNoOutdir/node/test.js index 38f1692117a..d93a6707fdf 100644 --- a/tests/baselines/reference/project/outSubfolderNoOutdir/node/test.js +++ b/tests/baselines/reference/project/outSubfolderNoOutdir/node/test.js @@ -4,7 +4,7 @@ var c1 = (function () { function c1() { } return c1; -})(); +}()); var instance1 = new c1(); function f1() { return instance1; diff --git a/tests/baselines/reference/project/outSubfolderSpecifyOutputDirectory/amd/outdir/simple/test.js b/tests/baselines/reference/project/outSubfolderSpecifyOutputDirectory/amd/outdir/simple/test.js index 38f1692117a..d93a6707fdf 100644 --- a/tests/baselines/reference/project/outSubfolderSpecifyOutputDirectory/amd/outdir/simple/test.js +++ b/tests/baselines/reference/project/outSubfolderSpecifyOutputDirectory/amd/outdir/simple/test.js @@ -4,7 +4,7 @@ var c1 = (function () { function c1() { } return c1; -})(); +}()); var instance1 = new c1(); function f1() { return instance1; diff --git a/tests/baselines/reference/project/outSubfolderSpecifyOutputDirectory/node/outdir/simple/test.js b/tests/baselines/reference/project/outSubfolderSpecifyOutputDirectory/node/outdir/simple/test.js index 38f1692117a..d93a6707fdf 100644 --- a/tests/baselines/reference/project/outSubfolderSpecifyOutputDirectory/node/outdir/simple/test.js +++ b/tests/baselines/reference/project/outSubfolderSpecifyOutputDirectory/node/outdir/simple/test.js @@ -4,7 +4,7 @@ var c1 = (function () { function c1() { } return c1; -})(); +}()); var instance1 = new c1(); function f1() { return instance1; diff --git a/tests/baselines/reference/project/quotesInFileAndDirectoryNames/amd/m'ain.js b/tests/baselines/reference/project/quotesInFileAndDirectoryNames/amd/m'ain.js index bdf2edefcb0..64a207a7cad 100644 --- a/tests/baselines/reference/project/quotesInFileAndDirectoryNames/amd/m'ain.js +++ b/tests/baselines/reference/project/quotesInFileAndDirectoryNames/amd/m'ain.js @@ -10,4 +10,4 @@ var ClassC = (function (_super) { _super.apply(this, arguments); } return ClassC; -})(test.ClassA); +}(test.ClassA)); diff --git a/tests/baselines/reference/project/quotesInFileAndDirectoryNames/node/m'ain.js b/tests/baselines/reference/project/quotesInFileAndDirectoryNames/node/m'ain.js index bdf2edefcb0..64a207a7cad 100644 --- a/tests/baselines/reference/project/quotesInFileAndDirectoryNames/node/m'ain.js +++ b/tests/baselines/reference/project/quotesInFileAndDirectoryNames/node/m'ain.js @@ -10,4 +10,4 @@ var ClassC = (function (_super) { _super.apply(this, arguments); } return ClassC; -})(test.ClassA); +}(test.ClassA)); diff --git a/tests/baselines/reference/project/referenceResolutionRelativePaths/amd/foo.js b/tests/baselines/reference/project/referenceResolutionRelativePaths/amd/foo.js index 20440d5c62b..4a01207bfce 100644 --- a/tests/baselines/reference/project/referenceResolutionRelativePaths/amd/foo.js +++ b/tests/baselines/reference/project/referenceResolutionRelativePaths/amd/foo.js @@ -3,4 +3,4 @@ var foo = (function () { function foo() { } return foo; -})(); +}()); diff --git a/tests/baselines/reference/project/referenceResolutionRelativePaths/node/foo.js b/tests/baselines/reference/project/referenceResolutionRelativePaths/node/foo.js index 20440d5c62b..4a01207bfce 100644 --- a/tests/baselines/reference/project/referenceResolutionRelativePaths/node/foo.js +++ b/tests/baselines/reference/project/referenceResolutionRelativePaths/node/foo.js @@ -3,4 +3,4 @@ var foo = (function () { function foo() { } return foo; -})(); +}()); diff --git a/tests/baselines/reference/project/referenceResolutionRelativePathsFromRootDirectory/amd/src/ts/foo/foo.js b/tests/baselines/reference/project/referenceResolutionRelativePathsFromRootDirectory/amd/src/ts/foo/foo.js index 20440d5c62b..4a01207bfce 100644 --- a/tests/baselines/reference/project/referenceResolutionRelativePathsFromRootDirectory/amd/src/ts/foo/foo.js +++ b/tests/baselines/reference/project/referenceResolutionRelativePathsFromRootDirectory/amd/src/ts/foo/foo.js @@ -3,4 +3,4 @@ var foo = (function () { function foo() { } return foo; -})(); +}()); diff --git a/tests/baselines/reference/project/referenceResolutionRelativePathsFromRootDirectory/node/src/ts/foo/foo.js b/tests/baselines/reference/project/referenceResolutionRelativePathsFromRootDirectory/node/src/ts/foo/foo.js index 20440d5c62b..4a01207bfce 100644 --- a/tests/baselines/reference/project/referenceResolutionRelativePathsFromRootDirectory/node/src/ts/foo/foo.js +++ b/tests/baselines/reference/project/referenceResolutionRelativePathsFromRootDirectory/node/src/ts/foo/foo.js @@ -3,4 +3,4 @@ var foo = (function () { function foo() { } return foo; -})(); +}()); diff --git a/tests/baselines/reference/project/referenceResolutionRelativePathsNoResolve/amd/diskFile0.js b/tests/baselines/reference/project/referenceResolutionRelativePathsNoResolve/amd/diskFile0.js index ae9742b492f..080f95401b3 100644 --- a/tests/baselines/reference/project/referenceResolutionRelativePathsNoResolve/amd/diskFile0.js +++ b/tests/baselines/reference/project/referenceResolutionRelativePathsNoResolve/amd/diskFile0.js @@ -4,4 +4,4 @@ var bar = (function () { function bar() { } return bar; -})(); +}()); diff --git a/tests/baselines/reference/project/referenceResolutionRelativePathsNoResolve/node/diskFile0.js b/tests/baselines/reference/project/referenceResolutionRelativePathsNoResolve/node/diskFile0.js index ae9742b492f..080f95401b3 100644 --- a/tests/baselines/reference/project/referenceResolutionRelativePathsNoResolve/node/diskFile0.js +++ b/tests/baselines/reference/project/referenceResolutionRelativePathsNoResolve/node/diskFile0.js @@ -4,4 +4,4 @@ var bar = (function () { function bar() { } return bar; -})(); +}()); diff --git a/tests/baselines/reference/project/referenceResolutionRelativePathsRelativeToRootDirectory/amd/foo.js b/tests/baselines/reference/project/referenceResolutionRelativePathsRelativeToRootDirectory/amd/foo.js index 20440d5c62b..4a01207bfce 100644 --- a/tests/baselines/reference/project/referenceResolutionRelativePathsRelativeToRootDirectory/amd/foo.js +++ b/tests/baselines/reference/project/referenceResolutionRelativePathsRelativeToRootDirectory/amd/foo.js @@ -3,4 +3,4 @@ var foo = (function () { function foo() { } return foo; -})(); +}()); diff --git a/tests/baselines/reference/project/referenceResolutionRelativePathsRelativeToRootDirectory/node/foo.js b/tests/baselines/reference/project/referenceResolutionRelativePathsRelativeToRootDirectory/node/foo.js index 20440d5c62b..4a01207bfce 100644 --- a/tests/baselines/reference/project/referenceResolutionRelativePathsRelativeToRootDirectory/node/foo.js +++ b/tests/baselines/reference/project/referenceResolutionRelativePathsRelativeToRootDirectory/node/foo.js @@ -3,4 +3,4 @@ var foo = (function () { function foo() { } return foo; -})(); +}()); diff --git a/tests/baselines/reference/project/rootDirectory/amd/outdir/simple/FolderB/fileB.js b/tests/baselines/reference/project/rootDirectory/amd/outdir/simple/FolderB/fileB.js index 84af55d2d89..aff1446877c 100644 --- a/tests/baselines/reference/project/rootDirectory/amd/outdir/simple/FolderB/fileB.js +++ b/tests/baselines/reference/project/rootDirectory/amd/outdir/simple/FolderB/fileB.js @@ -3,5 +3,5 @@ var B = (function () { function B() { } return B; -})(); +}()); //# sourceMappingURL=fileB.js.map \ No newline at end of file diff --git a/tests/baselines/reference/project/rootDirectory/node/outdir/simple/FolderB/fileB.js b/tests/baselines/reference/project/rootDirectory/node/outdir/simple/FolderB/fileB.js index 84af55d2d89..aff1446877c 100644 --- a/tests/baselines/reference/project/rootDirectory/node/outdir/simple/FolderB/fileB.js +++ b/tests/baselines/reference/project/rootDirectory/node/outdir/simple/FolderB/fileB.js @@ -3,5 +3,5 @@ var B = (function () { function B() { } return B; -})(); +}()); //# sourceMappingURL=fileB.js.map \ No newline at end of file diff --git a/tests/baselines/reference/project/rootDirectoryErrors/amd/outdir/simple/fileB.js b/tests/baselines/reference/project/rootDirectoryErrors/amd/outdir/simple/fileB.js index 99199ca1742..486a6bb87a5 100644 --- a/tests/baselines/reference/project/rootDirectoryErrors/amd/outdir/simple/fileB.js +++ b/tests/baselines/reference/project/rootDirectoryErrors/amd/outdir/simple/fileB.js @@ -3,4 +3,4 @@ var B = (function () { function B() { } return B; -})(); +}()); diff --git a/tests/baselines/reference/project/rootDirectoryErrors/node/outdir/simple/fileB.js b/tests/baselines/reference/project/rootDirectoryErrors/node/outdir/simple/fileB.js index 99199ca1742..486a6bb87a5 100644 --- a/tests/baselines/reference/project/rootDirectoryErrors/node/outdir/simple/fileB.js +++ b/tests/baselines/reference/project/rootDirectoryErrors/node/outdir/simple/fileB.js @@ -3,4 +3,4 @@ var B = (function () { function B() { } return B; -})(); +}()); diff --git a/tests/baselines/reference/project/rootDirectoryWithSourceRoot/amd/outdir/simple/FolderB/fileB.js b/tests/baselines/reference/project/rootDirectoryWithSourceRoot/amd/outdir/simple/FolderB/fileB.js index 84af55d2d89..aff1446877c 100644 --- a/tests/baselines/reference/project/rootDirectoryWithSourceRoot/amd/outdir/simple/FolderB/fileB.js +++ b/tests/baselines/reference/project/rootDirectoryWithSourceRoot/amd/outdir/simple/FolderB/fileB.js @@ -3,5 +3,5 @@ var B = (function () { function B() { } return B; -})(); +}()); //# sourceMappingURL=fileB.js.map \ No newline at end of file diff --git a/tests/baselines/reference/project/rootDirectoryWithSourceRoot/node/outdir/simple/FolderB/fileB.js b/tests/baselines/reference/project/rootDirectoryWithSourceRoot/node/outdir/simple/FolderB/fileB.js index 84af55d2d89..aff1446877c 100644 --- a/tests/baselines/reference/project/rootDirectoryWithSourceRoot/node/outdir/simple/FolderB/fileB.js +++ b/tests/baselines/reference/project/rootDirectoryWithSourceRoot/node/outdir/simple/FolderB/fileB.js @@ -3,5 +3,5 @@ var B = (function () { function B() { } return B; -})(); +}()); //# sourceMappingURL=fileB.js.map \ No newline at end of file diff --git a/tests/baselines/reference/project/sourceRootAbsolutePathMixedSubfolderNoOutdir/amd/ref/m2.js b/tests/baselines/reference/project/sourceRootAbsolutePathMixedSubfolderNoOutdir/amd/ref/m2.js index dd1c532b6df..41f4a4e2521 100644 --- a/tests/baselines/reference/project/sourceRootAbsolutePathMixedSubfolderNoOutdir/amd/ref/m2.js +++ b/tests/baselines/reference/project/sourceRootAbsolutePathMixedSubfolderNoOutdir/amd/ref/m2.js @@ -5,7 +5,7 @@ define(["require", "exports"], function (require, exports) { function m2_c1() { } return m2_c1; - })(); + }()); exports.m2_c1 = m2_c1; exports.m2_instance1 = new m2_c1(); function m2_f1() { diff --git a/tests/baselines/reference/project/sourceRootAbsolutePathMixedSubfolderNoOutdir/amd/test.js b/tests/baselines/reference/project/sourceRootAbsolutePathMixedSubfolderNoOutdir/amd/test.js index 8b8abfc1aed..78426750a82 100644 --- a/tests/baselines/reference/project/sourceRootAbsolutePathMixedSubfolderNoOutdir/amd/test.js +++ b/tests/baselines/reference/project/sourceRootAbsolutePathMixedSubfolderNoOutdir/amd/test.js @@ -5,7 +5,7 @@ var c1 = (function () { function c1() { } return c1; -})(); +}()); var instance1 = new c1(); function f1() { return instance1; diff --git a/tests/baselines/reference/project/sourceRootAbsolutePathMixedSubfolderNoOutdir/node/ref/m2.js b/tests/baselines/reference/project/sourceRootAbsolutePathMixedSubfolderNoOutdir/node/ref/m2.js index 1646fd608ea..eae1115846a 100644 --- a/tests/baselines/reference/project/sourceRootAbsolutePathMixedSubfolderNoOutdir/node/ref/m2.js +++ b/tests/baselines/reference/project/sourceRootAbsolutePathMixedSubfolderNoOutdir/node/ref/m2.js @@ -4,7 +4,7 @@ var m2_c1 = (function () { function m2_c1() { } return m2_c1; -})(); +}()); exports.m2_c1 = m2_c1; exports.m2_instance1 = new m2_c1(); function m2_f1() { diff --git a/tests/baselines/reference/project/sourceRootAbsolutePathMixedSubfolderNoOutdir/node/test.js b/tests/baselines/reference/project/sourceRootAbsolutePathMixedSubfolderNoOutdir/node/test.js index 8b8abfc1aed..78426750a82 100644 --- a/tests/baselines/reference/project/sourceRootAbsolutePathMixedSubfolderNoOutdir/node/test.js +++ b/tests/baselines/reference/project/sourceRootAbsolutePathMixedSubfolderNoOutdir/node/test.js @@ -5,7 +5,7 @@ var c1 = (function () { function c1() { } return c1; -})(); +}()); var instance1 = new c1(); function f1() { return instance1; diff --git a/tests/baselines/reference/project/sourceRootAbsolutePathMixedSubfolderSpecifyOutputDirectory/amd/outdir/simple/ref/m2.js b/tests/baselines/reference/project/sourceRootAbsolutePathMixedSubfolderSpecifyOutputDirectory/amd/outdir/simple/ref/m2.js index dd1c532b6df..41f4a4e2521 100644 --- a/tests/baselines/reference/project/sourceRootAbsolutePathMixedSubfolderSpecifyOutputDirectory/amd/outdir/simple/ref/m2.js +++ b/tests/baselines/reference/project/sourceRootAbsolutePathMixedSubfolderSpecifyOutputDirectory/amd/outdir/simple/ref/m2.js @@ -5,7 +5,7 @@ define(["require", "exports"], function (require, exports) { function m2_c1() { } return m2_c1; - })(); + }()); exports.m2_c1 = m2_c1; exports.m2_instance1 = new m2_c1(); function m2_f1() { diff --git a/tests/baselines/reference/project/sourceRootAbsolutePathMixedSubfolderSpecifyOutputDirectory/amd/outdir/simple/test.js b/tests/baselines/reference/project/sourceRootAbsolutePathMixedSubfolderSpecifyOutputDirectory/amd/outdir/simple/test.js index 8b8abfc1aed..78426750a82 100644 --- a/tests/baselines/reference/project/sourceRootAbsolutePathMixedSubfolderSpecifyOutputDirectory/amd/outdir/simple/test.js +++ b/tests/baselines/reference/project/sourceRootAbsolutePathMixedSubfolderSpecifyOutputDirectory/amd/outdir/simple/test.js @@ -5,7 +5,7 @@ var c1 = (function () { function c1() { } return c1; -})(); +}()); var instance1 = new c1(); function f1() { return instance1; diff --git a/tests/baselines/reference/project/sourceRootAbsolutePathMixedSubfolderSpecifyOutputDirectory/node/outdir/simple/ref/m2.js b/tests/baselines/reference/project/sourceRootAbsolutePathMixedSubfolderSpecifyOutputDirectory/node/outdir/simple/ref/m2.js index 1646fd608ea..eae1115846a 100644 --- a/tests/baselines/reference/project/sourceRootAbsolutePathMixedSubfolderSpecifyOutputDirectory/node/outdir/simple/ref/m2.js +++ b/tests/baselines/reference/project/sourceRootAbsolutePathMixedSubfolderSpecifyOutputDirectory/node/outdir/simple/ref/m2.js @@ -4,7 +4,7 @@ var m2_c1 = (function () { function m2_c1() { } return m2_c1; -})(); +}()); exports.m2_c1 = m2_c1; exports.m2_instance1 = new m2_c1(); function m2_f1() { diff --git a/tests/baselines/reference/project/sourceRootAbsolutePathMixedSubfolderSpecifyOutputDirectory/node/outdir/simple/test.js b/tests/baselines/reference/project/sourceRootAbsolutePathMixedSubfolderSpecifyOutputDirectory/node/outdir/simple/test.js index 8b8abfc1aed..78426750a82 100644 --- a/tests/baselines/reference/project/sourceRootAbsolutePathMixedSubfolderSpecifyOutputDirectory/node/outdir/simple/test.js +++ b/tests/baselines/reference/project/sourceRootAbsolutePathMixedSubfolderSpecifyOutputDirectory/node/outdir/simple/test.js @@ -5,7 +5,7 @@ var c1 = (function () { function c1() { } return c1; -})(); +}()); var instance1 = new c1(); function f1() { return instance1; diff --git a/tests/baselines/reference/project/sourceRootAbsolutePathModuleMultifolderNoOutdir/amd/diskFile1.js b/tests/baselines/reference/project/sourceRootAbsolutePathModuleMultifolderNoOutdir/amd/diskFile1.js index dd1c532b6df..41f4a4e2521 100644 --- a/tests/baselines/reference/project/sourceRootAbsolutePathModuleMultifolderNoOutdir/amd/diskFile1.js +++ b/tests/baselines/reference/project/sourceRootAbsolutePathModuleMultifolderNoOutdir/amd/diskFile1.js @@ -5,7 +5,7 @@ define(["require", "exports"], function (require, exports) { function m2_c1() { } return m2_c1; - })(); + }()); exports.m2_c1 = m2_c1; exports.m2_instance1 = new m2_c1(); function m2_f1() { diff --git a/tests/baselines/reference/project/sourceRootAbsolutePathModuleMultifolderNoOutdir/amd/test.js b/tests/baselines/reference/project/sourceRootAbsolutePathModuleMultifolderNoOutdir/amd/test.js index bf3f6e48267..efa0bc948ed 100644 --- a/tests/baselines/reference/project/sourceRootAbsolutePathModuleMultifolderNoOutdir/amd/test.js +++ b/tests/baselines/reference/project/sourceRootAbsolutePathModuleMultifolderNoOutdir/amd/test.js @@ -5,7 +5,7 @@ define(["require", "exports", "ref/m1", "../outputdir_module_multifolder_ref/m2" function c1() { } return c1; - })(); + }()); exports.c1 = c1; exports.instance1 = new c1(); function f1() { diff --git a/tests/baselines/reference/project/sourceRootAbsolutePathModuleMultifolderNoOutdir/node/diskFile1.js b/tests/baselines/reference/project/sourceRootAbsolutePathModuleMultifolderNoOutdir/node/diskFile1.js index 1646fd608ea..eae1115846a 100644 --- a/tests/baselines/reference/project/sourceRootAbsolutePathModuleMultifolderNoOutdir/node/diskFile1.js +++ b/tests/baselines/reference/project/sourceRootAbsolutePathModuleMultifolderNoOutdir/node/diskFile1.js @@ -4,7 +4,7 @@ var m2_c1 = (function () { function m2_c1() { } return m2_c1; -})(); +}()); exports.m2_c1 = m2_c1; exports.m2_instance1 = new m2_c1(); function m2_f1() { diff --git a/tests/baselines/reference/project/sourceRootAbsolutePathModuleMultifolderNoOutdir/node/test.js b/tests/baselines/reference/project/sourceRootAbsolutePathModuleMultifolderNoOutdir/node/test.js index 67406a9e410..84731dff566 100644 --- a/tests/baselines/reference/project/sourceRootAbsolutePathModuleMultifolderNoOutdir/node/test.js +++ b/tests/baselines/reference/project/sourceRootAbsolutePathModuleMultifolderNoOutdir/node/test.js @@ -6,7 +6,7 @@ var c1 = (function () { function c1() { } return c1; -})(); +}()); exports.c1 = c1; exports.instance1 = new c1(); function f1() { diff --git a/tests/baselines/reference/project/sourceRootAbsolutePathModuleMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_module_multifolder/test.js b/tests/baselines/reference/project/sourceRootAbsolutePathModuleMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_module_multifolder/test.js index bf3f6e48267..efa0bc948ed 100644 --- a/tests/baselines/reference/project/sourceRootAbsolutePathModuleMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_module_multifolder/test.js +++ b/tests/baselines/reference/project/sourceRootAbsolutePathModuleMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_module_multifolder/test.js @@ -5,7 +5,7 @@ define(["require", "exports", "ref/m1", "../outputdir_module_multifolder_ref/m2" function c1() { } return c1; - })(); + }()); exports.c1 = c1; exports.instance1 = new c1(); function f1() { diff --git a/tests/baselines/reference/project/sourceRootAbsolutePathModuleMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_module_multifolder_ref/m2.js b/tests/baselines/reference/project/sourceRootAbsolutePathModuleMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_module_multifolder_ref/m2.js index dd1c532b6df..41f4a4e2521 100644 --- a/tests/baselines/reference/project/sourceRootAbsolutePathModuleMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_module_multifolder_ref/m2.js +++ b/tests/baselines/reference/project/sourceRootAbsolutePathModuleMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_module_multifolder_ref/m2.js @@ -5,7 +5,7 @@ define(["require", "exports"], function (require, exports) { function m2_c1() { } return m2_c1; - })(); + }()); exports.m2_c1 = m2_c1; exports.m2_instance1 = new m2_c1(); function m2_f1() { diff --git a/tests/baselines/reference/project/sourceRootAbsolutePathModuleMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_module_multifolder/test.js b/tests/baselines/reference/project/sourceRootAbsolutePathModuleMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_module_multifolder/test.js index 67406a9e410..84731dff566 100644 --- a/tests/baselines/reference/project/sourceRootAbsolutePathModuleMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_module_multifolder/test.js +++ b/tests/baselines/reference/project/sourceRootAbsolutePathModuleMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_module_multifolder/test.js @@ -6,7 +6,7 @@ var c1 = (function () { function c1() { } return c1; -})(); +}()); exports.c1 = c1; exports.instance1 = new c1(); function f1() { diff --git a/tests/baselines/reference/project/sourceRootAbsolutePathModuleMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_module_multifolder_ref/m2.js b/tests/baselines/reference/project/sourceRootAbsolutePathModuleMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_module_multifolder_ref/m2.js index 1646fd608ea..eae1115846a 100644 --- a/tests/baselines/reference/project/sourceRootAbsolutePathModuleMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_module_multifolder_ref/m2.js +++ b/tests/baselines/reference/project/sourceRootAbsolutePathModuleMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_module_multifolder_ref/m2.js @@ -4,7 +4,7 @@ var m2_c1 = (function () { function m2_c1() { } return m2_c1; -})(); +}()); exports.m2_c1 = m2_c1; exports.m2_instance1 = new m2_c1(); function m2_f1() { diff --git a/tests/baselines/reference/project/sourceRootAbsolutePathModuleSimpleNoOutdir/amd/test.js b/tests/baselines/reference/project/sourceRootAbsolutePathModuleSimpleNoOutdir/amd/test.js index 4e5ad232cc3..c4b7f56d76a 100644 --- a/tests/baselines/reference/project/sourceRootAbsolutePathModuleSimpleNoOutdir/amd/test.js +++ b/tests/baselines/reference/project/sourceRootAbsolutePathModuleSimpleNoOutdir/amd/test.js @@ -5,7 +5,7 @@ define(["require", "exports", "m1"], function (require, exports, m1) { function c1() { } return c1; - })(); + }()); exports.c1 = c1; exports.instance1 = new c1(); function f1() { diff --git a/tests/baselines/reference/project/sourceRootAbsolutePathModuleSimpleNoOutdir/node/test.js b/tests/baselines/reference/project/sourceRootAbsolutePathModuleSimpleNoOutdir/node/test.js index bbc39c25431..fea4b619aa2 100644 --- a/tests/baselines/reference/project/sourceRootAbsolutePathModuleSimpleNoOutdir/node/test.js +++ b/tests/baselines/reference/project/sourceRootAbsolutePathModuleSimpleNoOutdir/node/test.js @@ -5,7 +5,7 @@ var c1 = (function () { function c1() { } return c1; -})(); +}()); exports.c1 = c1; exports.instance1 = new c1(); function f1() { diff --git a/tests/baselines/reference/project/sourceRootAbsolutePathModuleSimpleSpecifyOutputDirectory/amd/outdir/simple/test.js b/tests/baselines/reference/project/sourceRootAbsolutePathModuleSimpleSpecifyOutputDirectory/amd/outdir/simple/test.js index 4e5ad232cc3..c4b7f56d76a 100644 --- a/tests/baselines/reference/project/sourceRootAbsolutePathModuleSimpleSpecifyOutputDirectory/amd/outdir/simple/test.js +++ b/tests/baselines/reference/project/sourceRootAbsolutePathModuleSimpleSpecifyOutputDirectory/amd/outdir/simple/test.js @@ -5,7 +5,7 @@ define(["require", "exports", "m1"], function (require, exports, m1) { function c1() { } return c1; - })(); + }()); exports.c1 = c1; exports.instance1 = new c1(); function f1() { diff --git a/tests/baselines/reference/project/sourceRootAbsolutePathModuleSimpleSpecifyOutputDirectory/node/outdir/simple/test.js b/tests/baselines/reference/project/sourceRootAbsolutePathModuleSimpleSpecifyOutputDirectory/node/outdir/simple/test.js index bbc39c25431..fea4b619aa2 100644 --- a/tests/baselines/reference/project/sourceRootAbsolutePathModuleSimpleSpecifyOutputDirectory/node/outdir/simple/test.js +++ b/tests/baselines/reference/project/sourceRootAbsolutePathModuleSimpleSpecifyOutputDirectory/node/outdir/simple/test.js @@ -5,7 +5,7 @@ var c1 = (function () { function c1() { } return c1; -})(); +}()); exports.c1 = c1; exports.instance1 = new c1(); function f1() { diff --git a/tests/baselines/reference/project/sourceRootAbsolutePathModuleSubfolderNoOutdir/amd/test.js b/tests/baselines/reference/project/sourceRootAbsolutePathModuleSubfolderNoOutdir/amd/test.js index 081c888ee02..0ad51aeb02e 100644 --- a/tests/baselines/reference/project/sourceRootAbsolutePathModuleSubfolderNoOutdir/amd/test.js +++ b/tests/baselines/reference/project/sourceRootAbsolutePathModuleSubfolderNoOutdir/amd/test.js @@ -5,7 +5,7 @@ define(["require", "exports", "ref/m1"], function (require, exports, m1) { function c1() { } return c1; - })(); + }()); exports.c1 = c1; exports.instance1 = new c1(); function f1() { diff --git a/tests/baselines/reference/project/sourceRootAbsolutePathModuleSubfolderNoOutdir/node/test.js b/tests/baselines/reference/project/sourceRootAbsolutePathModuleSubfolderNoOutdir/node/test.js index bdc33590853..ebd5fdb3b3f 100644 --- a/tests/baselines/reference/project/sourceRootAbsolutePathModuleSubfolderNoOutdir/node/test.js +++ b/tests/baselines/reference/project/sourceRootAbsolutePathModuleSubfolderNoOutdir/node/test.js @@ -5,7 +5,7 @@ var c1 = (function () { function c1() { } return c1; -})(); +}()); exports.c1 = c1; exports.instance1 = new c1(); function f1() { diff --git a/tests/baselines/reference/project/sourceRootAbsolutePathModuleSubfolderSpecifyOutputDirectory/amd/outdir/simple/test.js b/tests/baselines/reference/project/sourceRootAbsolutePathModuleSubfolderSpecifyOutputDirectory/amd/outdir/simple/test.js index 081c888ee02..0ad51aeb02e 100644 --- a/tests/baselines/reference/project/sourceRootAbsolutePathModuleSubfolderSpecifyOutputDirectory/amd/outdir/simple/test.js +++ b/tests/baselines/reference/project/sourceRootAbsolutePathModuleSubfolderSpecifyOutputDirectory/amd/outdir/simple/test.js @@ -5,7 +5,7 @@ define(["require", "exports", "ref/m1"], function (require, exports, m1) { function c1() { } return c1; - })(); + }()); exports.c1 = c1; exports.instance1 = new c1(); function f1() { diff --git a/tests/baselines/reference/project/sourceRootAbsolutePathModuleSubfolderSpecifyOutputDirectory/node/outdir/simple/test.js b/tests/baselines/reference/project/sourceRootAbsolutePathModuleSubfolderSpecifyOutputDirectory/node/outdir/simple/test.js index bdc33590853..ebd5fdb3b3f 100644 --- a/tests/baselines/reference/project/sourceRootAbsolutePathModuleSubfolderSpecifyOutputDirectory/node/outdir/simple/test.js +++ b/tests/baselines/reference/project/sourceRootAbsolutePathModuleSubfolderSpecifyOutputDirectory/node/outdir/simple/test.js @@ -5,7 +5,7 @@ var c1 = (function () { function c1() { } return c1; -})(); +}()); exports.c1 = c1; exports.instance1 = new c1(); function f1() { diff --git a/tests/baselines/reference/project/sourceRootAbsolutePathMultifolderNoOutdir/amd/diskFile1.js b/tests/baselines/reference/project/sourceRootAbsolutePathMultifolderNoOutdir/amd/diskFile1.js index 9f44db1fad5..a1041b6d258 100644 --- a/tests/baselines/reference/project/sourceRootAbsolutePathMultifolderNoOutdir/amd/diskFile1.js +++ b/tests/baselines/reference/project/sourceRootAbsolutePathMultifolderNoOutdir/amd/diskFile1.js @@ -3,7 +3,7 @@ var m2_c1 = (function () { function m2_c1() { } return m2_c1; -})(); +}()); var m2_instance1 = new m2_c1(); function m2_f1() { return m2_instance1; diff --git a/tests/baselines/reference/project/sourceRootAbsolutePathMultifolderNoOutdir/amd/test.js b/tests/baselines/reference/project/sourceRootAbsolutePathMultifolderNoOutdir/amd/test.js index 87d3f006993..088a77f3f25 100644 --- a/tests/baselines/reference/project/sourceRootAbsolutePathMultifolderNoOutdir/amd/test.js +++ b/tests/baselines/reference/project/sourceRootAbsolutePathMultifolderNoOutdir/amd/test.js @@ -5,7 +5,7 @@ var c1 = (function () { function c1() { } return c1; -})(); +}()); var instance1 = new c1(); function f1() { return instance1; diff --git a/tests/baselines/reference/project/sourceRootAbsolutePathMultifolderNoOutdir/node/diskFile1.js b/tests/baselines/reference/project/sourceRootAbsolutePathMultifolderNoOutdir/node/diskFile1.js index 9f44db1fad5..a1041b6d258 100644 --- a/tests/baselines/reference/project/sourceRootAbsolutePathMultifolderNoOutdir/node/diskFile1.js +++ b/tests/baselines/reference/project/sourceRootAbsolutePathMultifolderNoOutdir/node/diskFile1.js @@ -3,7 +3,7 @@ var m2_c1 = (function () { function m2_c1() { } return m2_c1; -})(); +}()); var m2_instance1 = new m2_c1(); function m2_f1() { return m2_instance1; diff --git a/tests/baselines/reference/project/sourceRootAbsolutePathMultifolderNoOutdir/node/test.js b/tests/baselines/reference/project/sourceRootAbsolutePathMultifolderNoOutdir/node/test.js index 87d3f006993..088a77f3f25 100644 --- a/tests/baselines/reference/project/sourceRootAbsolutePathMultifolderNoOutdir/node/test.js +++ b/tests/baselines/reference/project/sourceRootAbsolutePathMultifolderNoOutdir/node/test.js @@ -5,7 +5,7 @@ var c1 = (function () { function c1() { } return c1; -})(); +}()); var instance1 = new c1(); function f1() { return instance1; diff --git a/tests/baselines/reference/project/sourceRootAbsolutePathMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_multifolder/test.js b/tests/baselines/reference/project/sourceRootAbsolutePathMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_multifolder/test.js index 87d3f006993..088a77f3f25 100644 --- a/tests/baselines/reference/project/sourceRootAbsolutePathMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_multifolder/test.js +++ b/tests/baselines/reference/project/sourceRootAbsolutePathMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_multifolder/test.js @@ -5,7 +5,7 @@ var c1 = (function () { function c1() { } return c1; -})(); +}()); var instance1 = new c1(); function f1() { return instance1; diff --git a/tests/baselines/reference/project/sourceRootAbsolutePathMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_multifolder_ref/m2.js b/tests/baselines/reference/project/sourceRootAbsolutePathMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_multifolder_ref/m2.js index 9f44db1fad5..a1041b6d258 100644 --- a/tests/baselines/reference/project/sourceRootAbsolutePathMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_multifolder_ref/m2.js +++ b/tests/baselines/reference/project/sourceRootAbsolutePathMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_multifolder_ref/m2.js @@ -3,7 +3,7 @@ var m2_c1 = (function () { function m2_c1() { } return m2_c1; -})(); +}()); var m2_instance1 = new m2_c1(); function m2_f1() { return m2_instance1; diff --git a/tests/baselines/reference/project/sourceRootAbsolutePathMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_multifolder/test.js b/tests/baselines/reference/project/sourceRootAbsolutePathMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_multifolder/test.js index 87d3f006993..088a77f3f25 100644 --- a/tests/baselines/reference/project/sourceRootAbsolutePathMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_multifolder/test.js +++ b/tests/baselines/reference/project/sourceRootAbsolutePathMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_multifolder/test.js @@ -5,7 +5,7 @@ var c1 = (function () { function c1() { } return c1; -})(); +}()); var instance1 = new c1(); function f1() { return instance1; diff --git a/tests/baselines/reference/project/sourceRootAbsolutePathMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_multifolder_ref/m2.js b/tests/baselines/reference/project/sourceRootAbsolutePathMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_multifolder_ref/m2.js index 9f44db1fad5..a1041b6d258 100644 --- a/tests/baselines/reference/project/sourceRootAbsolutePathMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_multifolder_ref/m2.js +++ b/tests/baselines/reference/project/sourceRootAbsolutePathMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_multifolder_ref/m2.js @@ -3,7 +3,7 @@ var m2_c1 = (function () { function m2_c1() { } return m2_c1; -})(); +}()); var m2_instance1 = new m2_c1(); function m2_f1() { return m2_instance1; diff --git a/tests/baselines/reference/project/sourceRootAbsolutePathSimpleNoOutdir/amd/test.js b/tests/baselines/reference/project/sourceRootAbsolutePathSimpleNoOutdir/amd/test.js index 218d8fcf05d..679b65b5733 100644 --- a/tests/baselines/reference/project/sourceRootAbsolutePathSimpleNoOutdir/amd/test.js +++ b/tests/baselines/reference/project/sourceRootAbsolutePathSimpleNoOutdir/amd/test.js @@ -4,7 +4,7 @@ var c1 = (function () { function c1() { } return c1; -})(); +}()); var instance1 = new c1(); function f1() { return instance1; diff --git a/tests/baselines/reference/project/sourceRootAbsolutePathSimpleNoOutdir/node/test.js b/tests/baselines/reference/project/sourceRootAbsolutePathSimpleNoOutdir/node/test.js index 218d8fcf05d..679b65b5733 100644 --- a/tests/baselines/reference/project/sourceRootAbsolutePathSimpleNoOutdir/node/test.js +++ b/tests/baselines/reference/project/sourceRootAbsolutePathSimpleNoOutdir/node/test.js @@ -4,7 +4,7 @@ var c1 = (function () { function c1() { } return c1; -})(); +}()); var instance1 = new c1(); function f1() { return instance1; diff --git a/tests/baselines/reference/project/sourceRootAbsolutePathSimpleSpecifyOutputDirectory/amd/outdir/simple/test.js b/tests/baselines/reference/project/sourceRootAbsolutePathSimpleSpecifyOutputDirectory/amd/outdir/simple/test.js index 218d8fcf05d..679b65b5733 100644 --- a/tests/baselines/reference/project/sourceRootAbsolutePathSimpleSpecifyOutputDirectory/amd/outdir/simple/test.js +++ b/tests/baselines/reference/project/sourceRootAbsolutePathSimpleSpecifyOutputDirectory/amd/outdir/simple/test.js @@ -4,7 +4,7 @@ var c1 = (function () { function c1() { } return c1; -})(); +}()); var instance1 = new c1(); function f1() { return instance1; diff --git a/tests/baselines/reference/project/sourceRootAbsolutePathSimpleSpecifyOutputDirectory/node/outdir/simple/test.js b/tests/baselines/reference/project/sourceRootAbsolutePathSimpleSpecifyOutputDirectory/node/outdir/simple/test.js index 218d8fcf05d..679b65b5733 100644 --- a/tests/baselines/reference/project/sourceRootAbsolutePathSimpleSpecifyOutputDirectory/node/outdir/simple/test.js +++ b/tests/baselines/reference/project/sourceRootAbsolutePathSimpleSpecifyOutputDirectory/node/outdir/simple/test.js @@ -4,7 +4,7 @@ var c1 = (function () { function c1() { } return c1; -})(); +}()); var instance1 = new c1(); function f1() { return instance1; diff --git a/tests/baselines/reference/project/sourceRootAbsolutePathSubfolderNoOutdir/amd/test.js b/tests/baselines/reference/project/sourceRootAbsolutePathSubfolderNoOutdir/amd/test.js index bdb90297aea..408b7e46f61 100644 --- a/tests/baselines/reference/project/sourceRootAbsolutePathSubfolderNoOutdir/amd/test.js +++ b/tests/baselines/reference/project/sourceRootAbsolutePathSubfolderNoOutdir/amd/test.js @@ -4,7 +4,7 @@ var c1 = (function () { function c1() { } return c1; -})(); +}()); var instance1 = new c1(); function f1() { return instance1; diff --git a/tests/baselines/reference/project/sourceRootAbsolutePathSubfolderNoOutdir/node/test.js b/tests/baselines/reference/project/sourceRootAbsolutePathSubfolderNoOutdir/node/test.js index bdb90297aea..408b7e46f61 100644 --- a/tests/baselines/reference/project/sourceRootAbsolutePathSubfolderNoOutdir/node/test.js +++ b/tests/baselines/reference/project/sourceRootAbsolutePathSubfolderNoOutdir/node/test.js @@ -4,7 +4,7 @@ var c1 = (function () { function c1() { } return c1; -})(); +}()); var instance1 = new c1(); function f1() { return instance1; diff --git a/tests/baselines/reference/project/sourceRootAbsolutePathSubfolderSpecifyOutputDirectory/amd/outdir/simple/test.js b/tests/baselines/reference/project/sourceRootAbsolutePathSubfolderSpecifyOutputDirectory/amd/outdir/simple/test.js index bdb90297aea..408b7e46f61 100644 --- a/tests/baselines/reference/project/sourceRootAbsolutePathSubfolderSpecifyOutputDirectory/amd/outdir/simple/test.js +++ b/tests/baselines/reference/project/sourceRootAbsolutePathSubfolderSpecifyOutputDirectory/amd/outdir/simple/test.js @@ -4,7 +4,7 @@ var c1 = (function () { function c1() { } return c1; -})(); +}()); var instance1 = new c1(); function f1() { return instance1; diff --git a/tests/baselines/reference/project/sourceRootAbsolutePathSubfolderSpecifyOutputDirectory/node/outdir/simple/test.js b/tests/baselines/reference/project/sourceRootAbsolutePathSubfolderSpecifyOutputDirectory/node/outdir/simple/test.js index bdb90297aea..408b7e46f61 100644 --- a/tests/baselines/reference/project/sourceRootAbsolutePathSubfolderSpecifyOutputDirectory/node/outdir/simple/test.js +++ b/tests/baselines/reference/project/sourceRootAbsolutePathSubfolderSpecifyOutputDirectory/node/outdir/simple/test.js @@ -4,7 +4,7 @@ var c1 = (function () { function c1() { } return c1; -})(); +}()); var instance1 = new c1(); function f1() { return instance1; diff --git a/tests/baselines/reference/project/sourceRootRelativePathMixedSubfolderNoOutdir/amd/ref/m2.js b/tests/baselines/reference/project/sourceRootRelativePathMixedSubfolderNoOutdir/amd/ref/m2.js index dd1c532b6df..41f4a4e2521 100644 --- a/tests/baselines/reference/project/sourceRootRelativePathMixedSubfolderNoOutdir/amd/ref/m2.js +++ b/tests/baselines/reference/project/sourceRootRelativePathMixedSubfolderNoOutdir/amd/ref/m2.js @@ -5,7 +5,7 @@ define(["require", "exports"], function (require, exports) { function m2_c1() { } return m2_c1; - })(); + }()); exports.m2_c1 = m2_c1; exports.m2_instance1 = new m2_c1(); function m2_f1() { diff --git a/tests/baselines/reference/project/sourceRootRelativePathMixedSubfolderNoOutdir/amd/test.js b/tests/baselines/reference/project/sourceRootRelativePathMixedSubfolderNoOutdir/amd/test.js index 8b8abfc1aed..78426750a82 100644 --- a/tests/baselines/reference/project/sourceRootRelativePathMixedSubfolderNoOutdir/amd/test.js +++ b/tests/baselines/reference/project/sourceRootRelativePathMixedSubfolderNoOutdir/amd/test.js @@ -5,7 +5,7 @@ var c1 = (function () { function c1() { } return c1; -})(); +}()); var instance1 = new c1(); function f1() { return instance1; diff --git a/tests/baselines/reference/project/sourceRootRelativePathMixedSubfolderNoOutdir/node/ref/m2.js b/tests/baselines/reference/project/sourceRootRelativePathMixedSubfolderNoOutdir/node/ref/m2.js index 1646fd608ea..eae1115846a 100644 --- a/tests/baselines/reference/project/sourceRootRelativePathMixedSubfolderNoOutdir/node/ref/m2.js +++ b/tests/baselines/reference/project/sourceRootRelativePathMixedSubfolderNoOutdir/node/ref/m2.js @@ -4,7 +4,7 @@ var m2_c1 = (function () { function m2_c1() { } return m2_c1; -})(); +}()); exports.m2_c1 = m2_c1; exports.m2_instance1 = new m2_c1(); function m2_f1() { diff --git a/tests/baselines/reference/project/sourceRootRelativePathMixedSubfolderNoOutdir/node/test.js b/tests/baselines/reference/project/sourceRootRelativePathMixedSubfolderNoOutdir/node/test.js index 8b8abfc1aed..78426750a82 100644 --- a/tests/baselines/reference/project/sourceRootRelativePathMixedSubfolderNoOutdir/node/test.js +++ b/tests/baselines/reference/project/sourceRootRelativePathMixedSubfolderNoOutdir/node/test.js @@ -5,7 +5,7 @@ var c1 = (function () { function c1() { } return c1; -})(); +}()); var instance1 = new c1(); function f1() { return instance1; diff --git a/tests/baselines/reference/project/sourceRootRelativePathMixedSubfolderSpecifyOutputDirectory/amd/outdir/simple/ref/m2.js b/tests/baselines/reference/project/sourceRootRelativePathMixedSubfolderSpecifyOutputDirectory/amd/outdir/simple/ref/m2.js index dd1c532b6df..41f4a4e2521 100644 --- a/tests/baselines/reference/project/sourceRootRelativePathMixedSubfolderSpecifyOutputDirectory/amd/outdir/simple/ref/m2.js +++ b/tests/baselines/reference/project/sourceRootRelativePathMixedSubfolderSpecifyOutputDirectory/amd/outdir/simple/ref/m2.js @@ -5,7 +5,7 @@ define(["require", "exports"], function (require, exports) { function m2_c1() { } return m2_c1; - })(); + }()); exports.m2_c1 = m2_c1; exports.m2_instance1 = new m2_c1(); function m2_f1() { diff --git a/tests/baselines/reference/project/sourceRootRelativePathMixedSubfolderSpecifyOutputDirectory/amd/outdir/simple/test.js b/tests/baselines/reference/project/sourceRootRelativePathMixedSubfolderSpecifyOutputDirectory/amd/outdir/simple/test.js index 8b8abfc1aed..78426750a82 100644 --- a/tests/baselines/reference/project/sourceRootRelativePathMixedSubfolderSpecifyOutputDirectory/amd/outdir/simple/test.js +++ b/tests/baselines/reference/project/sourceRootRelativePathMixedSubfolderSpecifyOutputDirectory/amd/outdir/simple/test.js @@ -5,7 +5,7 @@ var c1 = (function () { function c1() { } return c1; -})(); +}()); var instance1 = new c1(); function f1() { return instance1; diff --git a/tests/baselines/reference/project/sourceRootRelativePathMixedSubfolderSpecifyOutputDirectory/node/outdir/simple/ref/m2.js b/tests/baselines/reference/project/sourceRootRelativePathMixedSubfolderSpecifyOutputDirectory/node/outdir/simple/ref/m2.js index 1646fd608ea..eae1115846a 100644 --- a/tests/baselines/reference/project/sourceRootRelativePathMixedSubfolderSpecifyOutputDirectory/node/outdir/simple/ref/m2.js +++ b/tests/baselines/reference/project/sourceRootRelativePathMixedSubfolderSpecifyOutputDirectory/node/outdir/simple/ref/m2.js @@ -4,7 +4,7 @@ var m2_c1 = (function () { function m2_c1() { } return m2_c1; -})(); +}()); exports.m2_c1 = m2_c1; exports.m2_instance1 = new m2_c1(); function m2_f1() { diff --git a/tests/baselines/reference/project/sourceRootRelativePathMixedSubfolderSpecifyOutputDirectory/node/outdir/simple/test.js b/tests/baselines/reference/project/sourceRootRelativePathMixedSubfolderSpecifyOutputDirectory/node/outdir/simple/test.js index 8b8abfc1aed..78426750a82 100644 --- a/tests/baselines/reference/project/sourceRootRelativePathMixedSubfolderSpecifyOutputDirectory/node/outdir/simple/test.js +++ b/tests/baselines/reference/project/sourceRootRelativePathMixedSubfolderSpecifyOutputDirectory/node/outdir/simple/test.js @@ -5,7 +5,7 @@ var c1 = (function () { function c1() { } return c1; -})(); +}()); var instance1 = new c1(); function f1() { return instance1; diff --git a/tests/baselines/reference/project/sourceRootRelativePathModuleMultifolderNoOutdir/amd/diskFile1.js b/tests/baselines/reference/project/sourceRootRelativePathModuleMultifolderNoOutdir/amd/diskFile1.js index dd1c532b6df..41f4a4e2521 100644 --- a/tests/baselines/reference/project/sourceRootRelativePathModuleMultifolderNoOutdir/amd/diskFile1.js +++ b/tests/baselines/reference/project/sourceRootRelativePathModuleMultifolderNoOutdir/amd/diskFile1.js @@ -5,7 +5,7 @@ define(["require", "exports"], function (require, exports) { function m2_c1() { } return m2_c1; - })(); + }()); exports.m2_c1 = m2_c1; exports.m2_instance1 = new m2_c1(); function m2_f1() { diff --git a/tests/baselines/reference/project/sourceRootRelativePathModuleMultifolderNoOutdir/amd/test.js b/tests/baselines/reference/project/sourceRootRelativePathModuleMultifolderNoOutdir/amd/test.js index bf3f6e48267..efa0bc948ed 100644 --- a/tests/baselines/reference/project/sourceRootRelativePathModuleMultifolderNoOutdir/amd/test.js +++ b/tests/baselines/reference/project/sourceRootRelativePathModuleMultifolderNoOutdir/amd/test.js @@ -5,7 +5,7 @@ define(["require", "exports", "ref/m1", "../outputdir_module_multifolder_ref/m2" function c1() { } return c1; - })(); + }()); exports.c1 = c1; exports.instance1 = new c1(); function f1() { diff --git a/tests/baselines/reference/project/sourceRootRelativePathModuleMultifolderNoOutdir/node/diskFile1.js b/tests/baselines/reference/project/sourceRootRelativePathModuleMultifolderNoOutdir/node/diskFile1.js index 1646fd608ea..eae1115846a 100644 --- a/tests/baselines/reference/project/sourceRootRelativePathModuleMultifolderNoOutdir/node/diskFile1.js +++ b/tests/baselines/reference/project/sourceRootRelativePathModuleMultifolderNoOutdir/node/diskFile1.js @@ -4,7 +4,7 @@ var m2_c1 = (function () { function m2_c1() { } return m2_c1; -})(); +}()); exports.m2_c1 = m2_c1; exports.m2_instance1 = new m2_c1(); function m2_f1() { diff --git a/tests/baselines/reference/project/sourceRootRelativePathModuleMultifolderNoOutdir/node/test.js b/tests/baselines/reference/project/sourceRootRelativePathModuleMultifolderNoOutdir/node/test.js index 67406a9e410..84731dff566 100644 --- a/tests/baselines/reference/project/sourceRootRelativePathModuleMultifolderNoOutdir/node/test.js +++ b/tests/baselines/reference/project/sourceRootRelativePathModuleMultifolderNoOutdir/node/test.js @@ -6,7 +6,7 @@ var c1 = (function () { function c1() { } return c1; -})(); +}()); exports.c1 = c1; exports.instance1 = new c1(); function f1() { diff --git a/tests/baselines/reference/project/sourceRootRelativePathModuleMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_module_multifolder/test.js b/tests/baselines/reference/project/sourceRootRelativePathModuleMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_module_multifolder/test.js index bf3f6e48267..efa0bc948ed 100644 --- a/tests/baselines/reference/project/sourceRootRelativePathModuleMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_module_multifolder/test.js +++ b/tests/baselines/reference/project/sourceRootRelativePathModuleMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_module_multifolder/test.js @@ -5,7 +5,7 @@ define(["require", "exports", "ref/m1", "../outputdir_module_multifolder_ref/m2" function c1() { } return c1; - })(); + }()); exports.c1 = c1; exports.instance1 = new c1(); function f1() { diff --git a/tests/baselines/reference/project/sourceRootRelativePathModuleMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_module_multifolder_ref/m2.js b/tests/baselines/reference/project/sourceRootRelativePathModuleMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_module_multifolder_ref/m2.js index dd1c532b6df..41f4a4e2521 100644 --- a/tests/baselines/reference/project/sourceRootRelativePathModuleMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_module_multifolder_ref/m2.js +++ b/tests/baselines/reference/project/sourceRootRelativePathModuleMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_module_multifolder_ref/m2.js @@ -5,7 +5,7 @@ define(["require", "exports"], function (require, exports) { function m2_c1() { } return m2_c1; - })(); + }()); exports.m2_c1 = m2_c1; exports.m2_instance1 = new m2_c1(); function m2_f1() { diff --git a/tests/baselines/reference/project/sourceRootRelativePathModuleMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_module_multifolder/test.js b/tests/baselines/reference/project/sourceRootRelativePathModuleMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_module_multifolder/test.js index 67406a9e410..84731dff566 100644 --- a/tests/baselines/reference/project/sourceRootRelativePathModuleMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_module_multifolder/test.js +++ b/tests/baselines/reference/project/sourceRootRelativePathModuleMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_module_multifolder/test.js @@ -6,7 +6,7 @@ var c1 = (function () { function c1() { } return c1; -})(); +}()); exports.c1 = c1; exports.instance1 = new c1(); function f1() { diff --git a/tests/baselines/reference/project/sourceRootRelativePathModuleMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_module_multifolder_ref/m2.js b/tests/baselines/reference/project/sourceRootRelativePathModuleMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_module_multifolder_ref/m2.js index 1646fd608ea..eae1115846a 100644 --- a/tests/baselines/reference/project/sourceRootRelativePathModuleMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_module_multifolder_ref/m2.js +++ b/tests/baselines/reference/project/sourceRootRelativePathModuleMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_module_multifolder_ref/m2.js @@ -4,7 +4,7 @@ var m2_c1 = (function () { function m2_c1() { } return m2_c1; -})(); +}()); exports.m2_c1 = m2_c1; exports.m2_instance1 = new m2_c1(); function m2_f1() { diff --git a/tests/baselines/reference/project/sourceRootRelativePathModuleSimpleNoOutdir/amd/test.js b/tests/baselines/reference/project/sourceRootRelativePathModuleSimpleNoOutdir/amd/test.js index 4e5ad232cc3..c4b7f56d76a 100644 --- a/tests/baselines/reference/project/sourceRootRelativePathModuleSimpleNoOutdir/amd/test.js +++ b/tests/baselines/reference/project/sourceRootRelativePathModuleSimpleNoOutdir/amd/test.js @@ -5,7 +5,7 @@ define(["require", "exports", "m1"], function (require, exports, m1) { function c1() { } return c1; - })(); + }()); exports.c1 = c1; exports.instance1 = new c1(); function f1() { diff --git a/tests/baselines/reference/project/sourceRootRelativePathModuleSimpleNoOutdir/node/test.js b/tests/baselines/reference/project/sourceRootRelativePathModuleSimpleNoOutdir/node/test.js index bbc39c25431..fea4b619aa2 100644 --- a/tests/baselines/reference/project/sourceRootRelativePathModuleSimpleNoOutdir/node/test.js +++ b/tests/baselines/reference/project/sourceRootRelativePathModuleSimpleNoOutdir/node/test.js @@ -5,7 +5,7 @@ var c1 = (function () { function c1() { } return c1; -})(); +}()); exports.c1 = c1; exports.instance1 = new c1(); function f1() { diff --git a/tests/baselines/reference/project/sourceRootRelativePathModuleSimpleSpecifyOutputDirectory/amd/outdir/simple/test.js b/tests/baselines/reference/project/sourceRootRelativePathModuleSimpleSpecifyOutputDirectory/amd/outdir/simple/test.js index 4e5ad232cc3..c4b7f56d76a 100644 --- a/tests/baselines/reference/project/sourceRootRelativePathModuleSimpleSpecifyOutputDirectory/amd/outdir/simple/test.js +++ b/tests/baselines/reference/project/sourceRootRelativePathModuleSimpleSpecifyOutputDirectory/amd/outdir/simple/test.js @@ -5,7 +5,7 @@ define(["require", "exports", "m1"], function (require, exports, m1) { function c1() { } return c1; - })(); + }()); exports.c1 = c1; exports.instance1 = new c1(); function f1() { diff --git a/tests/baselines/reference/project/sourceRootRelativePathModuleSimpleSpecifyOutputDirectory/node/outdir/simple/test.js b/tests/baselines/reference/project/sourceRootRelativePathModuleSimpleSpecifyOutputDirectory/node/outdir/simple/test.js index bbc39c25431..fea4b619aa2 100644 --- a/tests/baselines/reference/project/sourceRootRelativePathModuleSimpleSpecifyOutputDirectory/node/outdir/simple/test.js +++ b/tests/baselines/reference/project/sourceRootRelativePathModuleSimpleSpecifyOutputDirectory/node/outdir/simple/test.js @@ -5,7 +5,7 @@ var c1 = (function () { function c1() { } return c1; -})(); +}()); exports.c1 = c1; exports.instance1 = new c1(); function f1() { diff --git a/tests/baselines/reference/project/sourceRootRelativePathModuleSubfolderNoOutdir/amd/test.js b/tests/baselines/reference/project/sourceRootRelativePathModuleSubfolderNoOutdir/amd/test.js index 081c888ee02..0ad51aeb02e 100644 --- a/tests/baselines/reference/project/sourceRootRelativePathModuleSubfolderNoOutdir/amd/test.js +++ b/tests/baselines/reference/project/sourceRootRelativePathModuleSubfolderNoOutdir/amd/test.js @@ -5,7 +5,7 @@ define(["require", "exports", "ref/m1"], function (require, exports, m1) { function c1() { } return c1; - })(); + }()); exports.c1 = c1; exports.instance1 = new c1(); function f1() { diff --git a/tests/baselines/reference/project/sourceRootRelativePathModuleSubfolderNoOutdir/node/test.js b/tests/baselines/reference/project/sourceRootRelativePathModuleSubfolderNoOutdir/node/test.js index bdc33590853..ebd5fdb3b3f 100644 --- a/tests/baselines/reference/project/sourceRootRelativePathModuleSubfolderNoOutdir/node/test.js +++ b/tests/baselines/reference/project/sourceRootRelativePathModuleSubfolderNoOutdir/node/test.js @@ -5,7 +5,7 @@ var c1 = (function () { function c1() { } return c1; -})(); +}()); exports.c1 = c1; exports.instance1 = new c1(); function f1() { diff --git a/tests/baselines/reference/project/sourceRootRelativePathModuleSubfolderSpecifyOutputDirectory/amd/outdir/simple/test.js b/tests/baselines/reference/project/sourceRootRelativePathModuleSubfolderSpecifyOutputDirectory/amd/outdir/simple/test.js index 081c888ee02..0ad51aeb02e 100644 --- a/tests/baselines/reference/project/sourceRootRelativePathModuleSubfolderSpecifyOutputDirectory/amd/outdir/simple/test.js +++ b/tests/baselines/reference/project/sourceRootRelativePathModuleSubfolderSpecifyOutputDirectory/amd/outdir/simple/test.js @@ -5,7 +5,7 @@ define(["require", "exports", "ref/m1"], function (require, exports, m1) { function c1() { } return c1; - })(); + }()); exports.c1 = c1; exports.instance1 = new c1(); function f1() { diff --git a/tests/baselines/reference/project/sourceRootRelativePathModuleSubfolderSpecifyOutputDirectory/node/outdir/simple/test.js b/tests/baselines/reference/project/sourceRootRelativePathModuleSubfolderSpecifyOutputDirectory/node/outdir/simple/test.js index bdc33590853..ebd5fdb3b3f 100644 --- a/tests/baselines/reference/project/sourceRootRelativePathModuleSubfolderSpecifyOutputDirectory/node/outdir/simple/test.js +++ b/tests/baselines/reference/project/sourceRootRelativePathModuleSubfolderSpecifyOutputDirectory/node/outdir/simple/test.js @@ -5,7 +5,7 @@ var c1 = (function () { function c1() { } return c1; -})(); +}()); exports.c1 = c1; exports.instance1 = new c1(); function f1() { diff --git a/tests/baselines/reference/project/sourceRootRelativePathMultifolderNoOutdir/amd/diskFile1.js b/tests/baselines/reference/project/sourceRootRelativePathMultifolderNoOutdir/amd/diskFile1.js index 9f44db1fad5..a1041b6d258 100644 --- a/tests/baselines/reference/project/sourceRootRelativePathMultifolderNoOutdir/amd/diskFile1.js +++ b/tests/baselines/reference/project/sourceRootRelativePathMultifolderNoOutdir/amd/diskFile1.js @@ -3,7 +3,7 @@ var m2_c1 = (function () { function m2_c1() { } return m2_c1; -})(); +}()); var m2_instance1 = new m2_c1(); function m2_f1() { return m2_instance1; diff --git a/tests/baselines/reference/project/sourceRootRelativePathMultifolderNoOutdir/amd/test.js b/tests/baselines/reference/project/sourceRootRelativePathMultifolderNoOutdir/amd/test.js index 87d3f006993..088a77f3f25 100644 --- a/tests/baselines/reference/project/sourceRootRelativePathMultifolderNoOutdir/amd/test.js +++ b/tests/baselines/reference/project/sourceRootRelativePathMultifolderNoOutdir/amd/test.js @@ -5,7 +5,7 @@ var c1 = (function () { function c1() { } return c1; -})(); +}()); var instance1 = new c1(); function f1() { return instance1; diff --git a/tests/baselines/reference/project/sourceRootRelativePathMultifolderNoOutdir/node/diskFile1.js b/tests/baselines/reference/project/sourceRootRelativePathMultifolderNoOutdir/node/diskFile1.js index 9f44db1fad5..a1041b6d258 100644 --- a/tests/baselines/reference/project/sourceRootRelativePathMultifolderNoOutdir/node/diskFile1.js +++ b/tests/baselines/reference/project/sourceRootRelativePathMultifolderNoOutdir/node/diskFile1.js @@ -3,7 +3,7 @@ var m2_c1 = (function () { function m2_c1() { } return m2_c1; -})(); +}()); var m2_instance1 = new m2_c1(); function m2_f1() { return m2_instance1; diff --git a/tests/baselines/reference/project/sourceRootRelativePathMultifolderNoOutdir/node/test.js b/tests/baselines/reference/project/sourceRootRelativePathMultifolderNoOutdir/node/test.js index 87d3f006993..088a77f3f25 100644 --- a/tests/baselines/reference/project/sourceRootRelativePathMultifolderNoOutdir/node/test.js +++ b/tests/baselines/reference/project/sourceRootRelativePathMultifolderNoOutdir/node/test.js @@ -5,7 +5,7 @@ var c1 = (function () { function c1() { } return c1; -})(); +}()); var instance1 = new c1(); function f1() { return instance1; diff --git a/tests/baselines/reference/project/sourceRootRelativePathMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_multifolder/test.js b/tests/baselines/reference/project/sourceRootRelativePathMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_multifolder/test.js index 87d3f006993..088a77f3f25 100644 --- a/tests/baselines/reference/project/sourceRootRelativePathMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_multifolder/test.js +++ b/tests/baselines/reference/project/sourceRootRelativePathMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_multifolder/test.js @@ -5,7 +5,7 @@ var c1 = (function () { function c1() { } return c1; -})(); +}()); var instance1 = new c1(); function f1() { return instance1; diff --git a/tests/baselines/reference/project/sourceRootRelativePathMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_multifolder_ref/m2.js b/tests/baselines/reference/project/sourceRootRelativePathMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_multifolder_ref/m2.js index 9f44db1fad5..a1041b6d258 100644 --- a/tests/baselines/reference/project/sourceRootRelativePathMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_multifolder_ref/m2.js +++ b/tests/baselines/reference/project/sourceRootRelativePathMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_multifolder_ref/m2.js @@ -3,7 +3,7 @@ var m2_c1 = (function () { function m2_c1() { } return m2_c1; -})(); +}()); var m2_instance1 = new m2_c1(); function m2_f1() { return m2_instance1; diff --git a/tests/baselines/reference/project/sourceRootRelativePathMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_multifolder/test.js b/tests/baselines/reference/project/sourceRootRelativePathMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_multifolder/test.js index 87d3f006993..088a77f3f25 100644 --- a/tests/baselines/reference/project/sourceRootRelativePathMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_multifolder/test.js +++ b/tests/baselines/reference/project/sourceRootRelativePathMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_multifolder/test.js @@ -5,7 +5,7 @@ var c1 = (function () { function c1() { } return c1; -})(); +}()); var instance1 = new c1(); function f1() { return instance1; diff --git a/tests/baselines/reference/project/sourceRootRelativePathMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_multifolder_ref/m2.js b/tests/baselines/reference/project/sourceRootRelativePathMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_multifolder_ref/m2.js index 9f44db1fad5..a1041b6d258 100644 --- a/tests/baselines/reference/project/sourceRootRelativePathMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_multifolder_ref/m2.js +++ b/tests/baselines/reference/project/sourceRootRelativePathMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_multifolder_ref/m2.js @@ -3,7 +3,7 @@ var m2_c1 = (function () { function m2_c1() { } return m2_c1; -})(); +}()); var m2_instance1 = new m2_c1(); function m2_f1() { return m2_instance1; diff --git a/tests/baselines/reference/project/sourceRootRelativePathSimpleNoOutdir/amd/test.js b/tests/baselines/reference/project/sourceRootRelativePathSimpleNoOutdir/amd/test.js index 218d8fcf05d..679b65b5733 100644 --- a/tests/baselines/reference/project/sourceRootRelativePathSimpleNoOutdir/amd/test.js +++ b/tests/baselines/reference/project/sourceRootRelativePathSimpleNoOutdir/amd/test.js @@ -4,7 +4,7 @@ var c1 = (function () { function c1() { } return c1; -})(); +}()); var instance1 = new c1(); function f1() { return instance1; diff --git a/tests/baselines/reference/project/sourceRootRelativePathSimpleNoOutdir/node/test.js b/tests/baselines/reference/project/sourceRootRelativePathSimpleNoOutdir/node/test.js index 218d8fcf05d..679b65b5733 100644 --- a/tests/baselines/reference/project/sourceRootRelativePathSimpleNoOutdir/node/test.js +++ b/tests/baselines/reference/project/sourceRootRelativePathSimpleNoOutdir/node/test.js @@ -4,7 +4,7 @@ var c1 = (function () { function c1() { } return c1; -})(); +}()); var instance1 = new c1(); function f1() { return instance1; diff --git a/tests/baselines/reference/project/sourceRootRelativePathSimpleSpecifyOutputDirectory/amd/outdir/simple/test.js b/tests/baselines/reference/project/sourceRootRelativePathSimpleSpecifyOutputDirectory/amd/outdir/simple/test.js index 218d8fcf05d..679b65b5733 100644 --- a/tests/baselines/reference/project/sourceRootRelativePathSimpleSpecifyOutputDirectory/amd/outdir/simple/test.js +++ b/tests/baselines/reference/project/sourceRootRelativePathSimpleSpecifyOutputDirectory/amd/outdir/simple/test.js @@ -4,7 +4,7 @@ var c1 = (function () { function c1() { } return c1; -})(); +}()); var instance1 = new c1(); function f1() { return instance1; diff --git a/tests/baselines/reference/project/sourceRootRelativePathSimpleSpecifyOutputDirectory/node/outdir/simple/test.js b/tests/baselines/reference/project/sourceRootRelativePathSimpleSpecifyOutputDirectory/node/outdir/simple/test.js index 218d8fcf05d..679b65b5733 100644 --- a/tests/baselines/reference/project/sourceRootRelativePathSimpleSpecifyOutputDirectory/node/outdir/simple/test.js +++ b/tests/baselines/reference/project/sourceRootRelativePathSimpleSpecifyOutputDirectory/node/outdir/simple/test.js @@ -4,7 +4,7 @@ var c1 = (function () { function c1() { } return c1; -})(); +}()); var instance1 = new c1(); function f1() { return instance1; diff --git a/tests/baselines/reference/project/sourceRootRelativePathSubfolderNoOutdir/amd/test.js b/tests/baselines/reference/project/sourceRootRelativePathSubfolderNoOutdir/amd/test.js index bdb90297aea..408b7e46f61 100644 --- a/tests/baselines/reference/project/sourceRootRelativePathSubfolderNoOutdir/amd/test.js +++ b/tests/baselines/reference/project/sourceRootRelativePathSubfolderNoOutdir/amd/test.js @@ -4,7 +4,7 @@ var c1 = (function () { function c1() { } return c1; -})(); +}()); var instance1 = new c1(); function f1() { return instance1; diff --git a/tests/baselines/reference/project/sourceRootRelativePathSubfolderNoOutdir/node/test.js b/tests/baselines/reference/project/sourceRootRelativePathSubfolderNoOutdir/node/test.js index bdb90297aea..408b7e46f61 100644 --- a/tests/baselines/reference/project/sourceRootRelativePathSubfolderNoOutdir/node/test.js +++ b/tests/baselines/reference/project/sourceRootRelativePathSubfolderNoOutdir/node/test.js @@ -4,7 +4,7 @@ var c1 = (function () { function c1() { } return c1; -})(); +}()); var instance1 = new c1(); function f1() { return instance1; diff --git a/tests/baselines/reference/project/sourceRootRelativePathSubfolderSpecifyOutputDirectory/amd/outdir/simple/test.js b/tests/baselines/reference/project/sourceRootRelativePathSubfolderSpecifyOutputDirectory/amd/outdir/simple/test.js index bdb90297aea..408b7e46f61 100644 --- a/tests/baselines/reference/project/sourceRootRelativePathSubfolderSpecifyOutputDirectory/amd/outdir/simple/test.js +++ b/tests/baselines/reference/project/sourceRootRelativePathSubfolderSpecifyOutputDirectory/amd/outdir/simple/test.js @@ -4,7 +4,7 @@ var c1 = (function () { function c1() { } return c1; -})(); +}()); var instance1 = new c1(); function f1() { return instance1; diff --git a/tests/baselines/reference/project/sourceRootRelativePathSubfolderSpecifyOutputDirectory/node/outdir/simple/test.js b/tests/baselines/reference/project/sourceRootRelativePathSubfolderSpecifyOutputDirectory/node/outdir/simple/test.js index bdb90297aea..408b7e46f61 100644 --- a/tests/baselines/reference/project/sourceRootRelativePathSubfolderSpecifyOutputDirectory/node/outdir/simple/test.js +++ b/tests/baselines/reference/project/sourceRootRelativePathSubfolderSpecifyOutputDirectory/node/outdir/simple/test.js @@ -4,7 +4,7 @@ var c1 = (function () { function c1() { } return c1; -})(); +}()); var instance1 = new c1(); function f1() { return instance1; diff --git a/tests/baselines/reference/project/sourcemapMixedSubfolderNoOutdir/amd/ref/m2.js b/tests/baselines/reference/project/sourcemapMixedSubfolderNoOutdir/amd/ref/m2.js index dd1c532b6df..41f4a4e2521 100644 --- a/tests/baselines/reference/project/sourcemapMixedSubfolderNoOutdir/amd/ref/m2.js +++ b/tests/baselines/reference/project/sourcemapMixedSubfolderNoOutdir/amd/ref/m2.js @@ -5,7 +5,7 @@ define(["require", "exports"], function (require, exports) { function m2_c1() { } return m2_c1; - })(); + }()); exports.m2_c1 = m2_c1; exports.m2_instance1 = new m2_c1(); function m2_f1() { diff --git a/tests/baselines/reference/project/sourcemapMixedSubfolderNoOutdir/amd/test.js b/tests/baselines/reference/project/sourcemapMixedSubfolderNoOutdir/amd/test.js index 8b8abfc1aed..78426750a82 100644 --- a/tests/baselines/reference/project/sourcemapMixedSubfolderNoOutdir/amd/test.js +++ b/tests/baselines/reference/project/sourcemapMixedSubfolderNoOutdir/amd/test.js @@ -5,7 +5,7 @@ var c1 = (function () { function c1() { } return c1; -})(); +}()); var instance1 = new c1(); function f1() { return instance1; diff --git a/tests/baselines/reference/project/sourcemapMixedSubfolderNoOutdir/node/ref/m2.js b/tests/baselines/reference/project/sourcemapMixedSubfolderNoOutdir/node/ref/m2.js index 1646fd608ea..eae1115846a 100644 --- a/tests/baselines/reference/project/sourcemapMixedSubfolderNoOutdir/node/ref/m2.js +++ b/tests/baselines/reference/project/sourcemapMixedSubfolderNoOutdir/node/ref/m2.js @@ -4,7 +4,7 @@ var m2_c1 = (function () { function m2_c1() { } return m2_c1; -})(); +}()); exports.m2_c1 = m2_c1; exports.m2_instance1 = new m2_c1(); function m2_f1() { diff --git a/tests/baselines/reference/project/sourcemapMixedSubfolderNoOutdir/node/test.js b/tests/baselines/reference/project/sourcemapMixedSubfolderNoOutdir/node/test.js index 8b8abfc1aed..78426750a82 100644 --- a/tests/baselines/reference/project/sourcemapMixedSubfolderNoOutdir/node/test.js +++ b/tests/baselines/reference/project/sourcemapMixedSubfolderNoOutdir/node/test.js @@ -5,7 +5,7 @@ var c1 = (function () { function c1() { } return c1; -})(); +}()); var instance1 = new c1(); function f1() { return instance1; diff --git a/tests/baselines/reference/project/sourcemapMixedSubfolderSpecifyOutputDirectory/amd/outdir/simple/ref/m2.js b/tests/baselines/reference/project/sourcemapMixedSubfolderSpecifyOutputDirectory/amd/outdir/simple/ref/m2.js index dd1c532b6df..41f4a4e2521 100644 --- a/tests/baselines/reference/project/sourcemapMixedSubfolderSpecifyOutputDirectory/amd/outdir/simple/ref/m2.js +++ b/tests/baselines/reference/project/sourcemapMixedSubfolderSpecifyOutputDirectory/amd/outdir/simple/ref/m2.js @@ -5,7 +5,7 @@ define(["require", "exports"], function (require, exports) { function m2_c1() { } return m2_c1; - })(); + }()); exports.m2_c1 = m2_c1; exports.m2_instance1 = new m2_c1(); function m2_f1() { diff --git a/tests/baselines/reference/project/sourcemapMixedSubfolderSpecifyOutputDirectory/amd/outdir/simple/test.js b/tests/baselines/reference/project/sourcemapMixedSubfolderSpecifyOutputDirectory/amd/outdir/simple/test.js index 8b8abfc1aed..78426750a82 100644 --- a/tests/baselines/reference/project/sourcemapMixedSubfolderSpecifyOutputDirectory/amd/outdir/simple/test.js +++ b/tests/baselines/reference/project/sourcemapMixedSubfolderSpecifyOutputDirectory/amd/outdir/simple/test.js @@ -5,7 +5,7 @@ var c1 = (function () { function c1() { } return c1; -})(); +}()); var instance1 = new c1(); function f1() { return instance1; diff --git a/tests/baselines/reference/project/sourcemapMixedSubfolderSpecifyOutputDirectory/node/outdir/simple/ref/m2.js b/tests/baselines/reference/project/sourcemapMixedSubfolderSpecifyOutputDirectory/node/outdir/simple/ref/m2.js index 1646fd608ea..eae1115846a 100644 --- a/tests/baselines/reference/project/sourcemapMixedSubfolderSpecifyOutputDirectory/node/outdir/simple/ref/m2.js +++ b/tests/baselines/reference/project/sourcemapMixedSubfolderSpecifyOutputDirectory/node/outdir/simple/ref/m2.js @@ -4,7 +4,7 @@ var m2_c1 = (function () { function m2_c1() { } return m2_c1; -})(); +}()); exports.m2_c1 = m2_c1; exports.m2_instance1 = new m2_c1(); function m2_f1() { diff --git a/tests/baselines/reference/project/sourcemapMixedSubfolderSpecifyOutputDirectory/node/outdir/simple/test.js b/tests/baselines/reference/project/sourcemapMixedSubfolderSpecifyOutputDirectory/node/outdir/simple/test.js index 8b8abfc1aed..78426750a82 100644 --- a/tests/baselines/reference/project/sourcemapMixedSubfolderSpecifyOutputDirectory/node/outdir/simple/test.js +++ b/tests/baselines/reference/project/sourcemapMixedSubfolderSpecifyOutputDirectory/node/outdir/simple/test.js @@ -5,7 +5,7 @@ var c1 = (function () { function c1() { } return c1; -})(); +}()); var instance1 = new c1(); function f1() { return instance1; diff --git a/tests/baselines/reference/project/sourcemapModuleMultifolderNoOutdir/amd/diskFile1.js b/tests/baselines/reference/project/sourcemapModuleMultifolderNoOutdir/amd/diskFile1.js index dd1c532b6df..41f4a4e2521 100644 --- a/tests/baselines/reference/project/sourcemapModuleMultifolderNoOutdir/amd/diskFile1.js +++ b/tests/baselines/reference/project/sourcemapModuleMultifolderNoOutdir/amd/diskFile1.js @@ -5,7 +5,7 @@ define(["require", "exports"], function (require, exports) { function m2_c1() { } return m2_c1; - })(); + }()); exports.m2_c1 = m2_c1; exports.m2_instance1 = new m2_c1(); function m2_f1() { diff --git a/tests/baselines/reference/project/sourcemapModuleMultifolderNoOutdir/amd/test.js b/tests/baselines/reference/project/sourcemapModuleMultifolderNoOutdir/amd/test.js index bf3f6e48267..efa0bc948ed 100644 --- a/tests/baselines/reference/project/sourcemapModuleMultifolderNoOutdir/amd/test.js +++ b/tests/baselines/reference/project/sourcemapModuleMultifolderNoOutdir/amd/test.js @@ -5,7 +5,7 @@ define(["require", "exports", "ref/m1", "../outputdir_module_multifolder_ref/m2" function c1() { } return c1; - })(); + }()); exports.c1 = c1; exports.instance1 = new c1(); function f1() { diff --git a/tests/baselines/reference/project/sourcemapModuleMultifolderNoOutdir/node/diskFile1.js b/tests/baselines/reference/project/sourcemapModuleMultifolderNoOutdir/node/diskFile1.js index 1646fd608ea..eae1115846a 100644 --- a/tests/baselines/reference/project/sourcemapModuleMultifolderNoOutdir/node/diskFile1.js +++ b/tests/baselines/reference/project/sourcemapModuleMultifolderNoOutdir/node/diskFile1.js @@ -4,7 +4,7 @@ var m2_c1 = (function () { function m2_c1() { } return m2_c1; -})(); +}()); exports.m2_c1 = m2_c1; exports.m2_instance1 = new m2_c1(); function m2_f1() { diff --git a/tests/baselines/reference/project/sourcemapModuleMultifolderNoOutdir/node/test.js b/tests/baselines/reference/project/sourcemapModuleMultifolderNoOutdir/node/test.js index 67406a9e410..84731dff566 100644 --- a/tests/baselines/reference/project/sourcemapModuleMultifolderNoOutdir/node/test.js +++ b/tests/baselines/reference/project/sourcemapModuleMultifolderNoOutdir/node/test.js @@ -6,7 +6,7 @@ var c1 = (function () { function c1() { } return c1; -})(); +}()); exports.c1 = c1; exports.instance1 = new c1(); function f1() { diff --git a/tests/baselines/reference/project/sourcemapModuleMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_module_multifolder/test.js b/tests/baselines/reference/project/sourcemapModuleMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_module_multifolder/test.js index bf3f6e48267..efa0bc948ed 100644 --- a/tests/baselines/reference/project/sourcemapModuleMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_module_multifolder/test.js +++ b/tests/baselines/reference/project/sourcemapModuleMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_module_multifolder/test.js @@ -5,7 +5,7 @@ define(["require", "exports", "ref/m1", "../outputdir_module_multifolder_ref/m2" function c1() { } return c1; - })(); + }()); exports.c1 = c1; exports.instance1 = new c1(); function f1() { diff --git a/tests/baselines/reference/project/sourcemapModuleMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_module_multifolder_ref/m2.js b/tests/baselines/reference/project/sourcemapModuleMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_module_multifolder_ref/m2.js index dd1c532b6df..41f4a4e2521 100644 --- a/tests/baselines/reference/project/sourcemapModuleMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_module_multifolder_ref/m2.js +++ b/tests/baselines/reference/project/sourcemapModuleMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_module_multifolder_ref/m2.js @@ -5,7 +5,7 @@ define(["require", "exports"], function (require, exports) { function m2_c1() { } return m2_c1; - })(); + }()); exports.m2_c1 = m2_c1; exports.m2_instance1 = new m2_c1(); function m2_f1() { diff --git a/tests/baselines/reference/project/sourcemapModuleMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_module_multifolder/test.js b/tests/baselines/reference/project/sourcemapModuleMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_module_multifolder/test.js index 67406a9e410..84731dff566 100644 --- a/tests/baselines/reference/project/sourcemapModuleMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_module_multifolder/test.js +++ b/tests/baselines/reference/project/sourcemapModuleMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_module_multifolder/test.js @@ -6,7 +6,7 @@ var c1 = (function () { function c1() { } return c1; -})(); +}()); exports.c1 = c1; exports.instance1 = new c1(); function f1() { diff --git a/tests/baselines/reference/project/sourcemapModuleMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_module_multifolder_ref/m2.js b/tests/baselines/reference/project/sourcemapModuleMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_module_multifolder_ref/m2.js index 1646fd608ea..eae1115846a 100644 --- a/tests/baselines/reference/project/sourcemapModuleMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_module_multifolder_ref/m2.js +++ b/tests/baselines/reference/project/sourcemapModuleMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_module_multifolder_ref/m2.js @@ -4,7 +4,7 @@ var m2_c1 = (function () { function m2_c1() { } return m2_c1; -})(); +}()); exports.m2_c1 = m2_c1; exports.m2_instance1 = new m2_c1(); function m2_f1() { diff --git a/tests/baselines/reference/project/sourcemapModuleSimpleNoOutdir/amd/test.js b/tests/baselines/reference/project/sourcemapModuleSimpleNoOutdir/amd/test.js index 4e5ad232cc3..c4b7f56d76a 100644 --- a/tests/baselines/reference/project/sourcemapModuleSimpleNoOutdir/amd/test.js +++ b/tests/baselines/reference/project/sourcemapModuleSimpleNoOutdir/amd/test.js @@ -5,7 +5,7 @@ define(["require", "exports", "m1"], function (require, exports, m1) { function c1() { } return c1; - })(); + }()); exports.c1 = c1; exports.instance1 = new c1(); function f1() { diff --git a/tests/baselines/reference/project/sourcemapModuleSimpleNoOutdir/node/test.js b/tests/baselines/reference/project/sourcemapModuleSimpleNoOutdir/node/test.js index bbc39c25431..fea4b619aa2 100644 --- a/tests/baselines/reference/project/sourcemapModuleSimpleNoOutdir/node/test.js +++ b/tests/baselines/reference/project/sourcemapModuleSimpleNoOutdir/node/test.js @@ -5,7 +5,7 @@ var c1 = (function () { function c1() { } return c1; -})(); +}()); exports.c1 = c1; exports.instance1 = new c1(); function f1() { diff --git a/tests/baselines/reference/project/sourcemapModuleSimpleSpecifyOutputDirectory/amd/outdir/simple/test.js b/tests/baselines/reference/project/sourcemapModuleSimpleSpecifyOutputDirectory/amd/outdir/simple/test.js index 4e5ad232cc3..c4b7f56d76a 100644 --- a/tests/baselines/reference/project/sourcemapModuleSimpleSpecifyOutputDirectory/amd/outdir/simple/test.js +++ b/tests/baselines/reference/project/sourcemapModuleSimpleSpecifyOutputDirectory/amd/outdir/simple/test.js @@ -5,7 +5,7 @@ define(["require", "exports", "m1"], function (require, exports, m1) { function c1() { } return c1; - })(); + }()); exports.c1 = c1; exports.instance1 = new c1(); function f1() { diff --git a/tests/baselines/reference/project/sourcemapModuleSimpleSpecifyOutputDirectory/node/outdir/simple/test.js b/tests/baselines/reference/project/sourcemapModuleSimpleSpecifyOutputDirectory/node/outdir/simple/test.js index bbc39c25431..fea4b619aa2 100644 --- a/tests/baselines/reference/project/sourcemapModuleSimpleSpecifyOutputDirectory/node/outdir/simple/test.js +++ b/tests/baselines/reference/project/sourcemapModuleSimpleSpecifyOutputDirectory/node/outdir/simple/test.js @@ -5,7 +5,7 @@ var c1 = (function () { function c1() { } return c1; -})(); +}()); exports.c1 = c1; exports.instance1 = new c1(); function f1() { diff --git a/tests/baselines/reference/project/sourcemapModuleSubfolderNoOutdir/amd/test.js b/tests/baselines/reference/project/sourcemapModuleSubfolderNoOutdir/amd/test.js index 081c888ee02..0ad51aeb02e 100644 --- a/tests/baselines/reference/project/sourcemapModuleSubfolderNoOutdir/amd/test.js +++ b/tests/baselines/reference/project/sourcemapModuleSubfolderNoOutdir/amd/test.js @@ -5,7 +5,7 @@ define(["require", "exports", "ref/m1"], function (require, exports, m1) { function c1() { } return c1; - })(); + }()); exports.c1 = c1; exports.instance1 = new c1(); function f1() { diff --git a/tests/baselines/reference/project/sourcemapModuleSubfolderNoOutdir/node/test.js b/tests/baselines/reference/project/sourcemapModuleSubfolderNoOutdir/node/test.js index bdc33590853..ebd5fdb3b3f 100644 --- a/tests/baselines/reference/project/sourcemapModuleSubfolderNoOutdir/node/test.js +++ b/tests/baselines/reference/project/sourcemapModuleSubfolderNoOutdir/node/test.js @@ -5,7 +5,7 @@ var c1 = (function () { function c1() { } return c1; -})(); +}()); exports.c1 = c1; exports.instance1 = new c1(); function f1() { diff --git a/tests/baselines/reference/project/sourcemapModuleSubfolderSpecifyOutputDirectory/amd/outdir/simple/test.js b/tests/baselines/reference/project/sourcemapModuleSubfolderSpecifyOutputDirectory/amd/outdir/simple/test.js index 081c888ee02..0ad51aeb02e 100644 --- a/tests/baselines/reference/project/sourcemapModuleSubfolderSpecifyOutputDirectory/amd/outdir/simple/test.js +++ b/tests/baselines/reference/project/sourcemapModuleSubfolderSpecifyOutputDirectory/amd/outdir/simple/test.js @@ -5,7 +5,7 @@ define(["require", "exports", "ref/m1"], function (require, exports, m1) { function c1() { } return c1; - })(); + }()); exports.c1 = c1; exports.instance1 = new c1(); function f1() { diff --git a/tests/baselines/reference/project/sourcemapModuleSubfolderSpecifyOutputDirectory/node/outdir/simple/test.js b/tests/baselines/reference/project/sourcemapModuleSubfolderSpecifyOutputDirectory/node/outdir/simple/test.js index bdc33590853..ebd5fdb3b3f 100644 --- a/tests/baselines/reference/project/sourcemapModuleSubfolderSpecifyOutputDirectory/node/outdir/simple/test.js +++ b/tests/baselines/reference/project/sourcemapModuleSubfolderSpecifyOutputDirectory/node/outdir/simple/test.js @@ -5,7 +5,7 @@ var c1 = (function () { function c1() { } return c1; -})(); +}()); exports.c1 = c1; exports.instance1 = new c1(); function f1() { diff --git a/tests/baselines/reference/project/sourcemapMultifolderNoOutdir/amd/diskFile1.js b/tests/baselines/reference/project/sourcemapMultifolderNoOutdir/amd/diskFile1.js index 9f44db1fad5..a1041b6d258 100644 --- a/tests/baselines/reference/project/sourcemapMultifolderNoOutdir/amd/diskFile1.js +++ b/tests/baselines/reference/project/sourcemapMultifolderNoOutdir/amd/diskFile1.js @@ -3,7 +3,7 @@ var m2_c1 = (function () { function m2_c1() { } return m2_c1; -})(); +}()); var m2_instance1 = new m2_c1(); function m2_f1() { return m2_instance1; diff --git a/tests/baselines/reference/project/sourcemapMultifolderNoOutdir/amd/test.js b/tests/baselines/reference/project/sourcemapMultifolderNoOutdir/amd/test.js index 87d3f006993..088a77f3f25 100644 --- a/tests/baselines/reference/project/sourcemapMultifolderNoOutdir/amd/test.js +++ b/tests/baselines/reference/project/sourcemapMultifolderNoOutdir/amd/test.js @@ -5,7 +5,7 @@ var c1 = (function () { function c1() { } return c1; -})(); +}()); var instance1 = new c1(); function f1() { return instance1; diff --git a/tests/baselines/reference/project/sourcemapMultifolderNoOutdir/node/diskFile1.js b/tests/baselines/reference/project/sourcemapMultifolderNoOutdir/node/diskFile1.js index 9f44db1fad5..a1041b6d258 100644 --- a/tests/baselines/reference/project/sourcemapMultifolderNoOutdir/node/diskFile1.js +++ b/tests/baselines/reference/project/sourcemapMultifolderNoOutdir/node/diskFile1.js @@ -3,7 +3,7 @@ var m2_c1 = (function () { function m2_c1() { } return m2_c1; -})(); +}()); var m2_instance1 = new m2_c1(); function m2_f1() { return m2_instance1; diff --git a/tests/baselines/reference/project/sourcemapMultifolderNoOutdir/node/test.js b/tests/baselines/reference/project/sourcemapMultifolderNoOutdir/node/test.js index 87d3f006993..088a77f3f25 100644 --- a/tests/baselines/reference/project/sourcemapMultifolderNoOutdir/node/test.js +++ b/tests/baselines/reference/project/sourcemapMultifolderNoOutdir/node/test.js @@ -5,7 +5,7 @@ var c1 = (function () { function c1() { } return c1; -})(); +}()); var instance1 = new c1(); function f1() { return instance1; diff --git a/tests/baselines/reference/project/sourcemapMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_multifolder/test.js b/tests/baselines/reference/project/sourcemapMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_multifolder/test.js index 87d3f006993..088a77f3f25 100644 --- a/tests/baselines/reference/project/sourcemapMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_multifolder/test.js +++ b/tests/baselines/reference/project/sourcemapMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_multifolder/test.js @@ -5,7 +5,7 @@ var c1 = (function () { function c1() { } return c1; -})(); +}()); var instance1 = new c1(); function f1() { return instance1; diff --git a/tests/baselines/reference/project/sourcemapMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_multifolder_ref/m2.js b/tests/baselines/reference/project/sourcemapMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_multifolder_ref/m2.js index 9f44db1fad5..a1041b6d258 100644 --- a/tests/baselines/reference/project/sourcemapMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_multifolder_ref/m2.js +++ b/tests/baselines/reference/project/sourcemapMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_multifolder_ref/m2.js @@ -3,7 +3,7 @@ var m2_c1 = (function () { function m2_c1() { } return m2_c1; -})(); +}()); var m2_instance1 = new m2_c1(); function m2_f1() { return m2_instance1; diff --git a/tests/baselines/reference/project/sourcemapMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_multifolder/test.js b/tests/baselines/reference/project/sourcemapMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_multifolder/test.js index 87d3f006993..088a77f3f25 100644 --- a/tests/baselines/reference/project/sourcemapMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_multifolder/test.js +++ b/tests/baselines/reference/project/sourcemapMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_multifolder/test.js @@ -5,7 +5,7 @@ var c1 = (function () { function c1() { } return c1; -})(); +}()); var instance1 = new c1(); function f1() { return instance1; diff --git a/tests/baselines/reference/project/sourcemapMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_multifolder_ref/m2.js b/tests/baselines/reference/project/sourcemapMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_multifolder_ref/m2.js index 9f44db1fad5..a1041b6d258 100644 --- a/tests/baselines/reference/project/sourcemapMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_multifolder_ref/m2.js +++ b/tests/baselines/reference/project/sourcemapMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_multifolder_ref/m2.js @@ -3,7 +3,7 @@ var m2_c1 = (function () { function m2_c1() { } return m2_c1; -})(); +}()); var m2_instance1 = new m2_c1(); function m2_f1() { return m2_instance1; diff --git a/tests/baselines/reference/project/sourcemapSimpleNoOutdir/amd/test.js b/tests/baselines/reference/project/sourcemapSimpleNoOutdir/amd/test.js index 218d8fcf05d..679b65b5733 100644 --- a/tests/baselines/reference/project/sourcemapSimpleNoOutdir/amd/test.js +++ b/tests/baselines/reference/project/sourcemapSimpleNoOutdir/amd/test.js @@ -4,7 +4,7 @@ var c1 = (function () { function c1() { } return c1; -})(); +}()); var instance1 = new c1(); function f1() { return instance1; diff --git a/tests/baselines/reference/project/sourcemapSimpleNoOutdir/node/test.js b/tests/baselines/reference/project/sourcemapSimpleNoOutdir/node/test.js index 218d8fcf05d..679b65b5733 100644 --- a/tests/baselines/reference/project/sourcemapSimpleNoOutdir/node/test.js +++ b/tests/baselines/reference/project/sourcemapSimpleNoOutdir/node/test.js @@ -4,7 +4,7 @@ var c1 = (function () { function c1() { } return c1; -})(); +}()); var instance1 = new c1(); function f1() { return instance1; diff --git a/tests/baselines/reference/project/sourcemapSimpleSpecifyOutputDirectory/amd/outdir/simple/test.js b/tests/baselines/reference/project/sourcemapSimpleSpecifyOutputDirectory/amd/outdir/simple/test.js index 218d8fcf05d..679b65b5733 100644 --- a/tests/baselines/reference/project/sourcemapSimpleSpecifyOutputDirectory/amd/outdir/simple/test.js +++ b/tests/baselines/reference/project/sourcemapSimpleSpecifyOutputDirectory/amd/outdir/simple/test.js @@ -4,7 +4,7 @@ var c1 = (function () { function c1() { } return c1; -})(); +}()); var instance1 = new c1(); function f1() { return instance1; diff --git a/tests/baselines/reference/project/sourcemapSimpleSpecifyOutputDirectory/node/outdir/simple/test.js b/tests/baselines/reference/project/sourcemapSimpleSpecifyOutputDirectory/node/outdir/simple/test.js index 218d8fcf05d..679b65b5733 100644 --- a/tests/baselines/reference/project/sourcemapSimpleSpecifyOutputDirectory/node/outdir/simple/test.js +++ b/tests/baselines/reference/project/sourcemapSimpleSpecifyOutputDirectory/node/outdir/simple/test.js @@ -4,7 +4,7 @@ var c1 = (function () { function c1() { } return c1; -})(); +}()); var instance1 = new c1(); function f1() { return instance1; diff --git a/tests/baselines/reference/project/sourcemapSubfolderNoOutdir/amd/test.js b/tests/baselines/reference/project/sourcemapSubfolderNoOutdir/amd/test.js index bdb90297aea..408b7e46f61 100644 --- a/tests/baselines/reference/project/sourcemapSubfolderNoOutdir/amd/test.js +++ b/tests/baselines/reference/project/sourcemapSubfolderNoOutdir/amd/test.js @@ -4,7 +4,7 @@ var c1 = (function () { function c1() { } return c1; -})(); +}()); var instance1 = new c1(); function f1() { return instance1; diff --git a/tests/baselines/reference/project/sourcemapSubfolderNoOutdir/node/test.js b/tests/baselines/reference/project/sourcemapSubfolderNoOutdir/node/test.js index bdb90297aea..408b7e46f61 100644 --- a/tests/baselines/reference/project/sourcemapSubfolderNoOutdir/node/test.js +++ b/tests/baselines/reference/project/sourcemapSubfolderNoOutdir/node/test.js @@ -4,7 +4,7 @@ var c1 = (function () { function c1() { } return c1; -})(); +}()); var instance1 = new c1(); function f1() { return instance1; diff --git a/tests/baselines/reference/project/sourcemapSubfolderSpecifyOutputDirectory/amd/outdir/simple/test.js b/tests/baselines/reference/project/sourcemapSubfolderSpecifyOutputDirectory/amd/outdir/simple/test.js index bdb90297aea..408b7e46f61 100644 --- a/tests/baselines/reference/project/sourcemapSubfolderSpecifyOutputDirectory/amd/outdir/simple/test.js +++ b/tests/baselines/reference/project/sourcemapSubfolderSpecifyOutputDirectory/amd/outdir/simple/test.js @@ -4,7 +4,7 @@ var c1 = (function () { function c1() { } return c1; -})(); +}()); var instance1 = new c1(); function f1() { return instance1; diff --git a/tests/baselines/reference/project/sourcemapSubfolderSpecifyOutputDirectory/node/outdir/simple/test.js b/tests/baselines/reference/project/sourcemapSubfolderSpecifyOutputDirectory/node/outdir/simple/test.js index bdb90297aea..408b7e46f61 100644 --- a/tests/baselines/reference/project/sourcemapSubfolderSpecifyOutputDirectory/node/outdir/simple/test.js +++ b/tests/baselines/reference/project/sourcemapSubfolderSpecifyOutputDirectory/node/outdir/simple/test.js @@ -4,7 +4,7 @@ var c1 = (function () { function c1() { } return c1; -})(); +}()); var instance1 = new c1(); function f1() { return instance1; diff --git a/tests/baselines/reference/project/sourcerootUrlMixedSubfolderNoOutdir/amd/ref/m2.js b/tests/baselines/reference/project/sourcerootUrlMixedSubfolderNoOutdir/amd/ref/m2.js index dd1c532b6df..41f4a4e2521 100644 --- a/tests/baselines/reference/project/sourcerootUrlMixedSubfolderNoOutdir/amd/ref/m2.js +++ b/tests/baselines/reference/project/sourcerootUrlMixedSubfolderNoOutdir/amd/ref/m2.js @@ -5,7 +5,7 @@ define(["require", "exports"], function (require, exports) { function m2_c1() { } return m2_c1; - })(); + }()); exports.m2_c1 = m2_c1; exports.m2_instance1 = new m2_c1(); function m2_f1() { diff --git a/tests/baselines/reference/project/sourcerootUrlMixedSubfolderNoOutdir/amd/test.js b/tests/baselines/reference/project/sourcerootUrlMixedSubfolderNoOutdir/amd/test.js index 8b8abfc1aed..78426750a82 100644 --- a/tests/baselines/reference/project/sourcerootUrlMixedSubfolderNoOutdir/amd/test.js +++ b/tests/baselines/reference/project/sourcerootUrlMixedSubfolderNoOutdir/amd/test.js @@ -5,7 +5,7 @@ var c1 = (function () { function c1() { } return c1; -})(); +}()); var instance1 = new c1(); function f1() { return instance1; diff --git a/tests/baselines/reference/project/sourcerootUrlMixedSubfolderNoOutdir/node/ref/m2.js b/tests/baselines/reference/project/sourcerootUrlMixedSubfolderNoOutdir/node/ref/m2.js index 1646fd608ea..eae1115846a 100644 --- a/tests/baselines/reference/project/sourcerootUrlMixedSubfolderNoOutdir/node/ref/m2.js +++ b/tests/baselines/reference/project/sourcerootUrlMixedSubfolderNoOutdir/node/ref/m2.js @@ -4,7 +4,7 @@ var m2_c1 = (function () { function m2_c1() { } return m2_c1; -})(); +}()); exports.m2_c1 = m2_c1; exports.m2_instance1 = new m2_c1(); function m2_f1() { diff --git a/tests/baselines/reference/project/sourcerootUrlMixedSubfolderNoOutdir/node/test.js b/tests/baselines/reference/project/sourcerootUrlMixedSubfolderNoOutdir/node/test.js index 8b8abfc1aed..78426750a82 100644 --- a/tests/baselines/reference/project/sourcerootUrlMixedSubfolderNoOutdir/node/test.js +++ b/tests/baselines/reference/project/sourcerootUrlMixedSubfolderNoOutdir/node/test.js @@ -5,7 +5,7 @@ var c1 = (function () { function c1() { } return c1; -})(); +}()); var instance1 = new c1(); function f1() { return instance1; diff --git a/tests/baselines/reference/project/sourcerootUrlMixedSubfolderSpecifyOutputDirectory/amd/outdir/simple/ref/m2.js b/tests/baselines/reference/project/sourcerootUrlMixedSubfolderSpecifyOutputDirectory/amd/outdir/simple/ref/m2.js index dd1c532b6df..41f4a4e2521 100644 --- a/tests/baselines/reference/project/sourcerootUrlMixedSubfolderSpecifyOutputDirectory/amd/outdir/simple/ref/m2.js +++ b/tests/baselines/reference/project/sourcerootUrlMixedSubfolderSpecifyOutputDirectory/amd/outdir/simple/ref/m2.js @@ -5,7 +5,7 @@ define(["require", "exports"], function (require, exports) { function m2_c1() { } return m2_c1; - })(); + }()); exports.m2_c1 = m2_c1; exports.m2_instance1 = new m2_c1(); function m2_f1() { diff --git a/tests/baselines/reference/project/sourcerootUrlMixedSubfolderSpecifyOutputDirectory/amd/outdir/simple/test.js b/tests/baselines/reference/project/sourcerootUrlMixedSubfolderSpecifyOutputDirectory/amd/outdir/simple/test.js index 8b8abfc1aed..78426750a82 100644 --- a/tests/baselines/reference/project/sourcerootUrlMixedSubfolderSpecifyOutputDirectory/amd/outdir/simple/test.js +++ b/tests/baselines/reference/project/sourcerootUrlMixedSubfolderSpecifyOutputDirectory/amd/outdir/simple/test.js @@ -5,7 +5,7 @@ var c1 = (function () { function c1() { } return c1; -})(); +}()); var instance1 = new c1(); function f1() { return instance1; diff --git a/tests/baselines/reference/project/sourcerootUrlMixedSubfolderSpecifyOutputDirectory/node/outdir/simple/ref/m2.js b/tests/baselines/reference/project/sourcerootUrlMixedSubfolderSpecifyOutputDirectory/node/outdir/simple/ref/m2.js index 1646fd608ea..eae1115846a 100644 --- a/tests/baselines/reference/project/sourcerootUrlMixedSubfolderSpecifyOutputDirectory/node/outdir/simple/ref/m2.js +++ b/tests/baselines/reference/project/sourcerootUrlMixedSubfolderSpecifyOutputDirectory/node/outdir/simple/ref/m2.js @@ -4,7 +4,7 @@ var m2_c1 = (function () { function m2_c1() { } return m2_c1; -})(); +}()); exports.m2_c1 = m2_c1; exports.m2_instance1 = new m2_c1(); function m2_f1() { diff --git a/tests/baselines/reference/project/sourcerootUrlMixedSubfolderSpecifyOutputDirectory/node/outdir/simple/test.js b/tests/baselines/reference/project/sourcerootUrlMixedSubfolderSpecifyOutputDirectory/node/outdir/simple/test.js index 8b8abfc1aed..78426750a82 100644 --- a/tests/baselines/reference/project/sourcerootUrlMixedSubfolderSpecifyOutputDirectory/node/outdir/simple/test.js +++ b/tests/baselines/reference/project/sourcerootUrlMixedSubfolderSpecifyOutputDirectory/node/outdir/simple/test.js @@ -5,7 +5,7 @@ var c1 = (function () { function c1() { } return c1; -})(); +}()); var instance1 = new c1(); function f1() { return instance1; diff --git a/tests/baselines/reference/project/sourcerootUrlModuleMultifolderNoOutdir/amd/diskFile1.js b/tests/baselines/reference/project/sourcerootUrlModuleMultifolderNoOutdir/amd/diskFile1.js index dd1c532b6df..41f4a4e2521 100644 --- a/tests/baselines/reference/project/sourcerootUrlModuleMultifolderNoOutdir/amd/diskFile1.js +++ b/tests/baselines/reference/project/sourcerootUrlModuleMultifolderNoOutdir/amd/diskFile1.js @@ -5,7 +5,7 @@ define(["require", "exports"], function (require, exports) { function m2_c1() { } return m2_c1; - })(); + }()); exports.m2_c1 = m2_c1; exports.m2_instance1 = new m2_c1(); function m2_f1() { diff --git a/tests/baselines/reference/project/sourcerootUrlModuleMultifolderNoOutdir/amd/test.js b/tests/baselines/reference/project/sourcerootUrlModuleMultifolderNoOutdir/amd/test.js index bf3f6e48267..efa0bc948ed 100644 --- a/tests/baselines/reference/project/sourcerootUrlModuleMultifolderNoOutdir/amd/test.js +++ b/tests/baselines/reference/project/sourcerootUrlModuleMultifolderNoOutdir/amd/test.js @@ -5,7 +5,7 @@ define(["require", "exports", "ref/m1", "../outputdir_module_multifolder_ref/m2" function c1() { } return c1; - })(); + }()); exports.c1 = c1; exports.instance1 = new c1(); function f1() { diff --git a/tests/baselines/reference/project/sourcerootUrlModuleMultifolderNoOutdir/node/diskFile1.js b/tests/baselines/reference/project/sourcerootUrlModuleMultifolderNoOutdir/node/diskFile1.js index 1646fd608ea..eae1115846a 100644 --- a/tests/baselines/reference/project/sourcerootUrlModuleMultifolderNoOutdir/node/diskFile1.js +++ b/tests/baselines/reference/project/sourcerootUrlModuleMultifolderNoOutdir/node/diskFile1.js @@ -4,7 +4,7 @@ var m2_c1 = (function () { function m2_c1() { } return m2_c1; -})(); +}()); exports.m2_c1 = m2_c1; exports.m2_instance1 = new m2_c1(); function m2_f1() { diff --git a/tests/baselines/reference/project/sourcerootUrlModuleMultifolderNoOutdir/node/test.js b/tests/baselines/reference/project/sourcerootUrlModuleMultifolderNoOutdir/node/test.js index 67406a9e410..84731dff566 100644 --- a/tests/baselines/reference/project/sourcerootUrlModuleMultifolderNoOutdir/node/test.js +++ b/tests/baselines/reference/project/sourcerootUrlModuleMultifolderNoOutdir/node/test.js @@ -6,7 +6,7 @@ var c1 = (function () { function c1() { } return c1; -})(); +}()); exports.c1 = c1; exports.instance1 = new c1(); function f1() { diff --git a/tests/baselines/reference/project/sourcerootUrlModuleMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_module_multifolder/test.js b/tests/baselines/reference/project/sourcerootUrlModuleMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_module_multifolder/test.js index bf3f6e48267..efa0bc948ed 100644 --- a/tests/baselines/reference/project/sourcerootUrlModuleMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_module_multifolder/test.js +++ b/tests/baselines/reference/project/sourcerootUrlModuleMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_module_multifolder/test.js @@ -5,7 +5,7 @@ define(["require", "exports", "ref/m1", "../outputdir_module_multifolder_ref/m2" function c1() { } return c1; - })(); + }()); exports.c1 = c1; exports.instance1 = new c1(); function f1() { diff --git a/tests/baselines/reference/project/sourcerootUrlModuleMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_module_multifolder_ref/m2.js b/tests/baselines/reference/project/sourcerootUrlModuleMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_module_multifolder_ref/m2.js index dd1c532b6df..41f4a4e2521 100644 --- a/tests/baselines/reference/project/sourcerootUrlModuleMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_module_multifolder_ref/m2.js +++ b/tests/baselines/reference/project/sourcerootUrlModuleMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_module_multifolder_ref/m2.js @@ -5,7 +5,7 @@ define(["require", "exports"], function (require, exports) { function m2_c1() { } return m2_c1; - })(); + }()); exports.m2_c1 = m2_c1; exports.m2_instance1 = new m2_c1(); function m2_f1() { diff --git a/tests/baselines/reference/project/sourcerootUrlModuleMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_module_multifolder/test.js b/tests/baselines/reference/project/sourcerootUrlModuleMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_module_multifolder/test.js index 67406a9e410..84731dff566 100644 --- a/tests/baselines/reference/project/sourcerootUrlModuleMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_module_multifolder/test.js +++ b/tests/baselines/reference/project/sourcerootUrlModuleMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_module_multifolder/test.js @@ -6,7 +6,7 @@ var c1 = (function () { function c1() { } return c1; -})(); +}()); exports.c1 = c1; exports.instance1 = new c1(); function f1() { diff --git a/tests/baselines/reference/project/sourcerootUrlModuleMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_module_multifolder_ref/m2.js b/tests/baselines/reference/project/sourcerootUrlModuleMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_module_multifolder_ref/m2.js index 1646fd608ea..eae1115846a 100644 --- a/tests/baselines/reference/project/sourcerootUrlModuleMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_module_multifolder_ref/m2.js +++ b/tests/baselines/reference/project/sourcerootUrlModuleMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_module_multifolder_ref/m2.js @@ -4,7 +4,7 @@ var m2_c1 = (function () { function m2_c1() { } return m2_c1; -})(); +}()); exports.m2_c1 = m2_c1; exports.m2_instance1 = new m2_c1(); function m2_f1() { diff --git a/tests/baselines/reference/project/sourcerootUrlModuleSimpleNoOutdir/amd/test.js b/tests/baselines/reference/project/sourcerootUrlModuleSimpleNoOutdir/amd/test.js index 4e5ad232cc3..c4b7f56d76a 100644 --- a/tests/baselines/reference/project/sourcerootUrlModuleSimpleNoOutdir/amd/test.js +++ b/tests/baselines/reference/project/sourcerootUrlModuleSimpleNoOutdir/amd/test.js @@ -5,7 +5,7 @@ define(["require", "exports", "m1"], function (require, exports, m1) { function c1() { } return c1; - })(); + }()); exports.c1 = c1; exports.instance1 = new c1(); function f1() { diff --git a/tests/baselines/reference/project/sourcerootUrlModuleSimpleNoOutdir/node/test.js b/tests/baselines/reference/project/sourcerootUrlModuleSimpleNoOutdir/node/test.js index bbc39c25431..fea4b619aa2 100644 --- a/tests/baselines/reference/project/sourcerootUrlModuleSimpleNoOutdir/node/test.js +++ b/tests/baselines/reference/project/sourcerootUrlModuleSimpleNoOutdir/node/test.js @@ -5,7 +5,7 @@ var c1 = (function () { function c1() { } return c1; -})(); +}()); exports.c1 = c1; exports.instance1 = new c1(); function f1() { diff --git a/tests/baselines/reference/project/sourcerootUrlModuleSimpleSpecifyOutputDirectory/amd/outdir/simple/test.js b/tests/baselines/reference/project/sourcerootUrlModuleSimpleSpecifyOutputDirectory/amd/outdir/simple/test.js index 4e5ad232cc3..c4b7f56d76a 100644 --- a/tests/baselines/reference/project/sourcerootUrlModuleSimpleSpecifyOutputDirectory/amd/outdir/simple/test.js +++ b/tests/baselines/reference/project/sourcerootUrlModuleSimpleSpecifyOutputDirectory/amd/outdir/simple/test.js @@ -5,7 +5,7 @@ define(["require", "exports", "m1"], function (require, exports, m1) { function c1() { } return c1; - })(); + }()); exports.c1 = c1; exports.instance1 = new c1(); function f1() { diff --git a/tests/baselines/reference/project/sourcerootUrlModuleSimpleSpecifyOutputDirectory/node/outdir/simple/test.js b/tests/baselines/reference/project/sourcerootUrlModuleSimpleSpecifyOutputDirectory/node/outdir/simple/test.js index bbc39c25431..fea4b619aa2 100644 --- a/tests/baselines/reference/project/sourcerootUrlModuleSimpleSpecifyOutputDirectory/node/outdir/simple/test.js +++ b/tests/baselines/reference/project/sourcerootUrlModuleSimpleSpecifyOutputDirectory/node/outdir/simple/test.js @@ -5,7 +5,7 @@ var c1 = (function () { function c1() { } return c1; -})(); +}()); exports.c1 = c1; exports.instance1 = new c1(); function f1() { diff --git a/tests/baselines/reference/project/sourcerootUrlModuleSubfolderNoOutdir/amd/test.js b/tests/baselines/reference/project/sourcerootUrlModuleSubfolderNoOutdir/amd/test.js index 081c888ee02..0ad51aeb02e 100644 --- a/tests/baselines/reference/project/sourcerootUrlModuleSubfolderNoOutdir/amd/test.js +++ b/tests/baselines/reference/project/sourcerootUrlModuleSubfolderNoOutdir/amd/test.js @@ -5,7 +5,7 @@ define(["require", "exports", "ref/m1"], function (require, exports, m1) { function c1() { } return c1; - })(); + }()); exports.c1 = c1; exports.instance1 = new c1(); function f1() { diff --git a/tests/baselines/reference/project/sourcerootUrlModuleSubfolderNoOutdir/node/test.js b/tests/baselines/reference/project/sourcerootUrlModuleSubfolderNoOutdir/node/test.js index bdc33590853..ebd5fdb3b3f 100644 --- a/tests/baselines/reference/project/sourcerootUrlModuleSubfolderNoOutdir/node/test.js +++ b/tests/baselines/reference/project/sourcerootUrlModuleSubfolderNoOutdir/node/test.js @@ -5,7 +5,7 @@ var c1 = (function () { function c1() { } return c1; -})(); +}()); exports.c1 = c1; exports.instance1 = new c1(); function f1() { diff --git a/tests/baselines/reference/project/sourcerootUrlModuleSubfolderSpecifyOutputDirectory/amd/outdir/simple/test.js b/tests/baselines/reference/project/sourcerootUrlModuleSubfolderSpecifyOutputDirectory/amd/outdir/simple/test.js index 081c888ee02..0ad51aeb02e 100644 --- a/tests/baselines/reference/project/sourcerootUrlModuleSubfolderSpecifyOutputDirectory/amd/outdir/simple/test.js +++ b/tests/baselines/reference/project/sourcerootUrlModuleSubfolderSpecifyOutputDirectory/amd/outdir/simple/test.js @@ -5,7 +5,7 @@ define(["require", "exports", "ref/m1"], function (require, exports, m1) { function c1() { } return c1; - })(); + }()); exports.c1 = c1; exports.instance1 = new c1(); function f1() { diff --git a/tests/baselines/reference/project/sourcerootUrlModuleSubfolderSpecifyOutputDirectory/node/outdir/simple/test.js b/tests/baselines/reference/project/sourcerootUrlModuleSubfolderSpecifyOutputDirectory/node/outdir/simple/test.js index bdc33590853..ebd5fdb3b3f 100644 --- a/tests/baselines/reference/project/sourcerootUrlModuleSubfolderSpecifyOutputDirectory/node/outdir/simple/test.js +++ b/tests/baselines/reference/project/sourcerootUrlModuleSubfolderSpecifyOutputDirectory/node/outdir/simple/test.js @@ -5,7 +5,7 @@ var c1 = (function () { function c1() { } return c1; -})(); +}()); exports.c1 = c1; exports.instance1 = new c1(); function f1() { diff --git a/tests/baselines/reference/project/sourcerootUrlMultifolderNoOutdir/amd/diskFile1.js b/tests/baselines/reference/project/sourcerootUrlMultifolderNoOutdir/amd/diskFile1.js index 9f44db1fad5..a1041b6d258 100644 --- a/tests/baselines/reference/project/sourcerootUrlMultifolderNoOutdir/amd/diskFile1.js +++ b/tests/baselines/reference/project/sourcerootUrlMultifolderNoOutdir/amd/diskFile1.js @@ -3,7 +3,7 @@ var m2_c1 = (function () { function m2_c1() { } return m2_c1; -})(); +}()); var m2_instance1 = new m2_c1(); function m2_f1() { return m2_instance1; diff --git a/tests/baselines/reference/project/sourcerootUrlMultifolderNoOutdir/amd/test.js b/tests/baselines/reference/project/sourcerootUrlMultifolderNoOutdir/amd/test.js index 87d3f006993..088a77f3f25 100644 --- a/tests/baselines/reference/project/sourcerootUrlMultifolderNoOutdir/amd/test.js +++ b/tests/baselines/reference/project/sourcerootUrlMultifolderNoOutdir/amd/test.js @@ -5,7 +5,7 @@ var c1 = (function () { function c1() { } return c1; -})(); +}()); var instance1 = new c1(); function f1() { return instance1; diff --git a/tests/baselines/reference/project/sourcerootUrlMultifolderNoOutdir/node/diskFile1.js b/tests/baselines/reference/project/sourcerootUrlMultifolderNoOutdir/node/diskFile1.js index 9f44db1fad5..a1041b6d258 100644 --- a/tests/baselines/reference/project/sourcerootUrlMultifolderNoOutdir/node/diskFile1.js +++ b/tests/baselines/reference/project/sourcerootUrlMultifolderNoOutdir/node/diskFile1.js @@ -3,7 +3,7 @@ var m2_c1 = (function () { function m2_c1() { } return m2_c1; -})(); +}()); var m2_instance1 = new m2_c1(); function m2_f1() { return m2_instance1; diff --git a/tests/baselines/reference/project/sourcerootUrlMultifolderNoOutdir/node/test.js b/tests/baselines/reference/project/sourcerootUrlMultifolderNoOutdir/node/test.js index 87d3f006993..088a77f3f25 100644 --- a/tests/baselines/reference/project/sourcerootUrlMultifolderNoOutdir/node/test.js +++ b/tests/baselines/reference/project/sourcerootUrlMultifolderNoOutdir/node/test.js @@ -5,7 +5,7 @@ var c1 = (function () { function c1() { } return c1; -})(); +}()); var instance1 = new c1(); function f1() { return instance1; diff --git a/tests/baselines/reference/project/sourcerootUrlMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_multifolder/test.js b/tests/baselines/reference/project/sourcerootUrlMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_multifolder/test.js index 87d3f006993..088a77f3f25 100644 --- a/tests/baselines/reference/project/sourcerootUrlMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_multifolder/test.js +++ b/tests/baselines/reference/project/sourcerootUrlMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_multifolder/test.js @@ -5,7 +5,7 @@ var c1 = (function () { function c1() { } return c1; -})(); +}()); var instance1 = new c1(); function f1() { return instance1; diff --git a/tests/baselines/reference/project/sourcerootUrlMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_multifolder_ref/m2.js b/tests/baselines/reference/project/sourcerootUrlMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_multifolder_ref/m2.js index 9f44db1fad5..a1041b6d258 100644 --- a/tests/baselines/reference/project/sourcerootUrlMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_multifolder_ref/m2.js +++ b/tests/baselines/reference/project/sourcerootUrlMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_multifolder_ref/m2.js @@ -3,7 +3,7 @@ var m2_c1 = (function () { function m2_c1() { } return m2_c1; -})(); +}()); var m2_instance1 = new m2_c1(); function m2_f1() { return m2_instance1; diff --git a/tests/baselines/reference/project/sourcerootUrlMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_multifolder/test.js b/tests/baselines/reference/project/sourcerootUrlMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_multifolder/test.js index 87d3f006993..088a77f3f25 100644 --- a/tests/baselines/reference/project/sourcerootUrlMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_multifolder/test.js +++ b/tests/baselines/reference/project/sourcerootUrlMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_multifolder/test.js @@ -5,7 +5,7 @@ var c1 = (function () { function c1() { } return c1; -})(); +}()); var instance1 = new c1(); function f1() { return instance1; diff --git a/tests/baselines/reference/project/sourcerootUrlMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_multifolder_ref/m2.js b/tests/baselines/reference/project/sourcerootUrlMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_multifolder_ref/m2.js index 9f44db1fad5..a1041b6d258 100644 --- a/tests/baselines/reference/project/sourcerootUrlMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_multifolder_ref/m2.js +++ b/tests/baselines/reference/project/sourcerootUrlMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_multifolder_ref/m2.js @@ -3,7 +3,7 @@ var m2_c1 = (function () { function m2_c1() { } return m2_c1; -})(); +}()); var m2_instance1 = new m2_c1(); function m2_f1() { return m2_instance1; diff --git a/tests/baselines/reference/project/sourcerootUrlSimpleNoOutdir/amd/test.js b/tests/baselines/reference/project/sourcerootUrlSimpleNoOutdir/amd/test.js index 218d8fcf05d..679b65b5733 100644 --- a/tests/baselines/reference/project/sourcerootUrlSimpleNoOutdir/amd/test.js +++ b/tests/baselines/reference/project/sourcerootUrlSimpleNoOutdir/amd/test.js @@ -4,7 +4,7 @@ var c1 = (function () { function c1() { } return c1; -})(); +}()); var instance1 = new c1(); function f1() { return instance1; diff --git a/tests/baselines/reference/project/sourcerootUrlSimpleNoOutdir/node/test.js b/tests/baselines/reference/project/sourcerootUrlSimpleNoOutdir/node/test.js index 218d8fcf05d..679b65b5733 100644 --- a/tests/baselines/reference/project/sourcerootUrlSimpleNoOutdir/node/test.js +++ b/tests/baselines/reference/project/sourcerootUrlSimpleNoOutdir/node/test.js @@ -4,7 +4,7 @@ var c1 = (function () { function c1() { } return c1; -})(); +}()); var instance1 = new c1(); function f1() { return instance1; diff --git a/tests/baselines/reference/project/sourcerootUrlSimpleSpecifyOutputDirectory/amd/outdir/simple/test.js b/tests/baselines/reference/project/sourcerootUrlSimpleSpecifyOutputDirectory/amd/outdir/simple/test.js index 218d8fcf05d..679b65b5733 100644 --- a/tests/baselines/reference/project/sourcerootUrlSimpleSpecifyOutputDirectory/amd/outdir/simple/test.js +++ b/tests/baselines/reference/project/sourcerootUrlSimpleSpecifyOutputDirectory/amd/outdir/simple/test.js @@ -4,7 +4,7 @@ var c1 = (function () { function c1() { } return c1; -})(); +}()); var instance1 = new c1(); function f1() { return instance1; diff --git a/tests/baselines/reference/project/sourcerootUrlSimpleSpecifyOutputDirectory/node/outdir/simple/test.js b/tests/baselines/reference/project/sourcerootUrlSimpleSpecifyOutputDirectory/node/outdir/simple/test.js index 218d8fcf05d..679b65b5733 100644 --- a/tests/baselines/reference/project/sourcerootUrlSimpleSpecifyOutputDirectory/node/outdir/simple/test.js +++ b/tests/baselines/reference/project/sourcerootUrlSimpleSpecifyOutputDirectory/node/outdir/simple/test.js @@ -4,7 +4,7 @@ var c1 = (function () { function c1() { } return c1; -})(); +}()); var instance1 = new c1(); function f1() { return instance1; diff --git a/tests/baselines/reference/project/sourcerootUrlSubfolderNoOutdir/amd/test.js b/tests/baselines/reference/project/sourcerootUrlSubfolderNoOutdir/amd/test.js index bdb90297aea..408b7e46f61 100644 --- a/tests/baselines/reference/project/sourcerootUrlSubfolderNoOutdir/amd/test.js +++ b/tests/baselines/reference/project/sourcerootUrlSubfolderNoOutdir/amd/test.js @@ -4,7 +4,7 @@ var c1 = (function () { function c1() { } return c1; -})(); +}()); var instance1 = new c1(); function f1() { return instance1; diff --git a/tests/baselines/reference/project/sourcerootUrlSubfolderNoOutdir/node/test.js b/tests/baselines/reference/project/sourcerootUrlSubfolderNoOutdir/node/test.js index bdb90297aea..408b7e46f61 100644 --- a/tests/baselines/reference/project/sourcerootUrlSubfolderNoOutdir/node/test.js +++ b/tests/baselines/reference/project/sourcerootUrlSubfolderNoOutdir/node/test.js @@ -4,7 +4,7 @@ var c1 = (function () { function c1() { } return c1; -})(); +}()); var instance1 = new c1(); function f1() { return instance1; diff --git a/tests/baselines/reference/project/sourcerootUrlSubfolderSpecifyOutputDirectory/amd/outdir/simple/test.js b/tests/baselines/reference/project/sourcerootUrlSubfolderSpecifyOutputDirectory/amd/outdir/simple/test.js index bdb90297aea..408b7e46f61 100644 --- a/tests/baselines/reference/project/sourcerootUrlSubfolderSpecifyOutputDirectory/amd/outdir/simple/test.js +++ b/tests/baselines/reference/project/sourcerootUrlSubfolderSpecifyOutputDirectory/amd/outdir/simple/test.js @@ -4,7 +4,7 @@ var c1 = (function () { function c1() { } return c1; -})(); +}()); var instance1 = new c1(); function f1() { return instance1; diff --git a/tests/baselines/reference/project/sourcerootUrlSubfolderSpecifyOutputDirectory/node/outdir/simple/test.js b/tests/baselines/reference/project/sourcerootUrlSubfolderSpecifyOutputDirectory/node/outdir/simple/test.js index bdb90297aea..408b7e46f61 100644 --- a/tests/baselines/reference/project/sourcerootUrlSubfolderSpecifyOutputDirectory/node/outdir/simple/test.js +++ b/tests/baselines/reference/project/sourcerootUrlSubfolderSpecifyOutputDirectory/node/outdir/simple/test.js @@ -4,7 +4,7 @@ var c1 = (function () { function c1() { } return c1; -})(); +}()); var instance1 = new c1(); function f1() { return instance1; From 50892acfd855b0a0ae42a4e2f2186fd11948753f Mon Sep 17 00:00:00 2001 From: Ryan Cavanaugh Date: Wed, 9 Dec 2015 11:16:57 -0800 Subject: [PATCH 070/177] Address CR feedback --- src/compiler/checker.ts | 17 ++++++++++------- src/compiler/types.ts | 1 + 2 files changed, 11 insertions(+), 7 deletions(-) diff --git a/src/compiler/checker.ts b/src/compiler/checker.ts index 79f514e7864..5e8fd45510e 100644 --- a/src/compiler/checker.ts +++ b/src/compiler/checker.ts @@ -2671,11 +2671,6 @@ namespace ts { // Handle exports.p = expr or this.p = expr or className.prototype.method = expr return links.type = checkExpressionCached((declaration.parent).right); } - else { - // Declaration for className.prototype in inferred JS class - const type = createAnonymousType(symbol, symbol.members, emptyArray, emptyArray, undefined, undefined); - return links.type = type; - } } // Handle variable, parameter or property if (!pushTypeResolution(symbol, TypeSystemPropertyName.Type)) { @@ -6908,7 +6903,7 @@ namespace ts { .expression as PropertyAccessExpression) // x.prototype .expression; // x const classSymbol = checkExpression(className).symbol; - if (classSymbol.members) { + if (classSymbol && classSymbol.members) { return createAnonymousType(undefined, classSymbol.members, emptyArray, emptyArray, /*stringIndexType*/ undefined, /*numberIndexType*/ undefined); } } @@ -9635,6 +9630,14 @@ namespace ts { return links.resolvedSignature; } + function getInferredClassType(symbol: Symbol) { + const links = getSymbolLinks(symbol); + if (!links.inferredClassType) { + links.inferredClassType = createAnonymousType(undefined, symbol.members, emptyArray, emptyArray, /*stringIndexType*/ undefined, /*numberIndexType*/ undefined); + } + return links.inferredClassType; + } + /** * Syntactically and semantically checks a call or new expression. * @param node The call/new expression to be checked. @@ -9661,7 +9664,7 @@ namespace ts { // in a JS file const funcSymbol = checkExpression(node.expression).symbol; if (funcSymbol && funcSymbol.members && (funcSymbol.flags & SymbolFlags.Function)) { - return createAnonymousType(undefined, funcSymbol.members, emptyArray, emptyArray, /*stringIndexType*/ undefined, /*numberIndexType*/ undefined); + return getInferredClassType(funcSymbol); } else if (compilerOptions.noImplicitAny) { error(node, Diagnostics.new_expression_whose_target_lacks_a_construct_signature_implicitly_has_an_any_type); diff --git a/src/compiler/types.ts b/src/compiler/types.ts index 34e862768d0..2e557ad09a4 100644 --- a/src/compiler/types.ts +++ b/src/compiler/types.ts @@ -1997,6 +1997,7 @@ namespace ts { type?: Type; // Type of value symbol declaredType?: Type; // Type of class, interface, enum, type alias, or type parameter typeParameters?: TypeParameter[]; // Type parameters of type alias (undefined if non-generic) + inferredClassType?: Type; // Type of an inferred ES5 class instantiations?: Map; // Instantiations of generic type alias (undefined if non-generic) mapper?: TypeMapper; // Type mapper for instantiation alias referenced?: boolean; // True if alias symbol has been referenced as a value From fcfc424b491bc139a02a1e4b09c0fb92f932b631 Mon Sep 17 00:00:00 2001 From: Ryan Cavanaugh Date: Wed, 9 Dec 2015 11:18:40 -0800 Subject: [PATCH 071/177] One more --- src/compiler/checker.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/compiler/checker.ts b/src/compiler/checker.ts index 5e8fd45510e..7e2bf85c59b 100644 --- a/src/compiler/checker.ts +++ b/src/compiler/checker.ts @@ -6904,7 +6904,7 @@ namespace ts { .expression; // x const classSymbol = checkExpression(className).symbol; if (classSymbol && classSymbol.members) { - return createAnonymousType(undefined, classSymbol.members, emptyArray, emptyArray, /*stringIndexType*/ undefined, /*numberIndexType*/ undefined); + return getInferredClassType(classSymbol); } } } From 028484664d019153ed23791ffa88014890986a54 Mon Sep 17 00:00:00 2001 From: Wesley Wigham Date: Wed, 9 Dec 2015 15:53:39 -0800 Subject: [PATCH 072/177] most pr feedback --- src/compiler/checker.ts | 29 +++++++++++++--------------- src/compiler/diagnosticMessages.json | 4 ++-- src/compiler/types.ts | 2 +- 3 files changed, 16 insertions(+), 19 deletions(-) diff --git a/src/compiler/checker.ts b/src/compiler/checker.ts index 45f4e43e424..35f92de8fbe 100644 --- a/src/compiler/checker.ts +++ b/src/compiler/checker.ts @@ -5103,7 +5103,7 @@ namespace ts { const targetPredicate = target as PredicateType; if (sourcePredicate.predicate.kind !== targetPredicate.predicate.kind) { if (reportErrors) { - reportError(Diagnostics.A_this_based_type_guard_is_not_assignable_to_a_parameter_based_type_guard); + reportError(Diagnostics.A_this_based_type_guard_is_not_compatible_with_a_parameter_based_type_guard); reportError(Diagnostics.Type_predicate_0_is_not_assignable_to_1, typeToString(source), typeToString(target)); } return Ternary.False; @@ -6506,10 +6506,7 @@ namespace ts { function isAssignedInBinaryExpression(node: BinaryExpression) { if (node.operatorToken.kind >= SyntaxKind.FirstAssignment && node.operatorToken.kind <= SyntaxKind.LastAssignment) { - let n = node.left; - while (n.kind === SyntaxKind.ParenthesizedExpression) { - n = (n).expression; - } + const n = skipParenthesizedNodes(node.left); if (n.kind === SyntaxKind.Identifier && getResolvedSymbol(n) === symbol) { return true; } @@ -6844,13 +6841,6 @@ namespace ts { return type; } - function skipParenthesizedNodes(expression: Expression): Expression { - while (expression.kind === SyntaxKind.ParenthesizedExpression) { - expression = (expression as ParenthesizedExpression).expression; - } - return expression; - } - function getSymbolAtTypePredicatePosition(expr: Expression): Symbol { expr = skipParenthesizedNodes(expr); switch (expr.kind) { @@ -6897,6 +6887,13 @@ namespace ts { } } + function skipParenthesizedNodes(expression: Expression): Expression { + while (expression.kind === SyntaxKind.ParenthesizedExpression) { + expression = (expression as ParenthesizedExpression).expression; + } + return expression; + } + function checkIdentifier(node: Identifier): Type { const symbol = getResolvedSymbol(node); @@ -11085,7 +11082,7 @@ namespace ts { return -1; } - function isInLegalTypePredicatePosition(node: Node): boolean { + function isInLegalParameterTypePredicatePosition(node: Node): boolean { switch (node.parent.kind) { case SyntaxKind.ArrowFunction: case SyntaxKind.CallSignature: @@ -11100,7 +11097,7 @@ namespace ts { } function isInLegalThisTypePredicatePosition(node: Node): boolean { - if (isInLegalTypePredicatePosition(node)) { + if (isInLegalParameterTypePredicatePosition(node)) { return true; } switch (node.parent.kind) { @@ -14332,12 +14329,12 @@ namespace ts { } function checkTypePredicate(node: TypePredicateNode) { - if (node.parameterName.kind === SyntaxKind.Identifier && !isInLegalTypePredicatePosition(node)) { + if (node.parameterName.kind === SyntaxKind.Identifier && !isInLegalParameterTypePredicatePosition(node)) { error(node, Diagnostics.A_type_predicate_is_only_allowed_in_return_type_position_for_functions_and_methods); } else if (node.parameterName.kind === SyntaxKind.ThisType) { if (!isInLegalThisTypePredicatePosition(node)) { - error(node, Diagnostics.A_this_based_type_predicate_is_only_allowed_in_class_or_interface_members_get_accessors_or_return_type_positions_for_functions_and_methods); + error(node, Diagnostics.A_this_based_type_predicate_is_only_allowed_within_a_class_or_interface_s_members_get_accessors_or_return_type_positions_for_functions_and_methods); } else { getTypeFromThisTypeNode(node.parameterName as ThisTypeNode); diff --git a/src/compiler/diagnosticMessages.json b/src/compiler/diagnosticMessages.json index 959363f148a..46983551338 100644 --- a/src/compiler/diagnosticMessages.json +++ b/src/compiler/diagnosticMessages.json @@ -1647,11 +1647,11 @@ "category": "Error", "code": 2517 }, - "A 'this'-based type guard is not assignable to a parameter-based type guard": { + "A 'this'-based type guard is not compatible with a parameter-based type guard.": { "category": "Error", "code": 2518 }, - "A 'this'-based type predicate is only allowed in class or interface members, get accessors, or return type positions for functions and methods": { + "A 'this'-based type predicate is only allowed within a class or interface's members, get accessors, or return type positions for functions and methods.": { "category": "Error", "code": 2519 }, diff --git a/src/compiler/types.ts b/src/compiler/types.ts index 7b795846190..85ae020753f 100644 --- a/src/compiler/types.ts +++ b/src/compiler/types.ts @@ -2110,7 +2110,7 @@ namespace ts { ESSymbol = 0x01000000, // Type of symbol primitive introduced in ES6 ThisType = 0x02000000, // This type ObjectLiteralPatternWithComputedProperties = 0x04000000, // Object literal type implied by binding pattern has computed properties - PredicateType = 0x08000000, + PredicateType = 0x08000000, // Predicate types are also Boolean types, but should not be considered Intrinsics - there's no way to capture this with flags /* @internal */ Intrinsic = Any | String | Number | Boolean | ESSymbol | Void | Undefined | Null, From 82386564d497772632c4bbd18e25048e4cb6368c Mon Sep 17 00:00:00 2001 From: Wesley Wigham Date: Wed, 9 Dec 2015 15:58:57 -0800 Subject: [PATCH 073/177] destructuring applied --- src/compiler/binder.ts | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/src/compiler/binder.ts b/src/compiler/binder.ts index 837260e5e1b..2682a5938d1 100644 --- a/src/compiler/binder.ts +++ b/src/compiler/binder.ts @@ -1277,13 +1277,14 @@ namespace ts { } function checkTypePredicate(node: TypePredicateNode) { - if (node.parameterName && node.parameterName.kind === SyntaxKind.Identifier) { - checkStrictModeIdentifier(node.parameterName as Identifier); + const { parameterName, type } = node; + if (parameterName && parameterName.kind === SyntaxKind.Identifier) { + checkStrictModeIdentifier(parameterName as Identifier); } - if (node.parameterName && node.parameterName.kind === SyntaxKind.ThisType) { + if (parameterName && parameterName.kind === SyntaxKind.ThisType) { seenThisKeyword = true; } - bind(node.type); + bind(type); } function bindSourceFileIfExternalModule() { From bc01b16057f3f7f88859a081922206d8821fa213 Mon Sep 17 00:00:00 2001 From: Wesley Wigham Date: Wed, 9 Dec 2015 16:06:21 -0800 Subject: [PATCH 074/177] reorder if --- src/compiler/checker.ts | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) diff --git a/src/compiler/checker.ts b/src/compiler/checker.ts index 35f92de8fbe..0ee73756e57 100644 --- a/src/compiler/checker.ts +++ b/src/compiler/checker.ts @@ -6038,12 +6038,12 @@ namespace ts { function getWidenedType(type: Type): Type { if (type.flags & TypeFlags.RequiresWidening) { - if (type.flags & TypeFlags.PredicateType) { - return booleanType; - } if (type.flags & (TypeFlags.Undefined | TypeFlags.Null)) { return anyType; } + if (type.flags & TypeFlags.PredicateType) { + return booleanType; + } if (type.flags & TypeFlags.ObjectLiteral) { return getWidenedTypeOfObjectLiteral(type); } @@ -14329,15 +14329,16 @@ namespace ts { } function checkTypePredicate(node: TypePredicateNode) { - if (node.parameterName.kind === SyntaxKind.Identifier && !isInLegalParameterTypePredicatePosition(node)) { + const { parameterName } = node; + if (parameterName.kind === SyntaxKind.Identifier && !isInLegalParameterTypePredicatePosition(node)) { error(node, Diagnostics.A_type_predicate_is_only_allowed_in_return_type_position_for_functions_and_methods); } - else if (node.parameterName.kind === SyntaxKind.ThisType) { + else if (parameterName.kind === SyntaxKind.ThisType) { if (!isInLegalThisTypePredicatePosition(node)) { error(node, Diagnostics.A_this_based_type_predicate_is_only_allowed_within_a_class_or_interface_s_members_get_accessors_or_return_type_positions_for_functions_and_methods); } else { - getTypeFromThisTypeNode(node.parameterName as ThisTypeNode); + getTypeFromThisTypeNode(parameterName as ThisTypeNode); } } } From 8e586943a1b60075e51fc482af2d9be278eab08b Mon Sep 17 00:00:00 2001 From: Wesley Wigham Date: Wed, 9 Dec 2015 16:43:45 -0800 Subject: [PATCH 075/177] accept baselines --- .../reference/typeGuardFunctionOfFormThis.js | 18 +++++++++--------- .../typeGuardFunctionOfFormThisErrors.js | 6 +++--- .../reference/typeGuardOfFormThisMember.js | 6 +++--- .../typeGuardOfFormThisMemberErrors.js | 6 +++--- 4 files changed, 18 insertions(+), 18 deletions(-) diff --git a/tests/baselines/reference/typeGuardFunctionOfFormThis.js b/tests/baselines/reference/typeGuardFunctionOfFormThis.js index c1c670e8d7d..0d1dceccede 100644 --- a/tests/baselines/reference/typeGuardFunctionOfFormThis.js +++ b/tests/baselines/reference/typeGuardFunctionOfFormThis.js @@ -157,7 +157,7 @@ var RoyalGuard = (function () { return this instanceof FollowerGuard; }; return RoyalGuard; -})(); +}()); var LeadGuard = (function (_super) { __extends(LeadGuard, _super); function LeadGuard() { @@ -166,7 +166,7 @@ var LeadGuard = (function (_super) { LeadGuard.prototype.lead = function () { }; ; return LeadGuard; -})(RoyalGuard); +}(RoyalGuard)); var FollowerGuard = (function (_super) { __extends(FollowerGuard, _super); function FollowerGuard() { @@ -175,7 +175,7 @@ var FollowerGuard = (function (_super) { FollowerGuard.prototype.follow = function () { }; ; return FollowerGuard; -})(RoyalGuard); +}(RoyalGuard)); var a = new FollowerGuard(); if (a.isLeader()) { a.lead(); @@ -220,7 +220,7 @@ var ArrowGuard = (function () { }; } return ArrowGuard; -})(); +}()); var ArrowElite = (function (_super) { __extends(ArrowElite, _super); function ArrowElite() { @@ -228,7 +228,7 @@ var ArrowElite = (function (_super) { } ArrowElite.prototype.defend = function () { }; return ArrowElite; -})(ArrowGuard); +}(ArrowGuard)); var ArrowMedic = (function (_super) { __extends(ArrowMedic, _super); function ArrowMedic() { @@ -236,7 +236,7 @@ var ArrowMedic = (function (_super) { } ArrowMedic.prototype.heal = function () { }; return ArrowMedic; -})(ArrowGuard); +}(ArrowGuard)); var guard = new ArrowGuard(); if (guard.isElite()) { guard.defend(); @@ -262,7 +262,7 @@ var MimicGuard = (function () { MimicGuard.prototype.isFollower = function () { return this instanceof MimicFollower; }; ; return MimicGuard; -})(); +}()); var MimicLeader = (function (_super) { __extends(MimicLeader, _super); function MimicLeader() { @@ -270,7 +270,7 @@ var MimicLeader = (function (_super) { } MimicLeader.prototype.lead = function () { }; return MimicLeader; -})(MimicGuard); +}(MimicGuard)); var MimicFollower = (function (_super) { __extends(MimicFollower, _super); function MimicFollower() { @@ -278,7 +278,7 @@ var MimicFollower = (function (_super) { } MimicFollower.prototype.follow = function () { }; return MimicFollower; -})(MimicGuard); +}(MimicGuard)); var mimic = new MimicGuard(); a.isLeader = mimic.isLeader; a.isFollower = mimic.isFollower; diff --git a/tests/baselines/reference/typeGuardFunctionOfFormThisErrors.js b/tests/baselines/reference/typeGuardFunctionOfFormThisErrors.js index 0495e3cd773..73622bf60cc 100644 --- a/tests/baselines/reference/typeGuardFunctionOfFormThisErrors.js +++ b/tests/baselines/reference/typeGuardFunctionOfFormThisErrors.js @@ -75,7 +75,7 @@ var RoyalGuard = (function () { return this instanceof FollowerGuard; }; return RoyalGuard; -})(); +}()); var LeadGuard = (function (_super) { __extends(LeadGuard, _super); function LeadGuard() { @@ -84,7 +84,7 @@ var LeadGuard = (function (_super) { LeadGuard.prototype.lead = function () { }; ; return LeadGuard; -})(RoyalGuard); +}(RoyalGuard)); var FollowerGuard = (function (_super) { __extends(FollowerGuard, _super); function FollowerGuard() { @@ -93,7 +93,7 @@ var FollowerGuard = (function (_super) { FollowerGuard.prototype.follow = function () { }; ; return FollowerGuard; -})(RoyalGuard); +}(RoyalGuard)); var a = new FollowerGuard(); var b = new LeadGuard(); // Mismatched guards shouldn't be assignable diff --git a/tests/baselines/reference/typeGuardOfFormThisMember.js b/tests/baselines/reference/typeGuardOfFormThisMember.js index 8cb5b89aa90..2f983d2cdf8 100644 --- a/tests/baselines/reference/typeGuardOfFormThisMember.js +++ b/tests/baselines/reference/typeGuardOfFormThisMember.js @@ -113,7 +113,7 @@ var Test; configurable: true }); return FileSystemObject; - })(); + }()); Test.FileSystemObject = FileSystemObject; var File = (function (_super) { __extends(File, _super); @@ -122,7 +122,7 @@ var Test; this.content = content; } return File; - })(FileSystemObject); + }(FileSystemObject)); Test.File = File; var Directory = (function (_super) { __extends(Directory, _super); @@ -130,7 +130,7 @@ var Test; _super.apply(this, arguments); } return Directory; - })(FileSystemObject); + }(FileSystemObject)); Test.Directory = Directory; var file = new File("foo/bar.txt", "foo"); file.isNetworked = false; diff --git a/tests/baselines/reference/typeGuardOfFormThisMemberErrors.js b/tests/baselines/reference/typeGuardOfFormThisMemberErrors.js index e6b2f556621..6f681ab09cf 100644 --- a/tests/baselines/reference/typeGuardOfFormThisMemberErrors.js +++ b/tests/baselines/reference/typeGuardOfFormThisMemberErrors.js @@ -63,7 +63,7 @@ var Test; configurable: true }); return FileSystemObject; - })(); + }()); Test.FileSystemObject = FileSystemObject; var File = (function (_super) { __extends(File, _super); @@ -72,7 +72,7 @@ var Test; this.content = content; } return File; - })(FileSystemObject); + }(FileSystemObject)); Test.File = File; var Directory = (function (_super) { __extends(Directory, _super); @@ -80,7 +80,7 @@ var Test; _super.apply(this, arguments); } return Directory; - })(FileSystemObject); + }(FileSystemObject)); Test.Directory = Directory; var file = new File("foo/bar.txt", "foo"); file.isNetworked = file.isFile; From 6cd5a4dac9599122eff78d016a82ac0d362850ab Mon Sep 17 00:00:00 2001 From: Nathan Shively-Sanders Date: Thu, 10 Dec 2015 11:03:45 -0800 Subject: [PATCH 076/177] Compare enums semi-structurally. 1. Unqualified names must match. 2. Target contains members with same names as all source members. --- src/compiler/checker.ts | 24 ++++++++++++++++++++++++ 1 file changed, 24 insertions(+) diff --git a/src/compiler/checker.ts b/src/compiler/checker.ts index 50a3aee9955..0f04daf2983 100644 --- a/src/compiler/checker.ts +++ b/src/compiler/checker.ts @@ -5040,6 +5040,11 @@ namespace ts { if (source === undefinedType) return Ternary.True; if (source === nullType && target !== undefinedType) return Ternary.True; if (source.flags & TypeFlags.Enum && target === numberType) return Ternary.True; + if (source.flags & TypeFlags.Enum && target.flags & TypeFlags.Enum) { + if (result = enumRelatedTo(source, target)) { + return result; + } + } if (source.flags & TypeFlags.StringLiteral && target === stringType) return Ternary.True; if (relation === assignableRelation) { if (isTypeAny(source)) return Ternary.True; @@ -5750,6 +5755,25 @@ namespace ts { } return Ternary.False; } + + function enumRelatedTo(source: Type, target: Type) { + if (source.symbol.name !== target.symbol.name) { + return Ternary.False; + } + const sourceDecl = getMergedSymbol(source.symbol).valueDeclaration; + const targetDecl = getMergedSymbol(target.symbol).valueDeclaration; + const targetMembers = arrayToMap(targetDecl.members, member => getTextOfPropertyName(member.name)); + for (const member of sourceDecl.members) { + const name = getTextOfPropertyName(member.name); + if (!targetMembers[name]) { + reportError(Diagnostics.Property_0_is_missing_in_type_1, + name, + typeToString(target, /*enclosingDeclaration*/ undefined, TypeFormatFlags.UseFullyQualifiedType)); + return Ternary.False; + } + } + return Ternary.True; + } } // Return true if the given type is part of a deeply nested chain of generic instantiations. We consider this to be the case From 6ed5b59f751f57532e43cbc0ac71ff097bcc899b Mon Sep 17 00:00:00 2001 From: Nathan Shively-Sanders Date: Thu, 10 Dec 2015 11:05:25 -0800 Subject: [PATCH 077/177] Add test case and accept baseline --- .../enumAssignmentCompat3.errors.txt | 75 ++++++++++++ .../reference/enumAssignmentCompat3.js | 115 ++++++++++++++++++ tests/cases/compiler/enumAssignmentCompat3.ts | 45 +++++++ 3 files changed, 235 insertions(+) create mode 100644 tests/baselines/reference/enumAssignmentCompat3.errors.txt create mode 100644 tests/baselines/reference/enumAssignmentCompat3.js create mode 100644 tests/cases/compiler/enumAssignmentCompat3.ts diff --git a/tests/baselines/reference/enumAssignmentCompat3.errors.txt b/tests/baselines/reference/enumAssignmentCompat3.errors.txt new file mode 100644 index 00000000000..d82a4b7d490 --- /dev/null +++ b/tests/baselines/reference/enumAssignmentCompat3.errors.txt @@ -0,0 +1,75 @@ +tests/cases/compiler/enumAssignmentCompat3.ts(37,1): error TS2322: Type 'Abcd.E' is not assignable to type 'First.E'. + Property 'd' is missing in type 'First.E'. +tests/cases/compiler/enumAssignmentCompat3.ts(39,1): error TS2322: Type 'Cd.E' is not assignable to type 'First.E'. + Property 'd' is missing in type 'First.E'. +tests/cases/compiler/enumAssignmentCompat3.ts(40,1): error TS2322: Type 'Nope' is not assignable to type 'E'. +tests/cases/compiler/enumAssignmentCompat3.ts(43,1): error TS2322: Type 'First.E' is not assignable to type 'Ab.E'. + Property 'c' is missing in type 'Ab.E'. +tests/cases/compiler/enumAssignmentCompat3.ts(44,1): error TS2322: Type 'First.E' is not assignable to type 'Cd.E'. + Property 'a' is missing in type 'Cd.E'. +tests/cases/compiler/enumAssignmentCompat3.ts(45,1): error TS2322: Type 'E' is not assignable to type 'Nope'. + + +==== tests/cases/compiler/enumAssignmentCompat3.ts (6 errors) ==== + namespace First { + export enum E { + a, b, c, + } + } + namespace Abc { + export enum E { + a, b, c, + } + export enum Nope { + a, b, c, + } + } + namespace Abcd { + export enum E { + a, b, c, d, + } + } + namespace Ab { + export enum E { + a, b, + } + } + namespace Cd { + export enum E { + c, d, + } + } + + var abc: First.E; + var secondAbc: Abc.E; + var secondAbcd: Abcd.E; + var secondAb: Ab.E; + var secondCd: Cd.E; + var nope: Abc.Nope; + abc = secondAbc; // ok + abc = secondAbcd; // missing 'd' + ~~~ +!!! error TS2322: Type 'Abcd.E' is not assignable to type 'First.E'. +!!! error TS2322: Property 'd' is missing in type 'First.E'. + abc = secondAb; // ok + abc = secondCd; // missing 'd' + ~~~ +!!! error TS2322: Type 'Cd.E' is not assignable to type 'First.E'. +!!! error TS2322: Property 'd' is missing in type 'First.E'. + abc = nope; // nope! + ~~~ +!!! error TS2322: Type 'Nope' is not assignable to type 'E'. + secondAbc = abc; // ok + secondAbcd = abc; // ok + secondAb = abc; // missing 'c' + ~~~~~~~~ +!!! error TS2322: Type 'First.E' is not assignable to type 'Ab.E'. +!!! error TS2322: Property 'c' is missing in type 'Ab.E'. + secondCd = abc; // missing 'a' and 'b' + ~~~~~~~~ +!!! error TS2322: Type 'First.E' is not assignable to type 'Cd.E'. +!!! error TS2322: Property 'a' is missing in type 'Cd.E'. + nope = abc; // nope! + ~~~~ +!!! error TS2322: Type 'E' is not assignable to type 'Nope'. + \ No newline at end of file diff --git a/tests/baselines/reference/enumAssignmentCompat3.js b/tests/baselines/reference/enumAssignmentCompat3.js new file mode 100644 index 00000000000..33cfdd28e88 --- /dev/null +++ b/tests/baselines/reference/enumAssignmentCompat3.js @@ -0,0 +1,115 @@ +//// [enumAssignmentCompat3.ts] +namespace First { + export enum E { + a, b, c, + } +} +namespace Abc { + export enum E { + a, b, c, + } + export enum Nope { + a, b, c, + } +} +namespace Abcd { + export enum E { + a, b, c, d, + } +} +namespace Ab { + export enum E { + a, b, + } +} +namespace Cd { + export enum E { + c, d, + } +} + +var abc: First.E; +var secondAbc: Abc.E; +var secondAbcd: Abcd.E; +var secondAb: Ab.E; +var secondCd: Cd.E; +var nope: Abc.Nope; +abc = secondAbc; // ok +abc = secondAbcd; // missing 'd' +abc = secondAb; // ok +abc = secondCd; // missing 'd' +abc = nope; // nope! +secondAbc = abc; // ok +secondAbcd = abc; // ok +secondAb = abc; // missing 'c' +secondCd = abc; // missing 'a' and 'b' +nope = abc; // nope! + + +//// [enumAssignmentCompat3.js] +var First; +(function (First) { + (function (E) { + E[E["a"] = 0] = "a"; + E[E["b"] = 1] = "b"; + E[E["c"] = 2] = "c"; + })(First.E || (First.E = {})); + var E = First.E; +})(First || (First = {})); +var Abc; +(function (Abc) { + (function (E) { + E[E["a"] = 0] = "a"; + E[E["b"] = 1] = "b"; + E[E["c"] = 2] = "c"; + })(Abc.E || (Abc.E = {})); + var E = Abc.E; + (function (Nope) { + Nope[Nope["a"] = 0] = "a"; + Nope[Nope["b"] = 1] = "b"; + Nope[Nope["c"] = 2] = "c"; + })(Abc.Nope || (Abc.Nope = {})); + var Nope = Abc.Nope; +})(Abc || (Abc = {})); +var Abcd; +(function (Abcd) { + (function (E) { + E[E["a"] = 0] = "a"; + E[E["b"] = 1] = "b"; + E[E["c"] = 2] = "c"; + E[E["d"] = 3] = "d"; + })(Abcd.E || (Abcd.E = {})); + var E = Abcd.E; +})(Abcd || (Abcd = {})); +var Ab; +(function (Ab) { + (function (E) { + E[E["a"] = 0] = "a"; + E[E["b"] = 1] = "b"; + })(Ab.E || (Ab.E = {})); + var E = Ab.E; +})(Ab || (Ab = {})); +var Cd; +(function (Cd) { + (function (E) { + E[E["c"] = 0] = "c"; + E[E["d"] = 1] = "d"; + })(Cd.E || (Cd.E = {})); + var E = Cd.E; +})(Cd || (Cd = {})); +var abc; +var secondAbc; +var secondAbcd; +var secondAb; +var secondCd; +var nope; +abc = secondAbc; // ok +abc = secondAbcd; // missing 'd' +abc = secondAb; // ok +abc = secondCd; // missing 'd' +abc = nope; // nope! +secondAbc = abc; // ok +secondAbcd = abc; // ok +secondAb = abc; // missing 'c' +secondCd = abc; // missing 'a' and 'b' +nope = abc; // nope! diff --git a/tests/cases/compiler/enumAssignmentCompat3.ts b/tests/cases/compiler/enumAssignmentCompat3.ts new file mode 100644 index 00000000000..94a22c7f346 --- /dev/null +++ b/tests/cases/compiler/enumAssignmentCompat3.ts @@ -0,0 +1,45 @@ +namespace First { + export enum E { + a, b, c, + } +} +namespace Abc { + export enum E { + a, b, c, + } + export enum Nope { + a, b, c, + } +} +namespace Abcd { + export enum E { + a, b, c, d, + } +} +namespace Ab { + export enum E { + a, b, + } +} +namespace Cd { + export enum E { + c, d, + } +} + +var abc: First.E; +var secondAbc: Abc.E; +var secondAbcd: Abcd.E; +var secondAb: Ab.E; +var secondCd: Cd.E; +var nope: Abc.Nope; +abc = secondAbc; // ok +abc = secondAbcd; // missing 'd' +abc = secondAb; // ok +abc = secondCd; // missing 'd' +abc = nope; // nope! +secondAbc = abc; // ok +secondAbcd = abc; // ok +secondAb = abc; // missing 'c' +secondCd = abc; // missing 'a' and 'b' +nope = abc; // nope! From 9810ddf3266f0a3bd61d13d3532647173a378ca2 Mon Sep 17 00:00:00 2001 From: Anders Hejlsberg Date: Thu, 10 Dec 2015 12:07:17 -0800 Subject: [PATCH 078/177] Include fresh type parameters in type parameter mapper function --- src/compiler/checker.ts | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/src/compiler/checker.ts b/src/compiler/checker.ts index ede1afb757e..43cfcb5e122 100644 --- a/src/compiler/checker.ts +++ b/src/compiler/checker.ts @@ -4744,16 +4744,10 @@ namespace ts { return t => instantiateType(mapper1(t), mapper2); } - function instantiateTypeParameter(typeParameter: TypeParameter, mapper: TypeMapper): TypeParameter { + function cloneTypeParameter(typeParameter: TypeParameter): TypeParameter { const result = createType(TypeFlags.TypeParameter); result.symbol = typeParameter.symbol; - if (typeParameter.constraint) { - result.constraint = instantiateType(typeParameter.constraint, mapper); - } - else { - result.target = typeParameter; - result.mapper = mapper; - } + result.target = typeParameter; return result; } @@ -4761,8 +4755,14 @@ namespace ts { let freshTypeParameters: TypeParameter[]; let freshTypePredicate: TypePredicate; if (signature.typeParameters && !eraseTypeParameters) { - freshTypeParameters = instantiateList(signature.typeParameters, mapper, instantiateTypeParameter); + // First create a fresh set of type parameters, then include a mapping from the old to the + // new type parameters in the mapper function. Finally store this mapper in the new type + // parameters such that we can use it when instantiating constraints. + freshTypeParameters = map(signature.typeParameters, cloneTypeParameter); mapper = combineTypeMappers(createTypeMapper(signature.typeParameters, freshTypeParameters), mapper); + for (const tp of freshTypeParameters) { + tp.mapper = mapper; + } } if (signature.typePredicate) { freshTypePredicate = { From 591f96321c724740dfcc4d40d1db920b12b6cf36 Mon Sep 17 00:00:00 2001 From: Wesley Wigham Date: Thu, 10 Dec 2015 13:25:26 -0800 Subject: [PATCH 079/177] Add language service tests for this predicates --- .../cases/fourslash/thisPredicateFunctions.ts | 95 ++++++++++++ tests/cases/fourslash/thisPredicateMembers.ts | 137 ++++++++++++++++++ 2 files changed, 232 insertions(+) create mode 100644 tests/cases/fourslash/thisPredicateFunctions.ts create mode 100644 tests/cases/fourslash/thisPredicateMembers.ts diff --git a/tests/cases/fourslash/thisPredicateFunctions.ts b/tests/cases/fourslash/thisPredicateFunctions.ts new file mode 100644 index 00000000000..8df03ea312a --- /dev/null +++ b/tests/cases/fourslash/thisPredicateFunctions.ts @@ -0,0 +1,95 @@ +/// + +//// class RoyalGuard { +//// isLeader(): this is LeadGuard { +//// return this instanceof LeadGuard; +//// } +//// isFollower(): this is FollowerGuard { +//// return this instanceof FollowerGuard; +//// } +//// } +//// +//// class LeadGuard extends RoyalGuard { +//// lead(): void {}; +//// } +//// +//// class FollowerGuard extends RoyalGuard { +//// follow(): void {}; +//// } +//// +//// let a: RoyalGuard = new FollowerGuard(); +//// if (a.is/*1*/Leader()) { +//// a./*2*/; +//// } +//// else if (a.is/*3*/Follower()) { +//// a./*4*/; +//// } +//// +//// interface GuardInterface { +//// isLeader(): this is LeadGuard; +//// isFollower(): this is FollowerGuard; +//// } +//// +//// let b: GuardInterface; +//// if (b.is/*5*/Leader()) { +//// b./*6*/; +//// } +//// else if (b.is/*7*/Follower()) { +//// b./*8*/; +//// } +//// +//// if (((a.isLeader)())) { +//// a./*9*/; +//// } +//// else if (((a).isFollower())) { +//// a./*10*/; +//// } +//// +//// if (((a["isLeader"])())) { +//// a./*11*/; +//// } +//// else if (((a)["isFollower"]())) { +//// a./*12*/; +//// } +//// +//// let leader/*13*/Status = a.isLeader(); +//// function isLeaderGuard(g: RoyalGuard) { +//// return g.isLeader(); +//// } +//// let checked/*14*/LeaderStatus = isLeader/*15*/Guard(a); + + +goTo.marker("1"); +verify.quickInfoIs("(method) RoyalGuard.isLeader(): this is LeadGuard"); +goTo.marker("2"); +verify.completionListContains("lead"); +goTo.marker("3"); +verify.quickInfoIs("(method) RoyalGuard.isFollower(): this is FollowerGuard"); +goTo.marker("4"); +verify.completionListContains("follow"); + +goTo.marker("5"); +verify.quickInfoIs("(method) GuardInterface.isLeader(): this is LeadGuard"); +goTo.marker("6"); +verify.completionListContains("lead"); +goTo.marker("7"); +verify.quickInfoIs("(method) GuardInterface.isFollower(): this is FollowerGuard"); +goTo.marker("8"); +verify.completionListContains("follow"); + +goTo.marker("9"); +verify.completionListContains("lead"); +goTo.marker("10"); +verify.completionListContains("follow"); + +goTo.marker("11"); +verify.completionListContains("lead"); +goTo.marker("12"); +verify.completionListContains("follow"); + +goTo.marker("13"); +verify.quickInfoIs("let leaderStatus: boolean"); +goTo.marker("14"); +verify.quickInfoIs("let checkedLeaderStatus: boolean"); +goTo.marker("15"); +verify.quickInfoIs("function isLeaderGuard(g: RoyalGuard): boolean"); \ No newline at end of file diff --git a/tests/cases/fourslash/thisPredicateMembers.ts b/tests/cases/fourslash/thisPredicateMembers.ts new file mode 100644 index 00000000000..b20a0de1997 --- /dev/null +++ b/tests/cases/fourslash/thisPredicateMembers.ts @@ -0,0 +1,137 @@ +/// + +//// class FileSystemObject { +//// get is/*1*/File(): this is Item { +//// return this instanceof Item; +//// } +//// set is/*2*/File(param) { +//// // noop +//// } +//// get is/*3*/Directory(): this is Directory { +//// return this instanceof Directory; +//// } +//// is/*4*/Networked: this is (Networked & this); +//// constructor(public path: string) {} +//// } +//// +//// class Item extends FileSystemObject { +//// constructor(path: string, public content: string) { super(path); } +//// } +//// class Directory extends FileSystemObject { +//// children: FileSystemObject[]; +//// } +//// interface Networked { +//// host: string; +//// } +//// +//// interface Sundries { +//// broken: boolean; +//// } +//// +//// interface Supplies { +//// spoiled: boolean; +//// } +//// +//// interface Crate { +//// contents: T; +//// is/*5*/Sundries: this is Crate; +//// is/*6*/Supplies: this is Crate; +//// is/*7*/PackedTight: this is (this & {extraContents: T}); +//// } +//// +//// const obj: FileSystemObject = new Item("/foo", ""); +//// if (obj.is/*8*/File) { +//// obj./*9*/; +//// if (obj.is/*10*/Networked) { +//// obj./*11*/; +//// } +//// } +//// if (obj.is/*12*/Directory) { +//// obj./*13*/; +//// if (obj.is/*14*/Networked) { +//// obj./*15*/; +//// } +//// } +//// if (obj.is/*16*/Networked) { +//// obj./*17*/; +//// } +//// +//// const crate: Crate; +//// if (crate.is/*18*/PackedTight) { +//// crate./*19*/; +//// } +//// if (crate.is/*20*/Sundries) { +//// crate.contents./*21*/; +//// if (crate.is/*22*/PackedTight) { +//// crate./*23*/ +//// } +//// } +//// if (crate.is/*24*/Supplies) { +//// crate.contents./*25*/; +//// if (crate.is/*26*/PackedTight) { +//// crate./*27*/ +//// } +//// } + +goTo.marker("1"); +verify.quickInfoIs("(property) FileSystemObject.isFile: this is Item"); +goTo.marker("2"); +verify.quickInfoIs("(property) FileSystemObject.isFile: this is Item"); +goTo.marker("3"); +verify.quickInfoIs("(property) FileSystemObject.isDirectory: this is Directory"); +goTo.marker("4"); +verify.quickInfoIs("(property) FileSystemObject.isNetworked: this is Networked & this"); +goTo.marker("5"); +verify.quickInfoIs("(property) Crate.isSundries: this is Crate"); +goTo.marker("6"); +verify.quickInfoIs("(property) Crate.isSupplies: this is Crate"); +goTo.marker("7"); +verify.quickInfoIs(`(property) Crate.isPackedTight: this is this & { + extraContents: T; +}`); +goTo.marker("8"); +verify.quickInfoIs("(property) FileSystemObject.isFile: this is Item"); +goTo.marker("9"); +verify.completionListContains("content"); +goTo.marker("10"); +verify.quickInfoIs("(property) FileSystemObject.isNetworked: this is Networked & Item"); +goTo.marker("11"); +verify.completionListContains("host"); +goTo.marker("12"); +verify.quickInfoIs("(property) FileSystemObject.isDirectory: this is Directory"); +goTo.marker("13"); +verify.completionListContains("children"); +goTo.marker("14"); +verify.quickInfoIs("(property) FileSystemObject.isNetworked: this is Networked & Directory"); +goTo.marker("15"); +verify.completionListContains("host"); +goTo.marker("16"); +verify.quickInfoIs("(property) FileSystemObject.isNetworked: this is Networked & FileSystemObject"); +goTo.marker("17"); +verify.completionListContains("host"); +goTo.marker("18"); +verify.quickInfoIs(`(property) Crate.isPackedTight: this is Crate & { + extraContents: any; +}`); +goTo.marker("19"); +verify.completionListContains("extraContents"); +goTo.marker("20"); +verify.quickInfoIs("(property) Crate.isSundries: this is Crate"); +goTo.marker("21"); +verify.completionListContains("broken"); +goTo.marker("22"); +verify.quickInfoIs(`(property) Crate.isPackedTight: this is Crate & { + extraContents: Sundries; +}`); +goTo.marker("23"); +verify.completionListContains("extraContents"); +goTo.marker("24"); +verify.quickInfoIs("(property) Crate.isSupplies: this is Crate"); +goTo.marker("25"); +verify.completionListContains("spoiled"); +goTo.marker("26"); +verify.quickInfoIs(`(property) Crate.isPackedTight: this is Crate & { + extraContents: Supplies; +}`); +goTo.marker("27"); +verify.completionListContains("extraContents"); \ No newline at end of file From cc1d8cf395eebdf5e1f6e2f9ddb90111fbad95b7 Mon Sep 17 00:00:00 2001 From: Nathan Shively-Sanders Date: Thu, 10 Dec 2015 13:47:18 -0800 Subject: [PATCH 080/177] Address review comments --- src/compiler/checker.ts | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/src/compiler/checker.ts b/src/compiler/checker.ts index 0f04daf2983..857fa97ca06 100644 --- a/src/compiler/checker.ts +++ b/src/compiler/checker.ts @@ -5757,15 +5757,17 @@ namespace ts { } function enumRelatedTo(source: Type, target: Type) { - if (source.symbol.name !== target.symbol.name) { + if (source.symbol.name !== target.symbol.name || + source.symbol.flags & SymbolFlags.ConstEnum || + target.symbol.flags & SymbolFlags.ConstEnum) { return Ternary.False; } - const sourceDecl = getMergedSymbol(source.symbol).valueDeclaration; - const targetDecl = getMergedSymbol(target.symbol).valueDeclaration; + const sourceDecl = getDeclarationOfKind(source.symbol, SyntaxKind.EnumDeclaration); + const targetDecl = getDeclarationOfKind(target.symbol, SyntaxKind.EnumDeclaration); const targetMembers = arrayToMap(targetDecl.members, member => getTextOfPropertyName(member.name)); for (const member of sourceDecl.members) { const name = getTextOfPropertyName(member.name); - if (!targetMembers[name]) { + if (!hasProperty(targetMembers, name)) { reportError(Diagnostics.Property_0_is_missing_in_type_1, name, typeToString(target, /*enclosingDeclaration*/ undefined, TypeFormatFlags.UseFullyQualifiedType)); From ff0138878ddbe5823df3d37073e875758f23ec18 Mon Sep 17 00:00:00 2001 From: Nathan Shively-Sanders Date: Thu, 10 Dec 2015 13:47:31 -0800 Subject: [PATCH 081/177] Add tests from review --- .../enumAssignmentCompat3.errors.txt | 38 +++++++++++++++---- .../reference/enumAssignmentCompat3.js | 28 ++++++++++++++ tests/cases/compiler/enumAssignmentCompat3.ts | 18 +++++++++ 3 files changed, 77 insertions(+), 7 deletions(-) diff --git a/tests/baselines/reference/enumAssignmentCompat3.errors.txt b/tests/baselines/reference/enumAssignmentCompat3.errors.txt index d82a4b7d490..b9ab92adec1 100644 --- a/tests/baselines/reference/enumAssignmentCompat3.errors.txt +++ b/tests/baselines/reference/enumAssignmentCompat3.errors.txt @@ -1,16 +1,18 @@ -tests/cases/compiler/enumAssignmentCompat3.ts(37,1): error TS2322: Type 'Abcd.E' is not assignable to type 'First.E'. +tests/cases/compiler/enumAssignmentCompat3.ts(49,1): error TS2322: Type 'Abcd.E' is not assignable to type 'First.E'. Property 'd' is missing in type 'First.E'. -tests/cases/compiler/enumAssignmentCompat3.ts(39,1): error TS2322: Type 'Cd.E' is not assignable to type 'First.E'. +tests/cases/compiler/enumAssignmentCompat3.ts(51,1): error TS2322: Type 'Cd.E' is not assignable to type 'First.E'. Property 'd' is missing in type 'First.E'. -tests/cases/compiler/enumAssignmentCompat3.ts(40,1): error TS2322: Type 'Nope' is not assignable to type 'E'. -tests/cases/compiler/enumAssignmentCompat3.ts(43,1): error TS2322: Type 'First.E' is not assignable to type 'Ab.E'. +tests/cases/compiler/enumAssignmentCompat3.ts(52,1): error TS2322: Type 'Nope' is not assignable to type 'E'. +tests/cases/compiler/enumAssignmentCompat3.ts(56,1): error TS2322: Type 'First.E' is not assignable to type 'Ab.E'. Property 'c' is missing in type 'Ab.E'. -tests/cases/compiler/enumAssignmentCompat3.ts(44,1): error TS2322: Type 'First.E' is not assignable to type 'Cd.E'. +tests/cases/compiler/enumAssignmentCompat3.ts(57,1): error TS2322: Type 'First.E' is not assignable to type 'Cd.E'. Property 'a' is missing in type 'Cd.E'. -tests/cases/compiler/enumAssignmentCompat3.ts(45,1): error TS2322: Type 'E' is not assignable to type 'Nope'. +tests/cases/compiler/enumAssignmentCompat3.ts(58,1): error TS2322: Type 'E' is not assignable to type 'Nope'. +tests/cases/compiler/enumAssignmentCompat3.ts(62,1): error TS2322: Type 'Const.E' is not assignable to type 'First.E'. +tests/cases/compiler/enumAssignmentCompat3.ts(63,1): error TS2322: Type 'First.E' is not assignable to type 'Const.E'. -==== tests/cases/compiler/enumAssignmentCompat3.ts (6 errors) ==== +==== tests/cases/compiler/enumAssignmentCompat3.ts (8 errors) ==== namespace First { export enum E { a, b, c, @@ -39,6 +41,16 @@ tests/cases/compiler/enumAssignmentCompat3.ts(45,1): error TS2322: Type 'E' is n c, d, } } + namespace Const { + export const enum E { + a, b, c, + } + } + namespace Decl { + export declare enum E { + a, b, c = 3, + } + } var abc: First.E; var secondAbc: Abc.E; @@ -46,6 +58,8 @@ tests/cases/compiler/enumAssignmentCompat3.ts(45,1): error TS2322: Type 'E' is n var secondAb: Ab.E; var secondCd: Cd.E; var nope: Abc.Nope; + var k: Const.E; + var decl: Decl.E; abc = secondAbc; // ok abc = secondAbcd; // missing 'd' ~~~ @@ -59,6 +73,7 @@ tests/cases/compiler/enumAssignmentCompat3.ts(45,1): error TS2322: Type 'E' is n abc = nope; // nope! ~~~ !!! error TS2322: Type 'Nope' is not assignable to type 'E'. + abc = decl; // ok secondAbc = abc; // ok secondAbcd = abc; // ok secondAb = abc; // missing 'c' @@ -72,4 +87,13 @@ tests/cases/compiler/enumAssignmentCompat3.ts(45,1): error TS2322: Type 'E' is n nope = abc; // nope! ~~~~ !!! error TS2322: Type 'E' is not assignable to type 'Nope'. + decl = abc; // ok + + k = k; // const is only assignable to itself + abc = k; // error + ~~~ +!!! error TS2322: Type 'Const.E' is not assignable to type 'First.E'. + k = abc; + ~ +!!! error TS2322: Type 'First.E' is not assignable to type 'Const.E'. \ No newline at end of file diff --git a/tests/baselines/reference/enumAssignmentCompat3.js b/tests/baselines/reference/enumAssignmentCompat3.js index 33cfdd28e88..1173bfa1812 100644 --- a/tests/baselines/reference/enumAssignmentCompat3.js +++ b/tests/baselines/reference/enumAssignmentCompat3.js @@ -27,6 +27,16 @@ namespace Cd { c, d, } } +namespace Const { + export const enum E { + a, b, c, + } +} +namespace Decl { + export declare enum E { + a, b, c = 3, + } +} var abc: First.E; var secondAbc: Abc.E; @@ -34,16 +44,24 @@ var secondAbcd: Abcd.E; var secondAb: Ab.E; var secondCd: Cd.E; var nope: Abc.Nope; +var k: Const.E; +var decl: Decl.E; abc = secondAbc; // ok abc = secondAbcd; // missing 'd' abc = secondAb; // ok abc = secondCd; // missing 'd' abc = nope; // nope! +abc = decl; // ok secondAbc = abc; // ok secondAbcd = abc; // ok secondAb = abc; // missing 'c' secondCd = abc; // missing 'a' and 'b' nope = abc; // nope! +decl = abc; // ok + +k = k; // const is only assignable to itself +abc = k; // error +k = abc; //// [enumAssignmentCompat3.js] @@ -97,19 +115,29 @@ var Cd; })(Cd.E || (Cd.E = {})); var E = Cd.E; })(Cd || (Cd = {})); +var Decl; +(function (Decl) { +})(Decl || (Decl = {})); var abc; var secondAbc; var secondAbcd; var secondAb; var secondCd; var nope; +var k; +var decl; abc = secondAbc; // ok abc = secondAbcd; // missing 'd' abc = secondAb; // ok abc = secondCd; // missing 'd' abc = nope; // nope! +abc = decl; // ok secondAbc = abc; // ok secondAbcd = abc; // ok secondAb = abc; // missing 'c' secondCd = abc; // missing 'a' and 'b' nope = abc; // nope! +decl = abc; // ok +k = k; // const is only assignable to itself +abc = k; // error +k = abc; diff --git a/tests/cases/compiler/enumAssignmentCompat3.ts b/tests/cases/compiler/enumAssignmentCompat3.ts index 94a22c7f346..aaaf96b69c8 100644 --- a/tests/cases/compiler/enumAssignmentCompat3.ts +++ b/tests/cases/compiler/enumAssignmentCompat3.ts @@ -26,6 +26,16 @@ namespace Cd { c, d, } } +namespace Const { + export const enum E { + a, b, c, + } +} +namespace Decl { + export declare enum E { + a, b, c = 3, + } +} var abc: First.E; var secondAbc: Abc.E; @@ -33,13 +43,21 @@ var secondAbcd: Abcd.E; var secondAb: Ab.E; var secondCd: Cd.E; var nope: Abc.Nope; +var k: Const.E; +var decl: Decl.E; abc = secondAbc; // ok abc = secondAbcd; // missing 'd' abc = secondAb; // ok abc = secondCd; // missing 'd' abc = nope; // nope! +abc = decl; // ok secondAbc = abc; // ok secondAbcd = abc; // ok secondAb = abc; // missing 'c' secondCd = abc; // missing 'a' and 'b' nope = abc; // nope! +decl = abc; // ok + +k = k; // const is only assignable to itself +abc = k; // error +k = abc; From 3055445d27c3d578e053541aae0fa30d7ab33191 Mon Sep 17 00:00:00 2001 From: Anders Hejlsberg Date: Thu, 10 Dec 2015 13:54:58 -0800 Subject: [PATCH 082/177] Adding test --- .../typeParameterConstraintInstantiation.js | 15 ++++++++ ...peParameterConstraintInstantiation.symbols | 32 +++++++++++++++++ ...typeParameterConstraintInstantiation.types | 34 +++++++++++++++++++ .../typeParameterConstraintInstantiation.ts | 8 +++++ 4 files changed, 89 insertions(+) create mode 100644 tests/baselines/reference/typeParameterConstraintInstantiation.js create mode 100644 tests/baselines/reference/typeParameterConstraintInstantiation.symbols create mode 100644 tests/baselines/reference/typeParameterConstraintInstantiation.types create mode 100644 tests/cases/compiler/typeParameterConstraintInstantiation.ts diff --git a/tests/baselines/reference/typeParameterConstraintInstantiation.js b/tests/baselines/reference/typeParameterConstraintInstantiation.js new file mode 100644 index 00000000000..225536941ca --- /dev/null +++ b/tests/baselines/reference/typeParameterConstraintInstantiation.js @@ -0,0 +1,15 @@ +//// [typeParameterConstraintInstantiation.ts] +// Check that type parameter constraints are properly instantiated + +interface Mapper { + map(f: (item: T) => U): V; +} + +var m: Mapper; +var a = m.map((x: string) => x); // string[] + + +//// [typeParameterConstraintInstantiation.js] +// Check that type parameter constraints are properly instantiated +var m; +var a = m.map(function (x) { return x; }); // string[] diff --git a/tests/baselines/reference/typeParameterConstraintInstantiation.symbols b/tests/baselines/reference/typeParameterConstraintInstantiation.symbols new file mode 100644 index 00000000000..9103d65c0e9 --- /dev/null +++ b/tests/baselines/reference/typeParameterConstraintInstantiation.symbols @@ -0,0 +1,32 @@ +=== tests/cases/compiler/typeParameterConstraintInstantiation.ts === +// Check that type parameter constraints are properly instantiated + +interface Mapper { +>Mapper : Symbol(Mapper, Decl(typeParameterConstraintInstantiation.ts, 0, 0)) +>T : Symbol(T, Decl(typeParameterConstraintInstantiation.ts, 2, 17)) + + map(f: (item: T) => U): V; +>map : Symbol(map, Decl(typeParameterConstraintInstantiation.ts, 2, 21)) +>U : Symbol(U, Decl(typeParameterConstraintInstantiation.ts, 3, 8)) +>T : Symbol(T, Decl(typeParameterConstraintInstantiation.ts, 2, 17)) +>V : Symbol(V, Decl(typeParameterConstraintInstantiation.ts, 3, 20)) +>U : Symbol(U, Decl(typeParameterConstraintInstantiation.ts, 3, 8)) +>f : Symbol(f, Decl(typeParameterConstraintInstantiation.ts, 3, 36)) +>item : Symbol(item, Decl(typeParameterConstraintInstantiation.ts, 3, 40)) +>T : Symbol(T, Decl(typeParameterConstraintInstantiation.ts, 2, 17)) +>U : Symbol(U, Decl(typeParameterConstraintInstantiation.ts, 3, 8)) +>V : Symbol(V, Decl(typeParameterConstraintInstantiation.ts, 3, 20)) +} + +var m: Mapper; +>m : Symbol(m, Decl(typeParameterConstraintInstantiation.ts, 6, 3)) +>Mapper : Symbol(Mapper, Decl(typeParameterConstraintInstantiation.ts, 0, 0)) + +var a = m.map((x: string) => x); // string[] +>a : Symbol(a, Decl(typeParameterConstraintInstantiation.ts, 7, 3)) +>m.map : Symbol(Mapper.map, Decl(typeParameterConstraintInstantiation.ts, 2, 21)) +>m : Symbol(m, Decl(typeParameterConstraintInstantiation.ts, 6, 3)) +>map : Symbol(Mapper.map, Decl(typeParameterConstraintInstantiation.ts, 2, 21)) +>x : Symbol(x, Decl(typeParameterConstraintInstantiation.ts, 7, 15)) +>x : Symbol(x, Decl(typeParameterConstraintInstantiation.ts, 7, 15)) + diff --git a/tests/baselines/reference/typeParameterConstraintInstantiation.types b/tests/baselines/reference/typeParameterConstraintInstantiation.types new file mode 100644 index 00000000000..5f806d57ea2 --- /dev/null +++ b/tests/baselines/reference/typeParameterConstraintInstantiation.types @@ -0,0 +1,34 @@ +=== tests/cases/compiler/typeParameterConstraintInstantiation.ts === +// Check that type parameter constraints are properly instantiated + +interface Mapper { +>Mapper : Mapper +>T : T + + map(f: (item: T) => U): V; +>map : (f: (item: T) => U) => V +>U : U +>T : T +>V : V +>U : U +>f : (item: T) => U +>item : T +>T : T +>U : U +>V : V +} + +var m: Mapper; +>m : Mapper +>Mapper : Mapper + +var a = m.map((x: string) => x); // string[] +>a : string[] +>m.map((x: string) => x) : string[] +>m.map : (f: (item: string) => U) => V +>m : Mapper +>map : (f: (item: string) => U) => V +>(x: string) => x : (x: string) => string +>x : string +>x : string + diff --git a/tests/cases/compiler/typeParameterConstraintInstantiation.ts b/tests/cases/compiler/typeParameterConstraintInstantiation.ts new file mode 100644 index 00000000000..f81ddaf8959 --- /dev/null +++ b/tests/cases/compiler/typeParameterConstraintInstantiation.ts @@ -0,0 +1,8 @@ +// Check that type parameter constraints are properly instantiated + +interface Mapper { + map(f: (item: T) => U): V; +} + +var m: Mapper; +var a = m.map((x: string) => x); // string[] From 5ab5338574de82803ef1acb7174eb6ca689f9857 Mon Sep 17 00:00:00 2001 From: Anders Hejlsberg Date: Thu, 10 Dec 2015 13:55:57 -0800 Subject: [PATCH 083/177] Fix declaration emitter scoping issue for type parameter constraints --- src/compiler/declarationEmitter.ts | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/compiler/declarationEmitter.ts b/src/compiler/declarationEmitter.ts index 6e09a398ea6..3348b51dff7 100644 --- a/src/compiler/declarationEmitter.ts +++ b/src/compiler/declarationEmitter.ts @@ -1309,6 +1309,9 @@ namespace ts { } function emitSignatureDeclaration(node: SignatureDeclaration) { + const prevEnclosingDeclaration = enclosingDeclaration; + enclosingDeclaration = node; + // Construct signature or constructor type write new Signature if (node.kind === SyntaxKind.ConstructSignature || node.kind === SyntaxKind.ConstructorType) { write("new "); @@ -1321,9 +1324,6 @@ namespace ts { write("("); } - const prevEnclosingDeclaration = enclosingDeclaration; - enclosingDeclaration = node; - // Parameters emitCommaList(node.parameters, emitParameterDeclaration); From 139f10fb441ea2e531200116f0b43c93a1a1401f Mon Sep 17 00:00:00 2001 From: Wesley Wigham Date: Thu, 10 Dec 2015 14:08:50 -0800 Subject: [PATCH 084/177] test for and fix #6043 --- src/compiler/checker.ts | 3 ++- tests/baselines/reference/typeAliasExport.js | 8 ++++++++ tests/baselines/reference/typeAliasExport.symbols | 10 ++++++++++ tests/baselines/reference/typeAliasExport.types | 10 ++++++++++ tests/cases/compiler/typeAliasExport.ts | 5 +++++ 5 files changed, 35 insertions(+), 1 deletion(-) create mode 100644 tests/baselines/reference/typeAliasExport.js create mode 100644 tests/baselines/reference/typeAliasExport.symbols create mode 100644 tests/baselines/reference/typeAliasExport.types create mode 100644 tests/cases/compiler/typeAliasExport.ts diff --git a/src/compiler/checker.ts b/src/compiler/checker.ts index 0ee73756e57..1073e8eda9b 100644 --- a/src/compiler/checker.ts +++ b/src/compiler/checker.ts @@ -14310,8 +14310,9 @@ namespace ts { continue; } const { declarations, flags } = exports[id]; + let declarationLength = declarations.length; // ECMA262: 15.2.1.1 It is a Syntax Error if the ExportedNames of ModuleItemList contains any duplicate entries. (TS Exceptions: namespaces, function overloads, enums, and interfaces) - if (!(flags & (SymbolFlags.Namespace | SymbolFlags.Interface | SymbolFlags.Enum)) && declarations.length > 1) { + if (!(flags & (SymbolFlags.Namespace | SymbolFlags.Interface | SymbolFlags.Enum)) && (flags & SymbolFlags.TypeAlias ? declarationLength-- : true) && declarationLength > 1) { const exportedDeclarations: Declaration[] = filter(declarations, isNotOverload); if (exportedDeclarations.length > 1) { for (const declaration of exportedDeclarations) { diff --git a/tests/baselines/reference/typeAliasExport.js b/tests/baselines/reference/typeAliasExport.js new file mode 100644 index 00000000000..fa864f571ea --- /dev/null +++ b/tests/baselines/reference/typeAliasExport.js @@ -0,0 +1,8 @@ +//// [typeAliasExport.ts] +declare module "a" { + export default 0 + export var a; + export type a = typeof a; +} + +//// [typeAliasExport.js] diff --git a/tests/baselines/reference/typeAliasExport.symbols b/tests/baselines/reference/typeAliasExport.symbols new file mode 100644 index 00000000000..1f580b03011 --- /dev/null +++ b/tests/baselines/reference/typeAliasExport.symbols @@ -0,0 +1,10 @@ +=== tests/cases/compiler/typeAliasExport.ts === +declare module "a" { + export default 0 + export var a; +>a : Symbol(a, Decl(typeAliasExport.ts, 2, 12), Decl(typeAliasExport.ts, 2, 15)) + + export type a = typeof a; +>a : Symbol(a, Decl(typeAliasExport.ts, 2, 12), Decl(typeAliasExport.ts, 2, 15)) +>a : Symbol(a, Decl(typeAliasExport.ts, 2, 12), Decl(typeAliasExport.ts, 2, 15)) +} diff --git a/tests/baselines/reference/typeAliasExport.types b/tests/baselines/reference/typeAliasExport.types new file mode 100644 index 00000000000..afa26073061 --- /dev/null +++ b/tests/baselines/reference/typeAliasExport.types @@ -0,0 +1,10 @@ +=== tests/cases/compiler/typeAliasExport.ts === +declare module "a" { + export default 0 + export var a; +>a : any + + export type a = typeof a; +>a : any +>a : any +} diff --git a/tests/cases/compiler/typeAliasExport.ts b/tests/cases/compiler/typeAliasExport.ts new file mode 100644 index 00000000000..706b731f0ab --- /dev/null +++ b/tests/cases/compiler/typeAliasExport.ts @@ -0,0 +1,5 @@ +declare module "a" { + export default 0 + export var a; + export type a = typeof a; +} \ No newline at end of file From 5cb2b6afded47aee8251dde8567033d656ab7e6a Mon Sep 17 00:00:00 2001 From: Anders Hejlsberg Date: Thu, 10 Dec 2015 14:09:18 -0800 Subject: [PATCH 085/177] Adding tests --- .../declarationEmitFBoundedTypeParams.js | 20 +++++ .../declarationEmitFBoundedTypeParams.symbols | 25 ++++++ .../declarationEmitFBoundedTypeParams.types | 26 ++++++ .../typeInferenceFBoundedTypeParams.js | 39 ++++++++ .../typeInferenceFBoundedTypeParams.symbols | 71 +++++++++++++++ .../typeInferenceFBoundedTypeParams.types | 89 +++++++++++++++++++ .../declarationEmitFBoundedTypeParams.ts | 8 ++ .../typeInferenceFBoundedTypeParams.ts | 22 +++++ 8 files changed, 300 insertions(+) create mode 100644 tests/baselines/reference/declarationEmitFBoundedTypeParams.js create mode 100644 tests/baselines/reference/declarationEmitFBoundedTypeParams.symbols create mode 100644 tests/baselines/reference/declarationEmitFBoundedTypeParams.types create mode 100644 tests/baselines/reference/typeInferenceFBoundedTypeParams.js create mode 100644 tests/baselines/reference/typeInferenceFBoundedTypeParams.symbols create mode 100644 tests/baselines/reference/typeInferenceFBoundedTypeParams.types create mode 100644 tests/cases/compiler/declarationEmitFBoundedTypeParams.ts create mode 100644 tests/cases/compiler/typeInferenceFBoundedTypeParams.ts diff --git a/tests/baselines/reference/declarationEmitFBoundedTypeParams.js b/tests/baselines/reference/declarationEmitFBoundedTypeParams.js new file mode 100644 index 00000000000..407dbf395e5 --- /dev/null +++ b/tests/baselines/reference/declarationEmitFBoundedTypeParams.js @@ -0,0 +1,20 @@ +//// [declarationEmitFBoundedTypeParams.ts] + +// Repro from #6040 + +function append(result: a[], value: b): a[] { + result.push(value); + return result; +} + + +//// [declarationEmitFBoundedTypeParams.js] +// Repro from #6040 +function append(result, value) { + result.push(value); + return result; +} + + +//// [declarationEmitFBoundedTypeParams.d.ts] +declare function append(result: a[], value: b): a[]; diff --git a/tests/baselines/reference/declarationEmitFBoundedTypeParams.symbols b/tests/baselines/reference/declarationEmitFBoundedTypeParams.symbols new file mode 100644 index 00000000000..bb12ea89600 --- /dev/null +++ b/tests/baselines/reference/declarationEmitFBoundedTypeParams.symbols @@ -0,0 +1,25 @@ +=== tests/cases/compiler/declarationEmitFBoundedTypeParams.ts === + +// Repro from #6040 + +function append(result: a[], value: b): a[] { +>append : Symbol(append, Decl(declarationEmitFBoundedTypeParams.ts, 0, 0)) +>a : Symbol(a, Decl(declarationEmitFBoundedTypeParams.ts, 3, 16)) +>b : Symbol(b, Decl(declarationEmitFBoundedTypeParams.ts, 3, 18)) +>a : Symbol(a, Decl(declarationEmitFBoundedTypeParams.ts, 3, 16)) +>result : Symbol(result, Decl(declarationEmitFBoundedTypeParams.ts, 3, 32)) +>a : Symbol(a, Decl(declarationEmitFBoundedTypeParams.ts, 3, 16)) +>value : Symbol(value, Decl(declarationEmitFBoundedTypeParams.ts, 3, 44)) +>b : Symbol(b, Decl(declarationEmitFBoundedTypeParams.ts, 3, 18)) +>a : Symbol(a, Decl(declarationEmitFBoundedTypeParams.ts, 3, 16)) + + result.push(value); +>result.push : Symbol(Array.push, Decl(lib.d.ts, --, --)) +>result : Symbol(result, Decl(declarationEmitFBoundedTypeParams.ts, 3, 32)) +>push : Symbol(Array.push, Decl(lib.d.ts, --, --)) +>value : Symbol(value, Decl(declarationEmitFBoundedTypeParams.ts, 3, 44)) + + return result; +>result : Symbol(result, Decl(declarationEmitFBoundedTypeParams.ts, 3, 32)) +} + diff --git a/tests/baselines/reference/declarationEmitFBoundedTypeParams.types b/tests/baselines/reference/declarationEmitFBoundedTypeParams.types new file mode 100644 index 00000000000..7f7198b3b6d --- /dev/null +++ b/tests/baselines/reference/declarationEmitFBoundedTypeParams.types @@ -0,0 +1,26 @@ +=== tests/cases/compiler/declarationEmitFBoundedTypeParams.ts === + +// Repro from #6040 + +function append(result: a[], value: b): a[] { +>append : (result: a[], value: b) => a[] +>a : a +>b : b +>a : a +>result : a[] +>a : a +>value : b +>b : b +>a : a + + result.push(value); +>result.push(value) : number +>result.push : (...items: a[]) => number +>result : a[] +>push : (...items: a[]) => number +>value : b + + return result; +>result : a[] +} + diff --git a/tests/baselines/reference/typeInferenceFBoundedTypeParams.js b/tests/baselines/reference/typeInferenceFBoundedTypeParams.js new file mode 100644 index 00000000000..3e30901df06 --- /dev/null +++ b/tests/baselines/reference/typeInferenceFBoundedTypeParams.js @@ -0,0 +1,39 @@ +//// [typeInferenceFBoundedTypeParams.ts] +// Example from #6037 + +function fold(values: a[], result: r, fold: (result: r, value: a) => r): r { + for (let value of values) { + result = fold(result, value); + } + return result; +} + +function append(values: a[], value: b): a[] { + values.push(value); + return values; +} + +fold( + [1, 2, 3], + [] as [string, string][], + (result, value) => append( + result, + ["", ""] + ) +); + + +//// [typeInferenceFBoundedTypeParams.js] +// Example from #6037 +function fold(values, result, fold) { + for (var _i = 0, values_1 = values; _i < values_1.length; _i++) { + var value = values_1[_i]; + result = fold(result, value); + } + return result; +} +function append(values, value) { + values.push(value); + return values; +} +fold([1, 2, 3], [], function (result, value) { return append(result, ["", ""]); }); diff --git a/tests/baselines/reference/typeInferenceFBoundedTypeParams.symbols b/tests/baselines/reference/typeInferenceFBoundedTypeParams.symbols new file mode 100644 index 00000000000..f49d7b7524e --- /dev/null +++ b/tests/baselines/reference/typeInferenceFBoundedTypeParams.symbols @@ -0,0 +1,71 @@ +=== tests/cases/compiler/typeInferenceFBoundedTypeParams.ts === +// Example from #6037 + +function fold(values: a[], result: r, fold: (result: r, value: a) => r): r { +>fold : Symbol(fold, Decl(typeInferenceFBoundedTypeParams.ts, 0, 0)) +>a : Symbol(a, Decl(typeInferenceFBoundedTypeParams.ts, 2, 14)) +>r : Symbol(r, Decl(typeInferenceFBoundedTypeParams.ts, 2, 16)) +>values : Symbol(values, Decl(typeInferenceFBoundedTypeParams.ts, 2, 20)) +>a : Symbol(a, Decl(typeInferenceFBoundedTypeParams.ts, 2, 14)) +>result : Symbol(result, Decl(typeInferenceFBoundedTypeParams.ts, 2, 32)) +>r : Symbol(r, Decl(typeInferenceFBoundedTypeParams.ts, 2, 16)) +>fold : Symbol(fold, Decl(typeInferenceFBoundedTypeParams.ts, 2, 43)) +>result : Symbol(result, Decl(typeInferenceFBoundedTypeParams.ts, 2, 51)) +>r : Symbol(r, Decl(typeInferenceFBoundedTypeParams.ts, 2, 16)) +>value : Symbol(value, Decl(typeInferenceFBoundedTypeParams.ts, 2, 61)) +>a : Symbol(a, Decl(typeInferenceFBoundedTypeParams.ts, 2, 14)) +>r : Symbol(r, Decl(typeInferenceFBoundedTypeParams.ts, 2, 16)) +>r : Symbol(r, Decl(typeInferenceFBoundedTypeParams.ts, 2, 16)) + + for (let value of values) { +>value : Symbol(value, Decl(typeInferenceFBoundedTypeParams.ts, 3, 12)) +>values : Symbol(values, Decl(typeInferenceFBoundedTypeParams.ts, 2, 20)) + + result = fold(result, value); +>result : Symbol(result, Decl(typeInferenceFBoundedTypeParams.ts, 2, 32)) +>fold : Symbol(fold, Decl(typeInferenceFBoundedTypeParams.ts, 2, 43)) +>result : Symbol(result, Decl(typeInferenceFBoundedTypeParams.ts, 2, 32)) +>value : Symbol(value, Decl(typeInferenceFBoundedTypeParams.ts, 3, 12)) + } + return result; +>result : Symbol(result, Decl(typeInferenceFBoundedTypeParams.ts, 2, 32)) +} + +function append(values: a[], value: b): a[] { +>append : Symbol(append, Decl(typeInferenceFBoundedTypeParams.ts, 7, 1)) +>a : Symbol(a, Decl(typeInferenceFBoundedTypeParams.ts, 9, 16)) +>b : Symbol(b, Decl(typeInferenceFBoundedTypeParams.ts, 9, 18)) +>a : Symbol(a, Decl(typeInferenceFBoundedTypeParams.ts, 9, 16)) +>values : Symbol(values, Decl(typeInferenceFBoundedTypeParams.ts, 9, 32)) +>a : Symbol(a, Decl(typeInferenceFBoundedTypeParams.ts, 9, 16)) +>value : Symbol(value, Decl(typeInferenceFBoundedTypeParams.ts, 9, 44)) +>b : Symbol(b, Decl(typeInferenceFBoundedTypeParams.ts, 9, 18)) +>a : Symbol(a, Decl(typeInferenceFBoundedTypeParams.ts, 9, 16)) + + values.push(value); +>values.push : Symbol(Array.push, Decl(lib.d.ts, --, --)) +>values : Symbol(values, Decl(typeInferenceFBoundedTypeParams.ts, 9, 32)) +>push : Symbol(Array.push, Decl(lib.d.ts, --, --)) +>value : Symbol(value, Decl(typeInferenceFBoundedTypeParams.ts, 9, 44)) + + return values; +>values : Symbol(values, Decl(typeInferenceFBoundedTypeParams.ts, 9, 32)) +} + +fold( +>fold : Symbol(fold, Decl(typeInferenceFBoundedTypeParams.ts, 0, 0)) + + [1, 2, 3], + [] as [string, string][], + (result, value) => append( +>result : Symbol(result, Decl(typeInferenceFBoundedTypeParams.ts, 17, 5)) +>value : Symbol(value, Decl(typeInferenceFBoundedTypeParams.ts, 17, 12)) +>append : Symbol(append, Decl(typeInferenceFBoundedTypeParams.ts, 7, 1)) + + result, +>result : Symbol(result, Decl(typeInferenceFBoundedTypeParams.ts, 17, 5)) + + ["", ""] + ) +); + diff --git a/tests/baselines/reference/typeInferenceFBoundedTypeParams.types b/tests/baselines/reference/typeInferenceFBoundedTypeParams.types new file mode 100644 index 00000000000..0ce04aabddf --- /dev/null +++ b/tests/baselines/reference/typeInferenceFBoundedTypeParams.types @@ -0,0 +1,89 @@ +=== tests/cases/compiler/typeInferenceFBoundedTypeParams.ts === +// Example from #6037 + +function fold(values: a[], result: r, fold: (result: r, value: a) => r): r { +>fold : (values: a[], result: r, fold: (result: r, value: a) => r) => r +>a : a +>r : r +>values : a[] +>a : a +>result : r +>r : r +>fold : (result: r, value: a) => r +>result : r +>r : r +>value : a +>a : a +>r : r +>r : r + + for (let value of values) { +>value : a +>values : a[] + + result = fold(result, value); +>result = fold(result, value) : r +>result : r +>fold(result, value) : r +>fold : (result: r, value: a) => r +>result : r +>value : a + } + return result; +>result : r +} + +function append(values: a[], value: b): a[] { +>append : (values: a[], value: b) => a[] +>a : a +>b : b +>a : a +>values : a[] +>a : a +>value : b +>b : b +>a : a + + values.push(value); +>values.push(value) : number +>values.push : (...items: a[]) => number +>values : a[] +>push : (...items: a[]) => number +>value : b + + return values; +>values : a[] +} + +fold( +>fold( [1, 2, 3], [] as [string, string][], (result, value) => append( result, ["", ""] )) : [string, string][] +>fold : (values: a[], result: r, fold: (result: r, value: a) => r) => r + + [1, 2, 3], +>[1, 2, 3] : number[] +>1 : number +>2 : number +>3 : number + + [] as [string, string][], +>[] as [string, string][] : [string, string][] +>[] : undefined[] + + (result, value) => append( +>(result, value) => append( result, ["", ""] ) : (result: [string, string][], value: number) => [string, string][] +>result : [string, string][] +>value : number +>append( result, ["", ""] ) : [string, string][] +>append : (values: a[], value: b) => a[] + + result, +>result : [string, string][] + + ["", ""] +>["", ""] : [string, string] +>"" : string +>"" : string + + ) +); + diff --git a/tests/cases/compiler/declarationEmitFBoundedTypeParams.ts b/tests/cases/compiler/declarationEmitFBoundedTypeParams.ts new file mode 100644 index 00000000000..baa91ab7bb2 --- /dev/null +++ b/tests/cases/compiler/declarationEmitFBoundedTypeParams.ts @@ -0,0 +1,8 @@ +// @declaration: true + +// Repro from #6040 + +function append(result: a[], value: b): a[] { + result.push(value); + return result; +} diff --git a/tests/cases/compiler/typeInferenceFBoundedTypeParams.ts b/tests/cases/compiler/typeInferenceFBoundedTypeParams.ts new file mode 100644 index 00000000000..26f6be3fad2 --- /dev/null +++ b/tests/cases/compiler/typeInferenceFBoundedTypeParams.ts @@ -0,0 +1,22 @@ +// Example from #6037 + +function fold(values: a[], result: r, fold: (result: r, value: a) => r): r { + for (let value of values) { + result = fold(result, value); + } + return result; +} + +function append(values: a[], value: b): a[] { + values.push(value); + return values; +} + +fold( + [1, 2, 3], + [] as [string, string][], + (result, value) => append( + result, + ["", ""] + ) +); From a995b23e4a00e252de81cdf0d1685700314eefa6 Mon Sep 17 00:00:00 2001 From: Nathan Shively-Sanders Date: Thu, 10 Dec 2015 14:28:29 -0800 Subject: [PATCH 086/177] Handle merged enums --- src/compiler/checker.ts | 23 ++++++++++++++++++----- src/compiler/utilities.ts | 15 +++++++++++++++ 2 files changed, 33 insertions(+), 5 deletions(-) diff --git a/src/compiler/checker.ts b/src/compiler/checker.ts index 857fa97ca06..2fb0296c1c7 100644 --- a/src/compiler/checker.ts +++ b/src/compiler/checker.ts @@ -5762,12 +5762,11 @@ namespace ts { target.symbol.flags & SymbolFlags.ConstEnum) { return Ternary.False; } - const sourceDecl = getDeclarationOfKind(source.symbol, SyntaxKind.EnumDeclaration); - const targetDecl = getDeclarationOfKind(target.symbol, SyntaxKind.EnumDeclaration); - const targetMembers = arrayToMap(targetDecl.members, member => getTextOfPropertyName(member.name)); - for (const member of sourceDecl.members) { + const targetMembers = getEnumMembers(target.symbol); + const targetNames = arrayToMap(targetMembers, member => getTextOfPropertyName(member.name)); + for (const member of getEnumMembers(source.symbol)) { const name = getTextOfPropertyName(member.name); - if (!hasProperty(targetMembers, name)) { + if (!hasProperty(targetNames, name)) { reportError(Diagnostics.Property_0_is_missing_in_type_1, name, typeToString(target, /*enclosingDeclaration*/ undefined, TypeFormatFlags.UseFullyQualifiedType)); @@ -5778,6 +5777,20 @@ namespace ts { } } + function getEnumMembers(symbol: Symbol): EnumMember[] { + const declarations = getDeclarationsOfKind(symbol, SyntaxKind.EnumDeclaration); + if (!declarations) { + return emptyArray; + } + const members: EnumMember[] = []; + for (const declaration of declarations) { + for (const member of (declaration).members) { + members.push(member); + } + } + return members; + } + // Return true if the given type is part of a deeply nested chain of generic instantiations. We consider this to be the case // when structural type comparisons have been started for 10 or more instantiations of the same generic type. It is possible, // though highly unlikely, for this test to be true in a situation where a chain of instantiations is not infinitely expanding. diff --git a/src/compiler/utilities.ts b/src/compiler/utilities.ts index 95bf4ff7fa3..24e2149ab3e 100644 --- a/src/compiler/utilities.ts +++ b/src/compiler/utilities.ts @@ -27,6 +27,21 @@ namespace ts { return undefined; } + export function getDeclarationsOfKind(symbol: Symbol, kind: SyntaxKind): Declaration[] { + const declarations = symbol.declarations; + if (declarations) { + const declarationsOfKind: Declaration[] = []; + for (const declaration of declarations) { + if (declaration.kind === kind) { + declarationsOfKind.push(declaration); + } + } + return declarationsOfKind; + } + + return undefined; + } + export interface StringSymbolWriter extends SymbolWriter { string(): string; } From 75304096959652551cdeed4140753f44940e45b6 Mon Sep 17 00:00:00 2001 From: Nathan Shively-Sanders Date: Thu, 10 Dec 2015 14:28:46 -0800 Subject: [PATCH 087/177] Add merged enum test --- .../enumAssignmentCompat3.errors.txt | 40 ++++++++++++++----- .../reference/enumAssignmentCompat3.js | 37 +++++++++++++++-- tests/cases/compiler/enumAssignmentCompat3.ts | 16 +++++++- 3 files changed, 78 insertions(+), 15 deletions(-) diff --git a/tests/baselines/reference/enumAssignmentCompat3.errors.txt b/tests/baselines/reference/enumAssignmentCompat3.errors.txt index b9ab92adec1..c34ad434347 100644 --- a/tests/baselines/reference/enumAssignmentCompat3.errors.txt +++ b/tests/baselines/reference/enumAssignmentCompat3.errors.txt @@ -1,18 +1,20 @@ -tests/cases/compiler/enumAssignmentCompat3.ts(49,1): error TS2322: Type 'Abcd.E' is not assignable to type 'First.E'. +tests/cases/compiler/enumAssignmentCompat3.ts(58,1): error TS2322: Type 'Abcd.E' is not assignable to type 'First.E'. Property 'd' is missing in type 'First.E'. -tests/cases/compiler/enumAssignmentCompat3.ts(51,1): error TS2322: Type 'Cd.E' is not assignable to type 'First.E'. +tests/cases/compiler/enumAssignmentCompat3.ts(60,1): error TS2322: Type 'Cd.E' is not assignable to type 'First.E'. Property 'd' is missing in type 'First.E'. -tests/cases/compiler/enumAssignmentCompat3.ts(52,1): error TS2322: Type 'Nope' is not assignable to type 'E'. -tests/cases/compiler/enumAssignmentCompat3.ts(56,1): error TS2322: Type 'First.E' is not assignable to type 'Ab.E'. +tests/cases/compiler/enumAssignmentCompat3.ts(61,1): error TS2322: Type 'Nope' is not assignable to type 'E'. +tests/cases/compiler/enumAssignmentCompat3.ts(65,1): error TS2322: Type 'First.E' is not assignable to type 'Ab.E'. Property 'c' is missing in type 'Ab.E'. -tests/cases/compiler/enumAssignmentCompat3.ts(57,1): error TS2322: Type 'First.E' is not assignable to type 'Cd.E'. +tests/cases/compiler/enumAssignmentCompat3.ts(66,1): error TS2322: Type 'First.E' is not assignable to type 'Cd.E'. Property 'a' is missing in type 'Cd.E'. -tests/cases/compiler/enumAssignmentCompat3.ts(58,1): error TS2322: Type 'E' is not assignable to type 'Nope'. -tests/cases/compiler/enumAssignmentCompat3.ts(62,1): error TS2322: Type 'Const.E' is not assignable to type 'First.E'. -tests/cases/compiler/enumAssignmentCompat3.ts(63,1): error TS2322: Type 'First.E' is not assignable to type 'Const.E'. +tests/cases/compiler/enumAssignmentCompat3.ts(67,1): error TS2322: Type 'E' is not assignable to type 'Nope'. +tests/cases/compiler/enumAssignmentCompat3.ts(72,1): error TS2322: Type 'Const.E' is not assignable to type 'First.E'. +tests/cases/compiler/enumAssignmentCompat3.ts(73,1): error TS2322: Type 'First.E' is not assignable to type 'Const.E'. +tests/cases/compiler/enumAssignmentCompat3.ts(76,1): error TS2322: Type 'Merged.E' is not assignable to type 'First.E'. + Property 'd' is missing in type 'First.E'. -==== tests/cases/compiler/enumAssignmentCompat3.ts (8 errors) ==== +==== tests/cases/compiler/enumAssignmentCompat3.ts (9 errors) ==== namespace First { export enum E { a, b, c, @@ -51,6 +53,14 @@ tests/cases/compiler/enumAssignmentCompat3.ts(63,1): error TS2322: Type 'First.E a, b, c = 3, } } + namespace Merged { + export enum E { + a, b, + } + export enum E { + c = 3, d, + } + } var abc: First.E; var secondAbc: Abc.E; @@ -60,6 +70,7 @@ tests/cases/compiler/enumAssignmentCompat3.ts(63,1): error TS2322: Type 'First.E var nope: Abc.Nope; var k: Const.E; var decl: Decl.E; + var merged: Merged.E; abc = secondAbc; // ok abc = secondAbcd; // missing 'd' ~~~ @@ -89,11 +100,18 @@ tests/cases/compiler/enumAssignmentCompat3.ts(63,1): error TS2322: Type 'First.E !!! error TS2322: Type 'E' is not assignable to type 'Nope'. decl = abc; // ok - k = k; // const is only assignable to itself + // const is only assignable to itself + k = k; abc = k; // error ~~~ !!! error TS2322: Type 'Const.E' is not assignable to type 'First.E'. k = abc; ~ !!! error TS2322: Type 'First.E' is not assignable to type 'Const.E'. - \ No newline at end of file + + // merged enums compare all their members + abc = merged; // missing 'd' + ~~~ +!!! error TS2322: Type 'Merged.E' is not assignable to type 'First.E'. +!!! error TS2322: Property 'd' is missing in type 'First.E'. + merged = abc; // ok \ No newline at end of file diff --git a/tests/baselines/reference/enumAssignmentCompat3.js b/tests/baselines/reference/enumAssignmentCompat3.js index 1173bfa1812..e43874911ce 100644 --- a/tests/baselines/reference/enumAssignmentCompat3.js +++ b/tests/baselines/reference/enumAssignmentCompat3.js @@ -37,6 +37,14 @@ namespace Decl { a, b, c = 3, } } +namespace Merged { + export enum E { + a, b, + } + export enum E { + c = 3, d, + } +} var abc: First.E; var secondAbc: Abc.E; @@ -46,6 +54,7 @@ var secondCd: Cd.E; var nope: Abc.Nope; var k: Const.E; var decl: Decl.E; +var merged: Merged.E; abc = secondAbc; // ok abc = secondAbcd; // missing 'd' abc = secondAb; // ok @@ -59,10 +68,14 @@ secondCd = abc; // missing 'a' and 'b' nope = abc; // nope! decl = abc; // ok -k = k; // const is only assignable to itself +// const is only assignable to itself +k = k; abc = k; // error k = abc; - + +// merged enums compare all their members +abc = merged; // missing 'd' +merged = abc; // ok //// [enumAssignmentCompat3.js] var First; @@ -118,6 +131,19 @@ var Cd; var Decl; (function (Decl) { })(Decl || (Decl = {})); +var Merged; +(function (Merged) { + (function (E) { + E[E["a"] = 0] = "a"; + E[E["b"] = 1] = "b"; + })(Merged.E || (Merged.E = {})); + var E = Merged.E; + (function (E) { + E[E["c"] = 3] = "c"; + E[E["d"] = 4] = "d"; + })(Merged.E || (Merged.E = {})); + var E = Merged.E; +})(Merged || (Merged = {})); var abc; var secondAbc; var secondAbcd; @@ -126,6 +152,7 @@ var secondCd; var nope; var k; var decl; +var merged; abc = secondAbc; // ok abc = secondAbcd; // missing 'd' abc = secondAb; // ok @@ -138,6 +165,10 @@ secondAb = abc; // missing 'c' secondCd = abc; // missing 'a' and 'b' nope = abc; // nope! decl = abc; // ok -k = k; // const is only assignable to itself +// const is only assignable to itself +k = k; abc = k; // error k = abc; +// merged enums compare all their members +abc = merged; // missing 'd' +merged = abc; // ok diff --git a/tests/cases/compiler/enumAssignmentCompat3.ts b/tests/cases/compiler/enumAssignmentCompat3.ts index aaaf96b69c8..33070572661 100644 --- a/tests/cases/compiler/enumAssignmentCompat3.ts +++ b/tests/cases/compiler/enumAssignmentCompat3.ts @@ -36,6 +36,14 @@ namespace Decl { a, b, c = 3, } } +namespace Merged { + export enum E { + a, b, + } + export enum E { + c = 3, d, + } +} var abc: First.E; var secondAbc: Abc.E; @@ -45,6 +53,7 @@ var secondCd: Cd.E; var nope: Abc.Nope; var k: Const.E; var decl: Decl.E; +var merged: Merged.E; abc = secondAbc; // ok abc = secondAbcd; // missing 'd' abc = secondAb; // ok @@ -58,6 +67,11 @@ secondCd = abc; // missing 'a' and 'b' nope = abc; // nope! decl = abc; // ok -k = k; // const is only assignable to itself +// const is only assignable to itself +k = k; abc = k; // error k = abc; + +// merged enums compare all their members +abc = merged; // missing 'd' +merged = abc; // ok \ No newline at end of file From da8e19e191ef508d18f400db62c9297e44002da7 Mon Sep 17 00:00:00 2001 From: Nathan Shively-Sanders Date: Thu, 10 Dec 2015 15:25:01 -0800 Subject: [PATCH 088/177] Use typeof enum to resolve members. Use getTypeOfSymbol >> resolveStructuredTypeMembers >> properties instead of looking at declarations. --- src/compiler/checker.ts | 26 ++++++-------------------- src/compiler/utilities.ts | 15 --------------- 2 files changed, 6 insertions(+), 35 deletions(-) diff --git a/src/compiler/checker.ts b/src/compiler/checker.ts index 2fb0296c1c7..bccbede909b 100644 --- a/src/compiler/checker.ts +++ b/src/compiler/checker.ts @@ -5762,13 +5762,13 @@ namespace ts { target.symbol.flags & SymbolFlags.ConstEnum) { return Ternary.False; } - const targetMembers = getEnumMembers(target.symbol); - const targetNames = arrayToMap(targetMembers, member => getTextOfPropertyName(member.name)); - for (const member of getEnumMembers(source.symbol)) { - const name = getTextOfPropertyName(member.name); - if (!hasProperty(targetNames, name)) { + const sourceMembers = resolveStructuredTypeMembers(getTypeOfSymbol(source.symbol)).properties; + const targetMembers = resolveStructuredTypeMembers(getTypeOfSymbol(target.symbol)).properties; + const targetNames = arrayToMap(targetMembers, member => member.name); + for (const member of sourceMembers) { + if (!hasProperty(targetNames, member.name)) { reportError(Diagnostics.Property_0_is_missing_in_type_1, - name, + member.name, typeToString(target, /*enclosingDeclaration*/ undefined, TypeFormatFlags.UseFullyQualifiedType)); return Ternary.False; } @@ -5777,20 +5777,6 @@ namespace ts { } } - function getEnumMembers(symbol: Symbol): EnumMember[] { - const declarations = getDeclarationsOfKind(symbol, SyntaxKind.EnumDeclaration); - if (!declarations) { - return emptyArray; - } - const members: EnumMember[] = []; - for (const declaration of declarations) { - for (const member of (declaration).members) { - members.push(member); - } - } - return members; - } - // Return true if the given type is part of a deeply nested chain of generic instantiations. We consider this to be the case // when structural type comparisons have been started for 10 or more instantiations of the same generic type. It is possible, // though highly unlikely, for this test to be true in a situation where a chain of instantiations is not infinitely expanding. diff --git a/src/compiler/utilities.ts b/src/compiler/utilities.ts index 24e2149ab3e..95bf4ff7fa3 100644 --- a/src/compiler/utilities.ts +++ b/src/compiler/utilities.ts @@ -27,21 +27,6 @@ namespace ts { return undefined; } - export function getDeclarationsOfKind(symbol: Symbol, kind: SyntaxKind): Declaration[] { - const declarations = symbol.declarations; - if (declarations) { - const declarationsOfKind: Declaration[] = []; - for (const declaration of declarations) { - if (declaration.kind === kind) { - declarationsOfKind.push(declaration); - } - } - return declarationsOfKind; - } - - return undefined; - } - export interface StringSymbolWriter extends SymbolWriter { string(): string; } From 7fe811e6b220cb3b0daa6c931ec7fe73e478efcb Mon Sep 17 00:00:00 2001 From: Anders Hejlsberg Date: Thu, 10 Dec 2015 16:02:46 -0800 Subject: [PATCH 089/177] Defer checks of accessor bodies in object literals --- src/compiler/checker.ts | 28 ++++++++++++++++++++++++---- 1 file changed, 24 insertions(+), 4 deletions(-) diff --git a/src/compiler/checker.ts b/src/compiler/checker.ts index 50a3aee9955..c3dc5935775 100644 --- a/src/compiler/checker.ts +++ b/src/compiler/checker.ts @@ -11297,6 +11297,8 @@ namespace ts { // Grammar checking accessors checkGrammarFunctionLikeDeclaration(node) || checkGrammarAccessor(node) || checkGrammarComputedPropertyName(node.name); + checkDecorators(node); + checkSignatureDeclaration(node); if (node.kind === SyntaxKind.GetAccessor) { if (!isInAmbientContext(node) && nodeIsPresent(node.body) && (node.flags & NodeFlags.HasImplicitReturn)) { if (node.flags & NodeFlags.HasExplicitReturn) { @@ -11309,7 +11311,12 @@ namespace ts { } } } - + // Do not use hasDynamicName here, because that returns false for well known symbols. + // We want to perform checkComputedPropertyName for all computed properties, including + // well known symbols. + if (node.name.kind === SyntaxKind.ComputedPropertyName) { + checkComputedPropertyName(node.name); + } if (!hasDynamicName(node)) { // TypeScript 1.0 spec (April 2014): 8.4.3 // Accessors for the same member name must specify the same accessibility. @@ -11333,8 +11340,16 @@ namespace ts { } getTypeOfAccessors(getSymbolOfNode(node)); } + if (node.parent.kind !== SyntaxKind.ObjectLiteralExpression) { + checkSourceElement(node.body); + } + } - checkFunctionLikeDeclaration(node); + function checkObjectLiteralAccessorBody(node: AccessorDeclaration) { + if (node.body) { + checkSourceElement(node.body); + checkFunctionAndClassExpressionBodies(node.body); + } } function checkMissingDeclaration(node: Node) { @@ -14379,11 +14394,16 @@ namespace ts { } break; case SyntaxKind.Constructor: - case SyntaxKind.GetAccessor: - case SyntaxKind.SetAccessor: case SyntaxKind.FunctionDeclaration: forEach((node).parameters, checkFunctionAndClassExpressionBodies); break; + case SyntaxKind.GetAccessor: + case SyntaxKind.SetAccessor: + forEach((node).parameters, checkFunctionAndClassExpressionBodies); + if (node.parent.kind === SyntaxKind.ObjectLiteralExpression) { + checkObjectLiteralAccessorBody(node); + } + break; case SyntaxKind.WithStatement: checkFunctionAndClassExpressionBodies((node).expression); break; From 2e5a4ea9837c9509e709b7fc55614995f443a3a6 Mon Sep 17 00:00:00 2001 From: Anders Hejlsberg Date: Thu, 10 Dec 2015 16:19:02 -0800 Subject: [PATCH 090/177] Adding regression test --- .../circularObjectLiteralAccessors.js | 29 ++++++++++++++ .../circularObjectLiteralAccessors.symbols | 34 +++++++++++++++++ .../circularObjectLiteralAccessors.types | 38 +++++++++++++++++++ .../circularObjectLiteralAccessors.ts | 15 ++++++++ 4 files changed, 116 insertions(+) create mode 100644 tests/baselines/reference/circularObjectLiteralAccessors.js create mode 100644 tests/baselines/reference/circularObjectLiteralAccessors.symbols create mode 100644 tests/baselines/reference/circularObjectLiteralAccessors.types create mode 100644 tests/cases/compiler/circularObjectLiteralAccessors.ts diff --git a/tests/baselines/reference/circularObjectLiteralAccessors.js b/tests/baselines/reference/circularObjectLiteralAccessors.js new file mode 100644 index 00000000000..6d99a8f25fc --- /dev/null +++ b/tests/baselines/reference/circularObjectLiteralAccessors.js @@ -0,0 +1,29 @@ +//// [circularObjectLiteralAccessors.ts] + +// Repro from #6000 + +const a = { + b: { + get foo(): string { + return a.foo; + }, + set foo(value: string) { + a.foo = value; + } + }, + foo: '' +}; + +//// [circularObjectLiteralAccessors.js] +// Repro from #6000 +var a = { + b: { + get foo() { + return a.foo; + }, + set foo(value) { + a.foo = value; + } + }, + foo: '' +}; diff --git a/tests/baselines/reference/circularObjectLiteralAccessors.symbols b/tests/baselines/reference/circularObjectLiteralAccessors.symbols new file mode 100644 index 00000000000..21e613c97fe --- /dev/null +++ b/tests/baselines/reference/circularObjectLiteralAccessors.symbols @@ -0,0 +1,34 @@ +=== tests/cases/compiler/circularObjectLiteralAccessors.ts === + +// Repro from #6000 + +const a = { +>a : Symbol(a, Decl(circularObjectLiteralAccessors.ts, 3, 5)) + + b: { +>b : Symbol(b, Decl(circularObjectLiteralAccessors.ts, 3, 11)) + + get foo(): string { +>foo : Symbol(foo, Decl(circularObjectLiteralAccessors.ts, 4, 8), Decl(circularObjectLiteralAccessors.ts, 7, 10)) + + return a.foo; +>a.foo : Symbol(foo, Decl(circularObjectLiteralAccessors.ts, 11, 6)) +>a : Symbol(a, Decl(circularObjectLiteralAccessors.ts, 3, 5)) +>foo : Symbol(foo, Decl(circularObjectLiteralAccessors.ts, 11, 6)) + + }, + set foo(value: string) { +>foo : Symbol(foo, Decl(circularObjectLiteralAccessors.ts, 4, 8), Decl(circularObjectLiteralAccessors.ts, 7, 10)) +>value : Symbol(value, Decl(circularObjectLiteralAccessors.ts, 8, 16)) + + a.foo = value; +>a.foo : Symbol(foo, Decl(circularObjectLiteralAccessors.ts, 11, 6)) +>a : Symbol(a, Decl(circularObjectLiteralAccessors.ts, 3, 5)) +>foo : Symbol(foo, Decl(circularObjectLiteralAccessors.ts, 11, 6)) +>value : Symbol(value, Decl(circularObjectLiteralAccessors.ts, 8, 16)) + } + }, + foo: '' +>foo : Symbol(foo, Decl(circularObjectLiteralAccessors.ts, 11, 6)) + +}; diff --git a/tests/baselines/reference/circularObjectLiteralAccessors.types b/tests/baselines/reference/circularObjectLiteralAccessors.types new file mode 100644 index 00000000000..1f01432db5a --- /dev/null +++ b/tests/baselines/reference/circularObjectLiteralAccessors.types @@ -0,0 +1,38 @@ +=== tests/cases/compiler/circularObjectLiteralAccessors.ts === + +// Repro from #6000 + +const a = { +>a : { b: { foo: string; }; foo: string; } +>{ b: { get foo(): string { return a.foo; }, set foo(value: string) { a.foo = value; } }, foo: ''} : { b: { foo: string; }; foo: string; } + + b: { +>b : { foo: string; } +>{ get foo(): string { return a.foo; }, set foo(value: string) { a.foo = value; } } : { foo: string; } + + get foo(): string { +>foo : string + + return a.foo; +>a.foo : string +>a : { b: { foo: string; }; foo: string; } +>foo : string + + }, + set foo(value: string) { +>foo : string +>value : string + + a.foo = value; +>a.foo = value : string +>a.foo : string +>a : { b: { foo: string; }; foo: string; } +>foo : string +>value : string + } + }, + foo: '' +>foo : string +>'' : string + +}; diff --git a/tests/cases/compiler/circularObjectLiteralAccessors.ts b/tests/cases/compiler/circularObjectLiteralAccessors.ts new file mode 100644 index 00000000000..3546ee75e6f --- /dev/null +++ b/tests/cases/compiler/circularObjectLiteralAccessors.ts @@ -0,0 +1,15 @@ +// @target: es5 + +// Repro from #6000 + +const a = { + b: { + get foo(): string { + return a.foo; + }, + set foo(value: string) { + a.foo = value; + } + }, + foo: '' +}; \ No newline at end of file From ef6c137f9e73d29833fb443a0ff604a44a6162a1 Mon Sep 17 00:00:00 2001 From: Wesley Wigham Date: Thu, 10 Dec 2015 19:55:08 -0800 Subject: [PATCH 091/177] add feedback from PR --- src/compiler/checker.ts | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/src/compiler/checker.ts b/src/compiler/checker.ts index 1073e8eda9b..666d983bd52 100644 --- a/src/compiler/checker.ts +++ b/src/compiler/checker.ts @@ -14310,9 +14310,8 @@ namespace ts { continue; } const { declarations, flags } = exports[id]; - let declarationLength = declarations.length; // ECMA262: 15.2.1.1 It is a Syntax Error if the ExportedNames of ModuleItemList contains any duplicate entries. (TS Exceptions: namespaces, function overloads, enums, and interfaces) - if (!(flags & (SymbolFlags.Namespace | SymbolFlags.Interface | SymbolFlags.Enum)) && (flags & SymbolFlags.TypeAlias ? declarationLength-- : true) && declarationLength > 1) { + if (!(flags & (SymbolFlags.Namespace | SymbolFlags.Interface | SymbolFlags.Enum)) && (flags & SymbolFlags.TypeAlias ? declarations.length - 1 : declarations.length) > 1) { const exportedDeclarations: Declaration[] = filter(declarations, isNotOverload); if (exportedDeclarations.length > 1) { for (const declaration of exportedDeclarations) { From 14374e62530bfd3ab5776e7142f8b78a1db7f05f Mon Sep 17 00:00:00 2001 From: Wesley Wigham Date: Thu, 10 Dec 2015 20:00:52 -0800 Subject: [PATCH 092/177] split tests by completions/quick info --- .../thisPredicateFunctionCompletions.ts | 80 ++++++++++++++++ ...s.ts => thisPredicateFunctionQuickInfo.ts} | 18 ---- .../thisPredicateMemberCompletions.ts | 95 +++++++++++++++++++ ...ers.ts => thisPredicateMemberQuickInfo.ts} | 22 +---- 4 files changed, 176 insertions(+), 39 deletions(-) create mode 100644 tests/cases/fourslash/thisPredicateFunctionCompletions.ts rename tests/cases/fourslash/{thisPredicateFunctions.ts => thisPredicateFunctionQuickInfo.ts} (77%) create mode 100644 tests/cases/fourslash/thisPredicateMemberCompletions.ts rename tests/cases/fourslash/{thisPredicateMembers.ts => thisPredicateMemberQuickInfo.ts} (82%) diff --git a/tests/cases/fourslash/thisPredicateFunctionCompletions.ts b/tests/cases/fourslash/thisPredicateFunctionCompletions.ts new file mode 100644 index 00000000000..3c93a859bf3 --- /dev/null +++ b/tests/cases/fourslash/thisPredicateFunctionCompletions.ts @@ -0,0 +1,80 @@ +/// + +//// class RoyalGuard { +//// isLeader(): this is LeadGuard { +//// return this instanceof LeadGuard; +//// } +//// isFollower(): this is FollowerGuard { +//// return this instanceof FollowerGuard; +//// } +//// } +//// +//// class LeadGuard extends RoyalGuard { +//// lead(): void {}; +//// } +//// +//// class FollowerGuard extends RoyalGuard { +//// follow(): void {}; +//// } +//// +//// let a: RoyalGuard = new FollowerGuard(); +//// if (a.is/*1*/Leader()) { +//// a./*2*/; +//// } +//// else if (a.is/*3*/Follower()) { +//// a./*4*/; +//// } +//// +//// interface GuardInterface { +//// isLeader(): this is LeadGuard; +//// isFollower(): this is FollowerGuard; +//// } +//// +//// let b: GuardInterface; +//// if (b.is/*5*/Leader()) { +//// b./*6*/; +//// } +//// else if (b.is/*7*/Follower()) { +//// b./*8*/; +//// } +//// +//// if (((a.isLeader)())) { +//// a./*9*/; +//// } +//// else if (((a).isFollower())) { +//// a./*10*/; +//// } +//// +//// if (((a["isLeader"])())) { +//// a./*11*/; +//// } +//// else if (((a)["isFollower"]())) { +//// a./*12*/; +//// } +//// +//// let leader/*13*/Status = a.isLeader(); +//// function isLeaderGuard(g: RoyalGuard) { +//// return g.isLeader(); +//// } +//// let checked/*14*/LeaderStatus = isLeader/*15*/Guard(a); + + +goTo.marker("2"); +verify.completionListContains("lead"); +goTo.marker("4"); +verify.completionListContains("follow"); + +goTo.marker("6"); +verify.completionListContains("lead"); +goTo.marker("8"); +verify.completionListContains("follow"); + +goTo.marker("9"); +verify.completionListContains("lead"); +goTo.marker("10"); +verify.completionListContains("follow"); + +goTo.marker("11"); +verify.completionListContains("lead"); +goTo.marker("12"); +verify.completionListContains("follow"); \ No newline at end of file diff --git a/tests/cases/fourslash/thisPredicateFunctions.ts b/tests/cases/fourslash/thisPredicateFunctionQuickInfo.ts similarity index 77% rename from tests/cases/fourslash/thisPredicateFunctions.ts rename to tests/cases/fourslash/thisPredicateFunctionQuickInfo.ts index 8df03ea312a..3b7adc460c5 100644 --- a/tests/cases/fourslash/thisPredicateFunctions.ts +++ b/tests/cases/fourslash/thisPredicateFunctionQuickInfo.ts @@ -61,31 +61,13 @@ goTo.marker("1"); verify.quickInfoIs("(method) RoyalGuard.isLeader(): this is LeadGuard"); -goTo.marker("2"); -verify.completionListContains("lead"); goTo.marker("3"); verify.quickInfoIs("(method) RoyalGuard.isFollower(): this is FollowerGuard"); -goTo.marker("4"); -verify.completionListContains("follow"); goTo.marker("5"); verify.quickInfoIs("(method) GuardInterface.isLeader(): this is LeadGuard"); -goTo.marker("6"); -verify.completionListContains("lead"); goTo.marker("7"); verify.quickInfoIs("(method) GuardInterface.isFollower(): this is FollowerGuard"); -goTo.marker("8"); -verify.completionListContains("follow"); - -goTo.marker("9"); -verify.completionListContains("lead"); -goTo.marker("10"); -verify.completionListContains("follow"); - -goTo.marker("11"); -verify.completionListContains("lead"); -goTo.marker("12"); -verify.completionListContains("follow"); goTo.marker("13"); verify.quickInfoIs("let leaderStatus: boolean"); diff --git a/tests/cases/fourslash/thisPredicateMemberCompletions.ts b/tests/cases/fourslash/thisPredicateMemberCompletions.ts new file mode 100644 index 00000000000..609ed248644 --- /dev/null +++ b/tests/cases/fourslash/thisPredicateMemberCompletions.ts @@ -0,0 +1,95 @@ +/// + +//// class FileSystemObject { +//// get is/*1*/File(): this is Item { +//// return this instanceof Item; +//// } +//// set is/*2*/File(param) { +//// // noop +//// } +//// get is/*3*/Directory(): this is Directory { +//// return this instanceof Directory; +//// } +//// is/*4*/Networked: this is (Networked & this); +//// constructor(public path: string) {} +//// } +//// +//// class Item extends FileSystemObject { +//// constructor(path: string, public content: string) { super(path); } +//// } +//// class Directory extends FileSystemObject { +//// children: FileSystemObject[]; +//// } +//// interface Networked { +//// host: string; +//// } +//// +//// interface Sundries { +//// broken: boolean; +//// } +//// +//// interface Supplies { +//// spoiled: boolean; +//// } +//// +//// interface Crate { +//// contents: T; +//// is/*5*/Sundries: this is Crate; +//// is/*6*/Supplies: this is Crate; +//// is/*7*/PackedTight: this is (this & {extraContents: T}); +//// } +//// +//// const obj: FileSystemObject = new Item("/foo", ""); +//// if (obj.is/*8*/File) { +//// obj./*9*/; +//// if (obj.is/*10*/Networked) { +//// obj./*11*/; +//// } +//// } +//// if (obj.is/*12*/Directory) { +//// obj./*13*/; +//// if (obj.is/*14*/Networked) { +//// obj./*15*/; +//// } +//// } +//// if (obj.is/*16*/Networked) { +//// obj./*17*/; +//// } +//// +//// const crate: Crate; +//// if (crate.is/*18*/PackedTight) { +//// crate./*19*/; +//// } +//// if (crate.is/*20*/Sundries) { +//// crate.contents./*21*/; +//// if (crate.is/*22*/PackedTight) { +//// crate./*23*/ +//// } +//// } +//// if (crate.is/*24*/Supplies) { +//// crate.contents./*25*/; +//// if (crate.is/*26*/PackedTight) { +//// crate./*27*/ +//// } +//// } + +goTo.marker("9"); +verify.completionListContains("content"); +goTo.marker("11"); +verify.completionListContains("host"); +goTo.marker("13"); +verify.completionListContains("children"); +goTo.marker("15"); +verify.completionListContains("host"); +goTo.marker("17"); +verify.completionListContains("host"); +goTo.marker("19"); +verify.completionListContains("extraContents"); +goTo.marker("21"); +verify.completionListContains("broken"); +goTo.marker("23"); +verify.completionListContains("extraContents"); +goTo.marker("25"); +verify.completionListContains("spoiled"); +goTo.marker("27"); +verify.completionListContains("extraContents"); \ No newline at end of file diff --git a/tests/cases/fourslash/thisPredicateMembers.ts b/tests/cases/fourslash/thisPredicateMemberQuickInfo.ts similarity index 82% rename from tests/cases/fourslash/thisPredicateMembers.ts rename to tests/cases/fourslash/thisPredicateMemberQuickInfo.ts index b20a0de1997..dd596743902 100644 --- a/tests/cases/fourslash/thisPredicateMembers.ts +++ b/tests/cases/fourslash/thisPredicateMemberQuickInfo.ts @@ -91,47 +91,27 @@ verify.quickInfoIs(`(property) Crate.isPackedTight: this is this & { }`); goTo.marker("8"); verify.quickInfoIs("(property) FileSystemObject.isFile: this is Item"); -goTo.marker("9"); -verify.completionListContains("content"); goTo.marker("10"); verify.quickInfoIs("(property) FileSystemObject.isNetworked: this is Networked & Item"); -goTo.marker("11"); -verify.completionListContains("host"); goTo.marker("12"); verify.quickInfoIs("(property) FileSystemObject.isDirectory: this is Directory"); -goTo.marker("13"); -verify.completionListContains("children"); goTo.marker("14"); verify.quickInfoIs("(property) FileSystemObject.isNetworked: this is Networked & Directory"); -goTo.marker("15"); -verify.completionListContains("host"); goTo.marker("16"); verify.quickInfoIs("(property) FileSystemObject.isNetworked: this is Networked & FileSystemObject"); -goTo.marker("17"); -verify.completionListContains("host"); goTo.marker("18"); verify.quickInfoIs(`(property) Crate.isPackedTight: this is Crate & { extraContents: any; }`); -goTo.marker("19"); -verify.completionListContains("extraContents"); goTo.marker("20"); verify.quickInfoIs("(property) Crate.isSundries: this is Crate"); -goTo.marker("21"); -verify.completionListContains("broken"); goTo.marker("22"); verify.quickInfoIs(`(property) Crate.isPackedTight: this is Crate & { extraContents: Sundries; }`); -goTo.marker("23"); -verify.completionListContains("extraContents"); goTo.marker("24"); verify.quickInfoIs("(property) Crate.isSupplies: this is Crate"); -goTo.marker("25"); -verify.completionListContains("spoiled"); goTo.marker("26"); verify.quickInfoIs(`(property) Crate.isPackedTight: this is Crate & { extraContents: Supplies; -}`); -goTo.marker("27"); -verify.completionListContains("extraContents"); \ No newline at end of file +}`); \ No newline at end of file From 564c4af59bc55c91074b5146f6a1c47fe68cc3f9 Mon Sep 17 00:00:00 2001 From: Zhengbo Li Date: Thu, 10 Dec 2015 23:27:07 -0800 Subject: [PATCH 093/177] Rollback to polling file watching --- src/compiler/sys.ts | 5 ----- 1 file changed, 5 deletions(-) diff --git a/src/compiler/sys.ts b/src/compiler/sys.ts index cd7580119b5..61accfb71af 100644 --- a/src/compiler/sys.ts +++ b/src/compiler/sys.ts @@ -411,11 +411,6 @@ namespace ts { // and is more efficient than `fs.watchFile` (ref: https://github.com/nodejs/node/pull/2649 // and https://github.com/Microsoft/TypeScript/issues/4643), therefore // if the current node.js version is newer than 4, use `fs.watch` instead. - if (isNode4OrLater()) { - // Note: in node the callback of fs.watch is given only the relative file name as a parameter - return _fs.watch(fileName, (eventName: string, relativeFileName: string) => callback(fileName)); - } - const watchedFile = watchedFileSet.addFile(fileName, callback); return { close: () => watchedFileSet.removeFile(watchedFile) From 8202576ab2d503258dbd18b7ebc1035607ebd173 Mon Sep 17 00:00:00 2001 From: Nathan Shively-Sanders Date: Fri, 11 Dec 2015 09:56:13 -0800 Subject: [PATCH 094/177] Filter for enum members only. --- src/compiler/checker.ts | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/src/compiler/checker.ts b/src/compiler/checker.ts index bccbede909b..9944cebf54a 100644 --- a/src/compiler/checker.ts +++ b/src/compiler/checker.ts @@ -5762,10 +5762,8 @@ namespace ts { target.symbol.flags & SymbolFlags.ConstEnum) { return Ternary.False; } - const sourceMembers = resolveStructuredTypeMembers(getTypeOfSymbol(source.symbol)).properties; - const targetMembers = resolveStructuredTypeMembers(getTypeOfSymbol(target.symbol)).properties; - const targetNames = arrayToMap(targetMembers, member => member.name); - for (const member of sourceMembers) { + const targetNames = arrayToMap(getEnumMembersOfEnumType(target), member => member.name); + for (const member of getEnumMembersOfEnumType(source)) { if (!hasProperty(targetNames, member.name)) { reportError(Diagnostics.Property_0_is_missing_in_type_1, member.name, @@ -5775,6 +5773,11 @@ namespace ts { } return Ternary.True; } + + function getEnumMembersOfEnumType(type: Type) { + return filter(resolveStructuredTypeMembers(getTypeOfSymbol(type.symbol)).properties, + property => !!(property.flags & SymbolFlags.EnumMember)); + } } // Return true if the given type is part of a deeply nested chain of generic instantiations. We consider this to be the case From dc9d307f137dc2a7b812cea42aac6927711b419a Mon Sep 17 00:00:00 2001 From: Nathan Shively-Sanders Date: Fri, 11 Dec 2015 10:08:01 -0800 Subject: [PATCH 095/177] Fix lint --- src/compiler/checker.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/compiler/checker.ts b/src/compiler/checker.ts index 9944cebf54a..8d9fe1f7ba5 100644 --- a/src/compiler/checker.ts +++ b/src/compiler/checker.ts @@ -5775,7 +5775,7 @@ namespace ts { } function getEnumMembersOfEnumType(type: Type) { - return filter(resolveStructuredTypeMembers(getTypeOfSymbol(type.symbol)).properties, + return filter(resolveStructuredTypeMembers(getTypeOfSymbol(type.symbol)).properties, property => !!(property.flags & SymbolFlags.EnumMember)); } } From 18e23a1b90d78afe709ea51dfe04ab649d92bebc Mon Sep 17 00:00:00 2001 From: Anders Hejlsberg Date: Fri, 11 Dec 2015 10:52:04 -0800 Subject: [PATCH 096/177] Addressing CR feedback --- src/compiler/checker.ts | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/src/compiler/checker.ts b/src/compiler/checker.ts index c3dc5935775..214748e6944 100644 --- a/src/compiler/checker.ts +++ b/src/compiler/checker.ts @@ -11170,7 +11170,7 @@ namespace ts { checkGrammarMethod(node) || checkGrammarComputedPropertyName(node.name); // Grammar checking for modifiers is done inside the function checkGrammarFunctionLikeDeclaration - checkFunctionLikeDeclaration(node); + checkFunctionOrMethodDeclaration(node); // Abstract methods cannot have an implementation. // Extra checks are to avoid reporting multiple errors relating to the "abstractness" of the node. @@ -12197,7 +12197,7 @@ namespace ts { function checkFunctionDeclaration(node: FunctionDeclaration): void { if (produceDiagnostics) { - checkFunctionLikeDeclaration(node) || checkGrammarForGenerator(node); + checkFunctionOrMethodDeclaration(node) || checkGrammarForGenerator(node); checkCollisionWithCapturedSuperVariable(node, node.name); checkCollisionWithCapturedThisVariable(node, node.name); @@ -12205,7 +12205,7 @@ namespace ts { } } - function checkFunctionLikeDeclaration(node: FunctionLikeDeclaration): void { + function checkFunctionOrMethodDeclaration(node: FunctionDeclaration | MethodDeclaration): void { checkDecorators(node); checkSignatureDeclaration(node); const isAsync = isAsyncFunctionLike(node); @@ -12252,7 +12252,7 @@ namespace ts { } checkSourceElement(node.body); - if (!isAccessor(node.kind) && !node.asteriskToken) { + if (!node.asteriskToken) { const returnOrPromisedType = node.type && (isAsync ? checkAsyncFunctionReturnType(node) : getTypeFromTypeNode(node.type)); checkAllCodePathsInNonVoidFunctionReturnOrThrow(node, returnOrPromisedType); } From e9dc011080e274e39f6eeecc27b5534b842739c3 Mon Sep 17 00:00:00 2001 From: Daniel Rosenwasser Date: Fri, 11 Dec 2015 14:10:12 -0800 Subject: [PATCH 097/177] Fixed unnecessary error in test. --- .../types/stringLiteral/stringLiteralTypesAsTags01.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tests/cases/conformance/types/stringLiteral/stringLiteralTypesAsTags01.ts b/tests/cases/conformance/types/stringLiteral/stringLiteralTypesAsTags01.ts index cea04f0818e..ba189406533 100644 --- a/tests/cases/conformance/types/stringLiteral/stringLiteralTypesAsTags01.ts +++ b/tests/cases/conformance/types/stringLiteral/stringLiteralTypesAsTags01.ts @@ -20,7 +20,7 @@ function hasKind(entity: Entity, kind: "A"): entity is A; function hasKind(entity: Entity, kind: "B"): entity is B; function hasKind(entity: Entity, kind: Kind): entity is Entity; function hasKind(entity: Entity, kind: Kind): boolean { - return kind === is; + return entity.kind === kind; } let x: A = { From 8cceedd725a848e9e65002b1d4871cb54c579fb9 Mon Sep 17 00:00:00 2001 From: Daniel Rosenwasser Date: Fri, 11 Dec 2015 14:11:45 -0800 Subject: [PATCH 098/177] Accepted baselines. --- .../stringLiteralTypesAsTags01.errors.txt | 51 -------- .../reference/stringLiteralTypesAsTags01.js | 4 +- .../stringLiteralTypesAsTags01.symbols | 112 ++++++++++++++++ .../stringLiteralTypesAsTags01.types | 121 ++++++++++++++++++ .../reference/superPropertyAccess_ES5.js | 8 +- 5 files changed, 239 insertions(+), 57 deletions(-) delete mode 100644 tests/baselines/reference/stringLiteralTypesAsTags01.errors.txt create mode 100644 tests/baselines/reference/stringLiteralTypesAsTags01.symbols create mode 100644 tests/baselines/reference/stringLiteralTypesAsTags01.types diff --git a/tests/baselines/reference/stringLiteralTypesAsTags01.errors.txt b/tests/baselines/reference/stringLiteralTypesAsTags01.errors.txt deleted file mode 100644 index 90c8c3efdf7..00000000000 --- a/tests/baselines/reference/stringLiteralTypesAsTags01.errors.txt +++ /dev/null @@ -1,51 +0,0 @@ -tests/cases/conformance/types/stringLiteral/stringLiteralTypesAsTags01.ts(20,10): error TS2394: Overload signature is not compatible with function implementation. -tests/cases/conformance/types/stringLiteral/stringLiteralTypesAsTags01.ts(22,21): error TS2304: Cannot find name 'is'. - - -==== tests/cases/conformance/types/stringLiteral/stringLiteralTypesAsTags01.ts (2 errors) ==== - - type Kind = "A" | "B" - - interface Entity { - kind: Kind; - } - - interface A extends Entity { - kind: "A"; - a: number; - } - - interface B extends Entity { - kind: "B"; - b: string; - } - - function hasKind(entity: Entity, kind: "A"): entity is A; - function hasKind(entity: Entity, kind: "B"): entity is B; - function hasKind(entity: Entity, kind: Kind): entity is Entity; - ~~~~~~~ -!!! error TS2394: Overload signature is not compatible with function implementation. - function hasKind(entity: Entity, kind: Kind): boolean { - return kind === is; - ~~ -!!! error TS2304: Cannot find name 'is'. - } - - let x: A = { - kind: "A", - a: 100, - } - - if (hasKind(x, "A")) { - let a = x; - } - else { - let b = x; - } - - if (!hasKind(x, "B")) { - let c = x; - } - else { - let d = x; - } \ No newline at end of file diff --git a/tests/baselines/reference/stringLiteralTypesAsTags01.js b/tests/baselines/reference/stringLiteralTypesAsTags01.js index 3fe33ace487..b7b3872ce66 100644 --- a/tests/baselines/reference/stringLiteralTypesAsTags01.js +++ b/tests/baselines/reference/stringLiteralTypesAsTags01.js @@ -20,7 +20,7 @@ function hasKind(entity: Entity, kind: "A"): entity is A; function hasKind(entity: Entity, kind: "B"): entity is B; function hasKind(entity: Entity, kind: Kind): entity is Entity; function hasKind(entity: Entity, kind: Kind): boolean { - return kind === is; + return entity.kind === kind; } let x: A = { @@ -44,7 +44,7 @@ else { //// [stringLiteralTypesAsTags01.js] function hasKind(entity, kind) { - return kind === is; + return entity.kind === kind; } var x = { kind: "A", diff --git a/tests/baselines/reference/stringLiteralTypesAsTags01.symbols b/tests/baselines/reference/stringLiteralTypesAsTags01.symbols new file mode 100644 index 00000000000..afdeeff71a6 --- /dev/null +++ b/tests/baselines/reference/stringLiteralTypesAsTags01.symbols @@ -0,0 +1,112 @@ +=== tests/cases/conformance/types/stringLiteral/stringLiteralTypesAsTags01.ts === + +type Kind = "A" | "B" +>Kind : Symbol(Kind, Decl(stringLiteralTypesAsTags01.ts, 0, 0)) + +interface Entity { +>Entity : Symbol(Entity, Decl(stringLiteralTypesAsTags01.ts, 1, 21)) + + kind: Kind; +>kind : Symbol(kind, Decl(stringLiteralTypesAsTags01.ts, 3, 18)) +>Kind : Symbol(Kind, Decl(stringLiteralTypesAsTags01.ts, 0, 0)) +} + +interface A extends Entity { +>A : Symbol(A, Decl(stringLiteralTypesAsTags01.ts, 5, 1)) +>Entity : Symbol(Entity, Decl(stringLiteralTypesAsTags01.ts, 1, 21)) + + kind: "A"; +>kind : Symbol(kind, Decl(stringLiteralTypesAsTags01.ts, 7, 28)) + + a: number; +>a : Symbol(a, Decl(stringLiteralTypesAsTags01.ts, 8, 14)) +} + +interface B extends Entity { +>B : Symbol(B, Decl(stringLiteralTypesAsTags01.ts, 10, 1)) +>Entity : Symbol(Entity, Decl(stringLiteralTypesAsTags01.ts, 1, 21)) + + kind: "B"; +>kind : Symbol(kind, Decl(stringLiteralTypesAsTags01.ts, 12, 28)) + + b: string; +>b : Symbol(b, Decl(stringLiteralTypesAsTags01.ts, 13, 14)) +} + +function hasKind(entity: Entity, kind: "A"): entity is A; +>hasKind : Symbol(hasKind, Decl(stringLiteralTypesAsTags01.ts, 15, 1), Decl(stringLiteralTypesAsTags01.ts, 17, 57), Decl(stringLiteralTypesAsTags01.ts, 18, 57), Decl(stringLiteralTypesAsTags01.ts, 19, 63)) +>entity : Symbol(entity, Decl(stringLiteralTypesAsTags01.ts, 17, 17)) +>Entity : Symbol(Entity, Decl(stringLiteralTypesAsTags01.ts, 1, 21)) +>kind : Symbol(kind, Decl(stringLiteralTypesAsTags01.ts, 17, 32)) +>entity : Symbol(entity, Decl(stringLiteralTypesAsTags01.ts, 17, 17)) +>A : Symbol(A, Decl(stringLiteralTypesAsTags01.ts, 5, 1)) + +function hasKind(entity: Entity, kind: "B"): entity is B; +>hasKind : Symbol(hasKind, Decl(stringLiteralTypesAsTags01.ts, 15, 1), Decl(stringLiteralTypesAsTags01.ts, 17, 57), Decl(stringLiteralTypesAsTags01.ts, 18, 57), Decl(stringLiteralTypesAsTags01.ts, 19, 63)) +>entity : Symbol(entity, Decl(stringLiteralTypesAsTags01.ts, 18, 17)) +>Entity : Symbol(Entity, Decl(stringLiteralTypesAsTags01.ts, 1, 21)) +>kind : Symbol(kind, Decl(stringLiteralTypesAsTags01.ts, 18, 32)) +>entity : Symbol(entity, Decl(stringLiteralTypesAsTags01.ts, 18, 17)) +>B : Symbol(B, Decl(stringLiteralTypesAsTags01.ts, 10, 1)) + +function hasKind(entity: Entity, kind: Kind): entity is Entity; +>hasKind : Symbol(hasKind, Decl(stringLiteralTypesAsTags01.ts, 15, 1), Decl(stringLiteralTypesAsTags01.ts, 17, 57), Decl(stringLiteralTypesAsTags01.ts, 18, 57), Decl(stringLiteralTypesAsTags01.ts, 19, 63)) +>entity : Symbol(entity, Decl(stringLiteralTypesAsTags01.ts, 19, 17)) +>Entity : Symbol(Entity, Decl(stringLiteralTypesAsTags01.ts, 1, 21)) +>kind : Symbol(kind, Decl(stringLiteralTypesAsTags01.ts, 19, 32)) +>Kind : Symbol(Kind, Decl(stringLiteralTypesAsTags01.ts, 0, 0)) +>entity : Symbol(entity, Decl(stringLiteralTypesAsTags01.ts, 19, 17)) +>Entity : Symbol(Entity, Decl(stringLiteralTypesAsTags01.ts, 1, 21)) + +function hasKind(entity: Entity, kind: Kind): boolean { +>hasKind : Symbol(hasKind, Decl(stringLiteralTypesAsTags01.ts, 15, 1), Decl(stringLiteralTypesAsTags01.ts, 17, 57), Decl(stringLiteralTypesAsTags01.ts, 18, 57), Decl(stringLiteralTypesAsTags01.ts, 19, 63)) +>entity : Symbol(entity, Decl(stringLiteralTypesAsTags01.ts, 20, 17)) +>Entity : Symbol(Entity, Decl(stringLiteralTypesAsTags01.ts, 1, 21)) +>kind : Symbol(kind, Decl(stringLiteralTypesAsTags01.ts, 20, 32)) +>Kind : Symbol(Kind, Decl(stringLiteralTypesAsTags01.ts, 0, 0)) + + return entity.kind === kind; +>entity.kind : Symbol(Entity.kind, Decl(stringLiteralTypesAsTags01.ts, 3, 18)) +>entity : Symbol(entity, Decl(stringLiteralTypesAsTags01.ts, 20, 17)) +>kind : Symbol(Entity.kind, Decl(stringLiteralTypesAsTags01.ts, 3, 18)) +>kind : Symbol(kind, Decl(stringLiteralTypesAsTags01.ts, 20, 32)) +} + +let x: A = { +>x : Symbol(x, Decl(stringLiteralTypesAsTags01.ts, 24, 3)) +>A : Symbol(A, Decl(stringLiteralTypesAsTags01.ts, 5, 1)) + + kind: "A", +>kind : Symbol(kind, Decl(stringLiteralTypesAsTags01.ts, 24, 12)) + + a: 100, +>a : Symbol(a, Decl(stringLiteralTypesAsTags01.ts, 25, 14)) +} + +if (hasKind(x, "A")) { +>hasKind : Symbol(hasKind, Decl(stringLiteralTypesAsTags01.ts, 15, 1), Decl(stringLiteralTypesAsTags01.ts, 17, 57), Decl(stringLiteralTypesAsTags01.ts, 18, 57), Decl(stringLiteralTypesAsTags01.ts, 19, 63)) +>x : Symbol(x, Decl(stringLiteralTypesAsTags01.ts, 24, 3)) + + let a = x; +>a : Symbol(a, Decl(stringLiteralTypesAsTags01.ts, 30, 7)) +>x : Symbol(x, Decl(stringLiteralTypesAsTags01.ts, 24, 3)) +} +else { + let b = x; +>b : Symbol(b, Decl(stringLiteralTypesAsTags01.ts, 33, 7)) +>x : Symbol(x, Decl(stringLiteralTypesAsTags01.ts, 24, 3)) +} + +if (!hasKind(x, "B")) { +>hasKind : Symbol(hasKind, Decl(stringLiteralTypesAsTags01.ts, 15, 1), Decl(stringLiteralTypesAsTags01.ts, 17, 57), Decl(stringLiteralTypesAsTags01.ts, 18, 57), Decl(stringLiteralTypesAsTags01.ts, 19, 63)) +>x : Symbol(x, Decl(stringLiteralTypesAsTags01.ts, 24, 3)) + + let c = x; +>c : Symbol(c, Decl(stringLiteralTypesAsTags01.ts, 37, 7)) +>x : Symbol(x, Decl(stringLiteralTypesAsTags01.ts, 24, 3)) +} +else { + let d = x; +>d : Symbol(d, Decl(stringLiteralTypesAsTags01.ts, 40, 7)) +>x : Symbol(x, Decl(stringLiteralTypesAsTags01.ts, 24, 3)) +} diff --git a/tests/baselines/reference/stringLiteralTypesAsTags01.types b/tests/baselines/reference/stringLiteralTypesAsTags01.types new file mode 100644 index 00000000000..6966ede5482 --- /dev/null +++ b/tests/baselines/reference/stringLiteralTypesAsTags01.types @@ -0,0 +1,121 @@ +=== tests/cases/conformance/types/stringLiteral/stringLiteralTypesAsTags01.ts === + +type Kind = "A" | "B" +>Kind : "A" | "B" + +interface Entity { +>Entity : Entity + + kind: Kind; +>kind : "A" | "B" +>Kind : "A" | "B" +} + +interface A extends Entity { +>A : A +>Entity : Entity + + kind: "A"; +>kind : "A" + + a: number; +>a : number +} + +interface B extends Entity { +>B : B +>Entity : Entity + + kind: "B"; +>kind : "B" + + b: string; +>b : string +} + +function hasKind(entity: Entity, kind: "A"): entity is A; +>hasKind : { (entity: Entity, kind: "A"): entity is A; (entity: Entity, kind: "B"): entity is B; (entity: Entity, kind: "A" | "B"): entity is Entity; } +>entity : Entity +>Entity : Entity +>kind : "A" +>entity : any +>A : A + +function hasKind(entity: Entity, kind: "B"): entity is B; +>hasKind : { (entity: Entity, kind: "A"): entity is A; (entity: Entity, kind: "B"): entity is B; (entity: Entity, kind: "A" | "B"): entity is Entity; } +>entity : Entity +>Entity : Entity +>kind : "B" +>entity : any +>B : B + +function hasKind(entity: Entity, kind: Kind): entity is Entity; +>hasKind : { (entity: Entity, kind: "A"): entity is A; (entity: Entity, kind: "B"): entity is B; (entity: Entity, kind: "A" | "B"): entity is Entity; } +>entity : Entity +>Entity : Entity +>kind : "A" | "B" +>Kind : "A" | "B" +>entity : any +>Entity : Entity + +function hasKind(entity: Entity, kind: Kind): boolean { +>hasKind : { (entity: Entity, kind: "A"): entity is A; (entity: Entity, kind: "B"): entity is B; (entity: Entity, kind: "A" | "B"): entity is Entity; } +>entity : Entity +>Entity : Entity +>kind : "A" | "B" +>Kind : "A" | "B" + + return entity.kind === kind; +>entity.kind === kind : boolean +>entity.kind : "A" | "B" +>entity : Entity +>kind : "A" | "B" +>kind : "A" | "B" +} + +let x: A = { +>x : A +>A : A +>{ kind: "A", a: 100,} : { kind: "A"; a: number; } + + kind: "A", +>kind : "A" +>"A" : "A" + + a: 100, +>a : number +>100 : number +} + +if (hasKind(x, "A")) { +>hasKind(x, "A") : entity is A +>hasKind : { (entity: Entity, kind: "A"): entity is A; (entity: Entity, kind: "B"): entity is B; (entity: Entity, kind: "A" | "B"): entity is Entity; } +>x : A +>"A" : "A" + + let a = x; +>a : A +>x : A +} +else { + let b = x; +>b : A +>x : A +} + +if (!hasKind(x, "B")) { +>!hasKind(x, "B") : boolean +>hasKind(x, "B") : entity is B +>hasKind : { (entity: Entity, kind: "A"): entity is A; (entity: Entity, kind: "B"): entity is B; (entity: Entity, kind: "A" | "B"): entity is Entity; } +>x : A +>"B" : "B" + + let c = x; +>c : A +>x : A +} +else { + let d = x; +>d : A +>x : A +} diff --git a/tests/baselines/reference/superPropertyAccess_ES5.js b/tests/baselines/reference/superPropertyAccess_ES5.js index a31c1dfdcba..63f5f6f316a 100644 --- a/tests/baselines/reference/superPropertyAccess_ES5.js +++ b/tests/baselines/reference/superPropertyAccess_ES5.js @@ -45,7 +45,7 @@ var MyBase = (function () { configurable: true }); return MyBase; -})(); +}()); var MyDerived = (function (_super) { __extends(MyDerived, _super); function MyDerived() { @@ -54,7 +54,7 @@ var MyDerived = (function (_super) { var f2 = _super.prototype.value; } return MyDerived; -})(MyBase); +}(MyBase)); var d = new MyDerived(); var f3 = d.value; var A = (function () { @@ -67,7 +67,7 @@ var A = (function () { configurable: true }); return A; -})(); +}()); var B = (function (_super) { __extends(B, _super); function B() { @@ -81,4 +81,4 @@ var B = (function (_super) { configurable: true }); return B; -})(A); +}(A)); From 3cdfc36109aff6243d22962f47fa331b8be84f8d Mon Sep 17 00:00:00 2001 From: Daniel Rosenwasser Date: Fri, 11 Dec 2015 15:02:43 -0800 Subject: [PATCH 099/177] Added tests for 'void' return type compatibilty on overloads and implementations. --- .../functions/functionOverloadCompatibilityWithVoid01.ts | 4 ++++ .../functions/functionOverloadCompatibilityWithVoid02.ts | 4 ++++ .../functions/functionOverloadCompatibilityWithVoid03.ts | 4 ++++ 3 files changed, 12 insertions(+) create mode 100644 tests/cases/conformance/functions/functionOverloadCompatibilityWithVoid01.ts create mode 100644 tests/cases/conformance/functions/functionOverloadCompatibilityWithVoid02.ts create mode 100644 tests/cases/conformance/functions/functionOverloadCompatibilityWithVoid03.ts diff --git a/tests/cases/conformance/functions/functionOverloadCompatibilityWithVoid01.ts b/tests/cases/conformance/functions/functionOverloadCompatibilityWithVoid01.ts new file mode 100644 index 00000000000..d973c946bb9 --- /dev/null +++ b/tests/cases/conformance/functions/functionOverloadCompatibilityWithVoid01.ts @@ -0,0 +1,4 @@ +function f(x: string): number; +function f(x: string): void { + return; +} \ No newline at end of file diff --git a/tests/cases/conformance/functions/functionOverloadCompatibilityWithVoid02.ts b/tests/cases/conformance/functions/functionOverloadCompatibilityWithVoid02.ts new file mode 100644 index 00000000000..ef89d790ff7 --- /dev/null +++ b/tests/cases/conformance/functions/functionOverloadCompatibilityWithVoid02.ts @@ -0,0 +1,4 @@ +function f(x: string): void; +function f(x: string): number { + return 0; +} \ No newline at end of file diff --git a/tests/cases/conformance/functions/functionOverloadCompatibilityWithVoid03.ts b/tests/cases/conformance/functions/functionOverloadCompatibilityWithVoid03.ts new file mode 100644 index 00000000000..5f0a2327d74 --- /dev/null +++ b/tests/cases/conformance/functions/functionOverloadCompatibilityWithVoid03.ts @@ -0,0 +1,4 @@ +function f(x: string): void; +function f(x: string): void { + return; +} \ No newline at end of file From 069fada0ce3e15622ed2da14d9c8a3edf042bde8 Mon Sep 17 00:00:00 2001 From: Daniel Rosenwasser Date: Fri, 11 Dec 2015 15:04:59 -0800 Subject: [PATCH 100/177] Accepted baselines. --- ...functionOverloadCompatibilityWithVoid01.errors.txt | 10 ++++++++++ .../functionOverloadCompatibilityWithVoid01.js | 10 ++++++++++ ...functionOverloadCompatibilityWithVoid02.errors.txt | 10 ++++++++++ .../functionOverloadCompatibilityWithVoid02.js | 10 ++++++++++ .../functionOverloadCompatibilityWithVoid03.js | 10 ++++++++++ .../functionOverloadCompatibilityWithVoid03.symbols | 11 +++++++++++ .../functionOverloadCompatibilityWithVoid03.types | 11 +++++++++++ 7 files changed, 72 insertions(+) create mode 100644 tests/baselines/reference/functionOverloadCompatibilityWithVoid01.errors.txt create mode 100644 tests/baselines/reference/functionOverloadCompatibilityWithVoid01.js create mode 100644 tests/baselines/reference/functionOverloadCompatibilityWithVoid02.errors.txt create mode 100644 tests/baselines/reference/functionOverloadCompatibilityWithVoid02.js create mode 100644 tests/baselines/reference/functionOverloadCompatibilityWithVoid03.js create mode 100644 tests/baselines/reference/functionOverloadCompatibilityWithVoid03.symbols create mode 100644 tests/baselines/reference/functionOverloadCompatibilityWithVoid03.types diff --git a/tests/baselines/reference/functionOverloadCompatibilityWithVoid01.errors.txt b/tests/baselines/reference/functionOverloadCompatibilityWithVoid01.errors.txt new file mode 100644 index 00000000000..56951e380e4 --- /dev/null +++ b/tests/baselines/reference/functionOverloadCompatibilityWithVoid01.errors.txt @@ -0,0 +1,10 @@ +tests/cases/conformance/functions/functionOverloadCompatibilityWithVoid01.ts(1,10): error TS2394: Overload signature is not compatible with function implementation. + + +==== tests/cases/conformance/functions/functionOverloadCompatibilityWithVoid01.ts (1 errors) ==== + function f(x: string): number; + ~ +!!! error TS2394: Overload signature is not compatible with function implementation. + function f(x: string): void { + return; + } \ No newline at end of file diff --git a/tests/baselines/reference/functionOverloadCompatibilityWithVoid01.js b/tests/baselines/reference/functionOverloadCompatibilityWithVoid01.js new file mode 100644 index 00000000000..b2d7e64d58e --- /dev/null +++ b/tests/baselines/reference/functionOverloadCompatibilityWithVoid01.js @@ -0,0 +1,10 @@ +//// [functionOverloadCompatibilityWithVoid01.ts] +function f(x: string): number; +function f(x: string): void { + return; +} + +//// [functionOverloadCompatibilityWithVoid01.js] +function f(x) { + return; +} diff --git a/tests/baselines/reference/functionOverloadCompatibilityWithVoid02.errors.txt b/tests/baselines/reference/functionOverloadCompatibilityWithVoid02.errors.txt new file mode 100644 index 00000000000..33155afb5f5 --- /dev/null +++ b/tests/baselines/reference/functionOverloadCompatibilityWithVoid02.errors.txt @@ -0,0 +1,10 @@ +tests/cases/conformance/functions/functionOverloadCompatibilityWithVoid02.ts(1,10): error TS2394: Overload signature is not compatible with function implementation. + + +==== tests/cases/conformance/functions/functionOverloadCompatibilityWithVoid02.ts (1 errors) ==== + function f(x: string): void; + ~ +!!! error TS2394: Overload signature is not compatible with function implementation. + function f(x: string): number { + return 0; + } \ No newline at end of file diff --git a/tests/baselines/reference/functionOverloadCompatibilityWithVoid02.js b/tests/baselines/reference/functionOverloadCompatibilityWithVoid02.js new file mode 100644 index 00000000000..4f53be1f9c3 --- /dev/null +++ b/tests/baselines/reference/functionOverloadCompatibilityWithVoid02.js @@ -0,0 +1,10 @@ +//// [functionOverloadCompatibilityWithVoid02.ts] +function f(x: string): void; +function f(x: string): number { + return 0; +} + +//// [functionOverloadCompatibilityWithVoid02.js] +function f(x) { + return 0; +} diff --git a/tests/baselines/reference/functionOverloadCompatibilityWithVoid03.js b/tests/baselines/reference/functionOverloadCompatibilityWithVoid03.js new file mode 100644 index 00000000000..b83939442cb --- /dev/null +++ b/tests/baselines/reference/functionOverloadCompatibilityWithVoid03.js @@ -0,0 +1,10 @@ +//// [functionOverloadCompatibilityWithVoid03.ts] +function f(x: string): void; +function f(x: string): void { + return; +} + +//// [functionOverloadCompatibilityWithVoid03.js] +function f(x) { + return; +} diff --git a/tests/baselines/reference/functionOverloadCompatibilityWithVoid03.symbols b/tests/baselines/reference/functionOverloadCompatibilityWithVoid03.symbols new file mode 100644 index 00000000000..57fe6006ced --- /dev/null +++ b/tests/baselines/reference/functionOverloadCompatibilityWithVoid03.symbols @@ -0,0 +1,11 @@ +=== tests/cases/conformance/functions/functionOverloadCompatibilityWithVoid03.ts === +function f(x: string): void; +>f : Symbol(f, Decl(functionOverloadCompatibilityWithVoid03.ts, 0, 0), Decl(functionOverloadCompatibilityWithVoid03.ts, 0, 28)) +>x : Symbol(x, Decl(functionOverloadCompatibilityWithVoid03.ts, 0, 11)) + +function f(x: string): void { +>f : Symbol(f, Decl(functionOverloadCompatibilityWithVoid03.ts, 0, 0), Decl(functionOverloadCompatibilityWithVoid03.ts, 0, 28)) +>x : Symbol(x, Decl(functionOverloadCompatibilityWithVoid03.ts, 1, 11)) + + return; +} diff --git a/tests/baselines/reference/functionOverloadCompatibilityWithVoid03.types b/tests/baselines/reference/functionOverloadCompatibilityWithVoid03.types new file mode 100644 index 00000000000..74dfa28c142 --- /dev/null +++ b/tests/baselines/reference/functionOverloadCompatibilityWithVoid03.types @@ -0,0 +1,11 @@ +=== tests/cases/conformance/functions/functionOverloadCompatibilityWithVoid03.ts === +function f(x: string): void; +>f : (x: string) => void +>x : string + +function f(x: string): void { +>f : (x: string) => void +>x : string + + return; +} From 9b507b7512290b28bcd710a363f7a98be261a077 Mon Sep 17 00:00:00 2001 From: Daniel Rosenwasser Date: Fri, 11 Dec 2015 15:08:30 -0800 Subject: [PATCH 101/177] Specifically test for 'void' to permit implementations to return more than what was guaranteed. --- src/compiler/checker.ts | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/compiler/checker.ts b/src/compiler/checker.ts index ac8a4ac89a4..a83c1027ad1 100644 --- a/src/compiler/checker.ts +++ b/src/compiler/checker.ts @@ -4987,7 +4987,8 @@ namespace ts { const sourceReturnType = getReturnTypeOfSignature(erasedSource); const targetReturnType = getReturnTypeOfSignature(erasedTarget); - if (checkTypeRelatedTo(sourceReturnType, targetReturnType, assignableRelation, /*errorNode*/ undefined) + if (targetReturnType === voidType + || checkTypeRelatedTo(sourceReturnType, targetReturnType, assignableRelation, /*errorNode*/ undefined) || checkTypeRelatedTo(targetReturnType, sourceReturnType, assignableRelation, /*errorNode*/ undefined)) { const anyReturningSource = cloneSignature(erasedSource); const anyReturningTarget = cloneSignature(erasedTarget); From e012645309eadc7496b26380edf49acff044fe93 Mon Sep 17 00:00:00 2001 From: Daniel Rosenwasser Date: Fri, 11 Dec 2015 15:08:45 -0800 Subject: [PATCH 102/177] Accepted baselines. --- ...unctionOverloadCompatibilityWithVoid02.errors.txt | 10 ---------- .../functionOverloadCompatibilityWithVoid02.symbols | 11 +++++++++++ .../functionOverloadCompatibilityWithVoid02.types | 12 ++++++++++++ 3 files changed, 23 insertions(+), 10 deletions(-) delete mode 100644 tests/baselines/reference/functionOverloadCompatibilityWithVoid02.errors.txt create mode 100644 tests/baselines/reference/functionOverloadCompatibilityWithVoid02.symbols create mode 100644 tests/baselines/reference/functionOverloadCompatibilityWithVoid02.types diff --git a/tests/baselines/reference/functionOverloadCompatibilityWithVoid02.errors.txt b/tests/baselines/reference/functionOverloadCompatibilityWithVoid02.errors.txt deleted file mode 100644 index 33155afb5f5..00000000000 --- a/tests/baselines/reference/functionOverloadCompatibilityWithVoid02.errors.txt +++ /dev/null @@ -1,10 +0,0 @@ -tests/cases/conformance/functions/functionOverloadCompatibilityWithVoid02.ts(1,10): error TS2394: Overload signature is not compatible with function implementation. - - -==== tests/cases/conformance/functions/functionOverloadCompatibilityWithVoid02.ts (1 errors) ==== - function f(x: string): void; - ~ -!!! error TS2394: Overload signature is not compatible with function implementation. - function f(x: string): number { - return 0; - } \ No newline at end of file diff --git a/tests/baselines/reference/functionOverloadCompatibilityWithVoid02.symbols b/tests/baselines/reference/functionOverloadCompatibilityWithVoid02.symbols new file mode 100644 index 00000000000..210f7e3e4ee --- /dev/null +++ b/tests/baselines/reference/functionOverloadCompatibilityWithVoid02.symbols @@ -0,0 +1,11 @@ +=== tests/cases/conformance/functions/functionOverloadCompatibilityWithVoid02.ts === +function f(x: string): void; +>f : Symbol(f, Decl(functionOverloadCompatibilityWithVoid02.ts, 0, 0), Decl(functionOverloadCompatibilityWithVoid02.ts, 0, 28)) +>x : Symbol(x, Decl(functionOverloadCompatibilityWithVoid02.ts, 0, 11)) + +function f(x: string): number { +>f : Symbol(f, Decl(functionOverloadCompatibilityWithVoid02.ts, 0, 0), Decl(functionOverloadCompatibilityWithVoid02.ts, 0, 28)) +>x : Symbol(x, Decl(functionOverloadCompatibilityWithVoid02.ts, 1, 11)) + + return 0; +} diff --git a/tests/baselines/reference/functionOverloadCompatibilityWithVoid02.types b/tests/baselines/reference/functionOverloadCompatibilityWithVoid02.types new file mode 100644 index 00000000000..aa6fda7222b --- /dev/null +++ b/tests/baselines/reference/functionOverloadCompatibilityWithVoid02.types @@ -0,0 +1,12 @@ +=== tests/cases/conformance/functions/functionOverloadCompatibilityWithVoid02.ts === +function f(x: string): void; +>f : (x: string) => void +>x : string + +function f(x: string): number { +>f : (x: string) => void +>x : string + + return 0; +>0 : number +} From a236461358691e9773ef02b61e3ef5fa4cc79f25 Mon Sep 17 00:00:00 2001 From: Daniel Rosenwasser Date: Fri, 11 Dec 2015 15:10:50 -0800 Subject: [PATCH 103/177] Reversed order of checks, since the implementation will typically be more general than the overload. --- src/compiler/checker.ts | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/compiler/checker.ts b/src/compiler/checker.ts index a83c1027ad1..cd95267589b 100644 --- a/src/compiler/checker.ts +++ b/src/compiler/checker.ts @@ -4988,8 +4988,8 @@ namespace ts { const sourceReturnType = getReturnTypeOfSignature(erasedSource); const targetReturnType = getReturnTypeOfSignature(erasedTarget); if (targetReturnType === voidType - || checkTypeRelatedTo(sourceReturnType, targetReturnType, assignableRelation, /*errorNode*/ undefined) - || checkTypeRelatedTo(targetReturnType, sourceReturnType, assignableRelation, /*errorNode*/ undefined)) { + || checkTypeRelatedTo(targetReturnType, sourceReturnType, assignableRelation, /*errorNode*/ undefined) + || checkTypeRelatedTo(sourceReturnType, targetReturnType, assignableRelation, /*errorNode*/ undefined)) { const anyReturningSource = cloneSignature(erasedSource); const anyReturningTarget = cloneSignature(erasedTarget); anyReturningSource.resolvedReturnType = anyType; From 73526cf39ab2086f25e3f7157edeee0897a47973 Mon Sep 17 00:00:00 2001 From: Daniel Rosenwasser Date: Fri, 11 Dec 2015 16:01:42 -0800 Subject: [PATCH 104/177] Do some caching so that we don't repeat the same work for the implementation signature for every overload. --- src/compiler/checker.ts | 21 +++++++++++++++++---- src/compiler/types.ts | 2 ++ 2 files changed, 19 insertions(+), 4 deletions(-) diff --git a/src/compiler/checker.ts b/src/compiler/checker.ts index cd95267589b..fac21177aae 100644 --- a/src/compiler/checker.ts +++ b/src/compiler/checker.ts @@ -4115,6 +4115,16 @@ namespace ts { return signature.erasedSignatureCache; } + function getAnyReturningErasedSignature(signature: Signature): Signature { + if (!signature.anyReturningErasedSignatureCache) { + const erasedSignature = getErasedSignature(signature); + const anyReturningErasedSignature = cloneSignature(erasedSignature); + anyReturningErasedSignature.resolvedReturnType = anyType; + signature.anyReturningErasedSignatureCache = anyReturningErasedSignature; + } + return signature.anyReturningErasedSignatureCache; + } + function getOrCreateTypeFromSignature(signature: Signature): ObjectType { // There are two ways to declare a construct signature, one is by declaring a class constructor // using the constructor keyword, and the other is declaring a bare construct signature in an @@ -4985,16 +4995,19 @@ namespace ts { const erasedSource = getErasedSignature(implementation); const erasedTarget = getErasedSignature(overload); + // First see if the return types are compatible in either direction. const sourceReturnType = getReturnTypeOfSignature(erasedSource); const targetReturnType = getReturnTypeOfSignature(erasedTarget); if (targetReturnType === voidType || checkTypeRelatedTo(targetReturnType, sourceReturnType, assignableRelation, /*errorNode*/ undefined) || checkTypeRelatedTo(sourceReturnType, targetReturnType, assignableRelation, /*errorNode*/ undefined)) { - const anyReturningSource = cloneSignature(erasedSource); - const anyReturningTarget = cloneSignature(erasedTarget); - anyReturningSource.resolvedReturnType = anyType; - anyReturningTarget.resolvedReturnType = anyType; + // The return types are compatible, so create versions of the signature with 'any' as the return type. + // We need to do this so that we can check assignability while disregarding the return type. + const anyReturningSource = getAnyReturningErasedSignature(implementation); + const anyReturningTarget = getAnyReturningErasedSignature(overload); + + // Create object types to actually perform relation checks. const anyReturningSourceType = getOrCreateTypeFromSignature(anyReturningSource); const anyReturningTargetType = getOrCreateTypeFromSignature(anyReturningTarget); return checkTypeRelatedTo(anyReturningSourceType, anyReturningTargetType, assignableRelation, /*errorNode*/ undefined); diff --git a/src/compiler/types.ts b/src/compiler/types.ts index ff8ffa4ebd2..c6c78709300 100644 --- a/src/compiler/types.ts +++ b/src/compiler/types.ts @@ -2280,6 +2280,8 @@ namespace ts { /* @internal */ erasedSignatureCache?: Signature; // Erased version of signature (deferred) /* @internal */ + anyReturningErasedSignatureCache?: Signature; // A version of the erased signature whose type returns 'any' + /* @internal */ isolatedSignatureType?: ObjectType; // A manufactured type that just contains the signature for purposes of signature comparison } From f3b55b8198881ad757668d0807b65096d516f6d5 Mon Sep 17 00:00:00 2001 From: Wesley Wigham Date: Fri, 11 Dec 2015 16:14:47 -0800 Subject: [PATCH 105/177] whitespace --- .../thisPredicateMemberCompletions.ts | 76 +++++++++---------- .../fourslash/thisPredicateMemberQuickInfo.ts | 76 +++++++++---------- 2 files changed, 76 insertions(+), 76 deletions(-) diff --git a/tests/cases/fourslash/thisPredicateMemberCompletions.ts b/tests/cases/fourslash/thisPredicateMemberCompletions.ts index 609ed248644..24ce742faac 100644 --- a/tests/cases/fourslash/thisPredicateMemberCompletions.ts +++ b/tests/cases/fourslash/thisPredicateMemberCompletions.ts @@ -1,76 +1,76 @@ /// //// class FileSystemObject { -//// get is/*1*/File(): this is Item { -//// return this instanceof Item; -//// } -//// set is/*2*/File(param) { -//// // noop -//// } -//// get is/*3*/Directory(): this is Directory { -//// return this instanceof Directory; -//// } -//// is/*4*/Networked: this is (Networked & this); -//// constructor(public path: string) {} +//// get is/*1*/File(): this is Item { +//// return this instanceof Item; +//// } +//// set is/*2*/File(param) { +//// // noop +//// } +//// get is/*3*/Directory(): this is Directory { +//// return this instanceof Directory; +//// } +//// is/*4*/Networked: this is (Networked & this); +//// constructor(public path: string) {} //// } //// //// class Item extends FileSystemObject { -//// constructor(path: string, public content: string) { super(path); } +//// constructor(path: string, public content: string) { super(path); } //// } //// class Directory extends FileSystemObject { -//// children: FileSystemObject[]; +//// children: FileSystemObject[]; //// } //// interface Networked { -//// host: string; +//// host: string; //// } //// //// interface Sundries { -//// broken: boolean; +//// broken: boolean; //// } //// //// interface Supplies { -//// spoiled: boolean; +//// spoiled: boolean; //// } //// //// interface Crate { -//// contents: T; -//// is/*5*/Sundries: this is Crate; -//// is/*6*/Supplies: this is Crate; -//// is/*7*/PackedTight: this is (this & {extraContents: T}); +//// contents: T; +//// is/*5*/Sundries: this is Crate; +//// is/*6*/Supplies: this is Crate; +//// is/*7*/PackedTight: this is (this & {extraContents: T}); //// } //// //// const obj: FileSystemObject = new Item("/foo", ""); //// if (obj.is/*8*/File) { -//// obj./*9*/; -//// if (obj.is/*10*/Networked) { -//// obj./*11*/; -//// } +//// obj./*9*/; +//// if (obj.is/*10*/Networked) { +//// obj./*11*/; +//// } //// } //// if (obj.is/*12*/Directory) { -//// obj./*13*/; -//// if (obj.is/*14*/Networked) { -//// obj./*15*/; -//// } +//// obj./*13*/; +//// if (obj.is/*14*/Networked) { +//// obj./*15*/; +//// } //// } //// if (obj.is/*16*/Networked) { -//// obj./*17*/; +//// obj./*17*/; //// } //// //// const crate: Crate; //// if (crate.is/*18*/PackedTight) { -//// crate./*19*/; +//// crate./*19*/; //// } //// if (crate.is/*20*/Sundries) { -//// crate.contents./*21*/; -//// if (crate.is/*22*/PackedTight) { -//// crate./*23*/ -//// } +//// crate.contents./*21*/; +//// if (crate.is/*22*/PackedTight) { +//// crate./*23*/ +//// } //// } //// if (crate.is/*24*/Supplies) { -//// crate.contents./*25*/; -//// if (crate.is/*26*/PackedTight) { -//// crate./*27*/ -//// } +//// crate.contents./*25*/; +//// if (crate.is/*26*/PackedTight) { +//// crate./*27*/ +//// } //// } goTo.marker("9"); diff --git a/tests/cases/fourslash/thisPredicateMemberQuickInfo.ts b/tests/cases/fourslash/thisPredicateMemberQuickInfo.ts index dd596743902..20d519e0008 100644 --- a/tests/cases/fourslash/thisPredicateMemberQuickInfo.ts +++ b/tests/cases/fourslash/thisPredicateMemberQuickInfo.ts @@ -1,76 +1,76 @@ /// //// class FileSystemObject { -//// get is/*1*/File(): this is Item { -//// return this instanceof Item; -//// } -//// set is/*2*/File(param) { -//// // noop -//// } -//// get is/*3*/Directory(): this is Directory { -//// return this instanceof Directory; -//// } -//// is/*4*/Networked: this is (Networked & this); -//// constructor(public path: string) {} +//// get is/*1*/File(): this is Item { +//// return this instanceof Item; +//// } +//// set is/*2*/File(param) { +//// // noop +//// } +//// get is/*3*/Directory(): this is Directory { +//// return this instanceof Directory; +//// } +//// is/*4*/Networked: this is (Networked & this); +//// constructor(public path: string) {} //// } //// //// class Item extends FileSystemObject { -//// constructor(path: string, public content: string) { super(path); } +//// constructor(path: string, public content: string) { super(path); } //// } //// class Directory extends FileSystemObject { -//// children: FileSystemObject[]; +//// children: FileSystemObject[]; //// } //// interface Networked { -//// host: string; +//// host: string; //// } //// //// interface Sundries { -//// broken: boolean; +//// broken: boolean; //// } //// //// interface Supplies { -//// spoiled: boolean; +//// spoiled: boolean; //// } //// //// interface Crate { -//// contents: T; -//// is/*5*/Sundries: this is Crate; -//// is/*6*/Supplies: this is Crate; -//// is/*7*/PackedTight: this is (this & {extraContents: T}); +//// contents: T; +//// is/*5*/Sundries: this is Crate; +//// is/*6*/Supplies: this is Crate; +//// is/*7*/PackedTight: this is (this & {extraContents: T}); //// } //// //// const obj: FileSystemObject = new Item("/foo", ""); //// if (obj.is/*8*/File) { -//// obj./*9*/; -//// if (obj.is/*10*/Networked) { -//// obj./*11*/; -//// } +//// obj./*9*/; +//// if (obj.is/*10*/Networked) { +//// obj./*11*/; +//// } //// } //// if (obj.is/*12*/Directory) { -//// obj./*13*/; -//// if (obj.is/*14*/Networked) { -//// obj./*15*/; -//// } +//// obj./*13*/; +//// if (obj.is/*14*/Networked) { +//// obj./*15*/; +//// } //// } //// if (obj.is/*16*/Networked) { -//// obj./*17*/; +//// obj./*17*/; //// } //// //// const crate: Crate; //// if (crate.is/*18*/PackedTight) { -//// crate./*19*/; +//// crate./*19*/; //// } //// if (crate.is/*20*/Sundries) { -//// crate.contents./*21*/; -//// if (crate.is/*22*/PackedTight) { -//// crate./*23*/ -//// } +//// crate.contents./*21*/; +//// if (crate.is/*22*/PackedTight) { +//// crate./*23*/ +//// } //// } //// if (crate.is/*24*/Supplies) { -//// crate.contents./*25*/; -//// if (crate.is/*26*/PackedTight) { -//// crate./*27*/ -//// } +//// crate.contents./*25*/; +//// if (crate.is/*26*/PackedTight) { +//// crate./*27*/ +//// } //// } goTo.marker("1"); From 0c365daac5422afe8a1a6c14f477e3a23d8ae80d Mon Sep 17 00:00:00 2001 From: Paul van Brenk Date: Fri, 11 Dec 2015 16:19:08 -0800 Subject: [PATCH 106/177] make ChakraHost more generally usefull --- src/compiler/sys.ts | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/src/compiler/sys.ts b/src/compiler/sys.ts index cd7580119b5..614adf72aba 100644 --- a/src/compiler/sys.ts +++ b/src/compiler/sys.ts @@ -51,6 +51,8 @@ namespace ts { args: string[]; currentDirectory: string; executingFile: string; + newLine?: string; + useCaseSensitiveFileNames?: boolean; echo(s: string): void; quit(exitCode?: number): void; fileExists(path: string): boolean; @@ -60,6 +62,8 @@ namespace ts { readFile(path: string): string; writeFile(path: string, contents: string): void; readDirectory(path: string, extension?: string, exclude?: string[]): string[]; + watchFile?(path: string, callback: (path: string, removed?: boolean) => void): FileWatcher; + watchDirectory?(path: string, callback: (path: string) => void, recursive?: boolean): FileWatcher; }; export var sys: System = (function () { @@ -474,9 +478,9 @@ namespace ts { function getChakraSystem(): System { return { - newLine: "\r\n", + newLine: ChakraHost.newLine || "\r\n", args: ChakraHost.args, - useCaseSensitiveFileNames: false, + useCaseSensitiveFileNames: !!ChakraHost.useCaseSensitiveFileNames, write: ChakraHost.echo, readFile(path: string, encoding?: string) { // encoding is automatically handled by the implementation in ChakraHost From 8ecb0452718000e165646f607a75ad61a84f8b6d Mon Sep 17 00:00:00 2001 From: Wesley Wigham Date: Fri, 11 Dec 2015 16:29:39 -0800 Subject: [PATCH 107/177] accept baseline --- tests/baselines/reference/superPropertyAccess_ES5.js | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/tests/baselines/reference/superPropertyAccess_ES5.js b/tests/baselines/reference/superPropertyAccess_ES5.js index a31c1dfdcba..63f5f6f316a 100644 --- a/tests/baselines/reference/superPropertyAccess_ES5.js +++ b/tests/baselines/reference/superPropertyAccess_ES5.js @@ -45,7 +45,7 @@ var MyBase = (function () { configurable: true }); return MyBase; -})(); +}()); var MyDerived = (function (_super) { __extends(MyDerived, _super); function MyDerived() { @@ -54,7 +54,7 @@ var MyDerived = (function (_super) { var f2 = _super.prototype.value; } return MyDerived; -})(MyBase); +}(MyBase)); var d = new MyDerived(); var f3 = d.value; var A = (function () { @@ -67,7 +67,7 @@ var A = (function () { configurable: true }); return A; -})(); +}()); var B = (function (_super) { __extends(B, _super); function B() { @@ -81,4 +81,4 @@ var B = (function (_super) { configurable: true }); return B; -})(A); +}(A)); From 27493736c3396a10466e551ab84bd9492cb9d6e3 Mon Sep 17 00:00:00 2001 From: Paul van Brenk Date: Fri, 11 Dec 2015 16:32:44 -0800 Subject: [PATCH 108/177] trailing whitespace --- src/compiler/sys.ts | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/src/compiler/sys.ts b/src/compiler/sys.ts index 614adf72aba..52e234e8246 100644 --- a/src/compiler/sys.ts +++ b/src/compiler/sys.ts @@ -51,8 +51,8 @@ namespace ts { args: string[]; currentDirectory: string; executingFile: string; - newLine?: string; - useCaseSensitiveFileNames?: boolean; + newLine?: string; + useCaseSensitiveFileNames?: boolean; echo(s: string): void; quit(exitCode?: number): void; fileExists(path: string): boolean; @@ -62,8 +62,8 @@ namespace ts { readFile(path: string): string; writeFile(path: string, contents: string): void; readDirectory(path: string, extension?: string, exclude?: string[]): string[]; - watchFile?(path: string, callback: (path: string, removed?: boolean) => void): FileWatcher; - watchDirectory?(path: string, callback: (path: string) => void, recursive?: boolean): FileWatcher; + watchFile?(path: string, callback: (path: string, removed?: boolean) => void): FileWatcher; + watchDirectory?(path: string, callback: (path: string) => void, recursive?: boolean): FileWatcher; }; export var sys: System = (function () { From 60e1f301822daba4afa67a37ec777b4fa47b6691 Mon Sep 17 00:00:00 2001 From: vladima Date: Fri, 11 Dec 2015 17:16:28 -0800 Subject: [PATCH 109/177] allow usage of 'super' in object literal expressions --- src/compiler/checker.ts | 86 ++++++----- src/compiler/diagnosticMessages.json | 8 ++ src/compiler/utilities.ts | 54 ++++--- src/services/services.ts | 4 +- .../computedPropertyNames24_ES5.errors.txt | 4 +- .../computedPropertyNames24_ES6.errors.txt | 4 +- .../computedPropertyNames26_ES5.errors.txt | 4 +- .../computedPropertyNames26_ES6.errors.txt | 4 +- .../computedPropertyNames27_ES5.errors.txt | 4 +- .../computedPropertyNames27_ES6.errors.txt | 4 +- .../decoratorOnClassMethod12.errors.txt | 4 +- .../emitThisInSuperMethodCall.errors.txt | 12 +- .../reference/errorSuperCalls.errors.txt | 32 ++--- .../errorSuperPropertyAccess.errors.txt | 16 +-- .../superCallFromFunction1.errors.txt | 4 +- .../reference/superErrors.errors.txt | 32 ++--- .../superInObjectLiterals_ES5.errors.txt | 95 +++++++++++++ .../reference/superInObjectLiterals_ES5.js | 133 ++++++++++++++++++ .../superInObjectLiterals_ES6.errors.txt | 77 ++++++++++ .../reference/superInObjectLiterals_ES6.js | 119 ++++++++++++++++ ...essInComputedPropertiesOfNestedType_ES5.js | 46 ++++++ ...ComputedPropertiesOfNestedType_ES5.symbols | 29 ++++ ...InComputedPropertiesOfNestedType_ES5.types | 35 +++++ ...essInComputedPropertiesOfNestedType_ES6.js | 31 ++++ ...ComputedPropertiesOfNestedType_ES6.symbols | 29 ++++ ...InComputedPropertiesOfNestedType_ES6.types | 35 +++++ ...ect-literal-getters-and-setters.errors.txt | 16 +-- ...side-object-literal-getters-and-setters.js | 6 +- .../compiler/superInObjectLiterals_ES5.ts | 60 ++++++++ .../compiler/superInObjectLiterals_ES6.ts | 60 ++++++++ ...essInComputedPropertiesOfNestedType_ES5.ts | 15 ++ ...essInComputedPropertiesOfNestedType_ES6.ts | 15 ++ 32 files changed, 940 insertions(+), 137 deletions(-) create mode 100644 tests/baselines/reference/superInObjectLiterals_ES5.errors.txt create mode 100644 tests/baselines/reference/superInObjectLiterals_ES5.js create mode 100644 tests/baselines/reference/superInObjectLiterals_ES6.errors.txt create mode 100644 tests/baselines/reference/superInObjectLiterals_ES6.js create mode 100644 tests/baselines/reference/superPropertyAccessInComputedPropertiesOfNestedType_ES5.js create mode 100644 tests/baselines/reference/superPropertyAccessInComputedPropertiesOfNestedType_ES5.symbols create mode 100644 tests/baselines/reference/superPropertyAccessInComputedPropertiesOfNestedType_ES5.types create mode 100644 tests/baselines/reference/superPropertyAccessInComputedPropertiesOfNestedType_ES6.js create mode 100644 tests/baselines/reference/superPropertyAccessInComputedPropertiesOfNestedType_ES6.symbols create mode 100644 tests/baselines/reference/superPropertyAccessInComputedPropertiesOfNestedType_ES6.types create mode 100644 tests/cases/compiler/superInObjectLiterals_ES5.ts create mode 100644 tests/cases/compiler/superInObjectLiterals_ES6.ts create mode 100644 tests/cases/compiler/superPropertyAccessInComputedPropertiesOfNestedType_ES5.ts create mode 100644 tests/cases/compiler/superPropertyAccessInComputedPropertiesOfNestedType_ES6.ts diff --git a/src/compiler/checker.ts b/src/compiler/checker.ts index 76bd39a00bf..6af7ddba419 100644 --- a/src/compiler/checker.ts +++ b/src/compiler/checker.ts @@ -7037,17 +7037,14 @@ namespace ts { function checkSuperExpression(node: Node): Type { const isCallExpression = node.parent.kind === SyntaxKind.CallExpression && (node.parent).expression === node; - const classDeclaration = getContainingClass(node); - const classType = classDeclaration && getDeclaredTypeOfSymbol(getSymbolOfNode(classDeclaration)); - const baseClassType = classType && getBaseTypes(classType)[0]; - let container = getSuperContainer(node, /*includeFunctions*/ true); + let container = getSuperContainer(node, /*stopOnFunctions*/ true); let needToCaptureLexicalThis = false; if (!isCallExpression) { // adjust the container reference in case if super is used inside arrow functions with arbitrary deep nesting while (container && container.kind === SyntaxKind.ArrowFunction) { - container = getSuperContainer(container, /*includeFunctions*/ true); + container = getSuperContainer(container, /*stopOnFunctions*/ true); needToCaptureLexicalThis = languageVersion < ScriptTarget.ES6; } } @@ -7055,43 +7052,64 @@ namespace ts { const canUseSuperExpression = isLegalUsageOfSuperExpression(container); let nodeCheckFlag: NodeCheckFlags = 0; - // always set NodeCheckFlags for 'super' expression node - if (canUseSuperExpression) { - if ((container.flags & NodeFlags.Static) || isCallExpression) { - nodeCheckFlag = NodeCheckFlags.SuperStatic; + if (!canUseSuperExpression) { + if (isCallExpression) { + error(node, Diagnostics.Super_calls_are_not_permitted_outside_constructors_or_in_nested_functions_inside_constructors); + } + else if (!container || !container.parent || !(isClassLike(container.parent) || container.parent.kind === SyntaxKind.ObjectLiteralExpression)) { + error(node, Diagnostics.super_can_only_be_referenced_in_members_of_derived_classes_or_object_literal_expressions); } else { - nodeCheckFlag = NodeCheckFlags.SuperInstance; - } - - getNodeLinks(node).flags |= nodeCheckFlag; - - if (needToCaptureLexicalThis) { - // call expressions are allowed only in constructors so they should always capture correct 'this' - // super property access expressions can also appear in arrow functions - - // in this case they should also use correct lexical this - captureLexicalThis(node.parent, container); - } - } - - if (!baseClassType) { - if (!classDeclaration || !getClassExtendsHeritageClauseElement(classDeclaration)) { - error(node, Diagnostics.super_can_only_be_referenced_in_a_derived_class); + // issue more specific error if super is used in computed property name + let current = node; + while (current && current !== container && current.kind !== SyntaxKind.ComputedPropertyName) { + current = current.parent; + } + if (current && current.kind === SyntaxKind.ComputedPropertyName) { + error(node, Diagnostics.super_cannot_be_referenced_in_a_computed_property_name); + } + else { + error(node, Diagnostics.super_property_access_is_permitted_only_in_a_constructor_member_function_or_member_accessor_of_a_derived_class); + } } return unknownType; } - if (!canUseSuperExpression) { - if (container && container.kind === SyntaxKind.ComputedPropertyName) { - error(node, Diagnostics.super_cannot_be_referenced_in_a_computed_property_name); - } - else if (isCallExpression) { - error(node, Diagnostics.Super_calls_are_not_permitted_outside_constructors_or_in_nested_functions_inside_constructors); + if ((container.flags & NodeFlags.Static) || isCallExpression) { + nodeCheckFlag = NodeCheckFlags.SuperStatic; + } + else { + nodeCheckFlag = NodeCheckFlags.SuperInstance; + } + + getNodeLinks(node).flags |= nodeCheckFlag; + + if (needToCaptureLexicalThis) { + // call expressions are allowed only in constructors so they should always capture correct 'this' + // super property access expressions can also appear in arrow functions - + // in this case they should also use correct lexical this + captureLexicalThis(node.parent, container); + } + + if (container.parent.kind === SyntaxKind.ObjectLiteralExpression) { + if (languageVersion < ScriptTarget.ES6) { + error(node, Diagnostics.super_in_members_of_object_literal_expressions_is_only_allowed_when_option_target_is_ES2015_or_higher); + return unknownType; } else { - error(node, Diagnostics.super_property_access_is_permitted_only_in_a_constructor_member_function_or_member_accessor_of_a_derived_class); + // for object literal assume that type of 'super' is 'any' + return anyType; } + } + // at this point the only legal case for parent is ClassLikeDeclaration + const classLikeDeclaration = container.parent; + const classType = getDeclaredTypeOfSymbol(getSymbolOfNode(classLikeDeclaration)); + const baseClassType = classType && getBaseTypes(classType)[0]; + if (!baseClassType) { + if (!getClassExtendsHeritageClauseElement(classLikeDeclaration)) { + error(node, Diagnostics.super_can_only_be_referenced_in_a_derived_class); + } return unknownType; } @@ -7121,8 +7139,8 @@ namespace ts { // - In a constructor, instance member function, instance member accessor, or instance member variable initializer where this references a derived class instance // - In a static member function or static member accessor - // topmost container must be something that is directly nested in the class declaration - if (container && isClassLike(container.parent)) { + // topmost container must be something that is directly nested in the class declaration\object literal expression + if (isClassLike(container.parent) || container.parent.kind === SyntaxKind.ObjectLiteralExpression) { if (container.flags & NodeFlags.Static) { return container.kind === SyntaxKind.MethodDeclaration || container.kind === SyntaxKind.MethodSignature || diff --git a/src/compiler/diagnosticMessages.json b/src/compiler/diagnosticMessages.json index 54123808932..30b46e5cde2 100644 --- a/src/compiler/diagnosticMessages.json +++ b/src/compiler/diagnosticMessages.json @@ -1759,6 +1759,14 @@ "category": "Error", "code": 2658 }, + "'super' in members of object literal expressions is only allowed when option 'target' is 'ES2015' or higher.": { + "category": "Error", + "code": 2659 + }, + "'super' can only be referenced in members of derived classes or object literal expressions.": { + "category": "Error", + "code": 2660 + }, "Import declaration '{0}' is using private name '{1}'.": { "category": "Error", "code": 4000 diff --git a/src/compiler/utilities.ts b/src/compiler/utilities.ts index eee09fc641f..a85432418cc 100644 --- a/src/compiler/utilities.ts +++ b/src/compiler/utilities.ts @@ -775,26 +775,38 @@ namespace ts { } } - export function getSuperContainer(node: Node, includeFunctions: boolean): Node { + /** + * Given an super call\property node returns a closest node where either + * - super call\property is legal in the node and not legal in the parent node the node. + * i.e. super call is legal in constructor but not legal in the class body. + * - node is arrow function (so caller might need to call getSuperContainer in case if he needs to climb higher) + * - super call\property is definitely illegal in the node (but might be legal in some subnode) + * i.e. super property access is illegal in function declaration but can be legal in the statement list + */ + export function getSuperContainer(node: Node, stopOnFunctions: boolean): Node { while (true) { node = node.parent; - if (!node) return node; + if (!node) { + return node; + } switch (node.kind) { case SyntaxKind.ComputedPropertyName: - // If the grandparent node is an object literal (as opposed to a class), - // then the computed property is not a 'super' container. - // A computed property name in a class needs to be a super container - // so that we can error on it. - if (isClassLike(node.parent.parent)) { - return node; - } - // If this is a computed property, then the parent should not - // make it a super container. The parent might be a property - // in an object literal, like a method or accessor. But in order for - // such a parent to be a super container, the reference must be in - // the *body* of the container. node = node.parent; break; + case SyntaxKind.FunctionDeclaration: + case SyntaxKind.FunctionExpression: + case SyntaxKind.ArrowFunction: + if (!stopOnFunctions) { + continue; + } + case SyntaxKind.PropertyDeclaration: + case SyntaxKind.PropertySignature: + case SyntaxKind.MethodDeclaration: + case SyntaxKind.MethodSignature: + case SyntaxKind.Constructor: + case SyntaxKind.GetAccessor: + case SyntaxKind.SetAccessor: + return node; case SyntaxKind.Decorator: // Decorators are always applied outside of the body of a class or method. if (node.parent.kind === SyntaxKind.Parameter && isClassElement(node.parent.parent)) { @@ -808,20 +820,6 @@ namespace ts { node = node.parent; } break; - case SyntaxKind.FunctionDeclaration: - case SyntaxKind.FunctionExpression: - case SyntaxKind.ArrowFunction: - if (!includeFunctions) { - continue; - } - case SyntaxKind.PropertyDeclaration: - case SyntaxKind.PropertySignature: - case SyntaxKind.MethodDeclaration: - case SyntaxKind.MethodSignature: - case SyntaxKind.Constructor: - case SyntaxKind.GetAccessor: - case SyntaxKind.SetAccessor: - return node; } } } diff --git a/src/services/services.ts b/src/services/services.ts index a9dda549ead..2d42172832f 100644 --- a/src/services/services.ts +++ b/src/services/services.ts @@ -5780,7 +5780,7 @@ namespace ts { } function getReferencesForSuperKeyword(superKeyword: Node): ReferencedSymbol[] { - let searchSpaceNode = getSuperContainer(superKeyword, /*includeFunctions*/ false); + let searchSpaceNode = getSuperContainer(superKeyword, /*stopOnFunctions*/ false); if (!searchSpaceNode) { return undefined; } @@ -5815,7 +5815,7 @@ namespace ts { return; } - let container = getSuperContainer(node, /*includeFunctions*/ false); + let container = getSuperContainer(node, /*stopOnFunctions*/ false); // If we have a 'super' container, we must have an enclosing class. // Now make sure the owning class is the same as the search-space diff --git a/tests/baselines/reference/computedPropertyNames24_ES5.errors.txt b/tests/baselines/reference/computedPropertyNames24_ES5.errors.txt index 121b39450a6..e06373fb1e3 100644 --- a/tests/baselines/reference/computedPropertyNames24_ES5.errors.txt +++ b/tests/baselines/reference/computedPropertyNames24_ES5.errors.txt @@ -1,4 +1,4 @@ -tests/cases/conformance/es6/computedProperties/computedPropertyNames24_ES5.ts(7,6): error TS2466: 'super' cannot be referenced in a computed property name. +tests/cases/conformance/es6/computedProperties/computedPropertyNames24_ES5.ts(7,6): error TS2660: 'super' can only be referenced in members of derived classes or object literal expressions. ==== tests/cases/conformance/es6/computedProperties/computedPropertyNames24_ES5.ts (1 errors) ==== @@ -10,5 +10,5 @@ tests/cases/conformance/es6/computedProperties/computedPropertyNames24_ES5.ts(7, class C extends Base { [super.bar()]() { } ~~~~~ -!!! error TS2466: 'super' cannot be referenced in a computed property name. +!!! error TS2660: 'super' can only be referenced in members of derived classes or object literal expressions. } \ No newline at end of file diff --git a/tests/baselines/reference/computedPropertyNames24_ES6.errors.txt b/tests/baselines/reference/computedPropertyNames24_ES6.errors.txt index cab0ba6a85c..331723afe34 100644 --- a/tests/baselines/reference/computedPropertyNames24_ES6.errors.txt +++ b/tests/baselines/reference/computedPropertyNames24_ES6.errors.txt @@ -1,4 +1,4 @@ -tests/cases/conformance/es6/computedProperties/computedPropertyNames24_ES6.ts(9,6): error TS2466: 'super' cannot be referenced in a computed property name. +tests/cases/conformance/es6/computedProperties/computedPropertyNames24_ES6.ts(9,6): error TS2660: 'super' can only be referenced in members of derived classes or object literal expressions. ==== tests/cases/conformance/es6/computedProperties/computedPropertyNames24_ES6.ts (1 errors) ==== @@ -12,5 +12,5 @@ tests/cases/conformance/es6/computedProperties/computedPropertyNames24_ES6.ts(9, // use of super in static properties initializers. [super.bar()]() { } ~~~~~ -!!! error TS2466: 'super' cannot be referenced in a computed property name. +!!! error TS2660: 'super' can only be referenced in members of derived classes or object literal expressions. } \ No newline at end of file diff --git a/tests/baselines/reference/computedPropertyNames26_ES5.errors.txt b/tests/baselines/reference/computedPropertyNames26_ES5.errors.txt index e7039712734..c8e24abfa9d 100644 --- a/tests/baselines/reference/computedPropertyNames26_ES5.errors.txt +++ b/tests/baselines/reference/computedPropertyNames26_ES5.errors.txt @@ -1,4 +1,4 @@ -tests/cases/conformance/es6/computedProperties/computedPropertyNames26_ES5.ts(8,12): error TS2466: 'super' cannot be referenced in a computed property name. +tests/cases/conformance/es6/computedProperties/computedPropertyNames26_ES5.ts(8,12): error TS2660: 'super' can only be referenced in members of derived classes or object literal expressions. ==== tests/cases/conformance/es6/computedProperties/computedPropertyNames26_ES5.ts (1 errors) ==== @@ -11,6 +11,6 @@ tests/cases/conformance/es6/computedProperties/computedPropertyNames26_ES5.ts(8, [ { [super.bar()]: 1 }[0] ~~~~~ -!!! error TS2466: 'super' cannot be referenced in a computed property name. +!!! error TS2660: 'super' can only be referenced in members of derived classes or object literal expressions. ]() { } } \ No newline at end of file diff --git a/tests/baselines/reference/computedPropertyNames26_ES6.errors.txt b/tests/baselines/reference/computedPropertyNames26_ES6.errors.txt index d7e2b5ce7c5..ec20ed57144 100644 --- a/tests/baselines/reference/computedPropertyNames26_ES6.errors.txt +++ b/tests/baselines/reference/computedPropertyNames26_ES6.errors.txt @@ -1,4 +1,4 @@ -tests/cases/conformance/es6/computedProperties/computedPropertyNames26_ES6.ts(10,12): error TS2466: 'super' cannot be referenced in a computed property name. +tests/cases/conformance/es6/computedProperties/computedPropertyNames26_ES6.ts(10,12): error TS2660: 'super' can only be referenced in members of derived classes or object literal expressions. ==== tests/cases/conformance/es6/computedProperties/computedPropertyNames26_ES6.ts (1 errors) ==== @@ -13,6 +13,6 @@ tests/cases/conformance/es6/computedProperties/computedPropertyNames26_ES6.ts(10 [ { [super.bar()]: 1 }[0] ~~~~~ -!!! error TS2466: 'super' cannot be referenced in a computed property name. +!!! error TS2660: 'super' can only be referenced in members of derived classes or object literal expressions. ]() { } } \ No newline at end of file diff --git a/tests/baselines/reference/computedPropertyNames27_ES5.errors.txt b/tests/baselines/reference/computedPropertyNames27_ES5.errors.txt index 1fbc7b37543..97964d48176 100644 --- a/tests/baselines/reference/computedPropertyNames27_ES5.errors.txt +++ b/tests/baselines/reference/computedPropertyNames27_ES5.errors.txt @@ -1,4 +1,4 @@ -tests/cases/conformance/es6/computedProperties/computedPropertyNames27_ES5.ts(4,7): error TS2466: 'super' cannot be referenced in a computed property name. +tests/cases/conformance/es6/computedProperties/computedPropertyNames27_ES5.ts(4,7): error TS2337: Super calls are not permitted outside constructors or in nested functions inside constructors. ==== tests/cases/conformance/es6/computedProperties/computedPropertyNames27_ES5.ts (1 errors) ==== @@ -7,5 +7,5 @@ tests/cases/conformance/es6/computedProperties/computedPropertyNames27_ES5.ts(4, class C extends Base { [(super(), "prop")]() { } ~~~~~ -!!! error TS2466: 'super' cannot be referenced in a computed property name. +!!! error TS2337: Super calls are not permitted outside constructors or in nested functions inside constructors. } \ No newline at end of file diff --git a/tests/baselines/reference/computedPropertyNames27_ES6.errors.txt b/tests/baselines/reference/computedPropertyNames27_ES6.errors.txt index edf84201647..30e1ce5b14f 100644 --- a/tests/baselines/reference/computedPropertyNames27_ES6.errors.txt +++ b/tests/baselines/reference/computedPropertyNames27_ES6.errors.txt @@ -1,4 +1,4 @@ -tests/cases/conformance/es6/computedProperties/computedPropertyNames27_ES6.ts(4,7): error TS2466: 'super' cannot be referenced in a computed property name. +tests/cases/conformance/es6/computedProperties/computedPropertyNames27_ES6.ts(4,7): error TS2337: Super calls are not permitted outside constructors or in nested functions inside constructors. ==== tests/cases/conformance/es6/computedProperties/computedPropertyNames27_ES6.ts (1 errors) ==== @@ -7,5 +7,5 @@ tests/cases/conformance/es6/computedProperties/computedPropertyNames27_ES6.ts(4, class C extends Base { [(super(), "prop")]() { } ~~~~~ -!!! error TS2466: 'super' cannot be referenced in a computed property name. +!!! error TS2337: Super calls are not permitted outside constructors or in nested functions inside constructors. } \ No newline at end of file diff --git a/tests/baselines/reference/decoratorOnClassMethod12.errors.txt b/tests/baselines/reference/decoratorOnClassMethod12.errors.txt index 3ad3cabebe2..c285d5f12c9 100644 --- a/tests/baselines/reference/decoratorOnClassMethod12.errors.txt +++ b/tests/baselines/reference/decoratorOnClassMethod12.errors.txt @@ -1,4 +1,4 @@ -tests/cases/conformance/decorators/class/method/decoratorOnClassMethod12.ts(6,10): error TS2338: 'super' property access is permitted only in a constructor, member function, or member accessor of a derived class. +tests/cases/conformance/decorators/class/method/decoratorOnClassMethod12.ts(6,10): error TS2660: 'super' can only be referenced in members of derived classes or object literal expressions. ==== tests/cases/conformance/decorators/class/method/decoratorOnClassMethod12.ts (1 errors) ==== @@ -9,7 +9,7 @@ tests/cases/conformance/decorators/class/method/decoratorOnClassMethod12.ts(6,10 class C extends S { @super.decorator ~~~~~ -!!! error TS2338: 'super' property access is permitted only in a constructor, member function, or member accessor of a derived class. +!!! error TS2660: 'super' can only be referenced in members of derived classes or object literal expressions. method() { } } } \ No newline at end of file diff --git a/tests/baselines/reference/emitThisInSuperMethodCall.errors.txt b/tests/baselines/reference/emitThisInSuperMethodCall.errors.txt index 06211ef771f..c8d694c8567 100644 --- a/tests/baselines/reference/emitThisInSuperMethodCall.errors.txt +++ b/tests/baselines/reference/emitThisInSuperMethodCall.errors.txt @@ -1,6 +1,6 @@ -tests/cases/compiler/emitThisInSuperMethodCall.ts(10,17): error TS2338: 'super' property access is permitted only in a constructor, member function, or member accessor of a derived class. -tests/cases/compiler/emitThisInSuperMethodCall.ts(17,17): error TS2338: 'super' property access is permitted only in a constructor, member function, or member accessor of a derived class. -tests/cases/compiler/emitThisInSuperMethodCall.ts(23,13): error TS2338: 'super' property access is permitted only in a constructor, member function, or member accessor of a derived class. +tests/cases/compiler/emitThisInSuperMethodCall.ts(10,17): error TS2660: 'super' can only be referenced in members of derived classes or object literal expressions. +tests/cases/compiler/emitThisInSuperMethodCall.ts(17,17): error TS2660: 'super' can only be referenced in members of derived classes or object literal expressions. +tests/cases/compiler/emitThisInSuperMethodCall.ts(23,13): error TS2660: 'super' can only be referenced in members of derived classes or object literal expressions. ==== tests/cases/compiler/emitThisInSuperMethodCall.ts (3 errors) ==== @@ -15,7 +15,7 @@ tests/cases/compiler/emitThisInSuperMethodCall.ts(23,13): error TS2338: 'super' function inner() { super.sayHello(); ~~~~~ -!!! error TS2338: 'super' property access is permitted only in a constructor, member function, or member accessor of a derived class. +!!! error TS2660: 'super' can only be referenced in members of derived classes or object literal expressions. } }; } @@ -24,7 +24,7 @@ tests/cases/compiler/emitThisInSuperMethodCall.ts(23,13): error TS2338: 'super' () => { super.sayHello(); ~~~~~ -!!! error TS2338: 'super' property access is permitted only in a constructor, member function, or member accessor of a derived class. +!!! error TS2660: 'super' can only be referenced in members of derived classes or object literal expressions. } } } @@ -32,7 +32,7 @@ tests/cases/compiler/emitThisInSuperMethodCall.ts(23,13): error TS2338: 'super' function inner() { super.sayHello(); ~~~~~ -!!! error TS2338: 'super' property access is permitted only in a constructor, member function, or member accessor of a derived class. +!!! error TS2660: 'super' can only be referenced in members of derived classes or object literal expressions. } } } diff --git a/tests/baselines/reference/errorSuperCalls.errors.txt b/tests/baselines/reference/errorSuperCalls.errors.txt index 9ecc7a1565e..49bcb4b4d45 100644 --- a/tests/baselines/reference/errorSuperCalls.errors.txt +++ b/tests/baselines/reference/errorSuperCalls.errors.txt @@ -1,12 +1,12 @@ tests/cases/conformance/expressions/superCalls/errorSuperCalls.ts(4,9): error TS2335: 'super' can only be referenced in a derived class. -tests/cases/conformance/expressions/superCalls/errorSuperCalls.ts(9,9): error TS2335: 'super' can only be referenced in a derived class. -tests/cases/conformance/expressions/superCalls/errorSuperCalls.ts(14,9): error TS2335: 'super' can only be referenced in a derived class. -tests/cases/conformance/expressions/superCalls/errorSuperCalls.ts(18,9): error TS2335: 'super' can only be referenced in a derived class. -tests/cases/conformance/expressions/superCalls/errorSuperCalls.ts(22,9): error TS2335: 'super' can only be referenced in a derived class. -tests/cases/conformance/expressions/superCalls/errorSuperCalls.ts(26,9): error TS2335: 'super' can only be referenced in a derived class. -tests/cases/conformance/expressions/superCalls/errorSuperCalls.ts(30,16): error TS2335: 'super' can only be referenced in a derived class. -tests/cases/conformance/expressions/superCalls/errorSuperCalls.ts(34,9): error TS2335: 'super' can only be referenced in a derived class. -tests/cases/conformance/expressions/superCalls/errorSuperCalls.ts(38,9): error TS2335: 'super' can only be referenced in a derived class. +tests/cases/conformance/expressions/superCalls/errorSuperCalls.ts(9,9): error TS2337: Super calls are not permitted outside constructors or in nested functions inside constructors. +tests/cases/conformance/expressions/superCalls/errorSuperCalls.ts(14,9): error TS2337: Super calls are not permitted outside constructors or in nested functions inside constructors. +tests/cases/conformance/expressions/superCalls/errorSuperCalls.ts(18,9): error TS2337: Super calls are not permitted outside constructors or in nested functions inside constructors. +tests/cases/conformance/expressions/superCalls/errorSuperCalls.ts(22,9): error TS2337: Super calls are not permitted outside constructors or in nested functions inside constructors. +tests/cases/conformance/expressions/superCalls/errorSuperCalls.ts(26,9): error TS2337: Super calls are not permitted outside constructors or in nested functions inside constructors. +tests/cases/conformance/expressions/superCalls/errorSuperCalls.ts(30,16): error TS2337: Super calls are not permitted outside constructors or in nested functions inside constructors. +tests/cases/conformance/expressions/superCalls/errorSuperCalls.ts(34,9): error TS2337: Super calls are not permitted outside constructors or in nested functions inside constructors. +tests/cases/conformance/expressions/superCalls/errorSuperCalls.ts(38,9): error TS2337: Super calls are not permitted outside constructors or in nested functions inside constructors. tests/cases/conformance/expressions/superCalls/errorSuperCalls.ts(46,14): error TS1034: 'super' must be followed by an argument list or member access. tests/cases/conformance/expressions/superCalls/errorSuperCalls.ts(58,9): error TS2337: Super calls are not permitted outside constructors or in nested functions inside constructors. tests/cases/conformance/expressions/superCalls/errorSuperCalls.ts(62,9): error TS2337: Super calls are not permitted outside constructors or in nested functions inside constructors. @@ -27,50 +27,50 @@ tests/cases/conformance/expressions/superCalls/errorSuperCalls.ts(71,9): error T fn() { super(); ~~~~~ -!!! error TS2335: 'super' can only be referenced in a derived class. +!!! error TS2337: Super calls are not permitted outside constructors or in nested functions inside constructors. } //super call in class accessor (get and set) with no base type get foo() { super(); ~~~~~ -!!! error TS2335: 'super' can only be referenced in a derived class. +!!! error TS2337: Super calls are not permitted outside constructors or in nested functions inside constructors. return null; } set foo(v) { super(); ~~~~~ -!!! error TS2335: 'super' can only be referenced in a derived class. +!!! error TS2337: Super calls are not permitted outside constructors or in nested functions inside constructors. } //super call in class member initializer with no base type p = super(); ~~~~~ -!!! error TS2335: 'super' can only be referenced in a derived class. +!!! error TS2337: Super calls are not permitted outside constructors or in nested functions inside constructors. //super call in static class member function with no base type static fn() { super(); ~~~~~ -!!! error TS2335: 'super' can only be referenced in a derived class. +!!! error TS2337: Super calls are not permitted outside constructors or in nested functions inside constructors. } //super call in static class member initializer with no base type static k = super(); ~~~~~ -!!! error TS2335: 'super' can only be referenced in a derived class. +!!! error TS2337: Super calls are not permitted outside constructors or in nested functions inside constructors. //super call in static class accessor (get and set) with no base type static get q() { super(); ~~~~~ -!!! error TS2335: 'super' can only be referenced in a derived class. +!!! error TS2337: Super calls are not permitted outside constructors or in nested functions inside constructors. return null; } static set q(n) { super(); ~~~~~ -!!! error TS2335: 'super' can only be referenced in a derived class. +!!! error TS2337: Super calls are not permitted outside constructors or in nested functions inside constructors. } } diff --git a/tests/baselines/reference/errorSuperPropertyAccess.errors.txt b/tests/baselines/reference/errorSuperPropertyAccess.errors.txt index c34ed912046..c54ace99f17 100644 --- a/tests/baselines/reference/errorSuperPropertyAccess.errors.txt +++ b/tests/baselines/reference/errorSuperPropertyAccess.errors.txt @@ -15,8 +15,8 @@ tests/cases/conformance/expressions/superPropertyAccess/errorSuperPropertyAccess tests/cases/conformance/expressions/superPropertyAccess/errorSuperPropertyAccess.ts(65,23): error TS2340: Only public and protected methods of the base class are accessible via the 'super' keyword. tests/cases/conformance/expressions/superPropertyAccess/errorSuperPropertyAccess.ts(68,9): error TS1056: Accessors are only available when targeting ECMAScript 5 and higher. tests/cases/conformance/expressions/superPropertyAccess/errorSuperPropertyAccess.ts(69,19): error TS2340: Only public and protected methods of the base class are accessible via the 'super' keyword. -tests/cases/conformance/expressions/superPropertyAccess/errorSuperPropertyAccess.ts(73,13): error TS2338: 'super' property access is permitted only in a constructor, member function, or member accessor of a derived class. -tests/cases/conformance/expressions/superPropertyAccess/errorSuperPropertyAccess.ts(76,40): error TS2338: 'super' property access is permitted only in a constructor, member function, or member accessor of a derived class. +tests/cases/conformance/expressions/superPropertyAccess/errorSuperPropertyAccess.ts(73,13): error TS2660: 'super' can only be referenced in members of derived classes or object literal expressions. +tests/cases/conformance/expressions/superPropertyAccess/errorSuperPropertyAccess.ts(76,40): error TS2660: 'super' can only be referenced in members of derived classes or object literal expressions. tests/cases/conformance/expressions/superPropertyAccess/errorSuperPropertyAccess.ts(87,15): error TS2340: Only public and protected methods of the base class are accessible via the 'super' keyword. tests/cases/conformance/expressions/superPropertyAccess/errorSuperPropertyAccess.ts(91,23): error TS2340: Only public and protected methods of the base class are accessible via the 'super' keyword. tests/cases/conformance/expressions/superPropertyAccess/errorSuperPropertyAccess.ts(94,9): error TS1056: Accessors are only available when targeting ECMAScript 5 and higher. @@ -34,8 +34,8 @@ tests/cases/conformance/expressions/superPropertyAccess/errorSuperPropertyAccess tests/cases/conformance/expressions/superPropertyAccess/errorSuperPropertyAccess.ts(120,15): error TS2340: Only public and protected methods of the base class are accessible via the 'super' keyword. tests/cases/conformance/expressions/superPropertyAccess/errorSuperPropertyAccess.ts(121,15): error TS2340: Only public and protected methods of the base class are accessible via the 'super' keyword. tests/cases/conformance/expressions/superPropertyAccess/errorSuperPropertyAccess.ts(122,9): error TS2341: Property 'privateStaticFunc' is private and only accessible within class 'SomeBase'. -tests/cases/conformance/expressions/superPropertyAccess/errorSuperPropertyAccess.ts(127,16): error TS2335: 'super' can only be referenced in a derived class. -tests/cases/conformance/expressions/superPropertyAccess/errorSuperPropertyAccess.ts(127,30): error TS2335: 'super' can only be referenced in a derived class. +tests/cases/conformance/expressions/superPropertyAccess/errorSuperPropertyAccess.ts(127,16): error TS2660: 'super' can only be referenced in members of derived classes or object literal expressions. +tests/cases/conformance/expressions/superPropertyAccess/errorSuperPropertyAccess.ts(127,30): error TS2660: 'super' can only be referenced in members of derived classes or object literal expressions. ==== tests/cases/conformance/expressions/superPropertyAccess/errorSuperPropertyAccess.ts (38 errors) ==== @@ -147,12 +147,12 @@ tests/cases/conformance/expressions/superPropertyAccess/errorSuperPropertyAccess function inner() { super.publicFunc(); ~~~~~ -!!! error TS2338: 'super' property access is permitted only in a constructor, member function, or member accessor of a derived class. +!!! error TS2660: 'super' can only be referenced in members of derived classes or object literal expressions. } var x = { test: function () { return super.publicFunc(); } ~~~~~ -!!! error TS2338: 'super' property access is permitted only in a constructor, member function, or member accessor of a derived class. +!!! error TS2660: 'super' can only be referenced in members of derived classes or object literal expressions. } } } @@ -239,7 +239,7 @@ tests/cases/conformance/expressions/superPropertyAccess/errorSuperPropertyAccess // In object literal var obj = { n: super.wat, p: super.foo() }; ~~~~~ -!!! error TS2335: 'super' can only be referenced in a derived class. +!!! error TS2660: 'super' can only be referenced in members of derived classes or object literal expressions. ~~~~~ -!!! error TS2335: 'super' can only be referenced in a derived class. +!!! error TS2660: 'super' can only be referenced in members of derived classes or object literal expressions. \ No newline at end of file diff --git a/tests/baselines/reference/superCallFromFunction1.errors.txt b/tests/baselines/reference/superCallFromFunction1.errors.txt index 374a3aeb16c..b993d9f1253 100644 --- a/tests/baselines/reference/superCallFromFunction1.errors.txt +++ b/tests/baselines/reference/superCallFromFunction1.errors.txt @@ -1,4 +1,4 @@ -tests/cases/compiler/superCallFromFunction1.ts(3,5): error TS2335: 'super' can only be referenced in a derived class. +tests/cases/compiler/superCallFromFunction1.ts(3,5): error TS2337: Super calls are not permitted outside constructors or in nested functions inside constructors. ==== tests/cases/compiler/superCallFromFunction1.ts (1 errors) ==== @@ -6,5 +6,5 @@ tests/cases/compiler/superCallFromFunction1.ts(3,5): error TS2335: 'super' can o function foo() { super(value => String(value)); ~~~~~ -!!! error TS2335: 'super' can only be referenced in a derived class. +!!! error TS2337: Super calls are not permitted outside constructors or in nested functions inside constructors. } \ No newline at end of file diff --git a/tests/baselines/reference/superErrors.errors.txt b/tests/baselines/reference/superErrors.errors.txt index 26e0ba3a6c4..5c6d7365a67 100644 --- a/tests/baselines/reference/superErrors.errors.txt +++ b/tests/baselines/reference/superErrors.errors.txt @@ -1,15 +1,15 @@ -tests/cases/compiler/superErrors.ts(3,13): error TS2335: 'super' can only be referenced in a derived class. +tests/cases/compiler/superErrors.ts(3,13): error TS2660: 'super' can only be referenced in members of derived classes or object literal expressions. tests/cases/compiler/superErrors.ts(3,18): error TS1034: 'super' must be followed by an argument list or member access. -tests/cases/compiler/superErrors.ts(4,19): error TS2335: 'super' can only be referenced in a derived class. +tests/cases/compiler/superErrors.ts(4,19): error TS2660: 'super' can only be referenced in members of derived classes or object literal expressions. tests/cases/compiler/superErrors.ts(4,24): error TS1034: 'super' must be followed by an argument list or member access. -tests/cases/compiler/superErrors.ts(5,31): error TS2335: 'super' can only be referenced in a derived class. +tests/cases/compiler/superErrors.ts(5,31): error TS2660: 'super' can only be referenced in members of derived classes or object literal expressions. tests/cases/compiler/superErrors.ts(5,36): error TS1034: 'super' must be followed by an argument list or member access. -tests/cases/compiler/superErrors.ts(22,13): error TS2338: 'super' property access is permitted only in a constructor, member function, or member accessor of a derived class. -tests/cases/compiler/superErrors.ts(27,27): error TS2338: 'super' property access is permitted only in a constructor, member function, or member accessor of a derived class. -tests/cases/compiler/superErrors.ts(31,36): error TS2338: 'super' property access is permitted only in a constructor, member function, or member accessor of a derived class. +tests/cases/compiler/superErrors.ts(22,13): error TS2660: 'super' can only be referenced in members of derived classes or object literal expressions. +tests/cases/compiler/superErrors.ts(27,27): error TS2660: 'super' can only be referenced in members of derived classes or object literal expressions. +tests/cases/compiler/superErrors.ts(31,36): error TS2660: 'super' can only be referenced in members of derived classes or object literal expressions. tests/cases/compiler/superErrors.ts(31,41): error TS1034: 'super' must be followed by an argument list or member access. -tests/cases/compiler/superErrors.ts(39,27): error TS2338: 'super' property access is permitted only in a constructor, member function, or member accessor of a derived class. -tests/cases/compiler/superErrors.ts(43,36): error TS2338: 'super' property access is permitted only in a constructor, member function, or member accessor of a derived class. +tests/cases/compiler/superErrors.ts(39,27): error TS2660: 'super' can only be referenced in members of derived classes or object literal expressions. +tests/cases/compiler/superErrors.ts(43,36): error TS2660: 'super' can only be referenced in members of derived classes or object literal expressions. tests/cases/compiler/superErrors.ts(43,41): error TS1034: 'super' must be followed by an argument list or member access. tests/cases/compiler/superErrors.ts(47,22): error TS1034: 'super' must be followed by an argument list or member access. tests/cases/compiler/superErrors.ts(48,28): error TS1034: 'super' must be followed by an argument list or member access. @@ -21,17 +21,17 @@ tests/cases/compiler/superErrors.ts(49,40): error TS1034: 'super' must be follow // super in a non class context var x = super; ~~~~~ -!!! error TS2335: 'super' can only be referenced in a derived class. +!!! error TS2660: 'super' can only be referenced in members of derived classes or object literal expressions. ~ !!! error TS1034: 'super' must be followed by an argument list or member access. var y = () => super; ~~~~~ -!!! error TS2335: 'super' can only be referenced in a derived class. +!!! error TS2660: 'super' can only be referenced in members of derived classes or object literal expressions. ~ !!! error TS1034: 'super' must be followed by an argument list or member access. var z = () => () => () => super; ~~~~~ -!!! error TS2335: 'super' can only be referenced in a derived class. +!!! error TS2660: 'super' can only be referenced in members of derived classes or object literal expressions. ~ !!! error TS1034: 'super' must be followed by an argument list or member access. } @@ -52,20 +52,20 @@ tests/cases/compiler/superErrors.ts(49,40): error TS1034: 'super' must be follow function inner() { super.sayHello(); ~~~~~ -!!! error TS2338: 'super' property access is permitted only in a constructor, member function, or member accessor of a derived class. +!!! error TS2660: 'super' can only be referenced in members of derived classes or object literal expressions. } // super call in a lambda in an inner function in a constructor function inner2() { var x = () => super.sayHello(); ~~~~~ -!!! error TS2338: 'super' property access is permitted only in a constructor, member function, or member accessor of a derived class. +!!! error TS2660: 'super' can only be referenced in members of derived classes or object literal expressions. } // super call in a lambda in a function expression in a constructor (function() { return () => super; })(); ~~~~~ -!!! error TS2338: 'super' property access is permitted only in a constructor, member function, or member accessor of a derived class. +!!! error TS2660: 'super' can only be referenced in members of derived classes or object literal expressions. ~ !!! error TS1034: 'super' must be followed by an argument list or member access. } @@ -77,13 +77,13 @@ tests/cases/compiler/superErrors.ts(49,40): error TS1034: 'super' must be follow function inner() { var x = () => super.sayHello(); ~~~~~ -!!! error TS2338: 'super' property access is permitted only in a constructor, member function, or member accessor of a derived class. +!!! error TS2660: 'super' can only be referenced in members of derived classes or object literal expressions. } // super call in a lambda in a function expression in a constructor (function() { return () => super; })(); ~~~~~ -!!! error TS2338: 'super' property access is permitted only in a constructor, member function, or member accessor of a derived class. +!!! error TS2660: 'super' can only be referenced in members of derived classes or object literal expressions. ~ !!! error TS1034: 'super' must be followed by an argument list or member access. } diff --git a/tests/baselines/reference/superInObjectLiterals_ES5.errors.txt b/tests/baselines/reference/superInObjectLiterals_ES5.errors.txt new file mode 100644 index 00000000000..944766cb5ae --- /dev/null +++ b/tests/baselines/reference/superInObjectLiterals_ES5.errors.txt @@ -0,0 +1,95 @@ +tests/cases/compiler/superInObjectLiterals_ES5.ts(7,9): error TS2659: 'super' in members of object literal expressions is only allowed when option 'target' is 'ES2015' or higher. +tests/cases/compiler/superInObjectLiterals_ES5.ts(10,9): error TS2659: 'super' in members of object literal expressions is only allowed when option 'target' is 'ES2015' or higher. +tests/cases/compiler/superInObjectLiterals_ES5.ts(14,9): error TS2659: 'super' in members of object literal expressions is only allowed when option 'target' is 'ES2015' or higher. +tests/cases/compiler/superInObjectLiterals_ES5.ts(17,9): error TS2660: 'super' can only be referenced in members of derived classes or object literal expressions. +tests/cases/compiler/superInObjectLiterals_ES5.ts(20,9): error TS2660: 'super' can only be referenced in members of derived classes or object literal expressions. +tests/cases/compiler/superInObjectLiterals_ES5.ts(23,9): error TS2660: 'super' can only be referenced in members of derived classes or object literal expressions. +tests/cases/compiler/superInObjectLiterals_ES5.ts(39,17): error TS2659: 'super' in members of object literal expressions is only allowed when option 'target' is 'ES2015' or higher. +tests/cases/compiler/superInObjectLiterals_ES5.ts(42,17): error TS2659: 'super' in members of object literal expressions is only allowed when option 'target' is 'ES2015' or higher. +tests/cases/compiler/superInObjectLiterals_ES5.ts(46,17): error TS2659: 'super' in members of object literal expressions is only allowed when option 'target' is 'ES2015' or higher. +tests/cases/compiler/superInObjectLiterals_ES5.ts(49,17): error TS2660: 'super' can only be referenced in members of derived classes or object literal expressions. +tests/cases/compiler/superInObjectLiterals_ES5.ts(52,17): error TS2660: 'super' can only be referenced in members of derived classes or object literal expressions. + + +==== tests/cases/compiler/superInObjectLiterals_ES5.ts (11 errors) ==== + var obj = { + __proto__: { + method() { + } + }, + method() { + super.method(); + ~~~~~ +!!! error TS2659: 'super' in members of object literal expressions is only allowed when option 'target' is 'ES2015' or higher. + }, + get prop() { + super.method(); + ~~~~~ +!!! error TS2659: 'super' in members of object literal expressions is only allowed when option 'target' is 'ES2015' or higher. + return 10; + }, + set prop(value) { + super.method(); + ~~~~~ +!!! error TS2659: 'super' in members of object literal expressions is only allowed when option 'target' is 'ES2015' or higher. + }, + p1: function () { + super.method(); + ~~~~~ +!!! error TS2660: 'super' can only be referenced in members of derived classes or object literal expressions. + }, + p2: function f() { + super.method(); + ~~~~~ +!!! error TS2660: 'super' can only be referenced in members of derived classes or object literal expressions. + }, + p3: () => { + super.method(); + ~~~~~ +!!! error TS2660: 'super' can only be referenced in members of derived classes or object literal expressions. + } + }; + + class A { + method() { } + } + + class B extends A { + f() { + var obj = { + __proto__: { + method() { + } + }, + method() { + super.method(); + ~~~~~ +!!! error TS2659: 'super' in members of object literal expressions is only allowed when option 'target' is 'ES2015' or higher. + }, + get prop() { + super.method(); + ~~~~~ +!!! error TS2659: 'super' in members of object literal expressions is only allowed when option 'target' is 'ES2015' or higher. + return 10; + }, + set prop(value) { + super.method(); + ~~~~~ +!!! error TS2659: 'super' in members of object literal expressions is only allowed when option 'target' is 'ES2015' or higher. + }, + p1: function () { + super.method(); + ~~~~~ +!!! error TS2660: 'super' can only be referenced in members of derived classes or object literal expressions. + }, + p2: function f() { + super.method(); + ~~~~~ +!!! error TS2660: 'super' can only be referenced in members of derived classes or object literal expressions. + }, + p3: () => { + super.method(); + } + }; + } + } \ No newline at end of file diff --git a/tests/baselines/reference/superInObjectLiterals_ES5.js b/tests/baselines/reference/superInObjectLiterals_ES5.js new file mode 100644 index 00000000000..f701ca7df7b --- /dev/null +++ b/tests/baselines/reference/superInObjectLiterals_ES5.js @@ -0,0 +1,133 @@ +//// [superInObjectLiterals_ES5.ts] +var obj = { + __proto__: { + method() { + } + }, + method() { + super.method(); + }, + get prop() { + super.method(); + return 10; + }, + set prop(value) { + super.method(); + }, + p1: function () { + super.method(); + }, + p2: function f() { + super.method(); + }, + p3: () => { + super.method(); + } +}; + +class A { + method() { } +} + +class B extends A { + f() { + var obj = { + __proto__: { + method() { + } + }, + method() { + super.method(); + }, + get prop() { + super.method(); + return 10; + }, + set prop(value) { + super.method(); + }, + p1: function () { + super.method(); + }, + p2: function f() { + super.method(); + }, + p3: () => { + super.method(); + } + }; + } +} + +//// [superInObjectLiterals_ES5.js] +var __extends = (this && this.__extends) || function (d, b) { + for (var p in b) if (b.hasOwnProperty(p)) d[p] = b[p]; + function __() { this.constructor = d; } + d.prototype = b === null ? Object.create(b) : (__.prototype = b.prototype, new __()); +}; +var obj = { + __proto__: { + method: function () { + } + }, + method: function () { + _super.prototype.method.call(this); + }, + get prop() { + _super.prototype.method.call(this); + return 10; + }, + set prop(value) { + _super.prototype.method.call(this); + }, + p1: function () { + _super.method.call(this); + }, + p2: function f() { + _super.method.call(this); + }, + p3: function () { + _super.method.call(this); + } +}; +var A = (function () { + function A() { + } + A.prototype.method = function () { }; + return A; +}()); +var B = (function (_super) { + __extends(B, _super); + function B() { + _super.apply(this, arguments); + } + B.prototype.f = function () { + var _this = this; + var obj = { + __proto__: { + method: function () { + } + }, + method: function () { + _super.prototype.method.call(this); + }, + get prop() { + _super.prototype.method.call(this); + return 10; + }, + set prop(value) { + _super.prototype.method.call(this); + }, + p1: function () { + _super.method.call(this); + }, + p2: function f() { + _super.method.call(this); + }, + p3: function () { + _super.prototype.method.call(_this); + } + }; + }; + return B; +}(A)); diff --git a/tests/baselines/reference/superInObjectLiterals_ES6.errors.txt b/tests/baselines/reference/superInObjectLiterals_ES6.errors.txt new file mode 100644 index 00000000000..dcd9692f5e3 --- /dev/null +++ b/tests/baselines/reference/superInObjectLiterals_ES6.errors.txt @@ -0,0 +1,77 @@ +tests/cases/compiler/superInObjectLiterals_ES6.ts(17,9): error TS2660: 'super' can only be referenced in members of derived classes or object literal expressions. +tests/cases/compiler/superInObjectLiterals_ES6.ts(20,9): error TS2660: 'super' can only be referenced in members of derived classes or object literal expressions. +tests/cases/compiler/superInObjectLiterals_ES6.ts(23,9): error TS2660: 'super' can only be referenced in members of derived classes or object literal expressions. +tests/cases/compiler/superInObjectLiterals_ES6.ts(49,17): error TS2660: 'super' can only be referenced in members of derived classes or object literal expressions. +tests/cases/compiler/superInObjectLiterals_ES6.ts(52,17): error TS2660: 'super' can only be referenced in members of derived classes or object literal expressions. + + +==== tests/cases/compiler/superInObjectLiterals_ES6.ts (5 errors) ==== + var obj = { + __proto__: { + method() { + } + }, + method() { + super.method(); + }, + get prop() { + super.method(); + return 10; + }, + set prop(value) { + super.method(); + }, + p1: function () { + super.method(); + ~~~~~ +!!! error TS2660: 'super' can only be referenced in members of derived classes or object literal expressions. + }, + p2: function f() { + super.method(); + ~~~~~ +!!! error TS2660: 'super' can only be referenced in members of derived classes or object literal expressions. + }, + p3: () => { + super.method(); + ~~~~~ +!!! error TS2660: 'super' can only be referenced in members of derived classes or object literal expressions. + } + }; + + class A { + method() { } + } + + class B extends A { + f() { + var obj = { + __proto__: { + method() { + } + }, + method() { + super.method(); + }, + get prop() { + super.method(); + return 10; + }, + set prop(value) { + super.method(); + }, + p1: function () { + super.method(); + ~~~~~ +!!! error TS2660: 'super' can only be referenced in members of derived classes or object literal expressions. + }, + p2: function f() { + super.method(); + ~~~~~ +!!! error TS2660: 'super' can only be referenced in members of derived classes or object literal expressions. + }, + p3: () => { + super.method(); + } + }; + } + } \ No newline at end of file diff --git a/tests/baselines/reference/superInObjectLiterals_ES6.js b/tests/baselines/reference/superInObjectLiterals_ES6.js new file mode 100644 index 00000000000..4cd62e68947 --- /dev/null +++ b/tests/baselines/reference/superInObjectLiterals_ES6.js @@ -0,0 +1,119 @@ +//// [superInObjectLiterals_ES6.ts] +var obj = { + __proto__: { + method() { + } + }, + method() { + super.method(); + }, + get prop() { + super.method(); + return 10; + }, + set prop(value) { + super.method(); + }, + p1: function () { + super.method(); + }, + p2: function f() { + super.method(); + }, + p3: () => { + super.method(); + } +}; + +class A { + method() { } +} + +class B extends A { + f() { + var obj = { + __proto__: { + method() { + } + }, + method() { + super.method(); + }, + get prop() { + super.method(); + return 10; + }, + set prop(value) { + super.method(); + }, + p1: function () { + super.method(); + }, + p2: function f() { + super.method(); + }, + p3: () => { + super.method(); + } + }; + } +} + +//// [superInObjectLiterals_ES6.js] +var obj = { + __proto__: { + method() { + } + }, + method() { + super.method(); + }, + get prop() { + super.method(); + return 10; + }, + set prop(value) { + super.method(); + }, + p1: function () { + super.method(); + }, + p2: function f() { + super.method(); + }, + p3: () => { + super.method(); + } +}; +class A { + method() { } +} +class B extends A { + f() { + var obj = { + __proto__: { + method() { + } + }, + method() { + super.method(); + }, + get prop() { + super.method(); + return 10; + }, + set prop(value) { + super.method(); + }, + p1: function () { + super.method(); + }, + p2: function f() { + super.method(); + }, + p3: () => { + super.method(); + } + }; + } +} diff --git a/tests/baselines/reference/superPropertyAccessInComputedPropertiesOfNestedType_ES5.js b/tests/baselines/reference/superPropertyAccessInComputedPropertiesOfNestedType_ES5.js new file mode 100644 index 00000000000..a91dfc76e3d --- /dev/null +++ b/tests/baselines/reference/superPropertyAccessInComputedPropertiesOfNestedType_ES5.js @@ -0,0 +1,46 @@ +//// [superPropertyAccessInComputedPropertiesOfNestedType_ES5.ts] +class A { + foo() { return 1; } +} + +class B extends A { + foo() { return 2; } + bar() { + return class { + [super.foo()]() { + return 100; + } + } + } +} + +//// [superPropertyAccessInComputedPropertiesOfNestedType_ES5.js] +var __extends = (this && this.__extends) || function (d, b) { + for (var p in b) if (b.hasOwnProperty(p)) d[p] = b[p]; + function __() { this.constructor = d; } + d.prototype = b === null ? Object.create(b) : (__.prototype = b.prototype, new __()); +}; +var A = (function () { + function A() { + } + A.prototype.foo = function () { return 1; }; + return A; +}()); +var B = (function (_super) { + __extends(B, _super); + function B() { + _super.apply(this, arguments); + } + B.prototype.foo = function () { return 2; }; + B.prototype.bar = function () { + return (function () { + function class_1() { + } + class_1.prototype[_super.prototype.foo.call(this)] = function () { + return 100; + }; + return class_1; + }()); + }; + return B; +}(A)); diff --git a/tests/baselines/reference/superPropertyAccessInComputedPropertiesOfNestedType_ES5.symbols b/tests/baselines/reference/superPropertyAccessInComputedPropertiesOfNestedType_ES5.symbols new file mode 100644 index 00000000000..1379d50179f --- /dev/null +++ b/tests/baselines/reference/superPropertyAccessInComputedPropertiesOfNestedType_ES5.symbols @@ -0,0 +1,29 @@ +=== tests/cases/compiler/superPropertyAccessInComputedPropertiesOfNestedType_ES5.ts === +class A { +>A : Symbol(A, Decl(superPropertyAccessInComputedPropertiesOfNestedType_ES5.ts, 0, 0)) + + foo() { return 1; } +>foo : Symbol(foo, Decl(superPropertyAccessInComputedPropertiesOfNestedType_ES5.ts, 0, 9)) +} + +class B extends A { +>B : Symbol(B, Decl(superPropertyAccessInComputedPropertiesOfNestedType_ES5.ts, 2, 1)) +>A : Symbol(A, Decl(superPropertyAccessInComputedPropertiesOfNestedType_ES5.ts, 0, 0)) + + foo() { return 2; } +>foo : Symbol(foo, Decl(superPropertyAccessInComputedPropertiesOfNestedType_ES5.ts, 4, 19)) + + bar() { +>bar : Symbol(bar, Decl(superPropertyAccessInComputedPropertiesOfNestedType_ES5.ts, 5, 23)) + + return class { + [super.foo()]() { +>super.foo : Symbol(A.foo, Decl(superPropertyAccessInComputedPropertiesOfNestedType_ES5.ts, 0, 9)) +>super : Symbol(A, Decl(superPropertyAccessInComputedPropertiesOfNestedType_ES5.ts, 0, 0)) +>foo : Symbol(A.foo, Decl(superPropertyAccessInComputedPropertiesOfNestedType_ES5.ts, 0, 9)) + + return 100; + } + } + } +} diff --git a/tests/baselines/reference/superPropertyAccessInComputedPropertiesOfNestedType_ES5.types b/tests/baselines/reference/superPropertyAccessInComputedPropertiesOfNestedType_ES5.types new file mode 100644 index 00000000000..d435bff69b5 --- /dev/null +++ b/tests/baselines/reference/superPropertyAccessInComputedPropertiesOfNestedType_ES5.types @@ -0,0 +1,35 @@ +=== tests/cases/compiler/superPropertyAccessInComputedPropertiesOfNestedType_ES5.ts === +class A { +>A : A + + foo() { return 1; } +>foo : () => number +>1 : number +} + +class B extends A { +>B : B +>A : A + + foo() { return 2; } +>foo : () => number +>2 : number + + bar() { +>bar : () => typeof (Anonymous class) + + return class { +>class { [super.foo()]() { return 100; } } : typeof (Anonymous class) + + [super.foo()]() { +>super.foo() : number +>super.foo : () => number +>super : A +>foo : () => number + + return 100; +>100 : number + } + } + } +} diff --git a/tests/baselines/reference/superPropertyAccessInComputedPropertiesOfNestedType_ES6.js b/tests/baselines/reference/superPropertyAccessInComputedPropertiesOfNestedType_ES6.js new file mode 100644 index 00000000000..825fa7682e2 --- /dev/null +++ b/tests/baselines/reference/superPropertyAccessInComputedPropertiesOfNestedType_ES6.js @@ -0,0 +1,31 @@ +//// [superPropertyAccessInComputedPropertiesOfNestedType_ES6.ts] +class A { + foo() { return 1; } +} + +class B extends A { + foo() { return 2; } + bar() { + return class { + [super.foo()]() { + return 100; + } + } + } +} + +//// [superPropertyAccessInComputedPropertiesOfNestedType_ES6.js] +class A { + foo() { return 1; } +} +class B extends A { + foo() { return 2; } + bar() { + return class { + [super.foo()]() { + return 100; + } + } + ; + } +} diff --git a/tests/baselines/reference/superPropertyAccessInComputedPropertiesOfNestedType_ES6.symbols b/tests/baselines/reference/superPropertyAccessInComputedPropertiesOfNestedType_ES6.symbols new file mode 100644 index 00000000000..12446259f32 --- /dev/null +++ b/tests/baselines/reference/superPropertyAccessInComputedPropertiesOfNestedType_ES6.symbols @@ -0,0 +1,29 @@ +=== tests/cases/compiler/superPropertyAccessInComputedPropertiesOfNestedType_ES6.ts === +class A { +>A : Symbol(A, Decl(superPropertyAccessInComputedPropertiesOfNestedType_ES6.ts, 0, 0)) + + foo() { return 1; } +>foo : Symbol(foo, Decl(superPropertyAccessInComputedPropertiesOfNestedType_ES6.ts, 0, 9)) +} + +class B extends A { +>B : Symbol(B, Decl(superPropertyAccessInComputedPropertiesOfNestedType_ES6.ts, 2, 1)) +>A : Symbol(A, Decl(superPropertyAccessInComputedPropertiesOfNestedType_ES6.ts, 0, 0)) + + foo() { return 2; } +>foo : Symbol(foo, Decl(superPropertyAccessInComputedPropertiesOfNestedType_ES6.ts, 4, 19)) + + bar() { +>bar : Symbol(bar, Decl(superPropertyAccessInComputedPropertiesOfNestedType_ES6.ts, 5, 23)) + + return class { + [super.foo()]() { +>super.foo : Symbol(A.foo, Decl(superPropertyAccessInComputedPropertiesOfNestedType_ES6.ts, 0, 9)) +>super : Symbol(A, Decl(superPropertyAccessInComputedPropertiesOfNestedType_ES6.ts, 0, 0)) +>foo : Symbol(A.foo, Decl(superPropertyAccessInComputedPropertiesOfNestedType_ES6.ts, 0, 9)) + + return 100; + } + } + } +} diff --git a/tests/baselines/reference/superPropertyAccessInComputedPropertiesOfNestedType_ES6.types b/tests/baselines/reference/superPropertyAccessInComputedPropertiesOfNestedType_ES6.types new file mode 100644 index 00000000000..817e3b73ba4 --- /dev/null +++ b/tests/baselines/reference/superPropertyAccessInComputedPropertiesOfNestedType_ES6.types @@ -0,0 +1,35 @@ +=== tests/cases/compiler/superPropertyAccessInComputedPropertiesOfNestedType_ES6.ts === +class A { +>A : A + + foo() { return 1; } +>foo : () => number +>1 : number +} + +class B extends A { +>B : B +>A : A + + foo() { return 2; } +>foo : () => number +>2 : number + + bar() { +>bar : () => typeof (Anonymous class) + + return class { +>class { [super.foo()]() { return 100; } } : typeof (Anonymous class) + + [super.foo()]() { +>super.foo() : number +>super.foo : () => number +>super : A +>foo : () => number + + return 100; +>100 : number + } + } + } +} diff --git a/tests/baselines/reference/super_inside-object-literal-getters-and-setters.errors.txt b/tests/baselines/reference/super_inside-object-literal-getters-and-setters.errors.txt index 4f1faf78a78..16a66bf6fa4 100644 --- a/tests/baselines/reference/super_inside-object-literal-getters-and-setters.errors.txt +++ b/tests/baselines/reference/super_inside-object-literal-getters-and-setters.errors.txt @@ -1,10 +1,10 @@ tests/cases/compiler/super_inside-object-literal-getters-and-setters.ts(4,13): error TS1056: Accessors are only available when targeting ECMAScript 5 and higher. -tests/cases/compiler/super_inside-object-literal-getters-and-setters.ts(5,20): error TS2335: 'super' can only be referenced in a derived class. +tests/cases/compiler/super_inside-object-literal-getters-and-setters.ts(5,20): error TS2659: 'super' in members of object literal expressions is only allowed when option 'target' is 'ES2015' or higher. tests/cases/compiler/super_inside-object-literal-getters-and-setters.ts(7,13): error TS1056: Accessors are only available when targeting ECMAScript 5 and higher. -tests/cases/compiler/super_inside-object-literal-getters-and-setters.ts(8,13): error TS2335: 'super' can only be referenced in a derived class. -tests/cases/compiler/super_inside-object-literal-getters-and-setters.ts(11,20): error TS2335: 'super' can only be referenced in a derived class. +tests/cases/compiler/super_inside-object-literal-getters-and-setters.ts(8,13): error TS2659: 'super' in members of object literal expressions is only allowed when option 'target' is 'ES2015' or higher. +tests/cases/compiler/super_inside-object-literal-getters-and-setters.ts(11,20): error TS2660: 'super' can only be referenced in members of derived classes or object literal expressions. tests/cases/compiler/super_inside-object-literal-getters-and-setters.ts(20,17): error TS1056: Accessors are only available when targeting ECMAScript 5 and higher. -tests/cases/compiler/super_inside-object-literal-getters-and-setters.ts(21,24): error TS2338: 'super' property access is permitted only in a constructor, member function, or member accessor of a derived class. +tests/cases/compiler/super_inside-object-literal-getters-and-setters.ts(21,24): error TS2659: 'super' in members of object literal expressions is only allowed when option 'target' is 'ES2015' or higher. ==== tests/cases/compiler/super_inside-object-literal-getters-and-setters.ts (7 errors) ==== @@ -16,19 +16,19 @@ tests/cases/compiler/super_inside-object-literal-getters-and-setters.ts(21,24): !!! error TS1056: Accessors are only available when targeting ECMAScript 5 and higher. return super._foo; ~~~~~ -!!! error TS2335: 'super' can only be referenced in a derived class. +!!! error TS2659: 'super' in members of object literal expressions is only allowed when option 'target' is 'ES2015' or higher. }, set foo(value: string) { ~~~ !!! error TS1056: Accessors are only available when targeting ECMAScript 5 and higher. super._foo = value; ~~~~~ -!!! error TS2335: 'super' can only be referenced in a derived class. +!!! error TS2659: 'super' in members of object literal expressions is only allowed when option 'target' is 'ES2015' or higher. }, test: function () { return super._foo; ~~~~~ -!!! error TS2335: 'super' can only be referenced in a derived class. +!!! error TS2660: 'super' can only be referenced in members of derived classes or object literal expressions. } } } @@ -42,7 +42,7 @@ tests/cases/compiler/super_inside-object-literal-getters-and-setters.ts(21,24): !!! error TS1056: Accessors are only available when targeting ECMAScript 5 and higher. return super.test(); ~~~~~ -!!! error TS2338: 'super' property access is permitted only in a constructor, member function, or member accessor of a derived class. +!!! error TS2659: 'super' in members of object literal expressions is only allowed when option 'target' is 'ES2015' or higher. } }; } diff --git a/tests/baselines/reference/super_inside-object-literal-getters-and-setters.js b/tests/baselines/reference/super_inside-object-literal-getters-and-setters.js index be70ee33183..db6db37ac8a 100644 --- a/tests/baselines/reference/super_inside-object-literal-getters-and-setters.js +++ b/tests/baselines/reference/super_inside-object-literal-getters-and-setters.js @@ -38,10 +38,10 @@ var ObjectLiteral; var ThisInObjectLiteral = { _foo: '1', get foo() { - return _super._foo; + return _super.prototype._foo; }, set foo(value) { - _super._foo = value; + _super.prototype._foo = value; }, test: function () { return _super._foo; @@ -62,7 +62,7 @@ var SuperObjectTest = (function (_super) { SuperObjectTest.prototype.testing = function () { var test = { get F() { - return _super.test.call(this); + return _super.prototype.test.call(this); } }; }; diff --git a/tests/cases/compiler/superInObjectLiterals_ES5.ts b/tests/cases/compiler/superInObjectLiterals_ES5.ts new file mode 100644 index 00000000000..96cdfaa5b7b --- /dev/null +++ b/tests/cases/compiler/superInObjectLiterals_ES5.ts @@ -0,0 +1,60 @@ +// @target: ES5 +var obj = { + __proto__: { + method() { + } + }, + method() { + super.method(); + }, + get prop() { + super.method(); + return 10; + }, + set prop(value) { + super.method(); + }, + p1: function () { + super.method(); + }, + p2: function f() { + super.method(); + }, + p3: () => { + super.method(); + } +}; + +class A { + method() { } +} + +class B extends A { + f() { + var obj = { + __proto__: { + method() { + } + }, + method() { + super.method(); + }, + get prop() { + super.method(); + return 10; + }, + set prop(value) { + super.method(); + }, + p1: function () { + super.method(); + }, + p2: function f() { + super.method(); + }, + p3: () => { + super.method(); + } + }; + } +} \ No newline at end of file diff --git a/tests/cases/compiler/superInObjectLiterals_ES6.ts b/tests/cases/compiler/superInObjectLiterals_ES6.ts new file mode 100644 index 00000000000..05b2853a90b --- /dev/null +++ b/tests/cases/compiler/superInObjectLiterals_ES6.ts @@ -0,0 +1,60 @@ +// @target: ES6 +var obj = { + __proto__: { + method() { + } + }, + method() { + super.method(); + }, + get prop() { + super.method(); + return 10; + }, + set prop(value) { + super.method(); + }, + p1: function () { + super.method(); + }, + p2: function f() { + super.method(); + }, + p3: () => { + super.method(); + } +}; + +class A { + method() { } +} + +class B extends A { + f() { + var obj = { + __proto__: { + method() { + } + }, + method() { + super.method(); + }, + get prop() { + super.method(); + return 10; + }, + set prop(value) { + super.method(); + }, + p1: function () { + super.method(); + }, + p2: function f() { + super.method(); + }, + p3: () => { + super.method(); + } + }; + } +} \ No newline at end of file diff --git a/tests/cases/compiler/superPropertyAccessInComputedPropertiesOfNestedType_ES5.ts b/tests/cases/compiler/superPropertyAccessInComputedPropertiesOfNestedType_ES5.ts new file mode 100644 index 00000000000..9c7d28f96a4 --- /dev/null +++ b/tests/cases/compiler/superPropertyAccessInComputedPropertiesOfNestedType_ES5.ts @@ -0,0 +1,15 @@ +// @target: ES5 +class A { + foo() { return 1; } +} + +class B extends A { + foo() { return 2; } + bar() { + return class { + [super.foo()]() { + return 100; + } + } + } +} \ No newline at end of file diff --git a/tests/cases/compiler/superPropertyAccessInComputedPropertiesOfNestedType_ES6.ts b/tests/cases/compiler/superPropertyAccessInComputedPropertiesOfNestedType_ES6.ts new file mode 100644 index 00000000000..6a8c2e1a7d6 --- /dev/null +++ b/tests/cases/compiler/superPropertyAccessInComputedPropertiesOfNestedType_ES6.ts @@ -0,0 +1,15 @@ +// @target: ES6 +class A { + foo() { return 1; } +} + +class B extends A { + foo() { return 2; } + bar() { + return class { + [super.foo()]() { + return 100; + } + } + } +} \ No newline at end of file From 0f3eb0a058cee9a858c8d17fdc74e5d1494d4e3a Mon Sep 17 00:00:00 2001 From: Yui T Date: Fri, 11 Dec 2015 19:27:24 -0800 Subject: [PATCH 110/177] Initial fix for rename for parameter property declaration --- src/compiler/binder.ts | 5 +---- src/compiler/checker.ts | 11 +++++++++++ src/compiler/types.ts | 1 + src/compiler/utilities.ts | 6 ++++++ src/services/services.ts | 11 +++++++++++ 5 files changed, 30 insertions(+), 4 deletions(-) diff --git a/src/compiler/binder.ts b/src/compiler/binder.ts index 2682a5938d1..9ce8b4f4eda 100644 --- a/src/compiler/binder.ts +++ b/src/compiler/binder.ts @@ -1444,10 +1444,7 @@ namespace ts { // If this is a property-parameter, then also declare the property symbol into the // containing class. - if (node.flags & NodeFlags.AccessibilityModifier && - node.parent.kind === SyntaxKind.Constructor && - isClassLike(node.parent.parent)) { - + if (isPropertyParameterDeclaration(node)) { const classDeclaration = node.parent.parent; declareSymbol(classDeclaration.symbol.members, classDeclaration.symbol, node, SymbolFlags.Property, SymbolFlags.PropertyExcludes); } diff --git a/src/compiler/checker.ts b/src/compiler/checker.ts index 7d4bfb43de7..57c4353baf1 100644 --- a/src/compiler/checker.ts +++ b/src/compiler/checker.ts @@ -67,6 +67,7 @@ namespace ts { // The language service will always care about the narrowed type of a symbol, because that is // the type the language says the symbol should have. getTypeOfSymbolAtLocation: getNarrowedTypeOfSymbol, + getSymbolOfParameterPropertyDeclaration, getDeclaredTypeOfSymbol, getPropertiesOfType, getPropertyOfType, @@ -427,6 +428,16 @@ namespace ts { } // return undefined if we can't find a symbol. } + + function getSymbolOfParameterPropertyDeclaration(parameter: ParameterDeclaration, parameterName: string): Symbol[] { + const constructoDeclaration = parameter.parent; + const classDeclaration = parameter.parent.parent; + + const parameterSymbol = getSymbol(constructoDeclaration.locals, parameterName, SymbolFlags.Value); + const propertySymbol = getSymbol(classDeclaration.symbol.members, parameterName, SymbolFlags.Value); + + return parameterSymbol && propertySymbol ? [parameterSymbol, propertySymbol] : undefined; + } function isBlockScopedNameDeclaredBeforeUse(declaration: Declaration, usage: Node): boolean { const declarationFile = getSourceFileOfNode(declaration); diff --git a/src/compiler/types.ts b/src/compiler/types.ts index ff8ffa4ebd2..4c1fb2bb1cd 100644 --- a/src/compiler/types.ts +++ b/src/compiler/types.ts @@ -1723,6 +1723,7 @@ namespace ts { getSymbolsInScope(location: Node, meaning: SymbolFlags): Symbol[]; getSymbolAtLocation(node: Node): Symbol; + getSymbolOfParameterPropertyDeclaration(parameter: ParameterDeclaration, parameterName: string): Symbol[]; getShorthandAssignmentValueSymbol(location: Node): Symbol; getTypeAtLocation(node: Node): Type; typeToString(type: Type, enclosingDeclaration?: Node, flags?: TypeFormatFlags): string; diff --git a/src/compiler/utilities.ts b/src/compiler/utilities.ts index eee09fc641f..472225d31e5 100644 --- a/src/compiler/utilities.ts +++ b/src/compiler/utilities.ts @@ -2741,4 +2741,10 @@ namespace ts { } } } + + export function isPropertyParameterDeclaration(node: ParameterDeclaration): boolean { + // If this is a property-parameter, then also declare the property symbol into the + // containing class. + return node.flags & NodeFlags.AccessibilityModifier && node.parent.kind === SyntaxKind.Constructor && isClassLike(node.parent.parent); + } } diff --git a/src/services/services.ts b/src/services/services.ts index a9dda549ead..4f2af5c35c4 100644 --- a/src/services/services.ts +++ b/src/services/services.ts @@ -5967,6 +5967,15 @@ namespace ts { } } + // If the symbol.valueDeclaration is a property parameter declaration, + // we should include both parameter declaration symbol and property declaration symbol + // Parameter Declaration symbol is only visible within function scope, so the symbol is stored in contructor.locals. + // Property Declaration symbol is a member of the class, so the symbol is stored in its class Declaration.symbol.members + if (symbol.valueDeclaration && symbol.valueDeclaration.kind === SyntaxKind.Parameter && + isPropertyParameterDeclaration(symbol.valueDeclaration)) { + result = result.concat(typeChecker.getSymbolOfParameterPropertyDeclaration(symbol.valueDeclaration, symbol.name)); + } + // If this is a union property, add all the symbols from all its source symbols in all unioned types. // If the symbol is an instantiation from a another symbol (e.g. widened symbol) , add the root the list forEach(typeChecker.getRootSymbols(symbol), rootSymbol => { @@ -6036,6 +6045,8 @@ namespace ts { }); } + // If the reference + // Unwrap symbols to get to the root (e.g. transient symbols as a result of widening) // Or a union property, use its underlying unioned symbols return forEach(typeChecker.getRootSymbols(referenceSymbol), rootSymbol => { From af65e86aaa9cbc28ac9cc767d12f74864de52f28 Mon Sep 17 00:00:00 2001 From: Yui T Date: Fri, 11 Dec 2015 19:28:21 -0800 Subject: [PATCH 111/177] Add tests --- .../renameParameterPropertyDeclaration.ts | 17 +++++++++++++++++ 1 file changed, 17 insertions(+) create mode 100644 tests/cases/fourslash/renameParameterPropertyDeclaration.ts diff --git a/tests/cases/fourslash/renameParameterPropertyDeclaration.ts b/tests/cases/fourslash/renameParameterPropertyDeclaration.ts new file mode 100644 index 00000000000..34d8c9ef428 --- /dev/null +++ b/tests/cases/fourslash/renameParameterPropertyDeclaration.ts @@ -0,0 +1,17 @@ +/// + +//// class Foo { +//// constructor(private privateParam: number, +//// public publicParam: string, +//// protected protectedParam: boolean) { +//// +//// let localPrivate = privateParam; +//// this.privateParam += 10; +//// +//// let localPublic = publicParam; +//// this.publicParam += " Hello!"; +//// +//// let localProtected = protectedParam; +//// this.protectedParam = !this.protectedParam; +//// } +//// } \ No newline at end of file From b00fa42dea98cdf3c9fd00923b6cd2a5ba288131 Mon Sep 17 00:00:00 2001 From: Yui T Date: Sat, 12 Dec 2015 15:52:55 -0800 Subject: [PATCH 112/177] Update tests --- ...HighlightAtParameterPropertyDeclaration.ts | 24 +++++++++++++++++++ ...indAllRefsParameterPropertyDeclaration1.ts | 18 ++++++++++++++ ...indAllRefsParameterPropertyDeclaration2.ts | 18 ++++++++++++++ ...indAllRefsParameterPropertyDeclaration3.ts | 18 ++++++++++++++ ...referenceInParameterPropertyDeclaration.ts | 24 +++++++++++++++++++ .../renameParameterPropertyDeclaration.ts | 17 ------------- .../renameParameterPropeterDeclaration1.ts | 14 +++++++++++ .../renameParameterPropeterDeclaration2.ts | 14 +++++++++++ .../renameParameterPropeterDeclaration3.ts | 14 +++++++++++ 9 files changed, 144 insertions(+), 17 deletions(-) create mode 100644 tests/cases/fourslash/documentHighlightAtParameterPropertyDeclaration.ts create mode 100644 tests/cases/fourslash/findAllRefsParameterPropertyDeclaration1.ts create mode 100644 tests/cases/fourslash/findAllRefsParameterPropertyDeclaration2.ts create mode 100644 tests/cases/fourslash/findAllRefsParameterPropertyDeclaration3.ts create mode 100644 tests/cases/fourslash/referenceInParameterPropertyDeclaration.ts delete mode 100644 tests/cases/fourslash/renameParameterPropertyDeclaration.ts create mode 100644 tests/cases/fourslash/renameParameterPropeterDeclaration1.ts create mode 100644 tests/cases/fourslash/renameParameterPropeterDeclaration2.ts create mode 100644 tests/cases/fourslash/renameParameterPropeterDeclaration3.ts diff --git a/tests/cases/fourslash/documentHighlightAtParameterPropertyDeclaration.ts b/tests/cases/fourslash/documentHighlightAtParameterPropertyDeclaration.ts new file mode 100644 index 00000000000..aeccd252fe9 --- /dev/null +++ b/tests/cases/fourslash/documentHighlightAtParameterPropertyDeclaration.ts @@ -0,0 +1,24 @@ +/// + +// @Filename: file1.ts +//// class Foo { +//// constructor(private /*0*/privateParam: number, +//// public /*1*/publicParam: string, +//// protected /*2*/protectedParam: boolean) { +//// +//// let localPrivate = /*3*/privateParam; +//// this./*4*/privateParam += 10; +//// +//// let localPublic = /*5*/publicParam; +//// this./*6*/publicParam += " Hello!"; +//// +//// let localProtected = /*7*/protectedParam; +//// this./*8*/protectedParam = false; +//// } +//// } + +let markers = test.markers() +for (let marker of markers) { + goTo.position(marker.position); + verify.documentHighlightsAtPositionCount(3, ["file1.ts"]); +} \ No newline at end of file diff --git a/tests/cases/fourslash/findAllRefsParameterPropertyDeclaration1.ts b/tests/cases/fourslash/findAllRefsParameterPropertyDeclaration1.ts new file mode 100644 index 00000000000..d0854262828 --- /dev/null +++ b/tests/cases/fourslash/findAllRefsParameterPropertyDeclaration1.ts @@ -0,0 +1,18 @@ +/// + +//// class Foo { +//// constructor(private |privateParam|: number) { +//// let localPrivate = |privateParam|; +//// this.|privateParam| += 10; +//// } +//// } + +let ranges = test.ranges(); +for (let range of ranges) { + goTo.position(range.start); + + verify.referencesCountIs(ranges.length); + for (let expectedRange of ranges) { + verify.referencesAtPositionContains(expectedRange); + } +} \ No newline at end of file diff --git a/tests/cases/fourslash/findAllRefsParameterPropertyDeclaration2.ts b/tests/cases/fourslash/findAllRefsParameterPropertyDeclaration2.ts new file mode 100644 index 00000000000..7e59567364a --- /dev/null +++ b/tests/cases/fourslash/findAllRefsParameterPropertyDeclaration2.ts @@ -0,0 +1,18 @@ +/// + +//// class Foo { +//// constructor(public |publicParam|: number) { +//// let localPublic = |publicParam|; +//// this.|publicParam| += 10; +//// } +//// } + +let ranges = test.ranges(); +for (let range of ranges) { + goTo.position(range.start); + + verify.referencesCountIs(ranges.length); + for (let expectedRange of ranges) { + verify.referencesAtPositionContains(expectedRange); + } +} \ No newline at end of file diff --git a/tests/cases/fourslash/findAllRefsParameterPropertyDeclaration3.ts b/tests/cases/fourslash/findAllRefsParameterPropertyDeclaration3.ts new file mode 100644 index 00000000000..2d78e9793f7 --- /dev/null +++ b/tests/cases/fourslash/findAllRefsParameterPropertyDeclaration3.ts @@ -0,0 +1,18 @@ +/// + +//// class Foo { +//// constructor(protected |protectedParam|: number) { +//// let localProtected = |protectedParam|; +//// this.|protectedParam| += 10; +//// } +//// } + +let ranges = test.ranges(); +for (let range of ranges) { + goTo.position(range.start); + + verify.referencesCountIs(ranges.length); + for (let expectedRange of ranges) { + verify.referencesAtPositionContains(expectedRange); + } +} \ No newline at end of file diff --git a/tests/cases/fourslash/referenceInParameterPropertyDeclaration.ts b/tests/cases/fourslash/referenceInParameterPropertyDeclaration.ts new file mode 100644 index 00000000000..4e86e7a4915 --- /dev/null +++ b/tests/cases/fourslash/referenceInParameterPropertyDeclaration.ts @@ -0,0 +1,24 @@ +/// + +// @Filename: file1.ts +//// class Foo { +//// constructor(private /*0*/privateParam: number, +//// public /*1*/publicParam: string, +//// protected /*2*/protectedParam: boolean) { +//// +//// let localPrivate = /*3*/privateParam; +//// this./*4*/privateParam += 10; +//// +//// let localPublic = /*5*/publicParam; +//// this./*6*/publicParam += " Hello!"; +//// +//// let localProtected = /*7*/protectedParam; +//// this./*8*/protectedParam = false; +//// } +//// } + +let markers = test.markers() +for (let marker of markers) { + goTo.position(marker.position); + verify.referencesCountIs(3); +} \ No newline at end of file diff --git a/tests/cases/fourslash/renameParameterPropertyDeclaration.ts b/tests/cases/fourslash/renameParameterPropertyDeclaration.ts deleted file mode 100644 index 34d8c9ef428..00000000000 --- a/tests/cases/fourslash/renameParameterPropertyDeclaration.ts +++ /dev/null @@ -1,17 +0,0 @@ -/// - -//// class Foo { -//// constructor(private privateParam: number, -//// public publicParam: string, -//// protected protectedParam: boolean) { -//// -//// let localPrivate = privateParam; -//// this.privateParam += 10; -//// -//// let localPublic = publicParam; -//// this.publicParam += " Hello!"; -//// -//// let localProtected = protectedParam; -//// this.protectedParam = !this.protectedParam; -//// } -//// } \ No newline at end of file diff --git a/tests/cases/fourslash/renameParameterPropeterDeclaration1.ts b/tests/cases/fourslash/renameParameterPropeterDeclaration1.ts new file mode 100644 index 00000000000..1faed546d91 --- /dev/null +++ b/tests/cases/fourslash/renameParameterPropeterDeclaration1.ts @@ -0,0 +1,14 @@ +/// + +//// class Foo { +//// constructor(private |privateParam|: number) { +//// let localPrivate = |privateParam|; +//// this.|privateParam| += 10; +//// } +//// } + +let ranges = test.ranges() +for (let range of ranges) { + goTo.position(range.start); + verify.renameLocations(/*findInStrings*/ false, /*findInComments*/ false); +} \ No newline at end of file diff --git a/tests/cases/fourslash/renameParameterPropeterDeclaration2.ts b/tests/cases/fourslash/renameParameterPropeterDeclaration2.ts new file mode 100644 index 00000000000..e8eec5d3a0a --- /dev/null +++ b/tests/cases/fourslash/renameParameterPropeterDeclaration2.ts @@ -0,0 +1,14 @@ +/// + +//// class Foo { +//// constructor(public |publicParam|: number) { +//// let publicParam = |publicParam|; +//// this.|publicParam| += 10; +//// } +//// } + +let ranges = test.ranges() +for (let range of ranges) { + goTo.position(range.start); + verify.renameLocations(/*findInStrings*/ false, /*findInComments*/ false); +} \ No newline at end of file diff --git a/tests/cases/fourslash/renameParameterPropeterDeclaration3.ts b/tests/cases/fourslash/renameParameterPropeterDeclaration3.ts new file mode 100644 index 00000000000..44f4cf68858 --- /dev/null +++ b/tests/cases/fourslash/renameParameterPropeterDeclaration3.ts @@ -0,0 +1,14 @@ +/// + +//// class Foo { +//// constructor(protected |protectedParam|: number) { +//// let protectedParam = |protectedParam|; +//// this.|protectedParam| += 10; +//// } +//// } + +let ranges = test.ranges() +for (let range of ranges) { + goTo.position(range.start); + verify.renameLocations(/*findInStrings*/ false, /*findInComments*/ false); +} \ No newline at end of file From 94c3d27f411b4f72d8f6adb422e98d38324b23e6 Mon Sep 17 00:00:00 2001 From: Yui T Date: Sat, 12 Dec 2015 15:53:04 -0800 Subject: [PATCH 113/177] Fix linting --- src/compiler/checker.ts | 6 +++--- src/compiler/utilities.ts | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/compiler/checker.ts b/src/compiler/checker.ts index 57c4353baf1..1646b51702a 100644 --- a/src/compiler/checker.ts +++ b/src/compiler/checker.ts @@ -428,14 +428,14 @@ namespace ts { } // return undefined if we can't find a symbol. } - + function getSymbolOfParameterPropertyDeclaration(parameter: ParameterDeclaration, parameterName: string): Symbol[] { const constructoDeclaration = parameter.parent; const classDeclaration = parameter.parent.parent; - + const parameterSymbol = getSymbol(constructoDeclaration.locals, parameterName, SymbolFlags.Value); const propertySymbol = getSymbol(classDeclaration.symbol.members, parameterName, SymbolFlags.Value); - + return parameterSymbol && propertySymbol ? [parameterSymbol, propertySymbol] : undefined; } diff --git a/src/compiler/utilities.ts b/src/compiler/utilities.ts index 472225d31e5..566a578cedf 100644 --- a/src/compiler/utilities.ts +++ b/src/compiler/utilities.ts @@ -2741,7 +2741,7 @@ namespace ts { } } } - + export function isPropertyParameterDeclaration(node: ParameterDeclaration): boolean { // If this is a property-parameter, then also declare the property symbol into the // containing class. From b44f6e47d653419b1f47baf6734bd0942a3f15d0 Mon Sep 17 00:00:00 2001 From: Anders Hejlsberg Date: Sat, 12 Dec 2015 15:56:43 -0800 Subject: [PATCH 114/177] Simplify deferred checking of function, class, and accessor bodies. --- src/compiler/checker.ts | 155 +++++++++++----------------------------- 1 file changed, 40 insertions(+), 115 deletions(-) diff --git a/src/compiler/checker.ts b/src/compiler/checker.ts index ea23255472d..e4cf101946a 100644 --- a/src/compiler/checker.ts +++ b/src/compiler/checker.ts @@ -161,6 +161,8 @@ namespace ts { let jsxElementClassType: Type; + let deferredNodes: Node[]; + const tupleTypes: Map = {}; const unionTypes: Map = {}; const intersectionTypes: Map = {}; @@ -10123,6 +10125,7 @@ namespace ts { if (!contextChecked) { checkSignatureDeclaration(node); + checkNodeDeferred(node); } } } @@ -10135,7 +10138,7 @@ namespace ts { return type; } - function checkFunctionExpressionOrObjectLiteralMethodBody(node: ArrowFunction | FunctionExpression | MethodDeclaration) { + function checkFunctionExpressionOrObjectLiteralMethodDeferred(node: ArrowFunction | FunctionExpression | MethodDeclaration) { Debug.assert(node.kind !== SyntaxKind.MethodDeclaration || isObjectLiteralMethod(node)); const isAsync = isAsyncFunctionLike(node); @@ -10178,8 +10181,6 @@ namespace ts { checkTypeAssignableTo(exprType, returnOrPromisedType, node.body); } } - - checkFunctionAndClassExpressionBodies(node.body); } } } @@ -11428,13 +11429,13 @@ namespace ts { if (node.parent.kind !== SyntaxKind.ObjectLiteralExpression) { checkSourceElement(node.body); } + else { + checkNodeDeferred(node); + } } - function checkObjectLiteralAccessorBody(node: AccessorDeclaration) { - if (node.body) { - checkSourceElement(node.body); - checkFunctionAndClassExpressionBodies(node.body); - } + function checkAccessorDeferred(node: AccessorDeclaration) { + checkSourceElement(node.body); } function checkMissingDeclaration(node: Node) { @@ -12373,11 +12374,7 @@ namespace ts { if (node.kind === SyntaxKind.Block) { checkGrammarStatementInAmbientContext(node); } - forEach(node.statements, checkSourceElement); - if (isFunctionBlock(node) || node.kind === SyntaxKind.ModuleBlock) { - checkFunctionAndClassExpressionBodies(node); - } } function checkCollisionWithArgumentsInGeneratedCode(node: SignatureDeclaration) { @@ -13406,15 +13403,19 @@ namespace ts { function checkClassExpression(node: ClassExpression): Type { checkClassLikeDeclaration(node); + checkNodeDeferred(node); return getTypeOfSymbol(getSymbolOfNode(node)); } + function checkClassExpressionDeferred(node: ClassExpression) { + forEach(node.members, checkSourceElement); + } + function checkClassDeclaration(node: ClassDeclaration) { if (!node.name && !(node.flags & NodeFlags.Default)) { grammarErrorOnFirstToken(node, Diagnostics.A_class_declaration_without_the_default_modifier_must_have_a_name); } checkClassLikeDeclaration(node); - forEach(node.members, checkSourceElement); } @@ -14478,107 +14479,29 @@ namespace ts { // Here, performing a full type check of the body of the function expression whilst in the process of // determining the type of foo would cause foo to be given type any because of the recursive reference. // Delaying the type check of the body ensures foo has been assigned a type. - function checkFunctionAndClassExpressionBodies(node: Node): void { - switch (node.kind) { - case SyntaxKind.FunctionExpression: - case SyntaxKind.ArrowFunction: - forEach((node).parameters, checkFunctionAndClassExpressionBodies); - checkFunctionExpressionOrObjectLiteralMethodBody(node); - break; - case SyntaxKind.ClassExpression: - forEach((node).members, checkSourceElement); - forEachChild(node, checkFunctionAndClassExpressionBodies); - break; - case SyntaxKind.MethodDeclaration: - case SyntaxKind.MethodSignature: - forEach(node.decorators, checkFunctionAndClassExpressionBodies); - forEach((node).parameters, checkFunctionAndClassExpressionBodies); - if (isObjectLiteralMethod(node)) { - checkFunctionExpressionOrObjectLiteralMethodBody(node); - } - break; - case SyntaxKind.Constructor: - case SyntaxKind.FunctionDeclaration: - forEach((node).parameters, checkFunctionAndClassExpressionBodies); - break; - case SyntaxKind.GetAccessor: - case SyntaxKind.SetAccessor: - forEach((node).parameters, checkFunctionAndClassExpressionBodies); - if (node.parent.kind === SyntaxKind.ObjectLiteralExpression) { - checkObjectLiteralAccessorBody(node); - } - break; - case SyntaxKind.WithStatement: - checkFunctionAndClassExpressionBodies((node).expression); - break; - case SyntaxKind.Decorator: - case SyntaxKind.Parameter: - case SyntaxKind.PropertyDeclaration: - case SyntaxKind.PropertySignature: - case SyntaxKind.ObjectBindingPattern: - case SyntaxKind.ArrayBindingPattern: - case SyntaxKind.BindingElement: - case SyntaxKind.ArrayLiteralExpression: - case SyntaxKind.ObjectLiteralExpression: - case SyntaxKind.PropertyAssignment: - case SyntaxKind.PropertyAccessExpression: - case SyntaxKind.ElementAccessExpression: - case SyntaxKind.CallExpression: - case SyntaxKind.NewExpression: - case SyntaxKind.TaggedTemplateExpression: - case SyntaxKind.TemplateExpression: - case SyntaxKind.TemplateSpan: - case SyntaxKind.TypeAssertionExpression: - case SyntaxKind.AsExpression: - case SyntaxKind.ParenthesizedExpression: - case SyntaxKind.TypeOfExpression: - case SyntaxKind.VoidExpression: - case SyntaxKind.AwaitExpression: - case SyntaxKind.DeleteExpression: - case SyntaxKind.PrefixUnaryExpression: - case SyntaxKind.PostfixUnaryExpression: - case SyntaxKind.BinaryExpression: - case SyntaxKind.ConditionalExpression: - case SyntaxKind.SpreadElementExpression: - case SyntaxKind.YieldExpression: - case SyntaxKind.Block: - case SyntaxKind.ModuleBlock: - case SyntaxKind.VariableStatement: - case SyntaxKind.ExpressionStatement: - case SyntaxKind.IfStatement: - case SyntaxKind.DoStatement: - case SyntaxKind.WhileStatement: - case SyntaxKind.ForStatement: - case SyntaxKind.ForInStatement: - case SyntaxKind.ForOfStatement: - case SyntaxKind.ContinueStatement: - case SyntaxKind.BreakStatement: - case SyntaxKind.ReturnStatement: - case SyntaxKind.SwitchStatement: - case SyntaxKind.CaseBlock: - case SyntaxKind.CaseClause: - case SyntaxKind.DefaultClause: - case SyntaxKind.LabeledStatement: - case SyntaxKind.ThrowStatement: - case SyntaxKind.TryStatement: - case SyntaxKind.CatchClause: - case SyntaxKind.VariableDeclaration: - case SyntaxKind.VariableDeclarationList: - case SyntaxKind.ClassDeclaration: - case SyntaxKind.HeritageClause: - case SyntaxKind.ExpressionWithTypeArguments: - case SyntaxKind.EnumDeclaration: - case SyntaxKind.EnumMember: - case SyntaxKind.ExportAssignment: - case SyntaxKind.SourceFile: - case SyntaxKind.JsxExpression: - case SyntaxKind.JsxElement: - case SyntaxKind.JsxSelfClosingElement: - case SyntaxKind.JsxAttribute: - case SyntaxKind.JsxSpreadAttribute: - case SyntaxKind.JsxOpeningElement: - forEachChild(node, checkFunctionAndClassExpressionBodies); - break; + function checkNodeDeferred(node: Node) { + if (deferredNodes) { + deferredNodes.push(node); + } + } + + function checkDeferredNodes() { + for (const node of deferredNodes) { + switch (node.kind) { + case SyntaxKind.FunctionExpression: + case SyntaxKind.ArrowFunction: + case SyntaxKind.MethodDeclaration: + case SyntaxKind.MethodSignature: + checkFunctionExpressionOrObjectLiteralMethodDeferred(node); + break; + case SyntaxKind.GetAccessor: + case SyntaxKind.SetAccessor: + checkAccessorDeferred(node); + break; + case SyntaxKind.ClassExpression: + checkClassExpressionDeferred(node); + break; + } } } @@ -14613,8 +14536,10 @@ namespace ts { emitAwaiter = false; potentialThisCollisions.length = 0; + deferredNodes = []; forEach(node.statements, checkSourceElement); - checkFunctionAndClassExpressionBodies(node); + checkDeferredNodes(); + deferredNodes = undefined; if (isExternalOrCommonJsModule(node)) { checkExternalModuleExports(node); From 91b93439f12a911bc83fbc3399a9a739a619721a Mon Sep 17 00:00:00 2001 From: Anders Hejlsberg Date: Sat, 12 Dec 2015 15:57:39 -0800 Subject: [PATCH 115/177] Accepting new baselines --- ...nePropertyAccessAndArrowFunctionIndent1.errors.txt | 11 +---------- .../multiLinePropertyAccessAndArrowFunctionIndent1.js | 3 +-- ...atementIsNotAMemberVariableDeclaration1.errors.txt | 5 +---- 3 files changed, 3 insertions(+), 16 deletions(-) diff --git a/tests/baselines/reference/multiLinePropertyAccessAndArrowFunctionIndent1.errors.txt b/tests/baselines/reference/multiLinePropertyAccessAndArrowFunctionIndent1.errors.txt index abf11dc9dba..48a1da7d22c 100644 --- a/tests/baselines/reference/multiLinePropertyAccessAndArrowFunctionIndent1.errors.txt +++ b/tests/baselines/reference/multiLinePropertyAccessAndArrowFunctionIndent1.errors.txt @@ -1,20 +1,11 @@ tests/cases/compiler/multiLinePropertyAccessAndArrowFunctionIndent1.ts(1,1): error TS1108: A 'return' statement can only be used within a function body. -tests/cases/compiler/multiLinePropertyAccessAndArrowFunctionIndent1.ts(1,18): error TS2304: Cannot find name 'role'. -tests/cases/compiler/multiLinePropertyAccessAndArrowFunctionIndent1.ts(2,18): error TS2304: Cannot find name 'Role'. -tests/cases/compiler/multiLinePropertyAccessAndArrowFunctionIndent1.ts(4,26): error TS2503: Cannot find namespace 'ng'. -==== tests/cases/compiler/multiLinePropertyAccessAndArrowFunctionIndent1.ts (4 errors) ==== +==== tests/cases/compiler/multiLinePropertyAccessAndArrowFunctionIndent1.ts (1 errors) ==== return this.edit(role) ~~~~~~ !!! error TS1108: A 'return' statement can only be used within a function body. - ~~~~ -!!! error TS2304: Cannot find name 'role'. .then((role: Role) => - ~~~~ -!!! error TS2304: Cannot find name 'Role'. this.roleService.add(role) .then((data: ng.IHttpPromiseCallbackArg) => data.data)); - ~~ -!!! error TS2503: Cannot find namespace 'ng'. \ No newline at end of file diff --git a/tests/baselines/reference/multiLinePropertyAccessAndArrowFunctionIndent1.js b/tests/baselines/reference/multiLinePropertyAccessAndArrowFunctionIndent1.js index 2ada9f1bb52..4821f1fe69c 100644 --- a/tests/baselines/reference/multiLinePropertyAccessAndArrowFunctionIndent1.js +++ b/tests/baselines/reference/multiLinePropertyAccessAndArrowFunctionIndent1.js @@ -6,9 +6,8 @@ return this.edit(role) //// [multiLinePropertyAccessAndArrowFunctionIndent1.js] -var _this = this; return this.edit(role) .then(function (role) { - return _this.roleService.add(role) + return this.roleService.add(role) .then(function (data) { return data.data; }); }); diff --git a/tests/baselines/reference/parserStatementIsNotAMemberVariableDeclaration1.errors.txt b/tests/baselines/reference/parserStatementIsNotAMemberVariableDeclaration1.errors.txt index 72cfee58e54..0532fd28d63 100644 --- a/tests/baselines/reference/parserStatementIsNotAMemberVariableDeclaration1.errors.txt +++ b/tests/baselines/reference/parserStatementIsNotAMemberVariableDeclaration1.errors.txt @@ -1,8 +1,7 @@ tests/cases/conformance/parser/ecmascript5/ErrorRecovery/parserStatementIsNotAMemberVariableDeclaration1.ts(1,1): error TS1108: A 'return' statement can only be used within a function body. -tests/cases/conformance/parser/ecmascript5/ErrorRecovery/parserStatementIsNotAMemberVariableDeclaration1.ts(6,5): error TS2304: Cannot find name 'private'. -==== tests/cases/conformance/parser/ecmascript5/ErrorRecovery/parserStatementIsNotAMemberVariableDeclaration1.ts (2 errors) ==== +==== tests/cases/conformance/parser/ecmascript5/ErrorRecovery/parserStatementIsNotAMemberVariableDeclaration1.ts (1 errors) ==== return { ~~~~~~ !!! error TS1108: A 'return' statement can only be used within a function body. @@ -11,8 +10,6 @@ tests/cases/conformance/parser/ecmascript5/ErrorRecovery/parserStatementIsNotAMe // 'private' should not be considered a member variable here. private[key] = value; - ~~~~~~~ -!!! error TS2304: Cannot find name 'private'. } From f138953d887f8e5fd37af81e66adab662039bdba Mon Sep 17 00:00:00 2001 From: Yui T Date: Sat, 12 Dec 2015 16:13:30 -0800 Subject: [PATCH 116/177] Fix comment --- src/compiler/checker.ts | 8 +++++++- src/services/services.ts | 2 -- 2 files changed, 7 insertions(+), 3 deletions(-) diff --git a/src/compiler/checker.ts b/src/compiler/checker.ts index 31665734167..a2338c5ba5b 100644 --- a/src/compiler/checker.ts +++ b/src/compiler/checker.ts @@ -429,7 +429,13 @@ namespace ts { // return undefined if we can't find a symbol. } - function getSymbolOfParameterPropertyDeclaration(parameter: ParameterDeclaration, parameterName: string): Symbol[] { + /** + * Get symbols that represent parameter-property-declaration as parameter and as property declaration + * @param parameter a parameterDeclaration node + * @param parameterName a name of the parameter to get the symbols for. + * @return a tuple of two symbols + */ + function getSymbolOfParameterPropertyDeclaration(parameter: ParameterDeclaration, parameterName: string): [Symbol, Symbol] { const constructoDeclaration = parameter.parent; const classDeclaration = parameter.parent.parent; diff --git a/src/services/services.ts b/src/services/services.ts index 4f2af5c35c4..6728c0d5ebc 100644 --- a/src/services/services.ts +++ b/src/services/services.ts @@ -6045,8 +6045,6 @@ namespace ts { }); } - // If the reference - // Unwrap symbols to get to the root (e.g. transient symbols as a result of widening) // Or a union property, use its underlying unioned symbols return forEach(typeChecker.getRootSymbols(referenceSymbol), rootSymbol => { From 99722e442cb2e0bd018f133cad04afd29cc8c756 Mon Sep 17 00:00:00 2001 From: Yui T Date: Sat, 12 Dec 2015 16:38:11 -0800 Subject: [PATCH 117/177] Add tests for binding pattern in parameter property declaration --- ...ghlightAtParameterPropertyDeclaration1.ts} | 0 ...ighlightAtParameterPropertyDeclaration2.ts | 24 +++++++++++++++++++ ...ighlightAtParameterPropertyDeclaration3.ts | 24 +++++++++++++++++++ ...=> renameParameterPropertyDeclaration1.ts} | 0 ...=> renameParameterPropertyDeclaration2.ts} | 0 ...=> renameParameterPropertyDeclaration3.ts} | 0 .../renameParameterPropertyDeclaration4.ts | 13 ++++++++++ .../renameParameterPropertyDeclaration5.ts | 13 ++++++++++ 8 files changed, 74 insertions(+) rename tests/cases/fourslash/{documentHighlightAtParameterPropertyDeclaration.ts => documentHighlightAtParameterPropertyDeclaration1.ts} (100%) create mode 100644 tests/cases/fourslash/documentHighlightAtParameterPropertyDeclaration2.ts create mode 100644 tests/cases/fourslash/documentHighlightAtParameterPropertyDeclaration3.ts rename tests/cases/fourslash/{renameParameterPropeterDeclaration1.ts => renameParameterPropertyDeclaration1.ts} (100%) rename tests/cases/fourslash/{renameParameterPropeterDeclaration2.ts => renameParameterPropertyDeclaration2.ts} (100%) rename tests/cases/fourslash/{renameParameterPropeterDeclaration3.ts => renameParameterPropertyDeclaration3.ts} (100%) create mode 100644 tests/cases/fourslash/renameParameterPropertyDeclaration4.ts create mode 100644 tests/cases/fourslash/renameParameterPropertyDeclaration5.ts diff --git a/tests/cases/fourslash/documentHighlightAtParameterPropertyDeclaration.ts b/tests/cases/fourslash/documentHighlightAtParameterPropertyDeclaration1.ts similarity index 100% rename from tests/cases/fourslash/documentHighlightAtParameterPropertyDeclaration.ts rename to tests/cases/fourslash/documentHighlightAtParameterPropertyDeclaration1.ts diff --git a/tests/cases/fourslash/documentHighlightAtParameterPropertyDeclaration2.ts b/tests/cases/fourslash/documentHighlightAtParameterPropertyDeclaration2.ts new file mode 100644 index 00000000000..2658dd56371 --- /dev/null +++ b/tests/cases/fourslash/documentHighlightAtParameterPropertyDeclaration2.ts @@ -0,0 +1,24 @@ +/// + +// @Filename: file1.ts +//// class Foo { +//// constructor(private {/*0*/privateParam}: number, +//// public {/*1*/publicParam}: string, +//// protected {/*2*/protectedParam}: boolean) { +//// +//// let localPrivate = /*3*/privateParam; +//// this.privateParam += 10; // this is not valid syntax +//// +//// let localPublic = /*4*/publicParam; +//// this.publicParam += " Hello!"; // this is not valid syntax +//// +//// let localProtected = /*5*/protectedParam; +//// this.protectedParam = false; // this is not valid syntax +//// } +//// } + +let markers = test.markers() +for (let marker of markers) { + goTo.position(marker.position); + verify.documentHighlightsAtPositionCount(3, ["file1.ts"]); +} \ No newline at end of file diff --git a/tests/cases/fourslash/documentHighlightAtParameterPropertyDeclaration3.ts b/tests/cases/fourslash/documentHighlightAtParameterPropertyDeclaration3.ts new file mode 100644 index 00000000000..958e3bb45c9 --- /dev/null +++ b/tests/cases/fourslash/documentHighlightAtParameterPropertyDeclaration3.ts @@ -0,0 +1,24 @@ +/// + +// @Filename: file1.ts +//// class Foo { +//// constructor(private [/*0*/privateParam]: number, +//// public [/*1*/publicParam]: string, +//// protected [/*2*/protectedParam]: boolean) { +//// +//// let localPrivate = /*3*/privateParam; +//// this.privateParam += 10; // this is not valid syntax +//// +//// let localPublic = /*4*/publicParam; +//// this.publicParam += " Hello!"; // this is not valid syntax +//// +//// let localProtected = /*5*/protectedParam; +//// this.protectedParam = false; // this is not valid syntax +//// } +//// } + +let markers = test.markers() +for (let marker of markers) { + goTo.position(marker.position); + verify.documentHighlightsAtPositionCount(2, ["file1.ts"]); +} \ No newline at end of file diff --git a/tests/cases/fourslash/renameParameterPropeterDeclaration1.ts b/tests/cases/fourslash/renameParameterPropertyDeclaration1.ts similarity index 100% rename from tests/cases/fourslash/renameParameterPropeterDeclaration1.ts rename to tests/cases/fourslash/renameParameterPropertyDeclaration1.ts diff --git a/tests/cases/fourslash/renameParameterPropeterDeclaration2.ts b/tests/cases/fourslash/renameParameterPropertyDeclaration2.ts similarity index 100% rename from tests/cases/fourslash/renameParameterPropeterDeclaration2.ts rename to tests/cases/fourslash/renameParameterPropertyDeclaration2.ts diff --git a/tests/cases/fourslash/renameParameterPropeterDeclaration3.ts b/tests/cases/fourslash/renameParameterPropertyDeclaration3.ts similarity index 100% rename from tests/cases/fourslash/renameParameterPropeterDeclaration3.ts rename to tests/cases/fourslash/renameParameterPropertyDeclaration3.ts diff --git a/tests/cases/fourslash/renameParameterPropertyDeclaration4.ts b/tests/cases/fourslash/renameParameterPropertyDeclaration4.ts new file mode 100644 index 00000000000..21ba7da4141 --- /dev/null +++ b/tests/cases/fourslash/renameParameterPropertyDeclaration4.ts @@ -0,0 +1,13 @@ +/// + +//// class Foo { +//// constructor(protected { |protectedParam| }) { +//// let myProtectedParam = |protectedParam|; +//// } +//// } + +let ranges = test.ranges() +for (let range of ranges) { + goTo.position(range.start); + verify.renameLocations(/*findInStrings*/ false, /*findInComments*/ false); +} \ No newline at end of file diff --git a/tests/cases/fourslash/renameParameterPropertyDeclaration5.ts b/tests/cases/fourslash/renameParameterPropertyDeclaration5.ts new file mode 100644 index 00000000000..a4bc00b697b --- /dev/null +++ b/tests/cases/fourslash/renameParameterPropertyDeclaration5.ts @@ -0,0 +1,13 @@ +/// + +//// class Foo { +//// constructor(protected [ |protectedParam| ]) { +//// let myProtectedParam = |protectedParam|; +//// } +//// } + +let ranges = test.ranges() +for (let range of ranges) { + goTo.position(range.start); + verify.renameLocations(/*findInStrings*/ false, /*findInComments*/ false); +} \ No newline at end of file From b65c5779a2e543c26849e4eb07d09fc849e07c87 Mon Sep 17 00:00:00 2001 From: vladima Date: Sat, 12 Dec 2015 23:07:18 -0800 Subject: [PATCH 118/177] addressed PR feedback --- src/compiler/checker.ts | 26 ++++++++++--------- .../computedPropertyNames24_ES5.errors.txt | 4 +-- .../computedPropertyNames24_ES6.errors.txt | 4 +-- .../computedPropertyNames26_ES5.errors.txt | 4 +-- .../computedPropertyNames26_ES6.errors.txt | 4 +-- .../computedPropertyNames27_ES5.errors.txt | 4 +-- .../computedPropertyNames27_ES6.errors.txt | 4 +-- .../computedPropertyNames30_ES5.errors.txt | 4 +-- .../computedPropertyNames30_ES6.errors.txt | 4 +-- 9 files changed, 30 insertions(+), 28 deletions(-) diff --git a/src/compiler/checker.ts b/src/compiler/checker.ts index 6af7ddba419..2dd567cbe90 100644 --- a/src/compiler/checker.ts +++ b/src/compiler/checker.ts @@ -7053,24 +7053,26 @@ namespace ts { let nodeCheckFlag: NodeCheckFlags = 0; if (!canUseSuperExpression) { - if (isCallExpression) { + // issue more specific error if super is used in computed property name + // class A { foo() { return "1" }} + // class B { + // [super.foo()]() {} + // } + let current = node; + while (current && current !== container && current.kind !== SyntaxKind.ComputedPropertyName) { + current = current.parent; + } + if (current && current.kind === SyntaxKind.ComputedPropertyName) { + error(node, Diagnostics.super_cannot_be_referenced_in_a_computed_property_name); + } + else if (isCallExpression) { error(node, Diagnostics.Super_calls_are_not_permitted_outside_constructors_or_in_nested_functions_inside_constructors); } else if (!container || !container.parent || !(isClassLike(container.parent) || container.parent.kind === SyntaxKind.ObjectLiteralExpression)) { error(node, Diagnostics.super_can_only_be_referenced_in_members_of_derived_classes_or_object_literal_expressions); } else { - // issue more specific error if super is used in computed property name - let current = node; - while (current && current !== container && current.kind !== SyntaxKind.ComputedPropertyName) { - current = current.parent; - } - if (current && current.kind === SyntaxKind.ComputedPropertyName) { - error(node, Diagnostics.super_cannot_be_referenced_in_a_computed_property_name); - } - else { - error(node, Diagnostics.super_property_access_is_permitted_only_in_a_constructor_member_function_or_member_accessor_of_a_derived_class); - } + error(node, Diagnostics.super_property_access_is_permitted_only_in_a_constructor_member_function_or_member_accessor_of_a_derived_class); } return unknownType; } diff --git a/tests/baselines/reference/computedPropertyNames24_ES5.errors.txt b/tests/baselines/reference/computedPropertyNames24_ES5.errors.txt index e06373fb1e3..121b39450a6 100644 --- a/tests/baselines/reference/computedPropertyNames24_ES5.errors.txt +++ b/tests/baselines/reference/computedPropertyNames24_ES5.errors.txt @@ -1,4 +1,4 @@ -tests/cases/conformance/es6/computedProperties/computedPropertyNames24_ES5.ts(7,6): error TS2660: 'super' can only be referenced in members of derived classes or object literal expressions. +tests/cases/conformance/es6/computedProperties/computedPropertyNames24_ES5.ts(7,6): error TS2466: 'super' cannot be referenced in a computed property name. ==== tests/cases/conformance/es6/computedProperties/computedPropertyNames24_ES5.ts (1 errors) ==== @@ -10,5 +10,5 @@ tests/cases/conformance/es6/computedProperties/computedPropertyNames24_ES5.ts(7, class C extends Base { [super.bar()]() { } ~~~~~ -!!! error TS2660: 'super' can only be referenced in members of derived classes or object literal expressions. +!!! error TS2466: 'super' cannot be referenced in a computed property name. } \ No newline at end of file diff --git a/tests/baselines/reference/computedPropertyNames24_ES6.errors.txt b/tests/baselines/reference/computedPropertyNames24_ES6.errors.txt index 331723afe34..cab0ba6a85c 100644 --- a/tests/baselines/reference/computedPropertyNames24_ES6.errors.txt +++ b/tests/baselines/reference/computedPropertyNames24_ES6.errors.txt @@ -1,4 +1,4 @@ -tests/cases/conformance/es6/computedProperties/computedPropertyNames24_ES6.ts(9,6): error TS2660: 'super' can only be referenced in members of derived classes or object literal expressions. +tests/cases/conformance/es6/computedProperties/computedPropertyNames24_ES6.ts(9,6): error TS2466: 'super' cannot be referenced in a computed property name. ==== tests/cases/conformance/es6/computedProperties/computedPropertyNames24_ES6.ts (1 errors) ==== @@ -12,5 +12,5 @@ tests/cases/conformance/es6/computedProperties/computedPropertyNames24_ES6.ts(9, // use of super in static properties initializers. [super.bar()]() { } ~~~~~ -!!! error TS2660: 'super' can only be referenced in members of derived classes or object literal expressions. +!!! error TS2466: 'super' cannot be referenced in a computed property name. } \ No newline at end of file diff --git a/tests/baselines/reference/computedPropertyNames26_ES5.errors.txt b/tests/baselines/reference/computedPropertyNames26_ES5.errors.txt index c8e24abfa9d..e7039712734 100644 --- a/tests/baselines/reference/computedPropertyNames26_ES5.errors.txt +++ b/tests/baselines/reference/computedPropertyNames26_ES5.errors.txt @@ -1,4 +1,4 @@ -tests/cases/conformance/es6/computedProperties/computedPropertyNames26_ES5.ts(8,12): error TS2660: 'super' can only be referenced in members of derived classes or object literal expressions. +tests/cases/conformance/es6/computedProperties/computedPropertyNames26_ES5.ts(8,12): error TS2466: 'super' cannot be referenced in a computed property name. ==== tests/cases/conformance/es6/computedProperties/computedPropertyNames26_ES5.ts (1 errors) ==== @@ -11,6 +11,6 @@ tests/cases/conformance/es6/computedProperties/computedPropertyNames26_ES5.ts(8, [ { [super.bar()]: 1 }[0] ~~~~~ -!!! error TS2660: 'super' can only be referenced in members of derived classes or object literal expressions. +!!! error TS2466: 'super' cannot be referenced in a computed property name. ]() { } } \ No newline at end of file diff --git a/tests/baselines/reference/computedPropertyNames26_ES6.errors.txt b/tests/baselines/reference/computedPropertyNames26_ES6.errors.txt index ec20ed57144..d7e2b5ce7c5 100644 --- a/tests/baselines/reference/computedPropertyNames26_ES6.errors.txt +++ b/tests/baselines/reference/computedPropertyNames26_ES6.errors.txt @@ -1,4 +1,4 @@ -tests/cases/conformance/es6/computedProperties/computedPropertyNames26_ES6.ts(10,12): error TS2660: 'super' can only be referenced in members of derived classes or object literal expressions. +tests/cases/conformance/es6/computedProperties/computedPropertyNames26_ES6.ts(10,12): error TS2466: 'super' cannot be referenced in a computed property name. ==== tests/cases/conformance/es6/computedProperties/computedPropertyNames26_ES6.ts (1 errors) ==== @@ -13,6 +13,6 @@ tests/cases/conformance/es6/computedProperties/computedPropertyNames26_ES6.ts(10 [ { [super.bar()]: 1 }[0] ~~~~~ -!!! error TS2660: 'super' can only be referenced in members of derived classes or object literal expressions. +!!! error TS2466: 'super' cannot be referenced in a computed property name. ]() { } } \ No newline at end of file diff --git a/tests/baselines/reference/computedPropertyNames27_ES5.errors.txt b/tests/baselines/reference/computedPropertyNames27_ES5.errors.txt index 97964d48176..1fbc7b37543 100644 --- a/tests/baselines/reference/computedPropertyNames27_ES5.errors.txt +++ b/tests/baselines/reference/computedPropertyNames27_ES5.errors.txt @@ -1,4 +1,4 @@ -tests/cases/conformance/es6/computedProperties/computedPropertyNames27_ES5.ts(4,7): error TS2337: Super calls are not permitted outside constructors or in nested functions inside constructors. +tests/cases/conformance/es6/computedProperties/computedPropertyNames27_ES5.ts(4,7): error TS2466: 'super' cannot be referenced in a computed property name. ==== tests/cases/conformance/es6/computedProperties/computedPropertyNames27_ES5.ts (1 errors) ==== @@ -7,5 +7,5 @@ tests/cases/conformance/es6/computedProperties/computedPropertyNames27_ES5.ts(4, class C extends Base { [(super(), "prop")]() { } ~~~~~ -!!! error TS2337: Super calls are not permitted outside constructors or in nested functions inside constructors. +!!! error TS2466: 'super' cannot be referenced in a computed property name. } \ No newline at end of file diff --git a/tests/baselines/reference/computedPropertyNames27_ES6.errors.txt b/tests/baselines/reference/computedPropertyNames27_ES6.errors.txt index 30e1ce5b14f..edf84201647 100644 --- a/tests/baselines/reference/computedPropertyNames27_ES6.errors.txt +++ b/tests/baselines/reference/computedPropertyNames27_ES6.errors.txt @@ -1,4 +1,4 @@ -tests/cases/conformance/es6/computedProperties/computedPropertyNames27_ES6.ts(4,7): error TS2337: Super calls are not permitted outside constructors or in nested functions inside constructors. +tests/cases/conformance/es6/computedProperties/computedPropertyNames27_ES6.ts(4,7): error TS2466: 'super' cannot be referenced in a computed property name. ==== tests/cases/conformance/es6/computedProperties/computedPropertyNames27_ES6.ts (1 errors) ==== @@ -7,5 +7,5 @@ tests/cases/conformance/es6/computedProperties/computedPropertyNames27_ES6.ts(4, class C extends Base { [(super(), "prop")]() { } ~~~~~ -!!! error TS2337: Super calls are not permitted outside constructors or in nested functions inside constructors. +!!! error TS2466: 'super' cannot be referenced in a computed property name. } \ No newline at end of file diff --git a/tests/baselines/reference/computedPropertyNames30_ES5.errors.txt b/tests/baselines/reference/computedPropertyNames30_ES5.errors.txt index deb80dbcca8..e64b83f609e 100644 --- a/tests/baselines/reference/computedPropertyNames30_ES5.errors.txt +++ b/tests/baselines/reference/computedPropertyNames30_ES5.errors.txt @@ -1,4 +1,4 @@ -tests/cases/conformance/es6/computedProperties/computedPropertyNames30_ES5.ts(11,19): error TS2337: Super calls are not permitted outside constructors or in nested functions inside constructors. +tests/cases/conformance/es6/computedProperties/computedPropertyNames30_ES5.ts(11,19): error TS2466: 'super' cannot be referenced in a computed property name. ==== tests/cases/conformance/es6/computedProperties/computedPropertyNames30_ES5.ts (1 errors) ==== @@ -14,7 +14,7 @@ tests/cases/conformance/es6/computedProperties/computedPropertyNames30_ES5.ts(11 //treatment of other similar violations. [(super(), "prop")]() { } ~~~~~ -!!! error TS2337: Super calls are not permitted outside constructors or in nested functions inside constructors. +!!! error TS2466: 'super' cannot be referenced in a computed property name. }; } } diff --git a/tests/baselines/reference/computedPropertyNames30_ES6.errors.txt b/tests/baselines/reference/computedPropertyNames30_ES6.errors.txt index b10d184f799..a5771629ac2 100644 --- a/tests/baselines/reference/computedPropertyNames30_ES6.errors.txt +++ b/tests/baselines/reference/computedPropertyNames30_ES6.errors.txt @@ -1,4 +1,4 @@ -tests/cases/conformance/es6/computedProperties/computedPropertyNames30_ES6.ts(11,19): error TS2337: Super calls are not permitted outside constructors or in nested functions inside constructors. +tests/cases/conformance/es6/computedProperties/computedPropertyNames30_ES6.ts(11,19): error TS2466: 'super' cannot be referenced in a computed property name. ==== tests/cases/conformance/es6/computedProperties/computedPropertyNames30_ES6.ts (1 errors) ==== @@ -14,7 +14,7 @@ tests/cases/conformance/es6/computedProperties/computedPropertyNames30_ES6.ts(11 //treatment of other similar violations. [(super(), "prop")]() { } ~~~~~ -!!! error TS2337: Super calls are not permitted outside constructors or in nested functions inside constructors. +!!! error TS2466: 'super' cannot be referenced in a computed property name. }; } } From e354aec8a38a4a173fce8b242af3484bc9e72bb4 Mon Sep 17 00:00:00 2001 From: Anders Hejlsberg Date: Sun, 13 Dec 2015 18:25:45 -0800 Subject: [PATCH 119/177] Mark anonymous type as resolved before resolving call signatures --- src/compiler/checker.ts | 48 ++++++++++++++++++++--------------------- 1 file changed, 23 insertions(+), 25 deletions(-) diff --git a/src/compiler/checker.ts b/src/compiler/checker.ts index ea23255472d..cf52531d6f5 100644 --- a/src/compiler/checker.ts +++ b/src/compiler/checker.ts @@ -3608,37 +3608,29 @@ namespace ts { function resolveAnonymousTypeMembers(type: AnonymousType) { const symbol = type.symbol; - let members: SymbolTable; - let callSignatures: Signature[]; - let constructSignatures: Signature[]; - let stringIndexType: Type; - let numberIndexType: Type; - if (type.target) { - members = createInstantiatedSymbolTable(getPropertiesOfObjectType(type.target), type.mapper, /*mappingThisOnly*/ false); - callSignatures = instantiateList(getSignaturesOfType(type.target, SignatureKind.Call), type.mapper, instantiateSignature); - constructSignatures = instantiateList(getSignaturesOfType(type.target, SignatureKind.Construct), type.mapper, instantiateSignature); - stringIndexType = instantiateType(getIndexTypeOfType(type.target, IndexKind.String), type.mapper); - numberIndexType = instantiateType(getIndexTypeOfType(type.target, IndexKind.Number), type.mapper); + const members = createInstantiatedSymbolTable(getPropertiesOfObjectType(type.target), type.mapper, /*mappingThisOnly*/ false); + const callSignatures = instantiateList(getSignaturesOfType(type.target, SignatureKind.Call), type.mapper, instantiateSignature); + const constructSignatures = instantiateList(getSignaturesOfType(type.target, SignatureKind.Construct), type.mapper, instantiateSignature); + const stringIndexType = instantiateType(getIndexTypeOfType(type.target, IndexKind.String), type.mapper); + const numberIndexType = instantiateType(getIndexTypeOfType(type.target, IndexKind.Number), type.mapper); + setObjectTypeMembers(type, members, callSignatures, constructSignatures, stringIndexType, numberIndexType); } else if (symbol.flags & SymbolFlags.TypeLiteral) { - members = symbol.members; - callSignatures = getSignaturesOfSymbol(members["__call"]); - constructSignatures = getSignaturesOfSymbol(members["__new"]); - stringIndexType = getIndexTypeOfSymbol(symbol, IndexKind.String); - numberIndexType = getIndexTypeOfSymbol(symbol, IndexKind.Number); + const members = symbol.members; + const callSignatures = getSignaturesOfSymbol(members["__call"]); + const constructSignatures = getSignaturesOfSymbol(members["__new"]); + const stringIndexType = getIndexTypeOfSymbol(symbol, IndexKind.String); + const numberIndexType = getIndexTypeOfSymbol(symbol, IndexKind.Number); + setObjectTypeMembers(type, members, callSignatures, constructSignatures, stringIndexType, numberIndexType); } else { // Combinations of function, class, enum and module - members = emptySymbols; - callSignatures = emptyArray; - constructSignatures = emptyArray; + let members = emptySymbols; + let constructSignatures: Signature[] = emptyArray; if (symbol.flags & SymbolFlags.HasExports) { members = getExportsOfSymbol(symbol); } - if (symbol.flags & (SymbolFlags.Function | SymbolFlags.Method)) { - callSignatures = getSignaturesOfSymbol(symbol); - } if (symbol.flags & SymbolFlags.Class) { const classType = getDeclaredTypeOfClassOrInterface(symbol); constructSignatures = getSignaturesOfSymbol(symbol.members["__constructor"]); @@ -3651,10 +3643,16 @@ namespace ts { addInheritedMembers(members, getPropertiesOfObjectType(baseConstructorType)); } } - stringIndexType = undefined; - numberIndexType = (symbol.flags & SymbolFlags.Enum) ? stringType : undefined; + const numberIndexType = (symbol.flags & SymbolFlags.Enum) ? stringType : undefined; + setObjectTypeMembers(type, members, emptyArray, constructSignatures, undefined, numberIndexType); + // We resolve the members before computing the signatures because a signature may use + // typeof with a qualified name expression that circularly references the type we are + // in the process of resolving (see issue #6072). The temporarily empty signature list + // will never be observed because a qualified name can't reference signatures. + if (symbol.flags & (SymbolFlags.Function | SymbolFlags.Method)) { + (type).callSignatures = getSignaturesOfSymbol(symbol); + } } - setObjectTypeMembers(type, members, callSignatures, constructSignatures, stringIndexType, numberIndexType); } function resolveStructuredTypeMembers(type: ObjectType): ResolvedType { From 3c8ad42a62021a1aa1a76851b059b61f72b17b31 Mon Sep 17 00:00:00 2001 From: Anders Hejlsberg Date: Sun, 13 Dec 2015 18:32:46 -0800 Subject: [PATCH 120/177] Adding regression test --- .../circularTypeofWithFunctionModule.js | 40 +++++++++++++++++++ .../circularTypeofWithFunctionModule.symbols | 27 +++++++++++++ .../circularTypeofWithFunctionModule.types | 27 +++++++++++++ .../circularTypeofWithFunctionModule.ts | 11 +++++ 4 files changed, 105 insertions(+) create mode 100644 tests/baselines/reference/circularTypeofWithFunctionModule.js create mode 100644 tests/baselines/reference/circularTypeofWithFunctionModule.symbols create mode 100644 tests/baselines/reference/circularTypeofWithFunctionModule.types create mode 100644 tests/cases/compiler/circularTypeofWithFunctionModule.ts diff --git a/tests/baselines/reference/circularTypeofWithFunctionModule.js b/tests/baselines/reference/circularTypeofWithFunctionModule.js new file mode 100644 index 00000000000..6ce1dd62fc5 --- /dev/null +++ b/tests/baselines/reference/circularTypeofWithFunctionModule.js @@ -0,0 +1,40 @@ +//// [circularTypeofWithFunctionModule.ts] +// Repro from #6072 + +class Foo {} + +function maker (value: string): typeof maker.Bar { + return maker.Bar; +} + +namespace maker { + export class Bar extends Foo {} +} + + +//// [circularTypeofWithFunctionModule.js] +// Repro from #6072 +var __extends = (this && this.__extends) || function (d, b) { + for (var p in b) if (b.hasOwnProperty(p)) d[p] = b[p]; + function __() { this.constructor = d; } + d.prototype = b === null ? Object.create(b) : (__.prototype = b.prototype, new __()); +}; +var Foo = (function () { + function Foo() { + } + return Foo; +}()); +function maker(value) { + return maker.Bar; +} +var maker; +(function (maker) { + var Bar = (function (_super) { + __extends(Bar, _super); + function Bar() { + _super.apply(this, arguments); + } + return Bar; + }(Foo)); + maker.Bar = Bar; +})(maker || (maker = {})); diff --git a/tests/baselines/reference/circularTypeofWithFunctionModule.symbols b/tests/baselines/reference/circularTypeofWithFunctionModule.symbols new file mode 100644 index 00000000000..19dde10852f --- /dev/null +++ b/tests/baselines/reference/circularTypeofWithFunctionModule.symbols @@ -0,0 +1,27 @@ +=== tests/cases/compiler/circularTypeofWithFunctionModule.ts === +// Repro from #6072 + +class Foo {} +>Foo : Symbol(Foo, Decl(circularTypeofWithFunctionModule.ts, 0, 0)) + +function maker (value: string): typeof maker.Bar { +>maker : Symbol(maker, Decl(circularTypeofWithFunctionModule.ts, 2, 12), Decl(circularTypeofWithFunctionModule.ts, 6, 1)) +>value : Symbol(value, Decl(circularTypeofWithFunctionModule.ts, 4, 16)) +>maker.Bar : Symbol(maker.Bar, Decl(circularTypeofWithFunctionModule.ts, 8, 17)) +>maker : Symbol(maker, Decl(circularTypeofWithFunctionModule.ts, 2, 12), Decl(circularTypeofWithFunctionModule.ts, 6, 1)) +>Bar : Symbol(maker.Bar, Decl(circularTypeofWithFunctionModule.ts, 8, 17)) + + return maker.Bar; +>maker.Bar : Symbol(maker.Bar, Decl(circularTypeofWithFunctionModule.ts, 8, 17)) +>maker : Symbol(maker, Decl(circularTypeofWithFunctionModule.ts, 2, 12), Decl(circularTypeofWithFunctionModule.ts, 6, 1)) +>Bar : Symbol(maker.Bar, Decl(circularTypeofWithFunctionModule.ts, 8, 17)) +} + +namespace maker { +>maker : Symbol(maker, Decl(circularTypeofWithFunctionModule.ts, 2, 12), Decl(circularTypeofWithFunctionModule.ts, 6, 1)) + + export class Bar extends Foo {} +>Bar : Symbol(Bar, Decl(circularTypeofWithFunctionModule.ts, 8, 17)) +>Foo : Symbol(Foo, Decl(circularTypeofWithFunctionModule.ts, 0, 0)) +} + diff --git a/tests/baselines/reference/circularTypeofWithFunctionModule.types b/tests/baselines/reference/circularTypeofWithFunctionModule.types new file mode 100644 index 00000000000..f1c2431bfde --- /dev/null +++ b/tests/baselines/reference/circularTypeofWithFunctionModule.types @@ -0,0 +1,27 @@ +=== tests/cases/compiler/circularTypeofWithFunctionModule.ts === +// Repro from #6072 + +class Foo {} +>Foo : Foo + +function maker (value: string): typeof maker.Bar { +>maker : typeof maker +>value : string +>maker.Bar : typeof maker.Bar +>maker : typeof maker +>Bar : typeof maker.Bar + + return maker.Bar; +>maker.Bar : typeof maker.Bar +>maker : typeof maker +>Bar : typeof maker.Bar +} + +namespace maker { +>maker : typeof maker + + export class Bar extends Foo {} +>Bar : Bar +>Foo : Foo +} + diff --git a/tests/cases/compiler/circularTypeofWithFunctionModule.ts b/tests/cases/compiler/circularTypeofWithFunctionModule.ts new file mode 100644 index 00000000000..b4c9fdb9fd5 --- /dev/null +++ b/tests/cases/compiler/circularTypeofWithFunctionModule.ts @@ -0,0 +1,11 @@ +// Repro from #6072 + +class Foo {} + +function maker (value: string): typeof maker.Bar { + return maker.Bar; +} + +namespace maker { + export class Bar extends Foo {} +} From 7e71686b1a969b083ee347bdb105fc8a30da6664 Mon Sep 17 00:00:00 2001 From: Yui T Date: Mon, 14 Dec 2015 10:14:35 -0800 Subject: [PATCH 121/177] Fix broken tests --- src/compiler/binder.ts | 2 +- src/compiler/checker.ts | 4 ++-- src/compiler/types.ts | 2 +- src/compiler/utilities.ts | 4 +--- src/services/services.ts | 4 ++-- .../documentHighlightAtParameterPropertyDeclaration2.ts | 2 +- 6 files changed, 8 insertions(+), 10 deletions(-) diff --git a/src/compiler/binder.ts b/src/compiler/binder.ts index 9ce8b4f4eda..b63348bfb60 100644 --- a/src/compiler/binder.ts +++ b/src/compiler/binder.ts @@ -1444,7 +1444,7 @@ namespace ts { // If this is a property-parameter, then also declare the property symbol into the // containing class. - if (isPropertyParameterDeclaration(node)) { + if (isParameterPropertyDeclaration(node)) { const classDeclaration = node.parent.parent; declareSymbol(classDeclaration.symbol.members, classDeclaration.symbol, node, SymbolFlags.Property, SymbolFlags.PropertyExcludes); } diff --git a/src/compiler/checker.ts b/src/compiler/checker.ts index a2338c5ba5b..9d14bb39206 100644 --- a/src/compiler/checker.ts +++ b/src/compiler/checker.ts @@ -67,7 +67,7 @@ namespace ts { // The language service will always care about the narrowed type of a symbol, because that is // the type the language says the symbol should have. getTypeOfSymbolAtLocation: getNarrowedTypeOfSymbol, - getSymbolOfParameterPropertyDeclaration, + getSymbolsOfParameterPropertyDeclaration, getDeclaredTypeOfSymbol, getPropertiesOfType, getPropertyOfType, @@ -435,7 +435,7 @@ namespace ts { * @param parameterName a name of the parameter to get the symbols for. * @return a tuple of two symbols */ - function getSymbolOfParameterPropertyDeclaration(parameter: ParameterDeclaration, parameterName: string): [Symbol, Symbol] { + function getSymbolsOfParameterPropertyDeclaration(parameter: ParameterDeclaration, parameterName: string): [Symbol, Symbol] { const constructoDeclaration = parameter.parent; const classDeclaration = parameter.parent.parent; diff --git a/src/compiler/types.ts b/src/compiler/types.ts index 4c1fb2bb1cd..ad446792f04 100644 --- a/src/compiler/types.ts +++ b/src/compiler/types.ts @@ -1723,7 +1723,7 @@ namespace ts { getSymbolsInScope(location: Node, meaning: SymbolFlags): Symbol[]; getSymbolAtLocation(node: Node): Symbol; - getSymbolOfParameterPropertyDeclaration(parameter: ParameterDeclaration, parameterName: string): Symbol[]; + getSymbolsOfParameterPropertyDeclaration(parameter: ParameterDeclaration, parameterName: string): Symbol[]; getShorthandAssignmentValueSymbol(location: Node): Symbol; getTypeAtLocation(node: Node): Type; typeToString(type: Type, enclosingDeclaration?: Node, flags?: TypeFormatFlags): string; diff --git a/src/compiler/utilities.ts b/src/compiler/utilities.ts index 566a578cedf..384f27c8868 100644 --- a/src/compiler/utilities.ts +++ b/src/compiler/utilities.ts @@ -2742,9 +2742,7 @@ namespace ts { } } - export function isPropertyParameterDeclaration(node: ParameterDeclaration): boolean { - // If this is a property-parameter, then also declare the property symbol into the - // containing class. + export function isParameterPropertyDeclaration(node: ParameterDeclaration): boolean { return node.flags & NodeFlags.AccessibilityModifier && node.parent.kind === SyntaxKind.Constructor && isClassLike(node.parent.parent); } } diff --git a/src/services/services.ts b/src/services/services.ts index 6728c0d5ebc..8e2e4913edd 100644 --- a/src/services/services.ts +++ b/src/services/services.ts @@ -5972,8 +5972,8 @@ namespace ts { // Parameter Declaration symbol is only visible within function scope, so the symbol is stored in contructor.locals. // Property Declaration symbol is a member of the class, so the symbol is stored in its class Declaration.symbol.members if (symbol.valueDeclaration && symbol.valueDeclaration.kind === SyntaxKind.Parameter && - isPropertyParameterDeclaration(symbol.valueDeclaration)) { - result = result.concat(typeChecker.getSymbolOfParameterPropertyDeclaration(symbol.valueDeclaration, symbol.name)); + isParameterPropertyDeclaration(symbol.valueDeclaration)) { + result = result.concat(typeChecker.getSymbolsOfParameterPropertyDeclaration(symbol.valueDeclaration, symbol.name)); } // If this is a union property, add all the symbols from all its source symbols in all unioned types. diff --git a/tests/cases/fourslash/documentHighlightAtParameterPropertyDeclaration2.ts b/tests/cases/fourslash/documentHighlightAtParameterPropertyDeclaration2.ts index 2658dd56371..f5d6764205b 100644 --- a/tests/cases/fourslash/documentHighlightAtParameterPropertyDeclaration2.ts +++ b/tests/cases/fourslash/documentHighlightAtParameterPropertyDeclaration2.ts @@ -20,5 +20,5 @@ let markers = test.markers() for (let marker of markers) { goTo.position(marker.position); - verify.documentHighlightsAtPositionCount(3, ["file1.ts"]); + verify.documentHighlightsAtPositionCount(2, ["file1.ts"]); } \ No newline at end of file From 37f3ff8d05efc6b3717bc7ead63bc746d509c3ee Mon Sep 17 00:00:00 2001 From: Ryan Cavanaugh Date: Mon, 14 Dec 2015 11:32:06 -0800 Subject: [PATCH 122/177] Check for function flag on class symbol --- src/compiler/checker.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/compiler/checker.ts b/src/compiler/checker.ts index 7e2bf85c59b..5bfa4744224 100644 --- a/src/compiler/checker.ts +++ b/src/compiler/checker.ts @@ -6903,7 +6903,7 @@ namespace ts { .expression as PropertyAccessExpression) // x.prototype .expression; // x const classSymbol = checkExpression(className).symbol; - if (classSymbol && classSymbol.members) { + if (classSymbol && classSymbol.members && (classSymbol.flags & SymbolFlags.Function)) { return getInferredClassType(classSymbol); } } From c5df5d768e34486f6cff985d9ad521ec906a8e6a Mon Sep 17 00:00:00 2001 From: Yui T Date: Mon, 14 Dec 2015 12:57:02 -0800 Subject: [PATCH 123/177] Fix linting issue --- Jakefile.js | 3 +- src/services/services.ts | 1073 +++++++++++++++++++------------------- 2 files changed, 538 insertions(+), 538 deletions(-) diff --git a/Jakefile.js b/Jakefile.js index beb16d2886f..91bd805a27b 100644 --- a/Jakefile.js +++ b/Jakefile.js @@ -924,7 +924,8 @@ function lintFileAsync(options, path, cb) { var lintTargets = compilerSources .concat(harnessCoreSources) .concat(serverCoreSources) - .concat(scriptSources); + .concat(scriptSources) + .concat([path.join(servicesDirectory,"services.ts")]); desc("Runs tslint on the compiler sources"); task("lint", ["build-rules"], function() { diff --git a/src/services/services.ts b/src/services/services.ts index 8e2e4913edd..092f987eb5a 100644 --- a/src/services/services.ts +++ b/src/services/services.ts @@ -12,7 +12,7 @@ namespace ts { /** The version of the language service API */ - export let servicesVersion = "0.4" + export const servicesVersion = "0.4"; export interface Node { getSourceFile(): SourceFile; @@ -48,7 +48,7 @@ namespace ts { getConstructSignatures(): Signature[]; getStringIndexType(): Type; getNumberIndexType(): Type; - getBaseTypes(): ObjectType[] + getBaseTypes(): ObjectType[]; } export interface Signature { @@ -97,7 +97,7 @@ namespace ts { dispose?(): void; } - export module ScriptSnapshot { + export namespace ScriptSnapshot { class StringScriptSnapshot implements IScriptSnapshot { constructor(private text: string) { @@ -126,12 +126,12 @@ namespace ts { referencedFiles: FileReference[]; importedFiles: FileReference[]; ambientExternalModules: string[]; - isLibFile: boolean + isLibFile: boolean; } - let scanner: Scanner = createScanner(ScriptTarget.Latest, /*skipTrivia*/ true); + const scanner: Scanner = createScanner(ScriptTarget.Latest, /*skipTrivia*/ true); - let emptyArray: any[] = []; + const emptyArray: any[] = []; const jsDocTagNames = [ "augments", @@ -174,7 +174,7 @@ namespace ts { let jsDocCompletionEntries: CompletionEntry[]; function createNode(kind: SyntaxKind, pos: number, end: number, flags: NodeFlags, parent?: Node): NodeObject { - let node = new NodeObject(kind, pos, end); + const node = new NodeObject(kind, pos, end); node.flags = flags; node.parent = parent; return node; @@ -235,8 +235,8 @@ namespace ts { private addSyntheticNodes(nodes: Node[], pos: number, end: number): number { scanner.setTextPos(pos); while (pos < end) { - let token = scanner.scan(); - let textPos = scanner.getTextPos(); + const token = scanner.scan(); + const textPos = scanner.getTextPos(); nodes.push(createNode(token, pos, textPos, NodeFlags.Synthetic, this)); pos = textPos; } @@ -244,13 +244,11 @@ namespace ts { } private createSyntaxList(nodes: NodeArray): Node { - let list = createNode(SyntaxKind.SyntaxList, nodes.pos, nodes.end, NodeFlags.Synthetic, this); + const list = createNode(SyntaxKind.SyntaxList, nodes.pos, nodes.end, NodeFlags.Synthetic, this); list._children = []; let pos = nodes.pos; - - - for (let node of nodes) { + for (const node of nodes) { if (pos < node.pos) { pos = this.addSyntheticNodes(list._children, pos, node.pos); } @@ -269,14 +267,14 @@ namespace ts { scanner.setText((sourceFile || this.getSourceFile()).text); children = []; let pos = this.pos; - let processNode = (node: Node) => { + const processNode = (node: Node) => { if (pos < node.pos) { pos = this.addSyntheticNodes(children, pos, node.pos); } children.push(node); pos = node.end; }; - let processNodes = (nodes: NodeArray) => { + const processNodes = (nodes: NodeArray) => { if (pos < nodes.pos) { pos = this.addSyntheticNodes(children, pos, nodes.pos); } @@ -308,20 +306,20 @@ namespace ts { } public getFirstToken(sourceFile?: SourceFile): Node { - let children = this.getChildren(sourceFile); + const children = this.getChildren(sourceFile); if (!children.length) { return undefined; } - let child = children[0]; + const child = children[0]; return child.kind < SyntaxKind.FirstNode ? child : child.getFirstToken(sourceFile); } public getLastToken(sourceFile?: SourceFile): Node { - let children = this.getChildren(sourceFile); + const children = this.getChildren(sourceFile); - let child = lastOrUndefined(children); + const child = lastOrUndefined(children); if (!child) { return undefined; } @@ -366,8 +364,8 @@ namespace ts { } function getJsDocCommentsFromDeclarations(declarations: Declaration[], name: string, canUseParsedParamTagComments: boolean) { - let documentationComment = []; - let docComments = getJsDocCommentsSeparatedByNewLines(); + const documentationComment = []; + const docComments = getJsDocCommentsSeparatedByNewLines(); ts.forEach(docComments, docComment => { if (documentationComment.length) { documentationComment.push(lineBreakPart()); @@ -378,22 +376,22 @@ namespace ts { return documentationComment; function getJsDocCommentsSeparatedByNewLines() { - let paramTag = "@param"; - let jsDocCommentParts: SymbolDisplayPart[] = []; + const paramTag = "@param"; + const jsDocCommentParts: SymbolDisplayPart[] = []; ts.forEach(declarations, (declaration, indexOfDeclaration) => { // Make sure we are collecting doc comment from declaration once, // In case of union property there might be same declaration multiple times // which only varies in type parameter - // Eg. let a: Array | Array; a.length + // Eg. const a: Array | Array; a.length // The property length will have two declarations of property length coming // from Array - Array and Array if (indexOf(declarations, declaration) === indexOfDeclaration) { - let sourceFileOfDeclaration = getSourceFileOfNode(declaration); + const sourceFileOfDeclaration = getSourceFileOfNode(declaration); // If it is parameter - try and get the jsDoc comment with @param tag from function declaration's jsDoc comments if (canUseParsedParamTagComments && declaration.kind === SyntaxKind.Parameter) { ts.forEach(getJsDocCommentTextRange(declaration.parent, sourceFileOfDeclaration), jsDocCommentTextRange => { - let cleanedParamJsDocComment = getCleanedParamJsDocComment(jsDocCommentTextRange.pos, jsDocCommentTextRange.end, sourceFileOfDeclaration); + const cleanedParamJsDocComment = getCleanedParamJsDocComment(jsDocCommentTextRange.pos, jsDocCommentTextRange.end, sourceFileOfDeclaration); if (cleanedParamJsDocComment) { addRange(jsDocCommentParts, cleanedParamJsDocComment); } @@ -413,7 +411,7 @@ namespace ts { // Get the cleaned js doc comment text from the declaration ts.forEach(getJsDocCommentTextRange( declaration.kind === SyntaxKind.VariableDeclaration ? declaration.parent.parent : declaration, sourceFileOfDeclaration), jsDocCommentTextRange => { - let cleanedJsDocComment = getCleanedJsDocComment(jsDocCommentTextRange.pos, jsDocCommentTextRange.end, sourceFileOfDeclaration); + const cleanedJsDocComment = getCleanedJsDocComment(jsDocCommentTextRange.pos, jsDocCommentTextRange.end, sourceFileOfDeclaration); if (cleanedJsDocComment) { addRange(jsDocCommentParts, cleanedJsDocComment); } @@ -439,7 +437,7 @@ namespace ts { } for (; pos < end; pos++) { - let ch = sourceFile.text.charCodeAt(pos); + const ch = sourceFile.text.charCodeAt(pos); if (!isWhiteSpace(ch) || isLineBreak(ch)) { // Either found lineBreak or non whiteSpace return pos; @@ -480,7 +478,7 @@ namespace ts { function getCleanedJsDocComment(pos: number, end: number, sourceFile: SourceFile) { let spacesToRemoveAfterAsterisk: number; - let docComments: SymbolDisplayPart[] = []; + const docComments: SymbolDisplayPart[] = []; let blankLineCount = 0; let isInParamTag = false; @@ -491,7 +489,7 @@ namespace ts { // If the comment starts with '*' consume the spaces on this line if (pos < end && sourceFile.text.charCodeAt(pos) === CharacterCodes.asterisk) { - let lineStartPos = pos + 1; + const lineStartPos = pos + 1; pos = consumeWhiteSpacesOnTheLine(pos + 1, end, sourceFile, spacesToRemoveAfterAsterisk); // Set the spaces to remove after asterisk as margin if not already set @@ -505,7 +503,7 @@ namespace ts { // Analyse text on this line while (pos < end && !isLineBreak(sourceFile.text.charCodeAt(pos))) { - let ch = sourceFile.text.charAt(pos); + const ch = sourceFile.text.charAt(pos); if (ch === "@") { // If it is @param tag if (isParamTag(pos, end, sourceFile)) { @@ -544,7 +542,7 @@ namespace ts { function getCleanedParamJsDocComment(pos: number, end: number, sourceFile: SourceFile) { let paramHelpStringMargin: number; - let paramDocComments: SymbolDisplayPart[] = []; + const paramDocComments: SymbolDisplayPart[] = []; while (pos < end) { if (isParamTag(pos, end, sourceFile)) { let blankLineCount = 0; @@ -559,7 +557,7 @@ namespace ts { if (sourceFile.text.charCodeAt(pos) === CharacterCodes.openBrace) { pos++; for (let curlies = 1; pos < end; pos++) { - let charCode = sourceFile.text.charCodeAt(pos); + const charCode = sourceFile.text.charCodeAt(pos); // { character means we need to find another } to match the found one if (charCode === CharacterCodes.openBrace) { @@ -603,9 +601,9 @@ namespace ts { } let paramHelpString = ""; - let firstLineParamHelpStringPos = pos; + const firstLineParamHelpStringPos = pos; while (pos < end) { - let ch = sourceFile.text.charCodeAt(pos); + const ch = sourceFile.text.charCodeAt(pos); // at line break, set this comment line text and go to next line if (isLineBreak(ch)) { @@ -674,15 +672,15 @@ namespace ts { } // Now consume white spaces max - let startOfLinePos = pos; + const startOfLinePos = pos; pos = consumeWhiteSpacesOnTheLine(pos, end, sourceFile, paramHelpStringMargin); if (pos >= end) { return; } - let consumedSpaces = pos - startOfLinePos; + const consumedSpaces = pos - startOfLinePos; if (consumedSpaces < paramHelpStringMargin) { - let ch = sourceFile.text.charCodeAt(pos); + const ch = sourceFile.text.charCodeAt(pos); if (ch === CharacterCodes.asterisk) { // Consume more spaces after asterisk pos = consumeWhiteSpacesOnTheLine(pos + 1, end, sourceFile, paramHelpStringMargin - consumedSpaces - 1); @@ -815,7 +813,7 @@ namespace ts { private namedDeclarations: Map; constructor(kind: SyntaxKind, pos: number, end: number) { - super(kind, pos, end) + super(kind, pos, end); } public update(newText: string, textChangeRange: TextChangeRange): SourceFile { @@ -843,16 +841,16 @@ namespace ts { } private computeNamedDeclarations(): Map { - let result: Map = {}; + const result: Map = {}; forEachChild(this, visit); return result; function addDeclaration(declaration: Declaration) { - let name = getDeclarationName(declaration); + const name = getDeclarationName(declaration); if (name) { - let declarations = getDeclarations(name); + const declarations = getDeclarations(name); declarations.push(declaration); } } @@ -863,13 +861,13 @@ namespace ts { function getDeclarationName(declaration: Declaration) { if (declaration.name) { - let result = getTextOfIdentifierOrLiteral(declaration.name); + const result = getTextOfIdentifierOrLiteral(declaration.name); if (result !== undefined) { return result; } if (declaration.name.kind === SyntaxKind.ComputedPropertyName) { - let expr = (declaration.name).expression; + const expr = (declaration.name).expression; if (expr.kind === SyntaxKind.PropertyAccessExpression) { return (expr).name.text; } @@ -899,12 +897,12 @@ namespace ts { case SyntaxKind.FunctionDeclaration: case SyntaxKind.MethodDeclaration: case SyntaxKind.MethodSignature: - let functionDeclaration = node; - let declarationName = getDeclarationName(functionDeclaration); + const functionDeclaration = node; + const declarationName = getDeclarationName(functionDeclaration); if (declarationName) { - let declarations = getDeclarations(declarationName); - let lastDeclaration = lastOrUndefined(declarations); + const declarations = getDeclarations(declarationName); + const lastDeclaration = lastOrUndefined(declarations); // Check whether this declaration belongs to an "overload group". if (lastDeclaration && functionDeclaration.parent === lastDeclaration.parent && functionDeclaration.symbol === lastDeclaration.symbol) { @@ -980,7 +978,7 @@ namespace ts { break; case SyntaxKind.ImportDeclaration: - let importClause = (node).importClause; + const importClause = (node).importClause; if (importClause) { // Handle default import case e.g.: // import d from "mod"; @@ -1113,8 +1111,8 @@ namespace ts { } export interface Classifications { - spans: number[], - endOfLineState: EndOfLineState + spans: number[]; + endOfLineState: EndOfLineState; } export interface ClassifiedSpan { @@ -1171,7 +1169,7 @@ namespace ts { highlightSpans: HighlightSpan[]; } - export module HighlightSpanKind { + export namespace HighlightSpanKind { export const none = "none"; export const definition = "definition"; export const reference = "reference"; @@ -1220,7 +1218,7 @@ namespace ts { InsertSpaceAfterOpeningAndBeforeClosingNonemptyBrackets: boolean; PlaceOpenBraceOnNewLineForFunctions: boolean; PlaceOpenBraceOnNewLineForControlBlocks: boolean; - [s: string]: boolean | number| string; + [s: string]: boolean | number | string; } export interface DefinitionInfo { @@ -1500,7 +1498,7 @@ namespace ts { } // TODO: move these to enums - export module ScriptElementKind { + export namespace ScriptElementKind { export const unknown = ""; export const warning = "warning"; @@ -1529,7 +1527,7 @@ namespace ts { export const enumElement = "enum"; // Inside module and script only - // let v = .. + // const v = .. export const variableElement = "var"; // Inside function @@ -1581,7 +1579,7 @@ namespace ts { export const letElement = "let"; } - export module ScriptElementKindModifier { + export namespace ScriptElementKindModifier { export const none = ""; export const publicMemberModifier = "public"; export const privateMemberModifier = "private"; @@ -1723,8 +1721,8 @@ namespace ts { this.fileNameToEntry = createFileMap(); // Initialize the list with the root file names - let rootFileNames = host.getScriptFileNames(); - for (let fileName of rootFileNames) { + const rootFileNames = host.getScriptFileNames(); + for (const fileName of rootFileNames) { this.createEntry(fileName, toPath(fileName, this.currentDirectory, getCanonicalFileName)); } @@ -1738,7 +1736,7 @@ namespace ts { private createEntry(fileName: string, path: Path) { let entry: HostFileInformation; - let scriptSnapshot = this.host.getScriptSnapshot(fileName); + const scriptSnapshot = this.host.getScriptSnapshot(fileName); if (scriptSnapshot) { entry = { hostFileName: fileName, @@ -1760,7 +1758,7 @@ namespace ts { } public getOrCreateEntry(fileName: string): HostFileInformation { - let path = toPath(fileName, this.currentDirectory, this.getCanonicalFileName) + const path = toPath(fileName, this.currentDirectory, this.getCanonicalFileName); if (this.contains(path)) { return this.getEntry(path); } @@ -1769,7 +1767,7 @@ namespace ts { } public getRootFileNames(): string[] { - let fileNames: string[] = []; + const fileNames: string[] = []; this.fileNameToEntry.forEachValue((path, value) => { if (value) { @@ -1781,12 +1779,12 @@ namespace ts { } public getVersion(path: Path): string { - let file = this.getEntry(path); + const file = this.getEntry(path); return file && file.version; } public getScriptSnapshot(path: Path): IScriptSnapshot { - let file = this.getEntry(path); + const file = this.getEntry(path); return file && file.scriptSnapshot; } } @@ -1803,22 +1801,22 @@ namespace ts { } public getCurrentSourceFile(fileName: string): SourceFile { - let scriptSnapshot = this.host.getScriptSnapshot(fileName); + const scriptSnapshot = this.host.getScriptSnapshot(fileName); if (!scriptSnapshot) { // The host does not know about this file. throw new Error("Could not find file: '" + fileName + "'."); } - let version = this.host.getScriptVersion(fileName); + const version = this.host.getScriptVersion(fileName); let sourceFile: SourceFile; if (this.currentFileName !== fileName) { // This is a new file, just parse it - sourceFile = createLanguageServiceSourceFile(fileName, scriptSnapshot, ScriptTarget.Latest, version, /*setNodeParents:*/ true); + sourceFile = createLanguageServiceSourceFile(fileName, scriptSnapshot, ScriptTarget.Latest, version, /*setNodeParents*/ true); } else if (this.currentFileVersion !== version) { // This is the same file, just a newer version. Incrementally parse the file. - let editRange = scriptSnapshot.getChangeRange(this.currentFileScriptSnapshot); + const editRange = scriptSnapshot.getChangeRange(this.currentFileScriptSnapshot); sourceFile = updateLanguageServiceSourceFile(this.currentSourceFile, scriptSnapshot, version, editRange); } @@ -1863,7 +1861,7 @@ namespace ts { * - noResolve = true */ export function transpileModule(input: string, transpileOptions: TranspileOptions): TranspileOutput { - let options = transpileOptions.compilerOptions ? clone(transpileOptions.compilerOptions) : getDefaultCompilerOptions(); + const options = transpileOptions.compilerOptions ? clone(transpileOptions.compilerOptions) : getDefaultCompilerOptions(); options.isolatedModules = true; @@ -1879,21 +1877,22 @@ namespace ts { options.noResolve = true; // if jsx is specified then treat file as .tsx - let inputFileName = transpileOptions.fileName || (options.jsx ? "module.tsx" : "module.ts"); - let sourceFile = createSourceFile(inputFileName, input, options.target); + const inputFileName = transpileOptions.fileName || (options.jsx ? "module.tsx" : "module.ts"); + const sourceFile = createSourceFile(inputFileName, input, options.target); if (transpileOptions.moduleName) { sourceFile.moduleName = transpileOptions.moduleName; } sourceFile.renamedDependencies = transpileOptions.renamedDependencies; - let newLine = getNewLineCharacter(options); + const newLine = getNewLineCharacter(options); // Output let outputText: string; let sourceMapText: string; + // Create a compilerHost object to allow the compiler to read and write files - let compilerHost: CompilerHost = { + const compilerHost: CompilerHost = { getSourceFile: (fileName, target) => fileName === normalizeSlashes(inputFileName) ? sourceFile : undefined, writeFile: (name, text, writeByteOrderMark) => { if (fileExtensionIs(name, ".map")) { @@ -1914,7 +1913,7 @@ namespace ts { readFile: (fileName): string => "" }; - let program = createProgram([inputFileName], options, compilerHost); + const program = createProgram([inputFileName], options, compilerHost); let diagnostics: Diagnostic[]; if (transpileOptions.reportDiagnostics) { @@ -1934,22 +1933,22 @@ namespace ts { * This is a shortcut function for transpileModule - it accepts transpileOptions as parameters and returns only outputText part of the result. */ export function transpile(input: string, compilerOptions?: CompilerOptions, fileName?: string, diagnostics?: Diagnostic[], moduleName?: string): string { - let output = transpileModule(input, { compilerOptions, fileName, reportDiagnostics: !!diagnostics, moduleName }); + const output = transpileModule(input, { compilerOptions, fileName, reportDiagnostics: !!diagnostics, moduleName }); // addRange correctly handles cases when wither 'from' or 'to' argument is missing addRange(diagnostics, output.diagnostics); return output.outputText; } export function createLanguageServiceSourceFile(fileName: string, scriptSnapshot: IScriptSnapshot, scriptTarget: ScriptTarget, version: string, setNodeParents: boolean): SourceFile { - let text = scriptSnapshot.getText(0, scriptSnapshot.getLength()); - let sourceFile = createSourceFile(fileName, text, scriptTarget, setNodeParents); + const text = scriptSnapshot.getText(0, scriptSnapshot.getLength()); + const sourceFile = createSourceFile(fileName, text, scriptTarget, setNodeParents); setSourceFileFields(sourceFile, scriptSnapshot, version); // after full parsing we can use table with interned strings as name table sourceFile.nameTable = sourceFile.identifiers; return sourceFile; } - export let disableIncrementalParsing = false; + export const disableIncrementalParsing = false; export function updateLanguageServiceSourceFile(sourceFile: SourceFile, scriptSnapshot: IScriptSnapshot, version: string, textChangeRange: TextChangeRange, aggressiveChecks?: boolean): SourceFile { // If we were given a text change range, and our version or open-ness changed, then @@ -1961,12 +1960,12 @@ namespace ts { let newText: string; // grab the fragment from the beginning of the original text to the beginning of the span - let prefix = textChangeRange.span.start !== 0 + const prefix = textChangeRange.span.start !== 0 ? sourceFile.text.substr(0, textChangeRange.span.start) : ""; // grab the fragment from the end of the span till the end of the original text - let suffix = textSpanEnd(textChangeRange.span) !== sourceFile.text.length + const suffix = textSpanEnd(textChangeRange.span) !== sourceFile.text.length ? sourceFile.text.substr(textSpanEnd(textChangeRange.span)) : ""; @@ -1976,7 +1975,7 @@ namespace ts { } else { // it was actual edit, fetch the fragment of new text that correspond to new span - let changedText = scriptSnapshot.getText(textChangeRange.span.start, textChangeRange.span.start + textChangeRange.newLength); + const changedText = scriptSnapshot.getText(textChangeRange.span.start, textChangeRange.span.start + textChangeRange.newLength); // combine prefix, changed text and suffix newText = prefix && suffix ? prefix + changedText + suffix @@ -1985,7 +1984,7 @@ namespace ts { : (changedText + suffix); } - let newSourceFile = updateSourceFile(sourceFile, newText, textChangeRange, aggressiveChecks); + const newSourceFile = updateSourceFile(sourceFile, newText, textChangeRange, aggressiveChecks); setSourceFileFields(newSourceFile, scriptSnapshot, version); // after incremental parsing nameTable might not be up-to-date // drop it so it can be lazily recreated later @@ -2006,7 +2005,7 @@ namespace ts { } // Otherwise, just create a new source file. - return createLanguageServiceSourceFile(sourceFile.fileName, scriptSnapshot, sourceFile.languageVersion, version, /*setNodeParents:*/ true); + return createLanguageServiceSourceFile(sourceFile.fileName, scriptSnapshot, sourceFile.languageVersion, version, /*setNodeParents*/ true); } export function createGetCanonicalFileName(useCaseSensitivefileNames: boolean): (fileName: string) => string { @@ -2019,15 +2018,15 @@ namespace ts { export function createDocumentRegistry(useCaseSensitiveFileNames?: boolean, currentDirectory = ""): DocumentRegistry { // Maps from compiler setting target (ES3, ES5, etc.) to all the cached documents we have // for those settings. - let buckets: Map> = {}; - let getCanonicalFileName = createGetCanonicalFileName(!!useCaseSensitiveFileNames); + const buckets: Map> = {}; + const getCanonicalFileName = createGetCanonicalFileName(!!useCaseSensitiveFileNames); function getKeyFromCompilationSettings(settings: CompilerOptions): string { return "_" + settings.target + "|" + settings.module + "|" + settings.noResolve + "|" + settings.jsx + +"|" + settings.allowJs; } function getBucketForCompilationSettings(settings: CompilerOptions, createIfMissing: boolean): FileMap { - let key = getKeyFromCompilationSettings(settings); + const key = getKeyFromCompilationSettings(settings); let bucket = lookUp(buckets, key); if (!bucket && createIfMissing) { buckets[key] = bucket = createFileMap(); @@ -2036,9 +2035,9 @@ namespace ts { } function reportStats() { - let bucketInfoArray = Object.keys(buckets).filter(name => name && name.charAt(0) === '_').map(name => { - let entries = lookUp(buckets, name); - let sourceFiles: { name: string; refCount: number; references: string[]; }[] = []; + const bucketInfoArray = Object.keys(buckets).filter(name => name && name.charAt(0) === "_").map(name => { + const entries = lookUp(buckets, name); + const sourceFiles: { name: string; refCount: number; references: string[]; }[] = []; entries.forEachValue((key, entry) => { sourceFiles.push({ name: key, @@ -2052,15 +2051,15 @@ namespace ts { sourceFiles }; }); - return JSON.stringify(bucketInfoArray, null, 2); + return JSON.stringify(bucketInfoArray, undefined, 2); } function acquireDocument(fileName: string, compilationSettings: CompilerOptions, scriptSnapshot: IScriptSnapshot, version: string): SourceFile { - return acquireOrUpdateDocument(fileName, compilationSettings, scriptSnapshot, version, /*acquiring:*/ true); + return acquireOrUpdateDocument(fileName, compilationSettings, scriptSnapshot, version, /*acquiring*/ true); } function updateDocument(fileName: string, compilationSettings: CompilerOptions, scriptSnapshot: IScriptSnapshot, version: string): SourceFile { - return acquireOrUpdateDocument(fileName, compilationSettings, scriptSnapshot, version, /*acquiring:*/ false); + return acquireOrUpdateDocument(fileName, compilationSettings, scriptSnapshot, version, /*acquiring*/ false); } function acquireOrUpdateDocument( @@ -2070,14 +2069,14 @@ namespace ts { version: string, acquiring: boolean): SourceFile { - let bucket = getBucketForCompilationSettings(compilationSettings, /*createIfMissing*/ true); - let path = toPath(fileName, currentDirectory, getCanonicalFileName); + const bucket = getBucketForCompilationSettings(compilationSettings, /*createIfMissing*/ true); + const path = toPath(fileName, currentDirectory, getCanonicalFileName); let entry = bucket.get(path); if (!entry) { Debug.assert(acquiring, "How could we be trying to update a document that the registry doesn't have?"); // Have never seen this file with these settings. Create a new source file for it. - let sourceFile = createLanguageServiceSourceFile(fileName, scriptSnapshot, compilationSettings.target, version, /*setNodeParents:*/ false); + const sourceFile = createLanguageServiceSourceFile(fileName, scriptSnapshot, compilationSettings.target, version, /*setNodeParents*/ false); entry = { sourceFile: sourceFile, @@ -2109,12 +2108,12 @@ namespace ts { } function releaseDocument(fileName: string, compilationSettings: CompilerOptions): void { - let bucket = getBucketForCompilationSettings(compilationSettings, false); + const bucket = getBucketForCompilationSettings(compilationSettings, /*createIfMissing*/false); Debug.assert(bucket !== undefined); - let path = toPath(fileName, currentDirectory, getCanonicalFileName); + const path = toPath(fileName, currentDirectory, getCanonicalFileName); - let entry = bucket.get(path); + const entry = bucket.get(path); entry.languageServiceRefCount--; Debug.assert(entry.languageServiceRefCount >= 0); @@ -2132,19 +2131,19 @@ namespace ts { } export function preProcessFile(sourceText: string, readImportFiles = true, detectJavaScriptImports = false): PreProcessedFileInfo { - let referencedFiles: FileReference[] = []; - let importedFiles: FileReference[] = []; + const referencedFiles: FileReference[] = []; + const importedFiles: FileReference[] = []; let ambientExternalModules: string[]; let isNoDefaultLib = false; function processTripleSlashDirectives(): void { - let commentRanges = getLeadingCommentRanges(sourceText, 0); + const commentRanges = getLeadingCommentRanges(sourceText, 0); forEach(commentRanges, commentRange => { - let comment = sourceText.substring(commentRange.pos, commentRange.end); - let referencePathMatchResult = getFileReferenceFromReferencePath(comment, commentRange); + const comment = sourceText.substring(commentRange.pos, commentRange.end); + const referencePathMatchResult = getFileReferenceFromReferencePath(comment, commentRange); if (referencePathMatchResult) { isNoDefaultLib = referencePathMatchResult.isNoDefaultLib; - let fileReference = referencePathMatchResult.fileReference; + const fileReference = referencePathMatchResult.fileReference; if (fileReference) { referencedFiles.push(fileReference); } @@ -2160,8 +2159,8 @@ namespace ts { } function recordModuleName() { - let importPath = scanner.getTokenValue(); - let pos = scanner.getTokenPos(); + const importPath = scanner.getTokenValue(); + const pos = scanner.getTokenPos(); importedFiles.push({ fileName: importPath, pos: pos, @@ -2213,7 +2212,7 @@ namespace ts { } } else if (token === SyntaxKind.EqualsToken) { - if (tryConsumeRequireCall(/* skipCurrentToken */ true)) { + if (tryConsumeRequireCall(/*skipCurrentToken*/ true)) { return true; } } @@ -2311,7 +2310,7 @@ namespace ts { if (token === SyntaxKind.Identifier || isKeyword(token)) { token = scanner.scan(); if (token === SyntaxKind.EqualsToken) { - if (tryConsumeRequireCall(/* skipCurrentToken */ true)) { + if (tryConsumeRequireCall(/*skipCurrentToken*/ true)) { return true; } } @@ -2410,7 +2409,7 @@ namespace ts { if (tryConsumeDeclare() || tryConsumeImport() || tryConsumeExport() || - (detectJavaScriptImports && (tryConsumeRequireCall(/* skipCurrentToken */ false) || tryConsumeDefine()))) { + (detectJavaScriptImports && (tryConsumeRequireCall(/*skipCurrentToken*/ false) || tryConsumeDefine()))) { continue; } else { @@ -2550,8 +2549,8 @@ namespace ts { return true; } else if (position === comment.end) { - let text = sourceFile.text; - let width = comment.end - comment.pos; + const text = sourceFile.text; + const width = comment.end - comment.pos; // is single line comment or just /* if (width <= 2 || text.charCodeAt(comment.pos + 1) === CharacterCodes.slash) { return true; @@ -2583,7 +2582,7 @@ namespace ts { } // A cache of completion entries for keywords, these do not change between sessions - let keywordCompletions: CompletionEntry[] = []; + const keywordCompletions: CompletionEntry[] = []; for (let i = SyntaxKind.FirstKeyword; i <= SyntaxKind.LastKeyword; i++) { keywordCompletions.push({ name: tokenToString(i), @@ -2673,15 +2672,15 @@ namespace ts { export function createLanguageService(host: LanguageServiceHost, documentRegistry: DocumentRegistry = createDocumentRegistry(host.useCaseSensitiveFileNames && host.useCaseSensitiveFileNames(), host.getCurrentDirectory())): LanguageService { - let syntaxTreeCache: SyntaxTreeCache = new SyntaxTreeCache(host); + const syntaxTreeCache: SyntaxTreeCache = new SyntaxTreeCache(host); let ruleProvider: formatting.RulesProvider; let program: Program; let lastProjectVersion: string; - let useCaseSensitivefileNames = false; - let cancellationToken = new CancellationTokenObject(host.getCancellationToken && host.getCancellationToken()); + const useCaseSensitivefileNames = false; + const cancellationToken = new CancellationTokenObject(host.getCancellationToken && host.getCancellationToken()); - let currentDirectory = host.getCurrentDirectory(); + const currentDirectory = host.getCurrentDirectory(); // Check if the localized messages json is set, otherwise query the host for it if (!localizedDiagnosticMessages && host.getLocalizedDiagnosticMessages) { localizedDiagnosticMessages = host.getLocalizedDiagnosticMessages(); @@ -2693,10 +2692,10 @@ namespace ts { } } - let getCanonicalFileName = createGetCanonicalFileName(useCaseSensitivefileNames); + const getCanonicalFileName = createGetCanonicalFileName(useCaseSensitivefileNames); function getValidSourceFile(fileName: string): SourceFile { - let sourceFile = program.getSourceFile(fileName); + const sourceFile = program.getSourceFile(fileName); if (!sourceFile) { throw new Error("Could not find file: '" + fileName + "'."); } @@ -2716,7 +2715,7 @@ namespace ts { function synchronizeHostData(): void { // perform fast check if host supports it if (host.getProjectVersion) { - let hostProjectVersion = host.getProjectVersion(); + const hostProjectVersion = host.getProjectVersion(); if (hostProjectVersion) { if (lastProjectVersion === hostProjectVersion) { return; @@ -2740,17 +2739,17 @@ namespace ts { // the program points to old source files that have been invalidated because of // incremental parsing. - let oldSettings = program && program.getCompilerOptions(); - let newSettings = hostCache.compilationSettings(); - let changesInCompilationSettingsAffectSyntax = oldSettings && + const oldSettings = program && program.getCompilerOptions(); + const newSettings = hostCache.compilationSettings(); + const changesInCompilationSettingsAffectSyntax = oldSettings && (oldSettings.target !== newSettings.target || oldSettings.module !== newSettings.module || oldSettings.noResolve !== newSettings.noResolve || - oldSettings.jsx !== newSettings.jsx || + oldSettings.jsx !== newSettings.jsx || oldSettings.allowJs !== newSettings.allowJs); // Now create a new compiler - let compilerHost: CompilerHost = { + const compilerHost: CompilerHost = { getSourceFile: getOrCreateSourceFile, getCancellationToken: () => cancellationToken, getCanonicalFileName, @@ -2766,22 +2765,22 @@ namespace ts { }, readFile: (fileName): string => { // stub missing host functionality - let entry = hostCache.getOrCreateEntry(fileName); + const entry = hostCache.getOrCreateEntry(fileName); return entry && entry.scriptSnapshot.getText(0, entry.scriptSnapshot.getLength()); } }; if (host.resolveModuleNames) { - compilerHost.resolveModuleNames = (moduleNames, containingFile) => host.resolveModuleNames(moduleNames, containingFile) + compilerHost.resolveModuleNames = (moduleNames, containingFile) => host.resolveModuleNames(moduleNames, containingFile); } - let newProgram = createProgram(hostCache.getRootFileNames(), newSettings, compilerHost, program); + const newProgram = createProgram(hostCache.getRootFileNames(), newSettings, compilerHost, program); // Release any files we have acquired in the old program but are // not part of the new program. if (program) { - let oldSourceFiles = program.getSourceFiles(); - for (let oldSourceFile of oldSourceFiles) { + const oldSourceFiles = program.getSourceFiles(); + for (const oldSourceFile of oldSourceFiles) { if (!newProgram.getSourceFile(oldSourceFile.fileName) || changesInCompilationSettingsAffectSyntax) { documentRegistry.releaseDocument(oldSourceFile.fileName, oldSettings); } @@ -2804,7 +2803,7 @@ namespace ts { // The program is asking for this file, check first if the host can locate it. // If the host can not locate the file, then it does not exist. return undefined // to the program to allow reporting of errors for missing files. - let hostFileInformation = hostCache.getOrCreateEntry(fileName); + const hostFileInformation = hostCache.getOrCreateEntry(fileName); if (!hostFileInformation) { return undefined; } @@ -2814,7 +2813,7 @@ namespace ts { // can not be reused. we have to dump all syntax trees and create new ones. if (!changesInCompilationSettingsAffectSyntax) { // Check if the old program had this file already - let oldSourceFile = program && program.getSourceFile(fileName); + const oldSourceFile = program && program.getSourceFile(fileName); if (oldSourceFile) { // We already had a source file for this file name. Go to the registry to // ensure that we get the right up to date version of it. We need this to @@ -2851,7 +2850,7 @@ namespace ts { if (!sourceFile) { return false; } - let path = sourceFile.path || toPath(sourceFile.fileName, currentDirectory, getCanonicalFileName); + const path = sourceFile.path || toPath(sourceFile.fileName, currentDirectory, getCanonicalFileName); return sourceFile.version === hostCache.getVersion(path); } @@ -2862,13 +2861,13 @@ namespace ts { } // If number of files in the program do not match, it is not up-to-date - let rootFileNames = hostCache.getRootFileNames(); + const rootFileNames = hostCache.getRootFileNames(); if (program.getSourceFiles().length !== rootFileNames.length) { return false; } // If any file is not up-to-date, then the whole program is not up-to-date - for (let fileName of rootFileNames) { + for (const fileName of rootFileNames) { if (!sourceFileUpToDate(program.getSourceFile(fileName))) { return false; } @@ -2910,18 +2909,18 @@ namespace ts { function getSemanticDiagnostics(fileName: string): Diagnostic[] { synchronizeHostData(); - let targetSourceFile = getValidSourceFile(fileName); + const targetSourceFile = getValidSourceFile(fileName); // Only perform the action per file regardless of '-out' flag as LanguageServiceHost is expected to call this function per file. // Therefore only get diagnostics for given file. - let semanticDiagnostics = program.getSemanticDiagnostics(targetSourceFile, cancellationToken); + const semanticDiagnostics = program.getSemanticDiagnostics(targetSourceFile, cancellationToken); if (!program.getCompilerOptions().declaration) { return semanticDiagnostics; } // If '-d' is enabled, check for emitter error. One example of emitter error is export class implements non-export interface - let declarationDiagnostics = program.getDeclarationDiagnostics(targetSourceFile, cancellationToken); + const declarationDiagnostics = program.getDeclarationDiagnostics(targetSourceFile, cancellationToken); return concatenate(semanticDiagnostics, declarationDiagnostics); } @@ -2937,14 +2936,14 @@ namespace ts { * @return undefined if the name is of external module otherwise a name with striped of any quote */ function getCompletionEntryDisplayNameForSymbol(symbol: Symbol, target: ScriptTarget, performCharacterChecks: boolean, location: Node): string { - let displayName: string = getDeclaredName(program.getTypeChecker(), symbol, location); + const displayName: string = getDeclaredName(program.getTypeChecker(), symbol, location); if (displayName) { - let firstCharCode = displayName.charCodeAt(0); + const firstCharCode = displayName.charCodeAt(0); // First check of the displayName is not external module; if it is an external module, it is not valid entry if ((symbol.flags & SymbolFlags.Namespace) && (firstCharCode === CharacterCodes.singleQuote || firstCharCode === CharacterCodes.doubleQuote)) { // If the symbol is external module, don't show it in the completion list - // (i.e declare module "http" { let x; } | // <= request completion here, "http" should not be there) + // (i.e declare module "http" { const x; } | // <= request completion here, "http" should not be there) return undefined; } } @@ -2987,20 +2986,20 @@ namespace ts { } function getCompletionData(fileName: string, position: number) { - let typeChecker = program.getTypeChecker(); - let syntacticStart = new Date().getTime(); - let sourceFile = getValidSourceFile(fileName); - let isJavaScriptFile = isSourceFileJavaScript(sourceFile); + const typeChecker = program.getTypeChecker(); + const syntacticStart = new Date().getTime(); + const sourceFile = getValidSourceFile(fileName); + const isJavaScriptFile = isSourceFileJavaScript(sourceFile); let isJsDocTagName = false; let start = new Date().getTime(); - let currentToken = getTokenAtPosition(sourceFile, position); + const currentToken = getTokenAtPosition(sourceFile, position); log("getCompletionData: Get current token: " + (new Date().getTime() - start)); start = new Date().getTime(); // Completion not allowed inside comments, bail out if this is the case - let insideComment = isInsideComment(sourceFile, currentToken, position); + const insideComment = isInsideComment(sourceFile, currentToken, position); log("getCompletionData: Is inside comment: " + (new Date().getTime() - start)); if (insideComment) { @@ -3014,7 +3013,7 @@ namespace ts { // /** @type {number | string} */ // Completion should work in the brackets let insideJsDocTagExpression = false; - let tag = getJsDocTagAtPosition(sourceFile, position); + const tag = getJsDocTagAtPosition(sourceFile, position); if (tag) { if (tag.tagName.pos <= position && position <= tag.tagName.end) { isJsDocTagName = true; @@ -3024,7 +3023,7 @@ namespace ts { case SyntaxKind.JSDocTypeTag: case SyntaxKind.JSDocParameterTag: case SyntaxKind.JSDocReturnTag: - let tagWithExpression = tag; + const tagWithExpression = tag; if (tagWithExpression.typeExpression) { insideJsDocTagExpression = tagWithExpression.typeExpression.pos < position && position < tagWithExpression.typeExpression.end; } @@ -3045,7 +3044,7 @@ namespace ts { } start = new Date().getTime(); - let previousToken = findPrecedingToken(position, sourceFile); + const previousToken = findPrecedingToken(position, sourceFile); log("getCompletionData: Get previous token 1: " + (new Date().getTime() - start)); // The decision to provide completion depends on the contextToken, which is determined through the previousToken. @@ -3055,7 +3054,7 @@ namespace ts { // Check if the caret is at the end of an identifier; this is a partial identifier that we want to complete: e.g. a.toS| // Skip this partial identifier and adjust the contextToken to the token that precedes it. if (contextToken && position <= contextToken.end && isWord(contextToken.kind)) { - let start = new Date().getTime(); + const start = new Date().getTime(); contextToken = findPrecedingToken(contextToken.getFullStart(), sourceFile); log("getCompletionData: Get previous token 2: " + (new Date().getTime() - start)); } @@ -3076,7 +3075,7 @@ namespace ts { return undefined; } - let { parent, kind } = contextToken; + const { parent, kind } = contextToken; if (kind === SyntaxKind.DotToken) { if (parent.kind === SyntaxKind.PropertyAccessExpression) { node = (contextToken.parent).expression; @@ -3103,7 +3102,7 @@ namespace ts { } } - let semanticStart = new Date().getTime(); + const semanticStart = new Date().getTime(); let isMemberCompletion: boolean; let isNewIdentifierLocation: boolean; let symbols: Symbol[] = []; @@ -3112,7 +3111,7 @@ namespace ts { getTypeScriptMemberSymbols(); } else if (isRightOfOpenTag) { - let tagSymbols = typeChecker.getJsxIntrinsicTagNames(); + const tagSymbols = typeChecker.getJsxIntrinsicTagNames(); if (tryGetGlobalSymbols()) { symbols = tagSymbols.concat(symbols.filter(s => !!(s.flags & SymbolFlags.Value))); } @@ -3123,7 +3122,7 @@ namespace ts { isNewIdentifierLocation = false; } else if (isStartingCloseTag) { - let tagName = (contextToken.parent.parent).openingElement.tagName; + const tagName = (contextToken.parent.parent).openingElement.tagName; symbols = [typeChecker.getSymbolAtLocation(tagName)]; isMemberCompletion = true; @@ -3157,7 +3156,7 @@ namespace ts { if (symbol && symbol.flags & SymbolFlags.HasExports) { // Extract module or enum members - let exportedSymbols = typeChecker.getExportsOfModule(symbol); + const exportedSymbols = typeChecker.getExportsOfModule(symbol); forEach(exportedSymbols, symbol => { if (typeChecker.isValidPropertyAccess((node.parent), symbol.name)) { symbols.push(symbol); @@ -3166,14 +3165,14 @@ namespace ts { } } - let type = typeChecker.getTypeAtLocation(node); + const type = typeChecker.getTypeAtLocation(node); addTypeProperties(type); } function addTypeProperties(type: Type) { if (type) { // Filter private properties - for (let symbol of type.getApparentProperties()) { + for (const symbol of type.getApparentProperties()) { if (typeChecker.isValidPropertyAccess((node.parent), symbol.name)) { symbols.push(symbol); } @@ -3185,8 +3184,8 @@ namespace ts { // each individual type has. This is because we're going to add all identifiers // anyways. So we might as well elevate the members that were at least part // of the individual types to a higher status since we know what they are. - let unionType = type; - for (let elementType of unionType.types) { + const unionType = type; + for (const elementType of unionType.types) { addTypeProperties(elementType); } } @@ -3256,14 +3255,14 @@ namespace ts { // - 'contextToken' was adjusted to the token prior to 'previousToken' // because we were at the end of an identifier. // - 'previousToken' is defined. - let adjustedPosition = previousToken !== contextToken ? + const adjustedPosition = previousToken !== contextToken ? previousToken.getStart() : position; - let scopeNode = getScopeNode(contextToken, adjustedPosition, sourceFile) || sourceFile; + const scopeNode = getScopeNode(contextToken, adjustedPosition, sourceFile) || sourceFile; /// TODO filter meaning based on the current context - let symbolMeanings = SymbolFlags.Type | SymbolFlags.Value | SymbolFlags.Namespace | SymbolFlags.Alias; + const symbolMeanings = SymbolFlags.Type | SymbolFlags.Value | SymbolFlags.Namespace | SymbolFlags.Alias; symbols = typeChecker.getSymbolsInScope(scopeNode, symbolMeanings); return true; @@ -3282,8 +3281,8 @@ namespace ts { } function isCompletionListBlocker(contextToken: Node): boolean { - let start = new Date().getTime(); - let result = isInStringOrRegularExpressionOrTemplateLiteral(contextToken) || + const start = new Date().getTime(); + const result = isInStringOrRegularExpressionOrTemplateLiteral(contextToken) || isSolelyIdentifierDefinitionLocation(contextToken) || isDotOfNumericLiteral(contextToken) || isInJsxText(contextToken); @@ -3310,27 +3309,27 @@ namespace ts { function isNewIdentifierDefinitionLocation(previousToken: Node): boolean { if (previousToken) { - let containingNodeKind = previousToken.parent.kind; + const containingNodeKind = previousToken.parent.kind; switch (previousToken.kind) { case SyntaxKind.CommaToken: return containingNodeKind === SyntaxKind.CallExpression // func( a, | || containingNodeKind === SyntaxKind.Constructor // constructor( a, | /* public, protected, private keywords are allowed here, so show completion */ || containingNodeKind === SyntaxKind.NewExpression // new C(a, | || containingNodeKind === SyntaxKind.ArrayLiteralExpression // [a, | - || containingNodeKind === SyntaxKind.BinaryExpression // let x = (a, | + || containingNodeKind === SyntaxKind.BinaryExpression // const x = (a, | || containingNodeKind === SyntaxKind.FunctionType; // var x: (s: string, list| case SyntaxKind.OpenParenToken: return containingNodeKind === SyntaxKind.CallExpression // func( | || containingNodeKind === SyntaxKind.Constructor // constructor( | || containingNodeKind === SyntaxKind.NewExpression // new C(a| - || containingNodeKind === SyntaxKind.ParenthesizedExpression // let x = (a| + || containingNodeKind === SyntaxKind.ParenthesizedExpression // const x = (a| || containingNodeKind === SyntaxKind.ParenthesizedType; // function F(pred: (a| /* this can become an arrow function, where 'a' is the argument */ case SyntaxKind.OpenBracketToken: return containingNodeKind === SyntaxKind.ArrayLiteralExpression // [ | || containingNodeKind === SyntaxKind.IndexSignature // [ | : string ] - || containingNodeKind === SyntaxKind.ComputedPropertyName // [ | /* this can become an index signature */ + || containingNodeKind === SyntaxKind.ComputedPropertyName; // [ | /* this can become an index signature */ case SyntaxKind.ModuleKeyword: // module | case SyntaxKind.NamespaceKeyword: // namespace | @@ -3343,7 +3342,7 @@ namespace ts { return containingNodeKind === SyntaxKind.ClassDeclaration; // class A{ | case SyntaxKind.EqualsToken: - return containingNodeKind === SyntaxKind.VariableDeclaration // let x = a| + return containingNodeKind === SyntaxKind.VariableDeclaration // const x = a| || containingNodeKind === SyntaxKind.BinaryExpression; // x = a| case SyntaxKind.TemplateHead: @@ -3375,8 +3374,8 @@ namespace ts { || contextToken.kind === SyntaxKind.StringLiteralType || contextToken.kind === SyntaxKind.RegularExpressionLiteral || isTemplateLiteralKind(contextToken.kind)) { - let start = contextToken.getStart(); - let end = contextToken.getEnd(); + const start = contextToken.getStart(); + const end = contextToken.getEnd(); // To be "in" one of these literals, the position has to be: // 1. entirely within the token text. @@ -3420,7 +3419,7 @@ namespace ts { // We are *only* completing on properties from the type being destructured. isNewIdentifierLocation = false; - let rootDeclaration = getRootDeclaration(objectLikeContainer.parent); + const rootDeclaration = getRootDeclaration(objectLikeContainer.parent); if (isVariableLike(rootDeclaration)) { // We don't want to complete using the type acquired by the shape // of the binding pattern; we are only interested in types acquired @@ -3431,7 +3430,7 @@ namespace ts { } } else { - Debug.fail("Root declaration is not variable-like.") + Debug.fail("Root declaration is not variable-like."); } } else { @@ -3442,7 +3441,7 @@ namespace ts { return false; } - let typeMembers = typeChecker.getPropertiesOfType(typeForObject); + const typeMembers = typeChecker.getPropertiesOfType(typeForObject); if (typeMembers && typeMembers.length > 0) { // Add filtered items to the completion list symbols = filterObjectMembersList(typeMembers, existingMembers); @@ -3466,11 +3465,11 @@ namespace ts { * @returns true if 'symbols' was successfully populated; false otherwise. */ function tryGetImportOrExportClauseCompletionSymbols(namedImportsOrExports: NamedImportsOrExports): boolean { - let declarationKind = namedImportsOrExports.kind === SyntaxKind.NamedImports ? + const declarationKind = namedImportsOrExports.kind === SyntaxKind.NamedImports ? SyntaxKind.ImportDeclaration : SyntaxKind.ExportDeclaration; - let importOrExportDeclaration = getAncestor(namedImportsOrExports, declarationKind); - let moduleSpecifier = importOrExportDeclaration.moduleSpecifier; + const importOrExportDeclaration = getAncestor(namedImportsOrExports, declarationKind); + const moduleSpecifier = importOrExportDeclaration.moduleSpecifier; if (!moduleSpecifier) { return false; @@ -3480,7 +3479,7 @@ namespace ts { isNewIdentifierLocation = false; let exports: Symbol[]; - let moduleSpecifierSymbol = typeChecker.getSymbolAtLocation(importOrExportDeclaration.moduleSpecifier); + const moduleSpecifierSymbol = typeChecker.getSymbolAtLocation(importOrExportDeclaration.moduleSpecifier); if (moduleSpecifierSymbol) { exports = typeChecker.getExportsOfModule(moduleSpecifierSymbol); } @@ -3497,9 +3496,9 @@ namespace ts { function tryGetObjectLikeCompletionContainer(contextToken: Node): ObjectLiteralExpression | BindingPattern { if (contextToken) { switch (contextToken.kind) { - case SyntaxKind.OpenBraceToken: // let x = { | - case SyntaxKind.CommaToken: // let x = { a: 0, | - let parent = contextToken.parent; + case SyntaxKind.OpenBraceToken: // const x = { | + case SyntaxKind.CommaToken: // const x = { a: 0, | + const parent = contextToken.parent; if (parent && (parent.kind === SyntaxKind.ObjectLiteralExpression || parent.kind === SyntaxKind.ObjectBindingPattern)) { return parent; } @@ -3532,8 +3531,8 @@ namespace ts { function tryGetContainingJsxElement(contextToken: Node): JsxOpeningLikeElement { if (contextToken) { - let parent = contextToken.parent; - switch(contextToken.kind) { + const parent = contextToken.parent; + switch (contextToken.kind) { case SyntaxKind.LessThanSlashToken: case SyntaxKind.SlashToken: case SyntaxKind.Identifier: @@ -3596,7 +3595,7 @@ namespace ts { * @returns true if we are certain that the currently edited location must define a new location; false otherwise. */ function isSolelyIdentifierDefinitionLocation(contextToken: Node): boolean { - let containingNodeKind = contextToken.parent.kind; + const containingNodeKind = contextToken.parent.kind; switch (contextToken.kind) { case SyntaxKind.CommaToken: return containingNodeKind === SyntaxKind.VariableDeclaration || @@ -3626,13 +3625,13 @@ namespace ts { case SyntaxKind.OpenBraceToken: return containingNodeKind === SyntaxKind.EnumDeclaration || // enum a { | containingNodeKind === SyntaxKind.InterfaceDeclaration || // interface a { | - containingNodeKind === SyntaxKind.TypeLiteral; // let x : { | + containingNodeKind === SyntaxKind.TypeLiteral; // const x : { | case SyntaxKind.SemicolonToken: return containingNodeKind === SyntaxKind.PropertySignature && contextToken.parent && contextToken.parent.parent && (contextToken.parent.parent.kind === SyntaxKind.InterfaceDeclaration || // interface a { f; | - contextToken.parent.parent.kind === SyntaxKind.TypeLiteral); // let x : { a; | + contextToken.parent.parent.kind === SyntaxKind.TypeLiteral); // const x : { a; | case SyntaxKind.LessThanToken: return containingNodeKind === SyntaxKind.ClassDeclaration || // class A< | @@ -3699,7 +3698,7 @@ namespace ts { function isDotOfNumericLiteral(contextToken: Node): boolean { if (contextToken.kind === SyntaxKind.NumericLiteral) { - let text = contextToken.getFullText(); + const text = contextToken.getFullText(); return text.charAt(text.length - 1) === "."; } @@ -3716,15 +3715,15 @@ namespace ts { * do not occur at the current position and have not otherwise been typed. */ function filterNamedImportOrExportCompletionItems(exportsOfModule: Symbol[], namedImportsOrExports: ImportOrExportSpecifier[]): Symbol[] { - let exisingImportsOrExports: Map = {}; + const exisingImportsOrExports: Map = {}; - for (let element of namedImportsOrExports) { + for (const element of namedImportsOrExports) { // If this is the current item we are editing right now, do not filter it out if (element.getStart() <= position && position <= element.getEnd()) { continue; } - let name = element.propertyName || element.name; + const name = element.propertyName || element.name; exisingImportsOrExports[name.text] = true; } @@ -3746,8 +3745,8 @@ namespace ts { return contextualMemberSymbols; } - let existingMemberNames: Map = {}; - for (let m of existingMembers) { + const existingMemberNames: Map = {}; + for (const m of existingMembers) { // Ignore omitted expressions for missing members if (m.kind !== SyntaxKind.PropertyAssignment && m.kind !== SyntaxKind.ShorthandPropertyAssignment && @@ -3766,7 +3765,7 @@ namespace ts { if (m.kind === SyntaxKind.BindingElement && (m).propertyName) { // include only identifiers in completion list if ((m).propertyName.kind === SyntaxKind.Identifier) { - existingName = ((m).propertyName).text + existingName = ((m).propertyName).text; } } else { @@ -3789,8 +3788,8 @@ namespace ts { * do not occur at the current position and have not otherwise been typed. */ function filterJsxAttributes(symbols: Symbol[], attributes: NodeArray): Symbol[] { - let seenNames: Map = {}; - for (let attr of attributes) { + const seenNames: Map = {}; + for (const attr of attributes) { // If this is the current item we are editing right now, do not filter it out if (attr.getStart() <= position && position <= attr.getEnd()) { continue; @@ -3809,21 +3808,21 @@ namespace ts { function getCompletionsAtPosition(fileName: string, position: number): CompletionInfo { synchronizeHostData(); - let completionData = getCompletionData(fileName, position); + const completionData = getCompletionData(fileName, position); if (!completionData) { return undefined; } - let { symbols, isMemberCompletion, isNewIdentifierLocation, location, isRightOfDot, isJsDocTagName } = completionData; + const { symbols, isMemberCompletion, isNewIdentifierLocation, location, isRightOfDot, isJsDocTagName } = completionData; if (isJsDocTagName) { // If the current position is a jsDoc tag name, only tag names should be provided for completion return { isMemberCompletion: false, isNewIdentifierLocation: false, entries: getAllJsDocCompletionEntries() }; } - let sourceFile = getValidSourceFile(fileName); + const sourceFile = getValidSourceFile(fileName); - let entries: CompletionEntry[] = []; + const entries: CompletionEntry[] = []; if (isRightOfDot && isSourceFileJavaScript(sourceFile)) { const uniqueNames = getCompletionEntriesFromSymbols(symbols, entries); @@ -3845,16 +3844,16 @@ namespace ts { return { isMemberCompletion, isNewIdentifierLocation, entries }; function getJavaScriptCompletionEntries(sourceFile: SourceFile, uniqueNames: Map): CompletionEntry[] { - let entries: CompletionEntry[] = []; - let target = program.getCompilerOptions().target; + const entries: CompletionEntry[] = []; + const target = program.getCompilerOptions().target; - let nameTable = getNameTable(sourceFile); - for (let name in nameTable) { + const nameTable = getNameTable(sourceFile); + for (const name in nameTable) { if (!uniqueNames[name]) { uniqueNames[name] = name; - let displayName = getCompletionEntryDisplayName(name, target, /*performCharacterChecks:*/ true); + const displayName = getCompletionEntryDisplayName(name, target, /*performCharacterChecks*/ true); if (displayName) { - let entry = { + const entry = { name: displayName, kind: ScriptElementKind.warning, kindModifiers: "", @@ -3875,7 +3874,7 @@ namespace ts { kind: ScriptElementKind.keyword, kindModifiers: "", sortText: "0", - } + }; })); } @@ -3883,7 +3882,7 @@ namespace ts { // Try to get a valid display name for this symbol, if we could not find one, then ignore it. // We would like to only show things that can be added after a dot, so for instance numeric properties can // not be accessed with a dot (a.1 <- invalid) - let displayName = getCompletionEntryDisplayNameForSymbol(symbol, program.getCompilerOptions().target, /*performCharacterChecks:*/ true, location); + const displayName = getCompletionEntryDisplayNameForSymbol(symbol, program.getCompilerOptions().target, /*performCharacterChecks*/ true, location); if (!displayName) { return undefined; } @@ -3905,13 +3904,13 @@ namespace ts { } function getCompletionEntriesFromSymbols(symbols: Symbol[], entries: CompletionEntry[]): Map { - let start = new Date().getTime(); - let uniqueNames: Map = {}; + const start = new Date().getTime(); + const uniqueNames: Map = {}; if (symbols) { - for (let symbol of symbols) { - let entry = createCompletionEntry(symbol, location); + for (const symbol of symbols) { + const entry = createCompletionEntry(symbol, location); if (entry) { - let id = escapeIdentifier(entry.name); + const id = escapeIdentifier(entry.name); if (!lookUp(uniqueNames, id)) { entries.push(entry); uniqueNames[id] = id; @@ -3929,19 +3928,19 @@ namespace ts { synchronizeHostData(); // Compute all the completion symbols again. - let completionData = getCompletionData(fileName, position); + const completionData = getCompletionData(fileName, position); if (completionData) { - let { symbols, location } = completionData; + const { symbols, location } = completionData; // Find the symbol with the matching entry name. - let target = program.getCompilerOptions().target; + const target = program.getCompilerOptions().target; // We don't need to perform character checks here because we're only comparing the // name against 'entryName' (which is known to be good), not building a new // completion entry. - let symbol = forEach(symbols, s => getCompletionEntryDisplayNameForSymbol(s, target, /*performCharacterChecks:*/ false, location) === entryName ? s : undefined); + const symbol = forEach(symbols, s => getCompletionEntryDisplayNameForSymbol(s, target, /*performCharacterChecks*/ false, location) === entryName ? s : undefined); if (symbol) { - let { displayParts, documentation, symbolKind } = getSymbolDisplayPartsDocumentationAndSymbolKind(symbol, getValidSourceFile(fileName), location, location, SemanticMeaning.All); + const { displayParts, documentation, symbolKind } = getSymbolDisplayPartsDocumentationAndSymbolKind(symbol, getValidSourceFile(fileName), location, location, SemanticMeaning.All); return { name: entryName, kindModifiers: getSymbolModifiers(symbol), @@ -3953,7 +3952,7 @@ namespace ts { } // Didn't find a symbol with this name. See if we can find a keyword instead. - let keywordCompletion = forEach(keywordCompletions, c => c.name === entryName); + const keywordCompletion = forEach(keywordCompletions, c => c.name === entryName); if (keywordCompletion) { return { name: entryName, @@ -3969,7 +3968,7 @@ namespace ts { // TODO(drosen): use contextual SemanticMeaning. function getSymbolKind(symbol: Symbol, location: Node): string { - let flags = symbol.getFlags(); + const flags = symbol.getFlags(); if (flags & SymbolFlags.Class) return getDeclarationOfKind(symbol, SyntaxKind.ClassExpression) ? ScriptElementKind.localClassElement : ScriptElementKind.classElement; @@ -3978,7 +3977,7 @@ namespace ts { if (flags & SymbolFlags.Interface) return ScriptElementKind.interfaceElement; if (flags & SymbolFlags.TypeParameter) return ScriptElementKind.typeParameterElement; - let result = getSymbolKindOfConstructorPropertyMethodAccessorFunctionOrVar(symbol, flags, location); + const result = getSymbolKindOfConstructorPropertyMethodAccessorFunctionOrVar(symbol, flags, location); if (result === ScriptElementKind.unknown) { if (flags & SymbolFlags.TypeParameter) return ScriptElementKind.typeParameterElement; if (flags & SymbolFlags.EnumMember) return ScriptElementKind.variableElement; @@ -3990,7 +3989,7 @@ namespace ts { } function getSymbolKindOfConstructorPropertyMethodAccessorFunctionOrVar(symbol: Symbol, flags: SymbolFlags, location: Node) { - let typeChecker = program.getTypeChecker(); + const typeChecker = program.getTypeChecker(); if (typeChecker.isUndefinedSymbol(symbol)) { return ScriptElementKind.variableElement; @@ -4019,8 +4018,8 @@ namespace ts { if (flags & SymbolFlags.Property) { if (flags & SymbolFlags.SyntheticProperty) { // If union property is result of union of non method (property/accessors/variables), it is labeled as property - let unionPropertyKind = forEach(typeChecker.getRootSymbols(symbol), rootSymbol => { - let rootSymbolFlags = rootSymbol.getFlags(); + const unionPropertyKind = forEach(typeChecker.getRootSymbols(symbol), rootSymbol => { + const rootSymbolFlags = rootSymbol.getFlags(); if (rootSymbolFlags & (SymbolFlags.PropertyOrAccessor | SymbolFlags.Variable)) { return ScriptElementKind.memberVariableElement; } @@ -4028,8 +4027,8 @@ namespace ts { }); if (!unionPropertyKind) { // If this was union of all methods, - //make sure it has call signatures before we can label it as method - let typeOfUnionProperty = typeChecker.getTypeOfSymbolAtLocation(symbol, location); + // make sure it has call signatures before we can label it as method + const typeOfUnionProperty = typeChecker.getTypeOfSymbolAtLocation(symbol, location); if (typeOfUnionProperty.getCallSignatures().length) { return ScriptElementKind.memberFunctionElement; } @@ -4053,11 +4052,11 @@ namespace ts { function getSymbolDisplayPartsDocumentationAndSymbolKind(symbol: Symbol, sourceFile: SourceFile, enclosingDeclaration: Node, location: Node, semanticMeaning = getMeaningFromLocation(location)) { - let typeChecker = program.getTypeChecker(); + const typeChecker = program.getTypeChecker(); - let displayParts: SymbolDisplayPart[] = []; + const displayParts: SymbolDisplayPart[] = []; let documentation: SymbolDisplayPart[]; - let symbolFlags = symbol.flags; + const symbolFlags = symbol.flags; let symbolKind = getSymbolKindOfConstructorPropertyMethodAccessorFunctionOrVar(symbol, symbolFlags, location); let hasAddedSymbolInfo: boolean; let type: Type; @@ -4073,7 +4072,7 @@ namespace ts { type = typeChecker.getTypeOfSymbolAtLocation(symbol, location); if (type) { if (location.parent && location.parent.kind === SyntaxKind.PropertyAccessExpression) { - let right = (location.parent).name; + const right = (location.parent).name; // Either the location is on the right of a property access, or on the left and the right is missing if (right === location || (right && right.getFullWidth() === 0)) { location = location.parent; @@ -4090,15 +4089,15 @@ namespace ts { } if (callExpression) { - let candidateSignatures: Signature[] = []; + const candidateSignatures: Signature[] = []; signature = typeChecker.getResolvedSignature(callExpression, candidateSignatures); if (!signature && candidateSignatures.length) { // Use the first candidate: signature = candidateSignatures[0]; } - let useConstructSignatures = callExpression.kind === SyntaxKind.NewExpression || callExpression.expression.kind === SyntaxKind.SuperKeyword; - let allSignatures = useConstructSignatures ? type.getConstructSignatures() : type.getCallSignatures(); + const useConstructSignatures = callExpression.kind === SyntaxKind.NewExpression || callExpression.expression.kind === SyntaxKind.SuperKeyword; + const allSignatures = useConstructSignatures ? type.getConstructSignatures() : type.getCallSignatures(); if (!contains(allSignatures, signature.target) && !contains(allSignatures, signature)) { // Get the first signature if there is one -- allSignatures may contain @@ -4156,8 +4155,8 @@ namespace ts { else if ((isNameOfFunctionDeclaration(location) && !(symbol.flags & SymbolFlags.Accessor)) || // name of function declaration (location.kind === SyntaxKind.ConstructorKeyword && location.parent.kind === SyntaxKind.Constructor)) { // At constructor keyword of constructor declaration // get the signature from the declaration and write it - let functionDeclaration = location.parent; - let allSignatures = functionDeclaration.kind === SyntaxKind.Constructor ? type.getConstructSignatures() : type.getCallSignatures(); + const functionDeclaration = location.parent; + const allSignatures = functionDeclaration.kind === SyntaxKind.Constructor ? type.getConstructSignatures() : type.getCallSignatures(); if (!typeChecker.isImplementationOfOverload(functionDeclaration)) { signature = typeChecker.getSignatureFromDeclaration(functionDeclaration); } @@ -4226,8 +4225,8 @@ namespace ts { } if (symbolFlags & SymbolFlags.Module) { addNewLineIfDisplayPartsExist(); - let declaration = getDeclarationOfKind(symbol, SyntaxKind.ModuleDeclaration); - let isNamespace = declaration && declaration.name && declaration.name.kind === SyntaxKind.Identifier; + const declaration = getDeclarationOfKind(symbol, SyntaxKind.ModuleDeclaration); + const isNamespace = declaration && declaration.name && declaration.name.kind === SyntaxKind.Identifier; displayParts.push(keywordPart(isNamespace ? SyntaxKind.NamespaceKeyword : SyntaxKind.ModuleKeyword)); displayParts.push(spacePart()); addFullSymbolName(symbol); @@ -4279,9 +4278,9 @@ namespace ts { } if (symbolFlags & SymbolFlags.EnumMember) { addPrefixForAnyFunctionOrVar(symbol, "enum member"); - let declaration = symbol.declarations[0]; + const declaration = symbol.declarations[0]; if (declaration.kind === SyntaxKind.EnumMember) { - let constantValue = typeChecker.getConstantValue(declaration); + const constantValue = typeChecker.getConstantValue(declaration); if (constantValue !== undefined) { displayParts.push(spacePart()); displayParts.push(operatorPart(SyntaxKind.EqualsToken)); @@ -4297,7 +4296,7 @@ namespace ts { addFullSymbolName(symbol); ts.forEach(symbol.declarations, declaration => { if (declaration.kind === SyntaxKind.ImportEqualsDeclaration) { - let importEqualsDeclaration = declaration; + const importEqualsDeclaration = declaration; if (isExternalModuleImportEqualsDeclaration(importEqualsDeclaration)) { displayParts.push(spacePart()); displayParts.push(operatorPart(SyntaxKind.EqualsToken)); @@ -4308,7 +4307,7 @@ namespace ts { displayParts.push(punctuationPart(SyntaxKind.CloseParenToken)); } else { - let internalAliasSymbol = typeChecker.getSymbolAtLocation(importEqualsDeclaration.moduleReference); + const internalAliasSymbol = typeChecker.getSymbolAtLocation(importEqualsDeclaration.moduleReference); if (internalAliasSymbol) { displayParts.push(spacePart()); displayParts.push(operatorPart(SyntaxKind.EqualsToken)); @@ -4332,7 +4331,7 @@ namespace ts { displayParts.push(spacePart()); // If the type is type parameter, format it specially if (type.symbol && type.symbol.flags & SymbolFlags.TypeParameter) { - let typeParameterParts = mapToDisplayParts(writer => { + const typeParameterParts = mapToDisplayParts(writer => { typeChecker.getSymbolDisplayBuilder().buildTypeParameterDisplay(type, writer, enclosingDeclaration); }); addRange(displayParts, typeParameterParts); @@ -4347,7 +4346,7 @@ namespace ts { symbolFlags & SymbolFlags.Signature || symbolFlags & SymbolFlags.Accessor || symbolKind === ScriptElementKind.memberFunctionElement) { - let allSignatures = type.getCallSignatures(); + const allSignatures = type.getCallSignatures(); addSignatureDisplayParts(allSignatures[0], allSignatures); } } @@ -4370,7 +4369,7 @@ namespace ts { } function addFullSymbolName(symbol: Symbol, enclosingDeclaration?: Node) { - let fullSymbolDisplayParts = symbolToDisplayParts(typeChecker, symbol, enclosingDeclaration || sourceFile, /*meaning*/ undefined, + const fullSymbolDisplayParts = symbolToDisplayParts(typeChecker, symbol, enclosingDeclaration || sourceFile, /*meaning*/ undefined, SymbolFormatFlags.WriteTypeParametersOrArguments | SymbolFormatFlags.UseOnlyExternalAliasing); addRange(displayParts, fullSymbolDisplayParts); } @@ -4416,7 +4415,7 @@ namespace ts { } function writeTypeParametersOfSymbol(symbol: Symbol, enclosingDeclaration: Node) { - let typeParameterParts = mapToDisplayParts(writer => { + const typeParameterParts = mapToDisplayParts(writer => { typeChecker.getSymbolDisplayBuilder().buildTypeParameterDisplayFromSymbol(symbol, writer, enclosingDeclaration); }); addRange(displayParts, typeParameterParts); @@ -4426,8 +4425,8 @@ namespace ts { function getQuickInfoAtPosition(fileName: string, position: number): QuickInfo { synchronizeHostData(); - let sourceFile = getValidSourceFile(fileName); - let node = getTouchingPropertyName(sourceFile, position); + const sourceFile = getValidSourceFile(fileName); + const node = getTouchingPropertyName(sourceFile, position); if (!node) { return undefined; } @@ -4436,8 +4435,8 @@ namespace ts { return undefined; } - let typeChecker = program.getTypeChecker(); - let symbol = typeChecker.getSymbolAtLocation(node); + const typeChecker = program.getTypeChecker(); + const symbol = typeChecker.getSymbolAtLocation(node); if (!symbol) { // Try getting just type at this position and show @@ -4449,7 +4448,7 @@ namespace ts { case SyntaxKind.ThisType: case SyntaxKind.SuperKeyword: // For the identifiers/this/super etc get the type at position - let type = typeChecker.getTypeAtLocation(node); + const type = typeChecker.getTypeAtLocation(node); if (type) { return { kind: ScriptElementKind.unknown, @@ -4464,7 +4463,7 @@ namespace ts { return undefined; } - let displayPartsDocumentationsAndKind = getSymbolDisplayPartsDocumentationAndSymbolKind(symbol, sourceFile, getContainerNode(node), node); + const displayPartsDocumentationsAndKind = getSymbolDisplayPartsDocumentationAndSymbolKind(symbol, sourceFile, getContainerNode(node), node); return { kind: displayPartsDocumentationsAndKind.symbolKind, kindModifiers: getSymbolModifiers(symbol), @@ -4486,13 +4485,13 @@ namespace ts { } function getDefinitionFromSymbol(symbol: Symbol, node: Node): DefinitionInfo[] { - let typeChecker = program.getTypeChecker(); - let result: DefinitionInfo[] = []; - let declarations = symbol.getDeclarations(); - let symbolName = typeChecker.symbolToString(symbol); // Do not get scoped name, just the name of the symbol - let symbolKind = getSymbolKind(symbol, node); - let containerSymbol = symbol.parent; - let containerName = containerSymbol ? typeChecker.symbolToString(containerSymbol, node) : ""; + const typeChecker = program.getTypeChecker(); + const result: DefinitionInfo[] = []; + const declarations = symbol.getDeclarations(); + const symbolName = typeChecker.symbolToString(symbol); // Do not get scoped name, just the name of the symbol + const symbolKind = getSymbolKind(symbol, node); + const containerSymbol = symbol.parent; + const containerName = containerSymbol ? typeChecker.symbolToString(containerSymbol, node) : ""; if (!tryAddConstructSignature(symbol, node, symbolKind, symbolName, containerName, result) && !tryAddCallSignature(symbol, node, symbolKind, symbolName, containerName, result)) { @@ -4510,7 +4509,7 @@ namespace ts { if (isNewExpressionTarget(location) || location.kind === SyntaxKind.ConstructorKeyword) { if (symbol.flags & SymbolFlags.Class) { // Find the first class-like declaration and try to get the construct signature. - for (let declaration of symbol.getDeclarations()) { + for (const declaration of symbol.getDeclarations()) { if (isClassLike(declaration)) { return tryAddSignature(declaration.members, /*selectConstructors*/ true, @@ -4535,7 +4534,7 @@ namespace ts { } function tryAddSignature(signatureDeclarations: Declaration[], selectConstructors: boolean, symbolKind: string, symbolName: string, containerName: string, result: DefinitionInfo[]) { - let declarations: Declaration[] = []; + const declarations: Declaration[] = []; let definition: Declaration; forEach(signatureDeclarations, d => { @@ -4563,24 +4562,24 @@ namespace ts { function getDefinitionAtPosition(fileName: string, position: number): DefinitionInfo[] { synchronizeHostData(); - let sourceFile = getValidSourceFile(fileName); + const sourceFile = getValidSourceFile(fileName); - let node = getTouchingPropertyName(sourceFile, position); + const node = getTouchingPropertyName(sourceFile, position); if (!node) { return undefined; } // Labels if (isJumpStatementTarget(node)) { - let labelName = (node).text; - let label = getTargetLabel((node.parent), (node).text); + const labelName = (node).text; + const label = getTargetLabel((node.parent), (node).text); return label ? [createDefinitionInfo(label, ScriptElementKind.label, labelName, /*containerName*/ undefined)] : undefined; } /// Triple slash reference comments - let comment = forEach(sourceFile.referencedFiles, r => (r.pos <= position && position < r.end) ? r : undefined); + const comment = forEach(sourceFile.referencedFiles, r => (r.pos <= position && position < r.end) ? r : undefined); if (comment) { - let referenceFile = tryResolveScriptReference(program, sourceFile, comment); + const referenceFile = tryResolveScriptReference(program, sourceFile, comment); if (referenceFile) { return [{ fileName: referenceFile.fileName, @@ -4594,7 +4593,7 @@ namespace ts { return undefined; } - let typeChecker = program.getTypeChecker(); + const typeChecker = program.getTypeChecker(); let symbol = typeChecker.getSymbolAtLocation(node); // Could not find a symbol e.g. node is string or number keyword, @@ -4608,7 +4607,7 @@ namespace ts { // import {A, B} from "mod"; // to jump to the implementation directly. if (symbol.flags & SymbolFlags.Alias) { - let declaration = symbol.declarations[0]; + const declaration = symbol.declarations[0]; if (node.kind === SyntaxKind.Identifier && node.parent === declaration) { symbol = typeChecker.getAliasedSymbol(symbol); } @@ -4620,15 +4619,15 @@ namespace ts { // is performed at the location of property access, we would like to go to definition of the property in the short-hand // assignment. This case and others are handled by the following code. if (node.parent.kind === SyntaxKind.ShorthandPropertyAssignment) { - let shorthandSymbol = typeChecker.getShorthandAssignmentValueSymbol(symbol.valueDeclaration); + const shorthandSymbol = typeChecker.getShorthandAssignmentValueSymbol(symbol.valueDeclaration); if (!shorthandSymbol) { return []; } - let shorthandDeclarations = shorthandSymbol.getDeclarations(); - let shorthandSymbolKind = getSymbolKind(shorthandSymbol, node); - let shorthandSymbolName = typeChecker.symbolToString(shorthandSymbol); - let shorthandContainerName = typeChecker.symbolToString(symbol.parent, node); + const shorthandDeclarations = shorthandSymbol.getDeclarations(); + const shorthandSymbolKind = getSymbolKind(shorthandSymbol, node); + const shorthandSymbolName = typeChecker.symbolToString(shorthandSymbol); + const shorthandContainerName = typeChecker.symbolToString(symbol.parent, node); return map(shorthandDeclarations, declaration => createDefinitionInfo(declaration, shorthandSymbolKind, shorthandSymbolName, shorthandContainerName)); } @@ -4640,27 +4639,27 @@ namespace ts { function getTypeDefinitionAtPosition(fileName: string, position: number): DefinitionInfo[] { synchronizeHostData(); - let sourceFile = getValidSourceFile(fileName); + const sourceFile = getValidSourceFile(fileName); - let node = getTouchingPropertyName(sourceFile, position); + const node = getTouchingPropertyName(sourceFile, position); if (!node) { return undefined; } - let typeChecker = program.getTypeChecker(); + const typeChecker = program.getTypeChecker(); - let symbol = typeChecker.getSymbolAtLocation(node); + const symbol = typeChecker.getSymbolAtLocation(node); if (!symbol) { return undefined; } - let type = typeChecker.getTypeOfSymbolAtLocation(symbol, node); + const type = typeChecker.getTypeOfSymbolAtLocation(symbol, node); if (!type) { return undefined; } if (type.flags & TypeFlags.Union) { - let result: DefinitionInfo[] = []; + const result: DefinitionInfo[] = []; forEach((type).types, t => { if (t.symbol) { addRange(/*to*/ result, /*from*/ getDefinitionFromSymbol(t.symbol, node)); @@ -4680,7 +4679,7 @@ namespace ts { let results = getOccurrencesAtPositionCore(fileName, position); if (results) { - let sourceFile = getCanonicalFileName(normalizeSlashes(fileName)); + const sourceFile = getCanonicalFileName(normalizeSlashes(fileName)); // Get occurrences only supports reporting occurrences for the file queried. So // filter down to that list. @@ -4694,10 +4693,10 @@ namespace ts { synchronizeHostData(); filesToSearch = map(filesToSearch, normalizeSlashes); - let sourceFilesToSearch = filter(program.getSourceFiles(), f => contains(filesToSearch, f.fileName)); - let sourceFile = getValidSourceFile(fileName); + const sourceFilesToSearch = filter(program.getSourceFiles(), f => contains(filesToSearch, f.fileName)); + const sourceFile = getValidSourceFile(fileName); - let node = getTouchingWord(sourceFile, position); + const node = getTouchingWord(sourceFile, position); if (!node) { return undefined; } @@ -4705,8 +4704,8 @@ namespace ts { return getSemanticDocumentHighlights(node) || getSyntacticDocumentHighlights(node); function getHighlightSpanForNode(node: Node): HighlightSpan { - let start = node.getStart(); - let end = node.getEnd(); + const start = node.getStart(); + const end = node.getEnd(); return { fileName: sourceFile.fileName, @@ -4723,7 +4722,7 @@ namespace ts { isLiteralNameOfPropertyDeclarationOrIndexAccess(node) || isNameOfExternalModuleImportOrDeclaration(node)) { - let referencedSymbols = getReferencedSymbolsForNode(node, sourceFilesToSearch, /*findInStrings:*/ false, /*findInComments:*/ false); + const referencedSymbols = getReferencedSymbolsForNode(node, sourceFilesToSearch, /*findInStrings*/ false, /*findInComments*/ false); return convertReferencedSymbols(referencedSymbols); } @@ -4734,11 +4733,11 @@ namespace ts { return undefined; } - let fileNameToDocumentHighlights: Map = {}; - let result: DocumentHighlights[] = []; - for (let referencedSymbol of referencedSymbols) { - for (let referenceEntry of referencedSymbol.references) { - let fileName = referenceEntry.fileName; + const fileNameToDocumentHighlights: Map = {}; + const result: DocumentHighlights[] = []; + for (const referencedSymbol of referencedSymbols) { + for (const referenceEntry of referencedSymbol.references) { + const fileName = referenceEntry.fileName; let documentHighlights = getProperty(fileNameToDocumentHighlights, fileName); if (!documentHighlights) { documentHighlights = { fileName, highlightSpans: [] }; @@ -4759,9 +4758,9 @@ namespace ts { } function getSyntacticDocumentHighlights(node: Node): DocumentHighlights[] { - let fileName = sourceFile.fileName; + const fileName = sourceFile.fileName; - let highlightSpans = getHighlightSpans(node); + const highlightSpans = getHighlightSpans(node); if (!highlightSpans || highlightSpans.length === 0) { return undefined; } @@ -4865,7 +4864,7 @@ namespace ts { * into function boundaries and try-blocks with catch-clauses. */ function aggregateOwnedThrowStatements(node: Node): ThrowStatement[] { - let statementAccumulator: ThrowStatement[] = [] + const statementAccumulator: ThrowStatement[] = []; aggregate(node); return statementAccumulator; @@ -4874,7 +4873,7 @@ namespace ts { statementAccumulator.push(node); } else if (node.kind === SyntaxKind.TryStatement) { - let tryStatement = node; + const tryStatement = node; if (tryStatement.catchClause) { aggregate(tryStatement.catchClause); @@ -4905,7 +4904,7 @@ namespace ts { let child: Node = throwStatement; while (child.parent) { - let parent = child.parent; + const parent = child.parent; if (isFunctionBlock(parent) || parent.kind === SyntaxKind.SourceFile) { return parent; @@ -4914,7 +4913,7 @@ namespace ts { // A throw-statement is only owned by a try-statement if the try-statement has // a catch clause, and if the throw-statement occurs within the try block. if (parent.kind === SyntaxKind.TryStatement) { - let tryStatement = parent; + const tryStatement = parent; if (tryStatement.tryBlock === child && tryStatement.catchClause) { return child; @@ -4928,7 +4927,7 @@ namespace ts { } function aggregateAllBreakAndContinueStatements(node: Node): BreakOrContinueStatement[] { - let statementAccumulator: BreakOrContinueStatement[] = [] + const statementAccumulator: BreakOrContinueStatement[] = []; aggregate(node); return statementAccumulator; @@ -4944,7 +4943,7 @@ namespace ts { } function ownsBreakOrContinueStatement(owner: Node, statement: BreakOrContinueStatement): boolean { - let actualOwner = getBreakOrContinueOwner(statement); + const actualOwner = getBreakOrContinueOwner(statement); return actualOwner && actualOwner === owner; } @@ -4979,7 +4978,7 @@ namespace ts { } function getModifierOccurrences(modifier: SyntaxKind, declaration: Node): HighlightSpan[] { - let container = declaration.parent; + const container = declaration.parent; // Make sure we only highlight the keyword when it makes sense to do so. if (isAccessibilityModifier(modifier)) { @@ -5009,8 +5008,8 @@ namespace ts { return undefined; } - let keywords: Node[] = []; - let modifierFlag: NodeFlags = getFlagFromModifier(modifier); + const keywords: Node[] = []; + const modifierFlag: NodeFlags = getFlagFromModifier(modifier); let nodes: Node[]; switch (container.kind) { @@ -5035,7 +5034,7 @@ namespace ts { // If we're an accessibility modifier, we're in an instance member and should search // the constructor's parameter list for instance members as well. if (modifierFlag & NodeFlags.AccessibilityModifier) { - let constructor = forEach((container).members, member => { + const constructor = forEach((container).members, member => { return member.kind === SyntaxKind.Constructor && member; }); @@ -5048,7 +5047,7 @@ namespace ts { } break; default: - Debug.fail("Invalid container kind.") + Debug.fail("Invalid container kind."); } forEach(nodes, node => { @@ -5091,7 +5090,7 @@ namespace ts { } function getGetAndSetOccurrences(accessorDeclaration: AccessorDeclaration): HighlightSpan[] { - let keywords: Node[] = []; + const keywords: Node[] = []; tryPushAccessorKeyword(accessorDeclaration.symbol, SyntaxKind.GetAccessor); tryPushAccessorKeyword(accessorDeclaration.symbol, SyntaxKind.SetAccessor); @@ -5099,7 +5098,7 @@ namespace ts { return map(keywords, getHighlightSpanForNode); function tryPushAccessorKeyword(accessorSymbol: Symbol, accessorKind: SyntaxKind): void { - let accessor = getDeclarationOfKind(accessorSymbol, accessorKind); + const accessor = getDeclarationOfKind(accessorSymbol, accessorKind); if (accessor) { forEach(accessor.getChildren(), child => pushKeywordIf(keywords, child, SyntaxKind.GetKeyword, SyntaxKind.SetKeyword)); @@ -5108,9 +5107,9 @@ namespace ts { } function getConstructorOccurrences(constructorDeclaration: ConstructorDeclaration): HighlightSpan[] { - let declarations = constructorDeclaration.symbol.getDeclarations() + const declarations = constructorDeclaration.symbol.getDeclarations(); - let keywords: Node[] = []; + const keywords: Node[] = []; forEach(declarations, declaration => { forEach(declaration.getChildren(), token => { @@ -5122,12 +5121,12 @@ namespace ts { } function getLoopBreakContinueOccurrences(loopNode: IterationStatement): HighlightSpan[] { - let keywords: Node[] = []; + const keywords: Node[] = []; if (pushKeywordIf(keywords, loopNode.getFirstToken(), SyntaxKind.ForKeyword, SyntaxKind.WhileKeyword, SyntaxKind.DoKeyword)) { // If we succeeded and got a do-while loop, then start looking for a 'while' keyword. if (loopNode.kind === SyntaxKind.DoStatement) { - let loopTokens = loopNode.getChildren(); + const loopTokens = loopNode.getChildren(); for (let i = loopTokens.length - 1; i >= 0; i--) { if (pushKeywordIf(keywords, loopTokens[i], SyntaxKind.WhileKeyword)) { @@ -5137,7 +5136,7 @@ namespace ts { } } - let breaksAndContinues = aggregateAllBreakAndContinueStatements(loopNode.statement); + const breaksAndContinues = aggregateAllBreakAndContinueStatements(loopNode.statement); forEach(breaksAndContinues, statement => { if (ownsBreakOrContinueStatement(loopNode, statement)) { @@ -5149,7 +5148,7 @@ namespace ts { } function getBreakOrContinueStatementOccurrences(breakOrContinueStatement: BreakOrContinueStatement): HighlightSpan[] { - let owner = getBreakOrContinueOwner(breakOrContinueStatement); + const owner = getBreakOrContinueOwner(breakOrContinueStatement); if (owner) { switch (owner.kind) { @@ -5158,7 +5157,7 @@ namespace ts { case SyntaxKind.ForOfStatement: case SyntaxKind.DoStatement: case SyntaxKind.WhileStatement: - return getLoopBreakContinueOccurrences(owner) + return getLoopBreakContinueOccurrences(owner); case SyntaxKind.SwitchStatement: return getSwitchCaseDefaultOccurrences(owner); @@ -5169,7 +5168,7 @@ namespace ts { } function getSwitchCaseDefaultOccurrences(switchStatement: SwitchStatement): HighlightSpan[] { - let keywords: Node[] = []; + const keywords: Node[] = []; pushKeywordIf(keywords, switchStatement.getFirstToken(), SyntaxKind.SwitchKeyword); @@ -5177,7 +5176,7 @@ namespace ts { forEach(switchStatement.caseBlock.clauses, clause => { pushKeywordIf(keywords, clause.getFirstToken(), SyntaxKind.CaseKeyword, SyntaxKind.DefaultKeyword); - let breaksAndContinues = aggregateAllBreakAndContinueStatements(clause); + const breaksAndContinues = aggregateAllBreakAndContinueStatements(clause); forEach(breaksAndContinues, statement => { if (ownsBreakOrContinueStatement(switchStatement, statement)) { @@ -5190,7 +5189,7 @@ namespace ts { } function getTryCatchFinallyOccurrences(tryStatement: TryStatement): HighlightSpan[] { - let keywords: Node[] = []; + const keywords: Node[] = []; pushKeywordIf(keywords, tryStatement.getFirstToken(), SyntaxKind.TryKeyword); @@ -5199,7 +5198,7 @@ namespace ts { } if (tryStatement.finallyBlock) { - let finallyKeyword = findChildOfKind(tryStatement, SyntaxKind.FinallyKeyword, sourceFile); + const finallyKeyword = findChildOfKind(tryStatement, SyntaxKind.FinallyKeyword, sourceFile); pushKeywordIf(keywords, finallyKeyword, SyntaxKind.FinallyKeyword); } @@ -5207,13 +5206,13 @@ namespace ts { } function getThrowOccurrences(throwStatement: ThrowStatement): HighlightSpan[] { - let owner = getThrowStatementOwner(throwStatement); + const owner = getThrowStatementOwner(throwStatement); if (!owner) { return undefined; } - let keywords: Node[] = []; + const keywords: Node[] = []; forEach(aggregateOwnedThrowStatements(owner), throwStatement => { pushKeywordIf(keywords, throwStatement.getFirstToken(), SyntaxKind.ThrowKeyword); @@ -5231,14 +5230,14 @@ namespace ts { } function getReturnOccurrences(returnStatement: ReturnStatement): HighlightSpan[] { - let func = getContainingFunction(returnStatement); + const func = getContainingFunction(returnStatement); // If we didn't find a containing function with a block body, bail out. if (!(func && hasKind(func.body, SyntaxKind.Block))) { return undefined; } - let keywords: Node[] = [] + const keywords: Node[] = []; forEachReturnStatement(func.body, returnStatement => { pushKeywordIf(keywords, returnStatement.getFirstToken(), SyntaxKind.ReturnKeyword); }); @@ -5252,7 +5251,7 @@ namespace ts { } function getIfElseOccurrences(ifStatement: IfStatement): HighlightSpan[] { - let keywords: Node[] = []; + const keywords: Node[] = []; // Traverse upwards through all parent if-statements linked by their else-branches. while (hasKind(ifStatement.parent, SyntaxKind.IfStatement) && (ifStatement.parent).elseStatement === ifStatement) { @@ -5261,7 +5260,7 @@ namespace ts { // Now traverse back down through the else branches, aggregating if/else keywords of if-statements. while (ifStatement) { - let children = ifStatement.getChildren(); + const children = ifStatement.getChildren(); pushKeywordIf(keywords, children[0], SyntaxKind.IfKeyword); // Generally the 'else' keyword is second-to-last, so we traverse backwards. @@ -5272,20 +5271,20 @@ namespace ts { } if (!hasKind(ifStatement.elseStatement, SyntaxKind.IfStatement)) { - break + break; } ifStatement = ifStatement.elseStatement; } - let result: HighlightSpan[] = []; + const result: HighlightSpan[] = []; // We'd like to highlight else/ifs together if they are only separated by whitespace // (i.e. the keywords are separated by no comments, no newlines). for (let i = 0; i < keywords.length; i++) { if (keywords[i].kind === SyntaxKind.ElseKeyword && i < keywords.length - 1) { - let elseKeyword = keywords[i]; - let ifKeyword = keywords[i + 1]; // this *should* always be an 'if' keyword. + const elseKeyword = keywords[i]; + const ifKeyword = keywords[i + 1]; // this *should* always be an 'if' keyword. let shouldCombindElseAndIf = true; @@ -5328,9 +5327,9 @@ namespace ts { return undefined; } - let result: ReferenceEntry[] = []; - for (let entry of documentHighlights) { - for (let highlightSpan of entry.highlightSpans) { + const result: ReferenceEntry[] = []; + for (const entry of documentHighlights) { + for (const highlightSpan of entry.highlightSpans) { result.push({ fileName: entry.fileName, textSpan: highlightSpan.textSpan, @@ -5348,9 +5347,9 @@ namespace ts { return undefined; } - let referenceEntries: ReferenceEntry[] = []; + const referenceEntries: ReferenceEntry[] = []; - for (let referenceSymbol of referenceSymbols) { + for (const referenceSymbol of referenceSymbols) { addRange(referenceEntries, referenceSymbol.references); } @@ -5358,17 +5357,17 @@ namespace ts { } function findRenameLocations(fileName: string, position: number, findInStrings: boolean, findInComments: boolean): RenameLocation[] { - let referencedSymbols = findReferencedSymbols(fileName, position, findInStrings, findInComments); + const referencedSymbols = findReferencedSymbols(fileName, position, findInStrings, findInComments); return convertReferences(referencedSymbols); } function getReferencesAtPosition(fileName: string, position: number): ReferenceEntry[] { - let referencedSymbols = findReferencedSymbols(fileName, position, /*findInStrings:*/ false, /*findInComments:*/ false); + const referencedSymbols = findReferencedSymbols(fileName, position, /*findInStrings*/ false, /*findInComments*/ false); return convertReferences(referencedSymbols); } - function findReferences(fileName: string, position: number): ReferencedSymbol[]{ - let referencedSymbols = findReferencedSymbols(fileName, position, /*findInStrings:*/ false, /*findInComments:*/ false); + function findReferences(fileName: string, position: number): ReferencedSymbol[] { + const referencedSymbols = findReferencedSymbols(fileName, position, /*findInStrings*/ false, /*findInComments*/ false); // Only include referenced symbols that have a valid definition. return filter(referencedSymbols, rs => !!rs.definition); @@ -5377,17 +5376,17 @@ namespace ts { function findReferencedSymbols(fileName: string, position: number, findInStrings: boolean, findInComments: boolean): ReferencedSymbol[] { synchronizeHostData(); - let sourceFile = getValidSourceFile(fileName); + const sourceFile = getValidSourceFile(fileName); - let node = getTouchingPropertyName(sourceFile, position); + const node = getTouchingPropertyName(sourceFile, position); if (!node) { return undefined; } if (node.kind !== SyntaxKind.Identifier && // TODO (drosen): This should be enabled in a later release - currently breaks rename. - //node.kind !== SyntaxKind.ThisKeyword && - //node.kind !== SyntaxKind.SuperKeyword && + // node.kind !== SyntaxKind.ThisKeyword && + // node.kind !== SyntaxKind.SuperKeyword && !isLiteralNameOfPropertyDeclarationOrIndexAccess(node) && !isNameOfExternalModuleImportOrDeclaration(node)) { return undefined; @@ -5398,12 +5397,12 @@ namespace ts { } function getReferencedSymbolsForNode(node: Node, sourceFiles: SourceFile[], findInStrings: boolean, findInComments: boolean): ReferencedSymbol[] { - let typeChecker = program.getTypeChecker(); + const typeChecker = program.getTypeChecker(); // Labels if (isLabelName(node)) { if (isJumpStatementTarget(node)) { - let labelDefinition = getTargetLabel((node.parent), (node).text); + const labelDefinition = getTargetLabel((node.parent), (node).text); // if we have a label definition, look within its statement for references, if not, then // the label is undefined and we have no results.. return labelDefinition ? getLabelReferencesInNode(labelDefinition.parent, labelDefinition) : undefined; @@ -5422,7 +5421,7 @@ namespace ts { return getReferencesForSuperKeyword(node); } - let symbol = typeChecker.getSymbolAtLocation(node); + const symbol = typeChecker.getSymbolAtLocation(node); // Could not find a symbol e.g. unknown identifier if (!symbol) { @@ -5430,7 +5429,7 @@ namespace ts { return undefined; } - let declarations = symbol.declarations; + const declarations = symbol.declarations; // The symbol was an internal symbol and does not have a declaration e.g. undefined symbol if (!declarations || !declarations.length) { @@ -5440,29 +5439,29 @@ namespace ts { let result: ReferencedSymbol[]; // Compute the meaning from the location and the symbol it references - let searchMeaning = getIntersectingMeaningFromDeclarations(getMeaningFromLocation(node), declarations); + const searchMeaning = getIntersectingMeaningFromDeclarations(getMeaningFromLocation(node), declarations); // Get the text to search for. // Note: if this is an external module symbol, the name doesn't include quotes. - let declaredName = stripQuotes(getDeclaredName(typeChecker, symbol, node)); + const declaredName = stripQuotes(getDeclaredName(typeChecker, symbol, node)); // Try to get the smallest valid scope that we can limit our search to; // otherwise we'll need to search globally (i.e. include each file). - let scope = getSymbolScope(symbol); + const scope = getSymbolScope(symbol); // Maps from a symbol ID to the ReferencedSymbol entry in 'result'. - let symbolToIndex: number[] = []; + const symbolToIndex: number[] = []; if (scope) { result = []; getReferencesInNode(scope, symbol, declaredName, node, searchMeaning, findInStrings, findInComments, result, symbolToIndex); } else { - let internedName = getInternedName(symbol, node, declarations) - for (let sourceFile of sourceFiles) { + const internedName = getInternedName(symbol, node, declarations); + for (const sourceFile of sourceFiles) { cancellationToken.throwIfCancellationRequested(); - let nameTable = getNameTable(sourceFile); + const nameTable = getNameTable(sourceFile); if (lookUp(nameTable, internedName)) { result = result || []; @@ -5474,9 +5473,9 @@ namespace ts { return result; function getDefinition(symbol: Symbol): DefinitionInfo { - let info = getSymbolDisplayPartsDocumentationAndSymbolKind(symbol, node.getSourceFile(), getContainerNode(node), node); - let name = map(info.displayParts, p => p.text).join(""); - let declarations = symbol.declarations; + const info = getSymbolDisplayPartsDocumentationAndSymbolKind(symbol, node.getSourceFile(), getContainerNode(node), node); + const name = map(info.displayParts, p => p.text).join(""); + const declarations = symbol.declarations; if (!declarations || declarations.length === 0) { return undefined; } @@ -5506,7 +5505,7 @@ namespace ts { // Try to get the local symbol if we're dealing with an 'export default' // since that symbol has the "true" name. - let localExportDefaultSymbol = getLocalSymbolForExportDefault(symbol); + const localExportDefaultSymbol = getLocalSymbolForExportDefault(symbol); symbol = localExportDefaultSymbol || symbol; return stripQuotes(symbol.name); @@ -5523,14 +5522,14 @@ namespace ts { function getSymbolScope(symbol: Symbol): Node { // If this is the symbol of a named function expression or named class expression, // then named references are limited to its own scope. - let valueDeclaration = symbol.valueDeclaration; + const valueDeclaration = symbol.valueDeclaration; if (valueDeclaration && (valueDeclaration.kind === SyntaxKind.FunctionExpression || valueDeclaration.kind === SyntaxKind.ClassExpression)) { return valueDeclaration; } // If this is private property or method, the scope is the containing class if (symbol.flags & (SymbolFlags.Property | SymbolFlags.Method)) { - let privateDeclaration = forEach(symbol.getDeclarations(), d => (d.flags & NodeFlags.Private) ? d : undefined); + const privateDeclaration = forEach(symbol.getDeclarations(), d => (d.flags & NodeFlags.Private) ? d : undefined); if (privateDeclaration) { return getAncestor(privateDeclaration, SyntaxKind.ClassDeclaration); } @@ -5548,12 +5547,12 @@ namespace ts { return undefined; } - let scope: Node = undefined; + let scope: Node; - let declarations = symbol.getDeclarations(); + const declarations = symbol.getDeclarations(); if (declarations) { - for (let declaration of declarations) { - let container = getContainerNode(declaration); + for (const declaration of declarations) { + const container = getContainerNode(declaration); if (!container) { return undefined; @@ -5579,7 +5578,7 @@ namespace ts { } function getPossibleSymbolReferencePositions(sourceFile: SourceFile, symbolName: string, start: number, end: number): number[] { - let positions: number[] = []; + const positions: number[] = []; /// TODO: Cache symbol existence for files to save text search // Also, need to make this work for unicode escapes. @@ -5589,9 +5588,9 @@ namespace ts { return positions; } - let text = sourceFile.text; - let sourceLength = text.length; - let symbolNameLength = symbolName.length; + const text = sourceFile.text; + const sourceLength = text.length; + const symbolNameLength = symbolName.length; let position = text.indexOf(symbolName, start); while (position >= 0) { @@ -5602,7 +5601,7 @@ namespace ts { // We found a match. Make sure it's not part of a larger word (i.e. the char // before and after it have to be a non-identifier char). - let endPosition = position + symbolNameLength; + const endPosition = position + symbolNameLength; if ((position === 0 || !isIdentifierPart(text.charCodeAt(position - 1), ScriptTarget.Latest)) && (endPosition === sourceLength || !isIdentifierPart(text.charCodeAt(endPosition), ScriptTarget.Latest))) { @@ -5616,14 +5615,14 @@ namespace ts { } function getLabelReferencesInNode(container: Node, targetLabel: Identifier): ReferencedSymbol[] { - let references: ReferenceEntry[] = []; - let sourceFile = container.getSourceFile(); - let labelName = targetLabel.text; - let possiblePositions = getPossibleSymbolReferencePositions(sourceFile, labelName, container.getStart(), container.getEnd()); + const references: ReferenceEntry[] = []; + const sourceFile = container.getSourceFile(); + const labelName = targetLabel.text; + const possiblePositions = getPossibleSymbolReferencePositions(sourceFile, labelName, container.getStart(), container.getEnd()); forEach(possiblePositions, position => { cancellationToken.throwIfCancellationRequested(); - let node = getTouchingWord(sourceFile, position); + const node = getTouchingWord(sourceFile, position); if (!node || node.getWidth() !== labelName.length) { return; } @@ -5635,14 +5634,14 @@ namespace ts { } }); - let definition: DefinitionInfo = { + const definition: DefinitionInfo = { containerKind: "", containerName: "", fileName: targetLabel.getSourceFile().fileName, kind: ScriptElementKind.label, name: labelName, textSpan: createTextSpanFromBounds(targetLabel.getStart(), targetLabel.getEnd()) - } + }; return [{ definition, references }]; } @@ -5687,19 +5686,19 @@ namespace ts { result: ReferencedSymbol[], symbolToIndex: number[]): void { - let sourceFile = container.getSourceFile(); - let tripleSlashDirectivePrefixRegex = /^\/\/\/\s* { cancellationToken.throwIfCancellationRequested(); - let referenceLocation = getTouchingPropertyName(sourceFile, position); + const referenceLocation = getTouchingPropertyName(sourceFile, position); if (!isValidReferencePosition(referenceLocation, searchText)) { // This wasn't the start of a token. Check to see if it might be a // match in a comment or string if that's what the caller is asking @@ -5727,14 +5726,14 @@ namespace ts { return; } - let referenceSymbol = typeChecker.getSymbolAtLocation(referenceLocation); + const referenceSymbol = typeChecker.getSymbolAtLocation(referenceLocation); if (referenceSymbol) { - let referenceSymbolDeclaration = referenceSymbol.valueDeclaration; - let shorthandValueSymbol = typeChecker.getShorthandAssignmentValueSymbol(referenceSymbolDeclaration); - let relatedSymbol = getRelatedSymbol(searchSymbols, referenceSymbol, referenceLocation); + const referenceSymbolDeclaration = referenceSymbol.valueDeclaration; + const shorthandValueSymbol = typeChecker.getShorthandAssignmentValueSymbol(referenceSymbolDeclaration); + const relatedSymbol = getRelatedSymbol(searchSymbols, referenceSymbol, referenceLocation); if (relatedSymbol) { - let referencedSymbol = getReferencedSymbol(relatedSymbol); + const referencedSymbol = getReferencedSymbol(relatedSymbol); referencedSymbol.references.push(getReferenceEntryFromNode(referenceLocation)); } /* Because in short-hand property assignment, an identifier which stored as name of the short-hand property assignment @@ -5744,7 +5743,7 @@ namespace ts { * position of property accessing, the referenceEntry of such position will be handled in the first case. */ else if (!(referenceSymbol.flags & SymbolFlags.Transient) && searchSymbols.indexOf(shorthandValueSymbol) >= 0) { - let referencedSymbol = getReferencedSymbol(shorthandValueSymbol); + const referencedSymbol = getReferencedSymbol(shorthandValueSymbol); referencedSymbol.references.push(getReferenceEntryFromNode(referenceSymbolDeclaration.name)); } } @@ -5754,7 +5753,7 @@ namespace ts { return; function getReferencedSymbol(symbol: Symbol): ReferencedSymbol { - let symbolId = getSymbolId(symbol); + const symbolId = getSymbolId(symbol); let index = symbolToIndex[symbolId]; if (index === undefined) { index = result.length; @@ -5773,7 +5772,7 @@ namespace ts { return isInCommentHelper(sourceFile, position, isNonReferenceComment); function isNonReferenceComment(c: CommentRange): boolean { - let commentText = sourceFile.text.substring(c.pos, c.end); + const commentText = sourceFile.text.substring(c.pos, c.end); return !tripleSlashDirectivePrefixRegex.test(commentText); } } @@ -5802,20 +5801,20 @@ namespace ts { return undefined; } - let references: ReferenceEntry[] = []; + const references: ReferenceEntry[] = []; - let sourceFile = searchSpaceNode.getSourceFile(); - let possiblePositions = getPossibleSymbolReferencePositions(sourceFile, "super", searchSpaceNode.getStart(), searchSpaceNode.getEnd()); + const sourceFile = searchSpaceNode.getSourceFile(); + const possiblePositions = getPossibleSymbolReferencePositions(sourceFile, "super", searchSpaceNode.getStart(), searchSpaceNode.getEnd()); forEach(possiblePositions, position => { cancellationToken.throwIfCancellationRequested(); - let node = getTouchingWord(sourceFile, position); + const node = getTouchingWord(sourceFile, position); if (!node || node.kind !== SyntaxKind.SuperKeyword) { return; } - let container = getSuperContainer(node, /*includeFunctions*/ false); + const container = getSuperContainer(node, /*includeFunctions*/ false); // If we have a 'super' container, we must have an enclosing class. // Now make sure the owning class is the same as the search-space @@ -5825,7 +5824,7 @@ namespace ts { } }); - let definition = getDefinition(searchSpaceNode.symbol); + const definition = getDefinition(searchSpaceNode.symbol); return [{ definition, references }]; } @@ -5847,7 +5846,7 @@ namespace ts { case SyntaxKind.Constructor: case SyntaxKind.GetAccessor: case SyntaxKind.SetAccessor: - staticFlag &= searchSpaceNode.flags + staticFlag &= searchSpaceNode.flags; searchSpaceNode = searchSpaceNode.parent; // re-assign to be the owning class break; case SyntaxKind.SourceFile: @@ -5864,7 +5863,7 @@ namespace ts { return undefined; } - let references: ReferenceEntry[] = []; + const references: ReferenceEntry[] = []; let possiblePositions: number[]; if (searchSpaceNode.kind === SyntaxKind.SourceFile) { @@ -5874,7 +5873,7 @@ namespace ts { }); } else { - let sourceFile = searchSpaceNode.getSourceFile(); + const sourceFile = searchSpaceNode.getSourceFile(); possiblePositions = getPossibleSymbolReferencePositions(sourceFile, "this", searchSpaceNode.getStart(), searchSpaceNode.getEnd()); getThisReferencesInFile(sourceFile, searchSpaceNode, possiblePositions, references); } @@ -5895,12 +5894,12 @@ namespace ts { forEach(possiblePositions, position => { cancellationToken.throwIfCancellationRequested(); - let node = getTouchingWord(sourceFile, position); + const node = getTouchingWord(sourceFile, position); if (!node || (node.kind !== SyntaxKind.ThisKeyword && node.kind !== SyntaxKind.ThisType)) { return; } - let container = getThisContainer(node, /* includeArrowFunctions */ false); + const container = getThisContainer(node, /* includeArrowFunctions */ false); switch (searchSpaceNode.kind) { case SyntaxKind.FunctionExpression: @@ -5955,13 +5954,13 @@ namespace ts { * property name and variable declaration of the identifier. * Like in below example, when querying for all references for an identifier 'name', of the property assignment, the language service * should show both 'name' in 'obj' and 'name' in variable declaration - * let name = "Foo"; - * let obj = { name }; + * const name = "Foo"; + * const obj = { name }; * In order to do that, we will populate the search set with the value symbol of the identifier as a value of the property assignment * so that when matching with potential reference symbol, both symbols from property declaration and variable declaration * will be included correctly. */ - let shorthandValueSymbol = typeChecker.getShorthandAssignmentValueSymbol(location.parent); + const shorthandValueSymbol = typeChecker.getShorthandAssignmentValueSymbol(location.parent); if (shorthandValueSymbol) { result.push(shorthandValueSymbol); } @@ -6008,9 +6007,9 @@ namespace ts { function getPropertySymbolFromTypeReference(typeReference: ExpressionWithTypeArguments) { if (typeReference) { - let type = typeChecker.getTypeAtLocation(typeReference); + const type = typeChecker.getTypeAtLocation(typeReference); if (type) { - let propertySymbol = typeChecker.getPropertyOfType(type, propertyName); + const propertySymbol = typeChecker.getPropertyOfType(type, propertyName); if (propertySymbol) { result.push(propertySymbol); } @@ -6030,7 +6029,7 @@ namespace ts { // If the reference symbol is an alias, check if what it is aliasing is one of the search // symbols. if (isImportOrExportSpecifierImportSymbol(referenceSymbol)) { - let aliasedSymbol = typeChecker.getAliasedSymbol(referenceSymbol); + const aliasedSymbol = typeChecker.getAliasedSymbol(referenceSymbol); if (searchSymbols.indexOf(aliasedSymbol) >= 0) { return aliasedSymbol; } @@ -6056,7 +6055,7 @@ namespace ts { // Finally, try all properties with the same name in any type the containing type extended or implemented, and // see if any is in the list if (rootSymbol.parent && rootSymbol.parent.flags & (SymbolFlags.Class | SymbolFlags.Interface)) { - let result: Symbol[] = []; + const result: Symbol[] = []; getPropertySymbolsFromBaseTypes(rootSymbol.parent, rootSymbol.getName(), result); return forEach(result, s => searchSymbols.indexOf(s) >= 0 ? s : undefined); } @@ -6067,21 +6066,21 @@ namespace ts { function getPropertySymbolsFromContextualType(node: Node): Symbol[] { if (isNameOfPropertyAssignment(node)) { - let objectLiteral = node.parent.parent; - let contextualType = typeChecker.getContextualType(objectLiteral); - let name = (node).text; + const objectLiteral = node.parent.parent; + const contextualType = typeChecker.getContextualType(objectLiteral); + const name = (node).text; if (contextualType) { if (contextualType.flags & TypeFlags.Union) { // This is a union type, first see if the property we are looking for is a union property (i.e. exists in all types) // if not, search the constituent types for the property - let unionProperty = contextualType.getProperty(name) + const unionProperty = contextualType.getProperty(name); if (unionProperty) { return [unionProperty]; } else { - let result: Symbol[] = []; + const result: Symbol[] = []; forEach((contextualType).types, t => { - let symbol = t.getProperty(name); + const symbol = t.getProperty(name); if (symbol) { result.push(symbol); } @@ -6090,7 +6089,7 @@ namespace ts { } } else { - let symbol = contextualType.getProperty(name); + const symbol = contextualType.getProperty(name); if (symbol) { return [symbol]; } @@ -6119,8 +6118,8 @@ namespace ts { // Remember the last meaning lastIterationMeaning = meaning; - for (let declaration of declarations) { - let declarationMeaning = getMeaningFromDeclaration(declaration); + for (const declaration of declarations) { + const declarationMeaning = getMeaningFromDeclaration(declaration); if (declarationMeaning & meaning) { meaning |= declarationMeaning; @@ -6155,13 +6154,13 @@ namespace ts { return true; } - let parent = node.parent; + const parent = node.parent; if (parent) { if (parent.kind === SyntaxKind.PostfixUnaryExpression || parent.kind === SyntaxKind.PrefixUnaryExpression) { return true; } else if (parent.kind === SyntaxKind.BinaryExpression && (parent).left === node) { - let operator = (parent).operatorToken.kind; + const operator = (parent).operatorToken.kind; return SyntaxKind.FirstAssignment <= operator && operator <= SyntaxKind.LastAssignment; } } @@ -6183,8 +6182,8 @@ namespace ts { function getEmitOutput(fileName: string): EmitOutput { synchronizeHostData(); - let sourceFile = getValidSourceFile(fileName); - let outputFiles: OutputFile[] = []; + const sourceFile = getValidSourceFile(fileName); + const outputFiles: OutputFile[] = []; function writeFile(fileName: string, data: string, writeByteOrderMark: boolean) { outputFiles.push({ @@ -6194,7 +6193,7 @@ namespace ts { }); } - let emitOutput = program.emit(sourceFile, writeFile, cancellationToken); + const emitOutput = program.emit(sourceFile, writeFile, cancellationToken); return { outputFiles, @@ -6287,7 +6286,7 @@ namespace ts { } if (!isLastClause && root.parent.kind === SyntaxKind.ExpressionWithTypeArguments && root.parent.parent.kind === SyntaxKind.HeritageClause) { - let decl = root.parent.parent.parent; + const decl = root.parent.parent.parent; return (decl.kind === SyntaxKind.ClassDeclaration && (root.parent.parent).token === SyntaxKind.ImplementsKeyword) || (decl.kind === SyntaxKind.InterfaceDeclaration && (root.parent.parent).token === SyntaxKind.ExtendsKeyword); } @@ -6359,7 +6358,7 @@ namespace ts { function getSignatureHelpItems(fileName: string, position: number): SignatureHelpItems { synchronizeHostData(); - let sourceFile = getValidSourceFile(fileName); + const sourceFile = getValidSourceFile(fileName); return SignatureHelp.getSignatureHelpItems(program, sourceFile, position, cancellationToken); } @@ -6370,10 +6369,10 @@ namespace ts { } function getNameOrDottedNameSpan(fileName: string, startPos: number, endPos: number): TextSpan { - let sourceFile = syntaxTreeCache.getCurrentSourceFile(fileName); + const sourceFile = syntaxTreeCache.getCurrentSourceFile(fileName); // Get node at the location - let node = getTouchingPropertyName(sourceFile, startPos); + const node = getTouchingPropertyName(sourceFile, startPos); if (!node) { return; @@ -6429,13 +6428,13 @@ namespace ts { function getBreakpointStatementAtPosition(fileName: string, position: number) { // doesn't use compiler - no need to synchronize with host - let sourceFile = syntaxTreeCache.getCurrentSourceFile(fileName); + const sourceFile = syntaxTreeCache.getCurrentSourceFile(fileName); return BreakpointResolver.spanInSourceFileAtLocation(sourceFile, position); } function getNavigationBarItems(fileName: string): NavigationBarItem[] { - let sourceFile = syntaxTreeCache.getCurrentSourceFile(fileName); + const sourceFile = syntaxTreeCache.getCurrentSourceFile(fileName); return NavigationBar.getNavigationBarItems(sourceFile, host.getCompilationSettings()); } @@ -6467,11 +6466,11 @@ namespace ts { function getEncodedSemanticClassifications(fileName: string, span: TextSpan): Classifications { synchronizeHostData(); - let sourceFile = getValidSourceFile(fileName); - let typeChecker = program.getTypeChecker(); + const sourceFile = getValidSourceFile(fileName); + const typeChecker = program.getTypeChecker(); - let result: number[] = []; - let classifiableNames = program.getClassifiableNames(); + const result: number[] = []; + const classifiableNames = program.getClassifiableNames(); processNode(sourceFile); return { spans: result, endOfLineState: EndOfLineState.None }; @@ -6483,7 +6482,7 @@ namespace ts { } function classifySymbol(symbol: Symbol, meaningAtPosition: SemanticMeaning): ClassificationType { - let flags = symbol.getFlags(); + const flags = symbol.getFlags(); if ((flags & SymbolFlags.Classifiable) === SymbolFlags.None) { return; } @@ -6531,19 +6530,19 @@ namespace ts { function processNode(node: Node) { // Only walk into nodes that intersect the requested span. if (node && textSpanIntersectsWith(span, node.getFullStart(), node.getFullWidth())) { - let kind = node.kind; + const kind = node.kind; checkForClassificationCancellation(kind); if (kind === SyntaxKind.Identifier && !nodeIsMissing(node)) { - let identifier = node; + const identifier = node; // Only bother calling into the typechecker if this is an identifier that // could possibly resolve to a type name. This makes classification run // in a third of the time it would normally take. if (classifiableNames[identifier.text]) { - let symbol = typeChecker.getSymbolAtLocation(node); + const symbol = typeChecker.getSymbolAtLocation(node); if (symbol) { - let type = classifySymbol(symbol, getMeaningFromLocation(node)); + const type = classifySymbol(symbol, getMeaningFromLocation(node)); if (type) { pushClassification(node.getStart(), node.getWidth(), type); } @@ -6583,8 +6582,8 @@ namespace ts { function convertClassifications(classifications: Classifications): ClassifiedSpan[] { Debug.assert(classifications.spans.length % 3 === 0); - let dense = classifications.spans; - let result: ClassifiedSpan[] = []; + const dense = classifications.spans; + const result: ClassifiedSpan[] = []; for (let i = 0, n = dense.length; i < n; i += 3) { result.push({ textSpan: createTextSpan(dense[i], dense[i + 1]), @@ -6601,15 +6600,15 @@ namespace ts { function getEncodedSyntacticClassifications(fileName: string, span: TextSpan): Classifications { // doesn't use compiler - no need to synchronize with host - let sourceFile = syntaxTreeCache.getCurrentSourceFile(fileName); - let spanStart = span.start; - let spanLength = span.length; + const sourceFile = syntaxTreeCache.getCurrentSourceFile(fileName); + const spanStart = span.start; + const spanLength = span.length; // Make a scanner we can get trivia from. - let triviaScanner = createScanner(ScriptTarget.Latest, /*skipTrivia:*/ false, sourceFile.languageVariant, sourceFile.text); - let mergeConflictScanner = createScanner(ScriptTarget.Latest, /*skipTrivia:*/ false, sourceFile.languageVariant, sourceFile.text); + const triviaScanner = createScanner(ScriptTarget.Latest, /*skipTrivia*/ false, sourceFile.languageVariant, sourceFile.text); + const mergeConflictScanner = createScanner(ScriptTarget.Latest, /*skipTrivia*/ false, sourceFile.languageVariant, sourceFile.text); - let result: number[] = []; + const result: number[] = []; processElement(sourceFile); return { spans: result, endOfLineState: EndOfLineState.None }; @@ -6623,15 +6622,15 @@ namespace ts { function classifyLeadingTriviaAndGetTokenStart(token: Node): number { triviaScanner.setTextPos(token.pos); while (true) { - let start = triviaScanner.getTextPos(); + const start = triviaScanner.getTextPos(); // only bother scanning if we have something that could be trivia. if (!couldStartTrivia(sourceFile.text, start)) { return start; } - let kind = triviaScanner.scan(); - let end = triviaScanner.getTextPos(); - let width = end - start; + const kind = triviaScanner.scan(); + const end = triviaScanner.getTextPos(); + const width = end - start; // The moment we get something that isn't trivia, then stop processing. if (!isTrivia(kind)) { @@ -6655,8 +6654,8 @@ namespace ts { } if (kind === SyntaxKind.ConflictMarkerTrivia) { - let text = sourceFile.text; - let ch = text.charCodeAt(start); + const text = sourceFile.text; + const ch = text.charCodeAt(start); // for the <<<<<<< and >>>>>>> markers, we just add them in as comments // in the classification stream. @@ -6677,7 +6676,7 @@ namespace ts { if (kind === SyntaxKind.MultiLineCommentTrivia) { // See if this is a doc comment. If so, we'll classify certain portions of it // specially. - let docCommentAndDiagnostics = parseIsolatedJSDocComment(sourceFile.text, start, width); + const docCommentAndDiagnostics = parseIsolatedJSDocComment(sourceFile.text, start, width); if (docCommentAndDiagnostics && docCommentAndDiagnostics.jsDocComment) { docCommentAndDiagnostics.jsDocComment.parent = token; classifyJSDocComment(docCommentAndDiagnostics.jsDocComment); @@ -6696,7 +6695,7 @@ namespace ts { function classifyJSDocComment(docComment: JSDocComment) { let pos = docComment.pos; - for (let tag of docComment.tags) { + for (const tag of docComment.tags) { // As we walk through each tag, classify the portion of text from the end of // the last tag (or the start of the entire doc comment) as 'comment'. if (tag.pos !== pos) { @@ -6754,7 +6753,7 @@ namespace ts { } function processJSDocTemplateTag(tag: JSDocTemplateTag) { - for (let child of tag.getChildren()) { + for (const child of tag.getChildren()) { processElement(child); } } @@ -6776,11 +6775,11 @@ namespace ts { } function classifyDisabledCodeToken() { - let start = mergeConflictScanner.getTextPos(); - let tokenKind = mergeConflictScanner.scan(); - let end = mergeConflictScanner.getTextPos(); + const start = mergeConflictScanner.getTextPos(); + const tokenKind = mergeConflictScanner.scan(); + const end = mergeConflictScanner.getTextPos(); - let type = classifyTokenType(tokenKind); + const type = classifyTokenType(tokenKind); if (type) { pushClassification(start, end - start, type); } @@ -6791,12 +6790,12 @@ namespace ts { return; } - let tokenStart = classifyLeadingTriviaAndGetTokenStart(token); + const tokenStart = classifyLeadingTriviaAndGetTokenStart(token); - let tokenWidth = token.end - tokenStart; + const tokenWidth = token.end - tokenStart; Debug.assert(tokenWidth >= 0); if (tokenWidth > 0) { - let type = classifyTokenType(token.kind, token); + const type = classifyTokenType(token.kind, token); if (type) { pushClassification(tokenStart, tokenWidth, type); } @@ -6923,9 +6922,9 @@ namespace ts { if (decodedTextSpanIntersectsWith(spanStart, spanLength, element.pos, element.getFullWidth())) { checkForClassificationCancellation(element.kind); - let children = element.getChildren(sourceFile); + const children = element.getChildren(sourceFile); for (let i = 0, n = children.length; i < n; i++) { - let child = children[i]; + const child = children[i]; if (isToken(child)) { classifyToken(child); } @@ -6940,28 +6939,28 @@ namespace ts { function getOutliningSpans(fileName: string): OutliningSpan[] { // doesn't use compiler - no need to synchronize with host - let sourceFile = syntaxTreeCache.getCurrentSourceFile(fileName); + const sourceFile = syntaxTreeCache.getCurrentSourceFile(fileName); return OutliningElementsCollector.collectElements(sourceFile); } function getBraceMatchingAtPosition(fileName: string, position: number) { - let sourceFile = syntaxTreeCache.getCurrentSourceFile(fileName); - let result: TextSpan[] = []; + const sourceFile = syntaxTreeCache.getCurrentSourceFile(fileName); + const result: TextSpan[] = []; - let token = getTouchingToken(sourceFile, position); + const token = getTouchingToken(sourceFile, position); if (token.getStart(sourceFile) === position) { - let matchKind = getMatchingTokenKind(token); + const matchKind = getMatchingTokenKind(token); // Ensure that there is a corresponding token to match ours. if (matchKind) { - let parentElement = token.parent; + const parentElement = token.parent; - let childNodes = parentElement.getChildren(sourceFile); - for (let current of childNodes) { + const childNodes = parentElement.getChildren(sourceFile); + for (const current of childNodes) { if (current.kind === matchKind) { - let range1 = createTextSpan(token.getStart(sourceFile), token.getWidth(sourceFile)); - let range2 = createTextSpan(current.getStart(sourceFile), current.getWidth(sourceFile)); + const range1 = createTextSpan(token.getStart(sourceFile), token.getWidth(sourceFile)); + const range2 = createTextSpan(current.getStart(sourceFile), current.getWidth(sourceFile)); // We want to order the braces when we return the result. if (range1.start < range2.start) { @@ -6981,11 +6980,11 @@ namespace ts { function getMatchingTokenKind(token: Node): ts.SyntaxKind { switch (token.kind) { - case ts.SyntaxKind.OpenBraceToken: return ts.SyntaxKind.CloseBraceToken + case ts.SyntaxKind.OpenBraceToken: return ts.SyntaxKind.CloseBraceToken; case ts.SyntaxKind.OpenParenToken: return ts.SyntaxKind.CloseParenToken; case ts.SyntaxKind.OpenBracketToken: return ts.SyntaxKind.CloseBracketToken; case ts.SyntaxKind.LessThanToken: return ts.SyntaxKind.GreaterThanToken; - case ts.SyntaxKind.CloseBraceToken: return ts.SyntaxKind.OpenBraceToken + case ts.SyntaxKind.CloseBraceToken: return ts.SyntaxKind.OpenBraceToken; case ts.SyntaxKind.CloseParenToken: return ts.SyntaxKind.OpenParenToken; case ts.SyntaxKind.CloseBracketToken: return ts.SyntaxKind.OpenBracketToken; case ts.SyntaxKind.GreaterThanToken: return ts.SyntaxKind.LessThanToken; @@ -6997,29 +6996,29 @@ namespace ts { function getIndentationAtPosition(fileName: string, position: number, editorOptions: EditorOptions) { let start = new Date().getTime(); - let sourceFile = syntaxTreeCache.getCurrentSourceFile(fileName); + const sourceFile = syntaxTreeCache.getCurrentSourceFile(fileName); log("getIndentationAtPosition: getCurrentSourceFile: " + (new Date().getTime() - start)); start = new Date().getTime(); - let result = formatting.SmartIndenter.getIndentation(position, sourceFile, editorOptions); + const result = formatting.SmartIndenter.getIndentation(position, sourceFile, editorOptions); log("getIndentationAtPosition: computeIndentation : " + (new Date().getTime() - start)); return result; } function getFormattingEditsForRange(fileName: string, start: number, end: number, options: FormatCodeOptions): TextChange[] { - let sourceFile = syntaxTreeCache.getCurrentSourceFile(fileName); + const sourceFile = syntaxTreeCache.getCurrentSourceFile(fileName); return formatting.formatSelection(start, end, sourceFile, getRuleProvider(options), options); } function getFormattingEditsForDocument(fileName: string, options: FormatCodeOptions): TextChange[] { - let sourceFile = syntaxTreeCache.getCurrentSourceFile(fileName); + const sourceFile = syntaxTreeCache.getCurrentSourceFile(fileName); return formatting.formatDocument(sourceFile, getRuleProvider(options), options); } function getFormattingEditsAfterKeystroke(fileName: string, position: number, key: string, options: FormatCodeOptions): TextChange[] { - let sourceFile = syntaxTreeCache.getCurrentSourceFile(fileName); + const sourceFile = syntaxTreeCache.getCurrentSourceFile(fileName); if (key === "}") { return formatting.formatOnClosingCurly(position, sourceFile, getRuleProvider(options), options); @@ -7055,16 +7054,16 @@ namespace ts { * be performed. */ function getDocCommentTemplateAtPosition(fileName: string, position: number): TextInsertion { - let start = new Date().getTime(); - let sourceFile = syntaxTreeCache.getCurrentSourceFile(fileName); + const start = new Date().getTime(); + const sourceFile = syntaxTreeCache.getCurrentSourceFile(fileName); // Check if in a context where we don't want to perform any insertion if (isInString(sourceFile, position) || isInComment(sourceFile, position) || hasDocComment(sourceFile, position)) { return undefined; } - let tokenAtPos = getTokenAtPosition(sourceFile, position); - let tokenStart = tokenAtPos.getStart() + const tokenAtPos = getTokenAtPosition(sourceFile, position); + const tokenStart = tokenAtPos.getStart(); if (!tokenAtPos || tokenStart < position) { return undefined; } @@ -7100,11 +7099,11 @@ namespace ts { return undefined; } - let parameters = getParametersForJsDocOwningNode(commentOwner); - let posLineAndChar = sourceFile.getLineAndCharacterOfPosition(position); - let lineStart = sourceFile.getLineStarts()[posLineAndChar.line]; + const parameters = getParametersForJsDocOwningNode(commentOwner); + const posLineAndChar = sourceFile.getLineAndCharacterOfPosition(position); + const lineStart = sourceFile.getLineStarts()[posLineAndChar.line]; - let indentationStr = sourceFile.text.substr(lineStart, posLineAndChar.character); + const indentationStr = sourceFile.text.substr(lineStart, posLineAndChar.character); // TODO: call a helper method instead once PR #4133 gets merged in. const newLine = host.getNewLine ? host.getNewLine() : "\r\n"; @@ -7128,7 +7127,7 @@ namespace ts { // * if the caret was directly in front of the object, then we add an extra line and indentation. const preamble = "/**" + newLine + indentationStr + " * "; - let result = + const result = preamble + newLine + docParams + indentationStr + " */" + @@ -7172,7 +7171,7 @@ namespace ts { case SyntaxKind.ArrowFunction: return (rightHandSide).parameters; case SyntaxKind.ClassExpression: - for (let member of (rightHandSide).members) { + for (const member of (rightHandSide).members) { if (member.kind === SyntaxKind.Constructor) { return (member).parameters; } @@ -7192,15 +7191,15 @@ namespace ts { // anything away. synchronizeHostData(); - let sourceFile = getValidSourceFile(fileName); + const sourceFile = getValidSourceFile(fileName); cancellationToken.throwIfCancellationRequested(); - let fileContents = sourceFile.text; - let result: TodoComment[] = []; + const fileContents = sourceFile.text; + const result: TodoComment[] = []; if (descriptors.length > 0) { - let regExp = getTodoCommentsRegExp(); + const regExp = getTodoCommentsRegExp(); let matchArray: RegExpExecArray; while (matchArray = regExp.exec(fileContents)) { @@ -7223,15 +7222,15 @@ namespace ts { // // i.e. 'undefined' in position 3 above means TODO(jason) didn't match. // "hack" in position 4 means HACK did match. - let firstDescriptorCaptureIndex = 3; + const firstDescriptorCaptureIndex = 3; Debug.assert(matchArray.length === descriptors.length + firstDescriptorCaptureIndex); - let preamble = matchArray[1]; - let matchPosition = matchArray.index + preamble.length; + const preamble = matchArray[1]; + const matchPosition = matchArray.index + preamble.length; // OK, we have found a match in the file. This is only an acceptable match if // it is contained within a comment. - let token = getTokenAtPosition(sourceFile, matchPosition); + const token = getTokenAtPosition(sourceFile, matchPosition); if (!isInsideComment(sourceFile, token, matchPosition)) { continue; } @@ -7250,7 +7249,7 @@ namespace ts { continue; } - let message = matchArray[2]; + const message = matchArray[2]; result.push({ descriptor: descriptor, message: message, @@ -7281,14 +7280,14 @@ namespace ts { // // The following three regexps are used to match the start of the text up to the TODO // comment portion. - let singleLineCommentStart = /(?:\/\/+\s*)/.source; - let multiLineCommentStart = /(?:\/\*+\s*)/.source; - let anyNumberOfSpacesAndAsterixesAtStartOfLine = /(?:^(?:\s|\*)*)/.source; + const singleLineCommentStart = /(?:\/\/+\s*)/.source; + const multiLineCommentStart = /(?:\/\*+\s*)/.source; + const anyNumberOfSpacesAndAsterixesAtStartOfLine = /(?:^(?:\s|\*)*)/.source; // Match any of the above three TODO comment start regexps. // Note that the outermost group *is* a capture group. We want to capture the preamble // so that we can determine the starting position of the TODO comment match. - let preamble = "(" + anyNumberOfSpacesAndAsterixesAtStartOfLine + "|" + singleLineCommentStart + "|" + multiLineCommentStart + ")"; + const preamble = "(" + anyNumberOfSpacesAndAsterixesAtStartOfLine + "|" + singleLineCommentStart + "|" + multiLineCommentStart + ")"; // Takes the descriptors and forms a regexp that matches them as if they were literals. // For example, if the descriptors are "TODO(jason)" and "HACK", then this will be: @@ -7298,17 +7297,17 @@ namespace ts { // Note that the outermost group is *not* a capture group, but the innermost groups // *are* capture groups. By capturing the inner literals we can determine after // matching which descriptor we are dealing with. - let literals = "(?:" + map(descriptors, d => "(" + escapeRegExp(d.text) + ")").join("|") + ")"; + const literals = "(?:" + map(descriptors, d => "(" + escapeRegExp(d.text) + ")").join("|") + ")"; // After matching a descriptor literal, the following regexp matches the rest of the // text up to the end of the line (or */). - let endOfLineOrEndOfComment = /(?:$|\*\/)/.source - let messageRemainder = /(?:.*?)/.source + const endOfLineOrEndOfComment = /(?:$|\*\/)/.source; + const messageRemainder = /(?:.*?)/.source; // This is the portion of the match we'll return as part of the TODO comment result. We // match the literal portion up to the end of the line or end of comment. - let messagePortion = "(" + literals + messageRemainder + ")"; - let regExpString = preamble + messagePortion + endOfLineOrEndOfComment; + const messagePortion = "(" + literals + messageRemainder + ")"; + const regExpString = preamble + messagePortion + endOfLineOrEndOfComment; // The final regexp will look like this: // /((?:\/\/+\s*)|(?:\/\*+\s*)|(?:^(?:\s|\*)*))((?:(TODO\(jason\))|(HACK))(?:.*?))(?:$|\*\/)/gim @@ -7334,40 +7333,40 @@ namespace ts { function getRenameInfo(fileName: string, position: number): RenameInfo { synchronizeHostData(); - let sourceFile = getValidSourceFile(fileName); - let typeChecker = program.getTypeChecker(); + const sourceFile = getValidSourceFile(fileName); + const typeChecker = program.getTypeChecker(); - let node = getTouchingWord(sourceFile, position); + const node = getTouchingWord(sourceFile, position); // Can only rename an identifier. if (node && node.kind === SyntaxKind.Identifier) { - let symbol = typeChecker.getSymbolAtLocation(node); + const symbol = typeChecker.getSymbolAtLocation(node); // Only allow a symbol to be renamed if it actually has at least one declaration. if (symbol) { - let declarations = symbol.getDeclarations(); + const declarations = symbol.getDeclarations(); if (declarations && declarations.length > 0) { // Disallow rename for elements that are defined in the standard TypeScript library. - let defaultLibFileName = host.getDefaultLibFileName(host.getCompilationSettings()); + const defaultLibFileName = host.getDefaultLibFileName(host.getCompilationSettings()); if (defaultLibFileName) { - for (let current of declarations) { - let sourceFile = current.getSourceFile(); - var canonicalName = getCanonicalFileName(ts.normalizePath(sourceFile.fileName)); + for (const current of declarations) { + const sourceFile = current.getSourceFile(); + const canonicalName = getCanonicalFileName(ts.normalizePath(sourceFile.fileName)); if (sourceFile && getCanonicalFileName(ts.normalizePath(sourceFile.fileName)) === getCanonicalFileName(ts.normalizePath(defaultLibFileName))) { return getRenameInfoError(getLocaleSpecificMessage(Diagnostics.You_cannot_rename_elements_that_are_defined_in_the_standard_TypeScript_library)); } } } - let displayName = stripQuotes(getDeclaredName(typeChecker, symbol, node)); - let kind = getSymbolKind(symbol, node); + const displayName = stripQuotes(getDeclaredName(typeChecker, symbol, node)); + const kind = getSymbolKind(symbol, node); if (kind) { return { canRename: true, - localizedErrorMessage: undefined, + kind, displayName, + localizedErrorMessage: undefined, fullDisplayName: typeChecker.getFullyQualifiedName(symbol), - kind: kind, kindModifiers: getSymbolModifiers(symbol), triggerSpan: createTextSpan(node.getStart(), node.getWidth()) }; @@ -7434,14 +7433,14 @@ namespace ts { /* @internal */ export function getNameTable(sourceFile: SourceFile): Map { if (!sourceFile.nameTable) { - initializeNameTable(sourceFile) + initializeNameTable(sourceFile); } return sourceFile.nameTable; } function initializeNameTable(sourceFile: SourceFile): void { - let nameTable: Map = {}; + const nameTable: Map = {}; walk(sourceFile); sourceFile.nameTable = nameTable; @@ -7479,13 +7478,13 @@ namespace ts { /// Classifier export function createClassifier(): Classifier { - let scanner = createScanner(ScriptTarget.Latest, /*skipTrivia*/ false); + const scanner = createScanner(ScriptTarget.Latest, /*skipTrivia*/ false); /// We do not have a full parser support to know when we should parse a regex or not /// If we consider every slash token to be a regex, we could be missing cases like "1/2/3", where /// we have a series of divide operator. this list allows us to be more accurate by ruling out /// locations where a regexp cannot exist. - let noRegexTable: boolean[] = []; + const noRegexTable: boolean[] = []; noRegexTable[SyntaxKind.Identifier] = true; noRegexTable[SyntaxKind.StringLiteral] = true; noRegexTable[SyntaxKind.NumericLiteral] = true; @@ -7519,7 +7518,7 @@ namespace ts { // // Where on the second line, you will get the 'return' keyword, // a string literal, and a template end consisting of '} } `'. - let templateStack: SyntaxKind[] = []; + const templateStack: SyntaxKind[] = []; /** Returns true if 'keyword2' can legally follow 'keyword1' in any language construct. */ function canFollow(keyword1: SyntaxKind, keyword2: SyntaxKind) { @@ -7545,18 +7544,18 @@ namespace ts { } function convertClassifications(classifications: Classifications, text: string): ClassificationResult { - let entries: ClassificationInfo[] = []; - let dense = classifications.spans; + const entries: ClassificationInfo[] = []; + const dense = classifications.spans; let lastEnd = 0; for (let i = 0, n = dense.length; i < n; i += 3) { - let start = dense[i]; - let length = dense[i + 1]; - let type = dense[i + 2]; + const start = dense[i]; + const length = dense[i + 1]; + const type = dense[i + 2]; // Make a whitespace entry between the last item and this one. if (lastEnd >= 0) { - let whitespaceLength = start - lastEnd; + const whitespaceLength = start - lastEnd; if (whitespaceLength > 0) { entries.push({ length: whitespaceLength, classification: TokenClass.Whitespace }); } @@ -7566,7 +7565,7 @@ namespace ts { lastEnd = start + length; } - let whitespaceLength = text.length - lastEnd; + const whitespaceLength = text.length - lastEnd; if (whitespaceLength > 0) { entries.push({ length: whitespaceLength, classification: TokenClass.Whitespace }); } @@ -7620,7 +7619,7 @@ namespace ts { // (and a newline). That way when we lex we'll think we're still in a multiline comment. switch (lexState) { case EndOfLineState.InDoubleQuoteStringLiteral: - text = '"\\\n' + text; + text = "\"\\\n" + text; offset = 3; break; case EndOfLineState.InSingleQuoteStringLiteral: @@ -7646,7 +7645,7 @@ namespace ts { scanner.setText(text); - let result: Classifications = { + const result: Classifications = { endOfLineState: EndOfLineState.None, spans: [] }; @@ -7728,7 +7727,7 @@ namespace ts { // If we don't have anything on the template stack, // then we aren't trying to keep track of a previously scanned template head. if (templateStack.length > 0) { - let lastTemplateStackToken = lastOrUndefined(templateStack); + const lastTemplateStackToken = lastOrUndefined(templateStack); if (lastTemplateStackToken === SyntaxKind.TemplateHead) { token = scanner.reScanTemplateToken(); @@ -7758,17 +7757,17 @@ namespace ts { return result; function processToken(): void { - let start = scanner.getTokenPos(); - let end = scanner.getTextPos(); + const start = scanner.getTokenPos(); + const end = scanner.getTextPos(); addResult(start, end, classFromKind(token)); if (end >= text.length) { if (token === SyntaxKind.StringLiteral || token === SyntaxKind.StringLiteralType) { // Check to see if we finished up on a multiline string literal. - let tokenText = scanner.getTokenText(); + const tokenText = scanner.getTokenText(); if (scanner.isUnterminated()) { - let lastCharIndex = tokenText.length - 1; + const lastCharIndex = tokenText.length - 1; let numBackslashes = 0; while (tokenText.charCodeAt(lastCharIndex - numBackslashes) === CharacterCodes.backslash) { @@ -7777,7 +7776,7 @@ namespace ts { // If we have an odd number of backslashes, then the multiline string is unclosed if (numBackslashes & 1) { - let quoteChar = tokenText.charCodeAt(0); + const quoteChar = tokenText.charCodeAt(0); result.endOfLineState = quoteChar === CharacterCodes.doubleQuote ? EndOfLineState.InDoubleQuoteStringLiteral : EndOfLineState.InSingleQuoteStringLiteral; @@ -7826,7 +7825,7 @@ namespace ts { // relative to the original text. start -= offset; end -= offset; - let length = end - start; + const length = end - start; if (length > 0) { result.spans.push(start); @@ -7941,7 +7940,7 @@ namespace ts { } /// getDefaultLibraryFilePath - declare let __dirname: string; + declare const __dirname: string; /** * Get the path of the default library files (lib.d.ts) as distributed with the typescript From c0b0bebaa79d055bf23bde9e2a4c4eb5c7c97766 Mon Sep 17 00:00:00 2001 From: Yui T Date: Mon, 14 Dec 2015 14:04:14 -0800 Subject: [PATCH 124/177] Fix linting issue --- Jakefile.js | 3 +- src/services/services.ts | 1071 +++++++++++++++++++------------------- 2 files changed, 537 insertions(+), 537 deletions(-) diff --git a/Jakefile.js b/Jakefile.js index beb16d2886f..91bd805a27b 100644 --- a/Jakefile.js +++ b/Jakefile.js @@ -924,7 +924,8 @@ function lintFileAsync(options, path, cb) { var lintTargets = compilerSources .concat(harnessCoreSources) .concat(serverCoreSources) - .concat(scriptSources); + .concat(scriptSources) + .concat([path.join(servicesDirectory,"services.ts")]); desc("Runs tslint on the compiler sources"); task("lint", ["build-rules"], function() { diff --git a/src/services/services.ts b/src/services/services.ts index 8e2e4913edd..4109a4eb345 100644 --- a/src/services/services.ts +++ b/src/services/services.ts @@ -12,7 +12,7 @@ namespace ts { /** The version of the language service API */ - export let servicesVersion = "0.4" + export const servicesVersion = "0.4"; export interface Node { getSourceFile(): SourceFile; @@ -48,7 +48,7 @@ namespace ts { getConstructSignatures(): Signature[]; getStringIndexType(): Type; getNumberIndexType(): Type; - getBaseTypes(): ObjectType[] + getBaseTypes(): ObjectType[]; } export interface Signature { @@ -97,7 +97,7 @@ namespace ts { dispose?(): void; } - export module ScriptSnapshot { + export namespace ScriptSnapshot { class StringScriptSnapshot implements IScriptSnapshot { constructor(private text: string) { @@ -126,12 +126,12 @@ namespace ts { referencedFiles: FileReference[]; importedFiles: FileReference[]; ambientExternalModules: string[]; - isLibFile: boolean + isLibFile: boolean; } - let scanner: Scanner = createScanner(ScriptTarget.Latest, /*skipTrivia*/ true); + const scanner: Scanner = createScanner(ScriptTarget.Latest, /*skipTrivia*/ true); - let emptyArray: any[] = []; + const emptyArray: any[] = []; const jsDocTagNames = [ "augments", @@ -174,7 +174,7 @@ namespace ts { let jsDocCompletionEntries: CompletionEntry[]; function createNode(kind: SyntaxKind, pos: number, end: number, flags: NodeFlags, parent?: Node): NodeObject { - let node = new NodeObject(kind, pos, end); + const node = new NodeObject(kind, pos, end); node.flags = flags; node.parent = parent; return node; @@ -235,8 +235,8 @@ namespace ts { private addSyntheticNodes(nodes: Node[], pos: number, end: number): number { scanner.setTextPos(pos); while (pos < end) { - let token = scanner.scan(); - let textPos = scanner.getTextPos(); + const token = scanner.scan(); + const textPos = scanner.getTextPos(); nodes.push(createNode(token, pos, textPos, NodeFlags.Synthetic, this)); pos = textPos; } @@ -244,13 +244,11 @@ namespace ts { } private createSyntaxList(nodes: NodeArray): Node { - let list = createNode(SyntaxKind.SyntaxList, nodes.pos, nodes.end, NodeFlags.Synthetic, this); + const list = createNode(SyntaxKind.SyntaxList, nodes.pos, nodes.end, NodeFlags.Synthetic, this); list._children = []; let pos = nodes.pos; - - - for (let node of nodes) { + for (const node of nodes) { if (pos < node.pos) { pos = this.addSyntheticNodes(list._children, pos, node.pos); } @@ -269,14 +267,14 @@ namespace ts { scanner.setText((sourceFile || this.getSourceFile()).text); children = []; let pos = this.pos; - let processNode = (node: Node) => { + const processNode = (node: Node) => { if (pos < node.pos) { pos = this.addSyntheticNodes(children, pos, node.pos); } children.push(node); pos = node.end; }; - let processNodes = (nodes: NodeArray) => { + const processNodes = (nodes: NodeArray) => { if (pos < nodes.pos) { pos = this.addSyntheticNodes(children, pos, nodes.pos); } @@ -308,20 +306,20 @@ namespace ts { } public getFirstToken(sourceFile?: SourceFile): Node { - let children = this.getChildren(sourceFile); + const children = this.getChildren(sourceFile); if (!children.length) { return undefined; } - let child = children[0]; + const child = children[0]; return child.kind < SyntaxKind.FirstNode ? child : child.getFirstToken(sourceFile); } public getLastToken(sourceFile?: SourceFile): Node { - let children = this.getChildren(sourceFile); + const children = this.getChildren(sourceFile); - let child = lastOrUndefined(children); + const child = lastOrUndefined(children); if (!child) { return undefined; } @@ -366,8 +364,8 @@ namespace ts { } function getJsDocCommentsFromDeclarations(declarations: Declaration[], name: string, canUseParsedParamTagComments: boolean) { - let documentationComment = []; - let docComments = getJsDocCommentsSeparatedByNewLines(); + const documentationComment = []; + const docComments = getJsDocCommentsSeparatedByNewLines(); ts.forEach(docComments, docComment => { if (documentationComment.length) { documentationComment.push(lineBreakPart()); @@ -378,22 +376,22 @@ namespace ts { return documentationComment; function getJsDocCommentsSeparatedByNewLines() { - let paramTag = "@param"; - let jsDocCommentParts: SymbolDisplayPart[] = []; + const paramTag = "@param"; + const jsDocCommentParts: SymbolDisplayPart[] = []; ts.forEach(declarations, (declaration, indexOfDeclaration) => { // Make sure we are collecting doc comment from declaration once, // In case of union property there might be same declaration multiple times // which only varies in type parameter - // Eg. let a: Array | Array; a.length + // Eg. const a: Array | Array; a.length // The property length will have two declarations of property length coming // from Array - Array and Array if (indexOf(declarations, declaration) === indexOfDeclaration) { - let sourceFileOfDeclaration = getSourceFileOfNode(declaration); + const sourceFileOfDeclaration = getSourceFileOfNode(declaration); // If it is parameter - try and get the jsDoc comment with @param tag from function declaration's jsDoc comments if (canUseParsedParamTagComments && declaration.kind === SyntaxKind.Parameter) { ts.forEach(getJsDocCommentTextRange(declaration.parent, sourceFileOfDeclaration), jsDocCommentTextRange => { - let cleanedParamJsDocComment = getCleanedParamJsDocComment(jsDocCommentTextRange.pos, jsDocCommentTextRange.end, sourceFileOfDeclaration); + const cleanedParamJsDocComment = getCleanedParamJsDocComment(jsDocCommentTextRange.pos, jsDocCommentTextRange.end, sourceFileOfDeclaration); if (cleanedParamJsDocComment) { addRange(jsDocCommentParts, cleanedParamJsDocComment); } @@ -413,7 +411,7 @@ namespace ts { // Get the cleaned js doc comment text from the declaration ts.forEach(getJsDocCommentTextRange( declaration.kind === SyntaxKind.VariableDeclaration ? declaration.parent.parent : declaration, sourceFileOfDeclaration), jsDocCommentTextRange => { - let cleanedJsDocComment = getCleanedJsDocComment(jsDocCommentTextRange.pos, jsDocCommentTextRange.end, sourceFileOfDeclaration); + const cleanedJsDocComment = getCleanedJsDocComment(jsDocCommentTextRange.pos, jsDocCommentTextRange.end, sourceFileOfDeclaration); if (cleanedJsDocComment) { addRange(jsDocCommentParts, cleanedJsDocComment); } @@ -439,7 +437,7 @@ namespace ts { } for (; pos < end; pos++) { - let ch = sourceFile.text.charCodeAt(pos); + const ch = sourceFile.text.charCodeAt(pos); if (!isWhiteSpace(ch) || isLineBreak(ch)) { // Either found lineBreak or non whiteSpace return pos; @@ -480,7 +478,7 @@ namespace ts { function getCleanedJsDocComment(pos: number, end: number, sourceFile: SourceFile) { let spacesToRemoveAfterAsterisk: number; - let docComments: SymbolDisplayPart[] = []; + const docComments: SymbolDisplayPart[] = []; let blankLineCount = 0; let isInParamTag = false; @@ -491,7 +489,7 @@ namespace ts { // If the comment starts with '*' consume the spaces on this line if (pos < end && sourceFile.text.charCodeAt(pos) === CharacterCodes.asterisk) { - let lineStartPos = pos + 1; + const lineStartPos = pos + 1; pos = consumeWhiteSpacesOnTheLine(pos + 1, end, sourceFile, spacesToRemoveAfterAsterisk); // Set the spaces to remove after asterisk as margin if not already set @@ -505,7 +503,7 @@ namespace ts { // Analyse text on this line while (pos < end && !isLineBreak(sourceFile.text.charCodeAt(pos))) { - let ch = sourceFile.text.charAt(pos); + const ch = sourceFile.text.charAt(pos); if (ch === "@") { // If it is @param tag if (isParamTag(pos, end, sourceFile)) { @@ -544,7 +542,7 @@ namespace ts { function getCleanedParamJsDocComment(pos: number, end: number, sourceFile: SourceFile) { let paramHelpStringMargin: number; - let paramDocComments: SymbolDisplayPart[] = []; + const paramDocComments: SymbolDisplayPart[] = []; while (pos < end) { if (isParamTag(pos, end, sourceFile)) { let blankLineCount = 0; @@ -559,7 +557,7 @@ namespace ts { if (sourceFile.text.charCodeAt(pos) === CharacterCodes.openBrace) { pos++; for (let curlies = 1; pos < end; pos++) { - let charCode = sourceFile.text.charCodeAt(pos); + const charCode = sourceFile.text.charCodeAt(pos); // { character means we need to find another } to match the found one if (charCode === CharacterCodes.openBrace) { @@ -603,9 +601,9 @@ namespace ts { } let paramHelpString = ""; - let firstLineParamHelpStringPos = pos; + const firstLineParamHelpStringPos = pos; while (pos < end) { - let ch = sourceFile.text.charCodeAt(pos); + const ch = sourceFile.text.charCodeAt(pos); // at line break, set this comment line text and go to next line if (isLineBreak(ch)) { @@ -674,15 +672,15 @@ namespace ts { } // Now consume white spaces max - let startOfLinePos = pos; + const startOfLinePos = pos; pos = consumeWhiteSpacesOnTheLine(pos, end, sourceFile, paramHelpStringMargin); if (pos >= end) { return; } - let consumedSpaces = pos - startOfLinePos; + const consumedSpaces = pos - startOfLinePos; if (consumedSpaces < paramHelpStringMargin) { - let ch = sourceFile.text.charCodeAt(pos); + const ch = sourceFile.text.charCodeAt(pos); if (ch === CharacterCodes.asterisk) { // Consume more spaces after asterisk pos = consumeWhiteSpacesOnTheLine(pos + 1, end, sourceFile, paramHelpStringMargin - consumedSpaces - 1); @@ -815,7 +813,7 @@ namespace ts { private namedDeclarations: Map; constructor(kind: SyntaxKind, pos: number, end: number) { - super(kind, pos, end) + super(kind, pos, end); } public update(newText: string, textChangeRange: TextChangeRange): SourceFile { @@ -843,16 +841,16 @@ namespace ts { } private computeNamedDeclarations(): Map { - let result: Map = {}; + const result: Map = {}; forEachChild(this, visit); return result; function addDeclaration(declaration: Declaration) { - let name = getDeclarationName(declaration); + const name = getDeclarationName(declaration); if (name) { - let declarations = getDeclarations(name); + const declarations = getDeclarations(name); declarations.push(declaration); } } @@ -863,13 +861,13 @@ namespace ts { function getDeclarationName(declaration: Declaration) { if (declaration.name) { - let result = getTextOfIdentifierOrLiteral(declaration.name); + const result = getTextOfIdentifierOrLiteral(declaration.name); if (result !== undefined) { return result; } if (declaration.name.kind === SyntaxKind.ComputedPropertyName) { - let expr = (declaration.name).expression; + const expr = (declaration.name).expression; if (expr.kind === SyntaxKind.PropertyAccessExpression) { return (expr).name.text; } @@ -899,12 +897,12 @@ namespace ts { case SyntaxKind.FunctionDeclaration: case SyntaxKind.MethodDeclaration: case SyntaxKind.MethodSignature: - let functionDeclaration = node; - let declarationName = getDeclarationName(functionDeclaration); + const functionDeclaration = node; + const declarationName = getDeclarationName(functionDeclaration); if (declarationName) { - let declarations = getDeclarations(declarationName); - let lastDeclaration = lastOrUndefined(declarations); + const declarations = getDeclarations(declarationName); + const lastDeclaration = lastOrUndefined(declarations); // Check whether this declaration belongs to an "overload group". if (lastDeclaration && functionDeclaration.parent === lastDeclaration.parent && functionDeclaration.symbol === lastDeclaration.symbol) { @@ -980,7 +978,7 @@ namespace ts { break; case SyntaxKind.ImportDeclaration: - let importClause = (node).importClause; + const importClause = (node).importClause; if (importClause) { // Handle default import case e.g.: // import d from "mod"; @@ -1113,8 +1111,8 @@ namespace ts { } export interface Classifications { - spans: number[], - endOfLineState: EndOfLineState + spans: number[]; + endOfLineState: EndOfLineState; } export interface ClassifiedSpan { @@ -1171,7 +1169,7 @@ namespace ts { highlightSpans: HighlightSpan[]; } - export module HighlightSpanKind { + export namespace HighlightSpanKind { export const none = "none"; export const definition = "definition"; export const reference = "reference"; @@ -1220,7 +1218,7 @@ namespace ts { InsertSpaceAfterOpeningAndBeforeClosingNonemptyBrackets: boolean; PlaceOpenBraceOnNewLineForFunctions: boolean; PlaceOpenBraceOnNewLineForControlBlocks: boolean; - [s: string]: boolean | number| string; + [s: string]: boolean | number | string; } export interface DefinitionInfo { @@ -1500,7 +1498,7 @@ namespace ts { } // TODO: move these to enums - export module ScriptElementKind { + export namespace ScriptElementKind { export const unknown = ""; export const warning = "warning"; @@ -1529,7 +1527,7 @@ namespace ts { export const enumElement = "enum"; // Inside module and script only - // let v = .. + // const v = .. export const variableElement = "var"; // Inside function @@ -1581,7 +1579,7 @@ namespace ts { export const letElement = "let"; } - export module ScriptElementKindModifier { + export namespace ScriptElementKindModifier { export const none = ""; export const publicMemberModifier = "public"; export const privateMemberModifier = "private"; @@ -1723,8 +1721,8 @@ namespace ts { this.fileNameToEntry = createFileMap(); // Initialize the list with the root file names - let rootFileNames = host.getScriptFileNames(); - for (let fileName of rootFileNames) { + const rootFileNames = host.getScriptFileNames(); + for (const fileName of rootFileNames) { this.createEntry(fileName, toPath(fileName, this.currentDirectory, getCanonicalFileName)); } @@ -1738,7 +1736,7 @@ namespace ts { private createEntry(fileName: string, path: Path) { let entry: HostFileInformation; - let scriptSnapshot = this.host.getScriptSnapshot(fileName); + const scriptSnapshot = this.host.getScriptSnapshot(fileName); if (scriptSnapshot) { entry = { hostFileName: fileName, @@ -1760,7 +1758,7 @@ namespace ts { } public getOrCreateEntry(fileName: string): HostFileInformation { - let path = toPath(fileName, this.currentDirectory, this.getCanonicalFileName) + const path = toPath(fileName, this.currentDirectory, this.getCanonicalFileName); if (this.contains(path)) { return this.getEntry(path); } @@ -1769,7 +1767,7 @@ namespace ts { } public getRootFileNames(): string[] { - let fileNames: string[] = []; + const fileNames: string[] = []; this.fileNameToEntry.forEachValue((path, value) => { if (value) { @@ -1781,12 +1779,12 @@ namespace ts { } public getVersion(path: Path): string { - let file = this.getEntry(path); + const file = this.getEntry(path); return file && file.version; } public getScriptSnapshot(path: Path): IScriptSnapshot { - let file = this.getEntry(path); + const file = this.getEntry(path); return file && file.scriptSnapshot; } } @@ -1803,22 +1801,22 @@ namespace ts { } public getCurrentSourceFile(fileName: string): SourceFile { - let scriptSnapshot = this.host.getScriptSnapshot(fileName); + const scriptSnapshot = this.host.getScriptSnapshot(fileName); if (!scriptSnapshot) { // The host does not know about this file. throw new Error("Could not find file: '" + fileName + "'."); } - let version = this.host.getScriptVersion(fileName); + const version = this.host.getScriptVersion(fileName); let sourceFile: SourceFile; if (this.currentFileName !== fileName) { // This is a new file, just parse it - sourceFile = createLanguageServiceSourceFile(fileName, scriptSnapshot, ScriptTarget.Latest, version, /*setNodeParents:*/ true); + sourceFile = createLanguageServiceSourceFile(fileName, scriptSnapshot, ScriptTarget.Latest, version, /*setNodeParents*/ true); } else if (this.currentFileVersion !== version) { // This is the same file, just a newer version. Incrementally parse the file. - let editRange = scriptSnapshot.getChangeRange(this.currentFileScriptSnapshot); + const editRange = scriptSnapshot.getChangeRange(this.currentFileScriptSnapshot); sourceFile = updateLanguageServiceSourceFile(this.currentSourceFile, scriptSnapshot, version, editRange); } @@ -1863,7 +1861,7 @@ namespace ts { * - noResolve = true */ export function transpileModule(input: string, transpileOptions: TranspileOptions): TranspileOutput { - let options = transpileOptions.compilerOptions ? clone(transpileOptions.compilerOptions) : getDefaultCompilerOptions(); + const options = transpileOptions.compilerOptions ? clone(transpileOptions.compilerOptions) : getDefaultCompilerOptions(); options.isolatedModules = true; @@ -1879,21 +1877,22 @@ namespace ts { options.noResolve = true; // if jsx is specified then treat file as .tsx - let inputFileName = transpileOptions.fileName || (options.jsx ? "module.tsx" : "module.ts"); - let sourceFile = createSourceFile(inputFileName, input, options.target); + const inputFileName = transpileOptions.fileName || (options.jsx ? "module.tsx" : "module.ts"); + const sourceFile = createSourceFile(inputFileName, input, options.target); if (transpileOptions.moduleName) { sourceFile.moduleName = transpileOptions.moduleName; } sourceFile.renamedDependencies = transpileOptions.renamedDependencies; - let newLine = getNewLineCharacter(options); + const newLine = getNewLineCharacter(options); // Output let outputText: string; let sourceMapText: string; + // Create a compilerHost object to allow the compiler to read and write files - let compilerHost: CompilerHost = { + const compilerHost: CompilerHost = { getSourceFile: (fileName, target) => fileName === normalizeSlashes(inputFileName) ? sourceFile : undefined, writeFile: (name, text, writeByteOrderMark) => { if (fileExtensionIs(name, ".map")) { @@ -1914,7 +1913,7 @@ namespace ts { readFile: (fileName): string => "" }; - let program = createProgram([inputFileName], options, compilerHost); + const program = createProgram([inputFileName], options, compilerHost); let diagnostics: Diagnostic[]; if (transpileOptions.reportDiagnostics) { @@ -1934,15 +1933,15 @@ namespace ts { * This is a shortcut function for transpileModule - it accepts transpileOptions as parameters and returns only outputText part of the result. */ export function transpile(input: string, compilerOptions?: CompilerOptions, fileName?: string, diagnostics?: Diagnostic[], moduleName?: string): string { - let output = transpileModule(input, { compilerOptions, fileName, reportDiagnostics: !!diagnostics, moduleName }); + const output = transpileModule(input, { compilerOptions, fileName, reportDiagnostics: !!diagnostics, moduleName }); // addRange correctly handles cases when wither 'from' or 'to' argument is missing addRange(diagnostics, output.diagnostics); return output.outputText; } export function createLanguageServiceSourceFile(fileName: string, scriptSnapshot: IScriptSnapshot, scriptTarget: ScriptTarget, version: string, setNodeParents: boolean): SourceFile { - let text = scriptSnapshot.getText(0, scriptSnapshot.getLength()); - let sourceFile = createSourceFile(fileName, text, scriptTarget, setNodeParents); + const text = scriptSnapshot.getText(0, scriptSnapshot.getLength()); + const sourceFile = createSourceFile(fileName, text, scriptTarget, setNodeParents); setSourceFileFields(sourceFile, scriptSnapshot, version); // after full parsing we can use table with interned strings as name table sourceFile.nameTable = sourceFile.identifiers; @@ -1961,12 +1960,12 @@ namespace ts { let newText: string; // grab the fragment from the beginning of the original text to the beginning of the span - let prefix = textChangeRange.span.start !== 0 + const prefix = textChangeRange.span.start !== 0 ? sourceFile.text.substr(0, textChangeRange.span.start) : ""; // grab the fragment from the end of the span till the end of the original text - let suffix = textSpanEnd(textChangeRange.span) !== sourceFile.text.length + const suffix = textSpanEnd(textChangeRange.span) !== sourceFile.text.length ? sourceFile.text.substr(textSpanEnd(textChangeRange.span)) : ""; @@ -1976,7 +1975,7 @@ namespace ts { } else { // it was actual edit, fetch the fragment of new text that correspond to new span - let changedText = scriptSnapshot.getText(textChangeRange.span.start, textChangeRange.span.start + textChangeRange.newLength); + const changedText = scriptSnapshot.getText(textChangeRange.span.start, textChangeRange.span.start + textChangeRange.newLength); // combine prefix, changed text and suffix newText = prefix && suffix ? prefix + changedText + suffix @@ -1985,7 +1984,7 @@ namespace ts { : (changedText + suffix); } - let newSourceFile = updateSourceFile(sourceFile, newText, textChangeRange, aggressiveChecks); + const newSourceFile = updateSourceFile(sourceFile, newText, textChangeRange, aggressiveChecks); setSourceFileFields(newSourceFile, scriptSnapshot, version); // after incremental parsing nameTable might not be up-to-date // drop it so it can be lazily recreated later @@ -2006,7 +2005,7 @@ namespace ts { } // Otherwise, just create a new source file. - return createLanguageServiceSourceFile(sourceFile.fileName, scriptSnapshot, sourceFile.languageVersion, version, /*setNodeParents:*/ true); + return createLanguageServiceSourceFile(sourceFile.fileName, scriptSnapshot, sourceFile.languageVersion, version, /*setNodeParents*/ true); } export function createGetCanonicalFileName(useCaseSensitivefileNames: boolean): (fileName: string) => string { @@ -2019,15 +2018,15 @@ namespace ts { export function createDocumentRegistry(useCaseSensitiveFileNames?: boolean, currentDirectory = ""): DocumentRegistry { // Maps from compiler setting target (ES3, ES5, etc.) to all the cached documents we have // for those settings. - let buckets: Map> = {}; - let getCanonicalFileName = createGetCanonicalFileName(!!useCaseSensitiveFileNames); + const buckets: Map> = {}; + const getCanonicalFileName = createGetCanonicalFileName(!!useCaseSensitiveFileNames); function getKeyFromCompilationSettings(settings: CompilerOptions): string { return "_" + settings.target + "|" + settings.module + "|" + settings.noResolve + "|" + settings.jsx + +"|" + settings.allowJs; } function getBucketForCompilationSettings(settings: CompilerOptions, createIfMissing: boolean): FileMap { - let key = getKeyFromCompilationSettings(settings); + const key = getKeyFromCompilationSettings(settings); let bucket = lookUp(buckets, key); if (!bucket && createIfMissing) { buckets[key] = bucket = createFileMap(); @@ -2036,9 +2035,9 @@ namespace ts { } function reportStats() { - let bucketInfoArray = Object.keys(buckets).filter(name => name && name.charAt(0) === '_').map(name => { - let entries = lookUp(buckets, name); - let sourceFiles: { name: string; refCount: number; references: string[]; }[] = []; + const bucketInfoArray = Object.keys(buckets).filter(name => name && name.charAt(0) === "_").map(name => { + const entries = lookUp(buckets, name); + const sourceFiles: { name: string; refCount: number; references: string[]; }[] = []; entries.forEachValue((key, entry) => { sourceFiles.push({ name: key, @@ -2052,15 +2051,15 @@ namespace ts { sourceFiles }; }); - return JSON.stringify(bucketInfoArray, null, 2); + return JSON.stringify(bucketInfoArray, undefined, 2); } function acquireDocument(fileName: string, compilationSettings: CompilerOptions, scriptSnapshot: IScriptSnapshot, version: string): SourceFile { - return acquireOrUpdateDocument(fileName, compilationSettings, scriptSnapshot, version, /*acquiring:*/ true); + return acquireOrUpdateDocument(fileName, compilationSettings, scriptSnapshot, version, /*acquiring*/ true); } function updateDocument(fileName: string, compilationSettings: CompilerOptions, scriptSnapshot: IScriptSnapshot, version: string): SourceFile { - return acquireOrUpdateDocument(fileName, compilationSettings, scriptSnapshot, version, /*acquiring:*/ false); + return acquireOrUpdateDocument(fileName, compilationSettings, scriptSnapshot, version, /*acquiring*/ false); } function acquireOrUpdateDocument( @@ -2070,14 +2069,14 @@ namespace ts { version: string, acquiring: boolean): SourceFile { - let bucket = getBucketForCompilationSettings(compilationSettings, /*createIfMissing*/ true); - let path = toPath(fileName, currentDirectory, getCanonicalFileName); + const bucket = getBucketForCompilationSettings(compilationSettings, /*createIfMissing*/ true); + const path = toPath(fileName, currentDirectory, getCanonicalFileName); let entry = bucket.get(path); if (!entry) { Debug.assert(acquiring, "How could we be trying to update a document that the registry doesn't have?"); // Have never seen this file with these settings. Create a new source file for it. - let sourceFile = createLanguageServiceSourceFile(fileName, scriptSnapshot, compilationSettings.target, version, /*setNodeParents:*/ false); + const sourceFile = createLanguageServiceSourceFile(fileName, scriptSnapshot, compilationSettings.target, version, /*setNodeParents*/ false); entry = { sourceFile: sourceFile, @@ -2109,12 +2108,12 @@ namespace ts { } function releaseDocument(fileName: string, compilationSettings: CompilerOptions): void { - let bucket = getBucketForCompilationSettings(compilationSettings, false); + const bucket = getBucketForCompilationSettings(compilationSettings, /*createIfMissing*/false); Debug.assert(bucket !== undefined); - let path = toPath(fileName, currentDirectory, getCanonicalFileName); + const path = toPath(fileName, currentDirectory, getCanonicalFileName); - let entry = bucket.get(path); + const entry = bucket.get(path); entry.languageServiceRefCount--; Debug.assert(entry.languageServiceRefCount >= 0); @@ -2132,19 +2131,19 @@ namespace ts { } export function preProcessFile(sourceText: string, readImportFiles = true, detectJavaScriptImports = false): PreProcessedFileInfo { - let referencedFiles: FileReference[] = []; - let importedFiles: FileReference[] = []; + const referencedFiles: FileReference[] = []; + const importedFiles: FileReference[] = []; let ambientExternalModules: string[]; let isNoDefaultLib = false; function processTripleSlashDirectives(): void { - let commentRanges = getLeadingCommentRanges(sourceText, 0); + const commentRanges = getLeadingCommentRanges(sourceText, 0); forEach(commentRanges, commentRange => { - let comment = sourceText.substring(commentRange.pos, commentRange.end); - let referencePathMatchResult = getFileReferenceFromReferencePath(comment, commentRange); + const comment = sourceText.substring(commentRange.pos, commentRange.end); + const referencePathMatchResult = getFileReferenceFromReferencePath(comment, commentRange); if (referencePathMatchResult) { isNoDefaultLib = referencePathMatchResult.isNoDefaultLib; - let fileReference = referencePathMatchResult.fileReference; + const fileReference = referencePathMatchResult.fileReference; if (fileReference) { referencedFiles.push(fileReference); } @@ -2160,8 +2159,8 @@ namespace ts { } function recordModuleName() { - let importPath = scanner.getTokenValue(); - let pos = scanner.getTokenPos(); + const importPath = scanner.getTokenValue(); + const pos = scanner.getTokenPos(); importedFiles.push({ fileName: importPath, pos: pos, @@ -2213,7 +2212,7 @@ namespace ts { } } else if (token === SyntaxKind.EqualsToken) { - if (tryConsumeRequireCall(/* skipCurrentToken */ true)) { + if (tryConsumeRequireCall(/*skipCurrentToken*/ true)) { return true; } } @@ -2311,7 +2310,7 @@ namespace ts { if (token === SyntaxKind.Identifier || isKeyword(token)) { token = scanner.scan(); if (token === SyntaxKind.EqualsToken) { - if (tryConsumeRequireCall(/* skipCurrentToken */ true)) { + if (tryConsumeRequireCall(/*skipCurrentToken*/ true)) { return true; } } @@ -2410,7 +2409,7 @@ namespace ts { if (tryConsumeDeclare() || tryConsumeImport() || tryConsumeExport() || - (detectJavaScriptImports && (tryConsumeRequireCall(/* skipCurrentToken */ false) || tryConsumeDefine()))) { + (detectJavaScriptImports && (tryConsumeRequireCall(/*skipCurrentToken*/ false) || tryConsumeDefine()))) { continue; } else { @@ -2550,8 +2549,8 @@ namespace ts { return true; } else if (position === comment.end) { - let text = sourceFile.text; - let width = comment.end - comment.pos; + const text = sourceFile.text; + const width = comment.end - comment.pos; // is single line comment or just /* if (width <= 2 || text.charCodeAt(comment.pos + 1) === CharacterCodes.slash) { return true; @@ -2583,7 +2582,7 @@ namespace ts { } // A cache of completion entries for keywords, these do not change between sessions - let keywordCompletions: CompletionEntry[] = []; + const keywordCompletions: CompletionEntry[] = []; for (let i = SyntaxKind.FirstKeyword; i <= SyntaxKind.LastKeyword; i++) { keywordCompletions.push({ name: tokenToString(i), @@ -2673,15 +2672,15 @@ namespace ts { export function createLanguageService(host: LanguageServiceHost, documentRegistry: DocumentRegistry = createDocumentRegistry(host.useCaseSensitiveFileNames && host.useCaseSensitiveFileNames(), host.getCurrentDirectory())): LanguageService { - let syntaxTreeCache: SyntaxTreeCache = new SyntaxTreeCache(host); + const syntaxTreeCache: SyntaxTreeCache = new SyntaxTreeCache(host); let ruleProvider: formatting.RulesProvider; let program: Program; let lastProjectVersion: string; - let useCaseSensitivefileNames = false; - let cancellationToken = new CancellationTokenObject(host.getCancellationToken && host.getCancellationToken()); + const useCaseSensitivefileNames = false; + const cancellationToken = new CancellationTokenObject(host.getCancellationToken && host.getCancellationToken()); - let currentDirectory = host.getCurrentDirectory(); + const currentDirectory = host.getCurrentDirectory(); // Check if the localized messages json is set, otherwise query the host for it if (!localizedDiagnosticMessages && host.getLocalizedDiagnosticMessages) { localizedDiagnosticMessages = host.getLocalizedDiagnosticMessages(); @@ -2693,10 +2692,10 @@ namespace ts { } } - let getCanonicalFileName = createGetCanonicalFileName(useCaseSensitivefileNames); + const getCanonicalFileName = createGetCanonicalFileName(useCaseSensitivefileNames); function getValidSourceFile(fileName: string): SourceFile { - let sourceFile = program.getSourceFile(fileName); + const sourceFile = program.getSourceFile(fileName); if (!sourceFile) { throw new Error("Could not find file: '" + fileName + "'."); } @@ -2716,7 +2715,7 @@ namespace ts { function synchronizeHostData(): void { // perform fast check if host supports it if (host.getProjectVersion) { - let hostProjectVersion = host.getProjectVersion(); + const hostProjectVersion = host.getProjectVersion(); if (hostProjectVersion) { if (lastProjectVersion === hostProjectVersion) { return; @@ -2740,17 +2739,17 @@ namespace ts { // the program points to old source files that have been invalidated because of // incremental parsing. - let oldSettings = program && program.getCompilerOptions(); - let newSettings = hostCache.compilationSettings(); - let changesInCompilationSettingsAffectSyntax = oldSettings && + const oldSettings = program && program.getCompilerOptions(); + const newSettings = hostCache.compilationSettings(); + const changesInCompilationSettingsAffectSyntax = oldSettings && (oldSettings.target !== newSettings.target || oldSettings.module !== newSettings.module || oldSettings.noResolve !== newSettings.noResolve || - oldSettings.jsx !== newSettings.jsx || + oldSettings.jsx !== newSettings.jsx || oldSettings.allowJs !== newSettings.allowJs); // Now create a new compiler - let compilerHost: CompilerHost = { + const compilerHost: CompilerHost = { getSourceFile: getOrCreateSourceFile, getCancellationToken: () => cancellationToken, getCanonicalFileName, @@ -2766,22 +2765,22 @@ namespace ts { }, readFile: (fileName): string => { // stub missing host functionality - let entry = hostCache.getOrCreateEntry(fileName); + const entry = hostCache.getOrCreateEntry(fileName); return entry && entry.scriptSnapshot.getText(0, entry.scriptSnapshot.getLength()); } }; if (host.resolveModuleNames) { - compilerHost.resolveModuleNames = (moduleNames, containingFile) => host.resolveModuleNames(moduleNames, containingFile) + compilerHost.resolveModuleNames = (moduleNames, containingFile) => host.resolveModuleNames(moduleNames, containingFile); } - let newProgram = createProgram(hostCache.getRootFileNames(), newSettings, compilerHost, program); + const newProgram = createProgram(hostCache.getRootFileNames(), newSettings, compilerHost, program); // Release any files we have acquired in the old program but are // not part of the new program. if (program) { - let oldSourceFiles = program.getSourceFiles(); - for (let oldSourceFile of oldSourceFiles) { + const oldSourceFiles = program.getSourceFiles(); + for (const oldSourceFile of oldSourceFiles) { if (!newProgram.getSourceFile(oldSourceFile.fileName) || changesInCompilationSettingsAffectSyntax) { documentRegistry.releaseDocument(oldSourceFile.fileName, oldSettings); } @@ -2804,7 +2803,7 @@ namespace ts { // The program is asking for this file, check first if the host can locate it. // If the host can not locate the file, then it does not exist. return undefined // to the program to allow reporting of errors for missing files. - let hostFileInformation = hostCache.getOrCreateEntry(fileName); + const hostFileInformation = hostCache.getOrCreateEntry(fileName); if (!hostFileInformation) { return undefined; } @@ -2814,7 +2813,7 @@ namespace ts { // can not be reused. we have to dump all syntax trees and create new ones. if (!changesInCompilationSettingsAffectSyntax) { // Check if the old program had this file already - let oldSourceFile = program && program.getSourceFile(fileName); + const oldSourceFile = program && program.getSourceFile(fileName); if (oldSourceFile) { // We already had a source file for this file name. Go to the registry to // ensure that we get the right up to date version of it. We need this to @@ -2851,7 +2850,7 @@ namespace ts { if (!sourceFile) { return false; } - let path = sourceFile.path || toPath(sourceFile.fileName, currentDirectory, getCanonicalFileName); + const path = sourceFile.path || toPath(sourceFile.fileName, currentDirectory, getCanonicalFileName); return sourceFile.version === hostCache.getVersion(path); } @@ -2862,13 +2861,13 @@ namespace ts { } // If number of files in the program do not match, it is not up-to-date - let rootFileNames = hostCache.getRootFileNames(); + const rootFileNames = hostCache.getRootFileNames(); if (program.getSourceFiles().length !== rootFileNames.length) { return false; } // If any file is not up-to-date, then the whole program is not up-to-date - for (let fileName of rootFileNames) { + for (const fileName of rootFileNames) { if (!sourceFileUpToDate(program.getSourceFile(fileName))) { return false; } @@ -2910,18 +2909,18 @@ namespace ts { function getSemanticDiagnostics(fileName: string): Diagnostic[] { synchronizeHostData(); - let targetSourceFile = getValidSourceFile(fileName); + const targetSourceFile = getValidSourceFile(fileName); // Only perform the action per file regardless of '-out' flag as LanguageServiceHost is expected to call this function per file. // Therefore only get diagnostics for given file. - let semanticDiagnostics = program.getSemanticDiagnostics(targetSourceFile, cancellationToken); + const semanticDiagnostics = program.getSemanticDiagnostics(targetSourceFile, cancellationToken); if (!program.getCompilerOptions().declaration) { return semanticDiagnostics; } // If '-d' is enabled, check for emitter error. One example of emitter error is export class implements non-export interface - let declarationDiagnostics = program.getDeclarationDiagnostics(targetSourceFile, cancellationToken); + const declarationDiagnostics = program.getDeclarationDiagnostics(targetSourceFile, cancellationToken); return concatenate(semanticDiagnostics, declarationDiagnostics); } @@ -2937,14 +2936,14 @@ namespace ts { * @return undefined if the name is of external module otherwise a name with striped of any quote */ function getCompletionEntryDisplayNameForSymbol(symbol: Symbol, target: ScriptTarget, performCharacterChecks: boolean, location: Node): string { - let displayName: string = getDeclaredName(program.getTypeChecker(), symbol, location); + const displayName: string = getDeclaredName(program.getTypeChecker(), symbol, location); if (displayName) { - let firstCharCode = displayName.charCodeAt(0); + const firstCharCode = displayName.charCodeAt(0); // First check of the displayName is not external module; if it is an external module, it is not valid entry if ((symbol.flags & SymbolFlags.Namespace) && (firstCharCode === CharacterCodes.singleQuote || firstCharCode === CharacterCodes.doubleQuote)) { // If the symbol is external module, don't show it in the completion list - // (i.e declare module "http" { let x; } | // <= request completion here, "http" should not be there) + // (i.e declare module "http" { const x; } | // <= request completion here, "http" should not be there) return undefined; } } @@ -2987,20 +2986,20 @@ namespace ts { } function getCompletionData(fileName: string, position: number) { - let typeChecker = program.getTypeChecker(); - let syntacticStart = new Date().getTime(); - let sourceFile = getValidSourceFile(fileName); - let isJavaScriptFile = isSourceFileJavaScript(sourceFile); + const typeChecker = program.getTypeChecker(); + const syntacticStart = new Date().getTime(); + const sourceFile = getValidSourceFile(fileName); + const isJavaScriptFile = isSourceFileJavaScript(sourceFile); let isJsDocTagName = false; let start = new Date().getTime(); - let currentToken = getTokenAtPosition(sourceFile, position); + const currentToken = getTokenAtPosition(sourceFile, position); log("getCompletionData: Get current token: " + (new Date().getTime() - start)); start = new Date().getTime(); // Completion not allowed inside comments, bail out if this is the case - let insideComment = isInsideComment(sourceFile, currentToken, position); + const insideComment = isInsideComment(sourceFile, currentToken, position); log("getCompletionData: Is inside comment: " + (new Date().getTime() - start)); if (insideComment) { @@ -3014,7 +3013,7 @@ namespace ts { // /** @type {number | string} */ // Completion should work in the brackets let insideJsDocTagExpression = false; - let tag = getJsDocTagAtPosition(sourceFile, position); + const tag = getJsDocTagAtPosition(sourceFile, position); if (tag) { if (tag.tagName.pos <= position && position <= tag.tagName.end) { isJsDocTagName = true; @@ -3024,7 +3023,7 @@ namespace ts { case SyntaxKind.JSDocTypeTag: case SyntaxKind.JSDocParameterTag: case SyntaxKind.JSDocReturnTag: - let tagWithExpression = tag; + const tagWithExpression = tag; if (tagWithExpression.typeExpression) { insideJsDocTagExpression = tagWithExpression.typeExpression.pos < position && position < tagWithExpression.typeExpression.end; } @@ -3045,7 +3044,7 @@ namespace ts { } start = new Date().getTime(); - let previousToken = findPrecedingToken(position, sourceFile); + const previousToken = findPrecedingToken(position, sourceFile); log("getCompletionData: Get previous token 1: " + (new Date().getTime() - start)); // The decision to provide completion depends on the contextToken, which is determined through the previousToken. @@ -3055,7 +3054,7 @@ namespace ts { // Check if the caret is at the end of an identifier; this is a partial identifier that we want to complete: e.g. a.toS| // Skip this partial identifier and adjust the contextToken to the token that precedes it. if (contextToken && position <= contextToken.end && isWord(contextToken.kind)) { - let start = new Date().getTime(); + const start = new Date().getTime(); contextToken = findPrecedingToken(contextToken.getFullStart(), sourceFile); log("getCompletionData: Get previous token 2: " + (new Date().getTime() - start)); } @@ -3076,7 +3075,7 @@ namespace ts { return undefined; } - let { parent, kind } = contextToken; + const { parent, kind } = contextToken; if (kind === SyntaxKind.DotToken) { if (parent.kind === SyntaxKind.PropertyAccessExpression) { node = (contextToken.parent).expression; @@ -3103,7 +3102,7 @@ namespace ts { } } - let semanticStart = new Date().getTime(); + const semanticStart = new Date().getTime(); let isMemberCompletion: boolean; let isNewIdentifierLocation: boolean; let symbols: Symbol[] = []; @@ -3112,7 +3111,7 @@ namespace ts { getTypeScriptMemberSymbols(); } else if (isRightOfOpenTag) { - let tagSymbols = typeChecker.getJsxIntrinsicTagNames(); + const tagSymbols = typeChecker.getJsxIntrinsicTagNames(); if (tryGetGlobalSymbols()) { symbols = tagSymbols.concat(symbols.filter(s => !!(s.flags & SymbolFlags.Value))); } @@ -3123,7 +3122,7 @@ namespace ts { isNewIdentifierLocation = false; } else if (isStartingCloseTag) { - let tagName = (contextToken.parent.parent).openingElement.tagName; + const tagName = (contextToken.parent.parent).openingElement.tagName; symbols = [typeChecker.getSymbolAtLocation(tagName)]; isMemberCompletion = true; @@ -3157,7 +3156,7 @@ namespace ts { if (symbol && symbol.flags & SymbolFlags.HasExports) { // Extract module or enum members - let exportedSymbols = typeChecker.getExportsOfModule(symbol); + const exportedSymbols = typeChecker.getExportsOfModule(symbol); forEach(exportedSymbols, symbol => { if (typeChecker.isValidPropertyAccess((node.parent), symbol.name)) { symbols.push(symbol); @@ -3166,14 +3165,14 @@ namespace ts { } } - let type = typeChecker.getTypeAtLocation(node); + const type = typeChecker.getTypeAtLocation(node); addTypeProperties(type); } function addTypeProperties(type: Type) { if (type) { // Filter private properties - for (let symbol of type.getApparentProperties()) { + for (const symbol of type.getApparentProperties()) { if (typeChecker.isValidPropertyAccess((node.parent), symbol.name)) { symbols.push(symbol); } @@ -3185,8 +3184,8 @@ namespace ts { // each individual type has. This is because we're going to add all identifiers // anyways. So we might as well elevate the members that were at least part // of the individual types to a higher status since we know what they are. - let unionType = type; - for (let elementType of unionType.types) { + const unionType = type; + for (const elementType of unionType.types) { addTypeProperties(elementType); } } @@ -3256,14 +3255,14 @@ namespace ts { // - 'contextToken' was adjusted to the token prior to 'previousToken' // because we were at the end of an identifier. // - 'previousToken' is defined. - let adjustedPosition = previousToken !== contextToken ? + const adjustedPosition = previousToken !== contextToken ? previousToken.getStart() : position; - let scopeNode = getScopeNode(contextToken, adjustedPosition, sourceFile) || sourceFile; + const scopeNode = getScopeNode(contextToken, adjustedPosition, sourceFile) || sourceFile; /// TODO filter meaning based on the current context - let symbolMeanings = SymbolFlags.Type | SymbolFlags.Value | SymbolFlags.Namespace | SymbolFlags.Alias; + const symbolMeanings = SymbolFlags.Type | SymbolFlags.Value | SymbolFlags.Namespace | SymbolFlags.Alias; symbols = typeChecker.getSymbolsInScope(scopeNode, symbolMeanings); return true; @@ -3282,8 +3281,8 @@ namespace ts { } function isCompletionListBlocker(contextToken: Node): boolean { - let start = new Date().getTime(); - let result = isInStringOrRegularExpressionOrTemplateLiteral(contextToken) || + const start = new Date().getTime(); + const result = isInStringOrRegularExpressionOrTemplateLiteral(contextToken) || isSolelyIdentifierDefinitionLocation(contextToken) || isDotOfNumericLiteral(contextToken) || isInJsxText(contextToken); @@ -3310,27 +3309,27 @@ namespace ts { function isNewIdentifierDefinitionLocation(previousToken: Node): boolean { if (previousToken) { - let containingNodeKind = previousToken.parent.kind; + const containingNodeKind = previousToken.parent.kind; switch (previousToken.kind) { case SyntaxKind.CommaToken: return containingNodeKind === SyntaxKind.CallExpression // func( a, | || containingNodeKind === SyntaxKind.Constructor // constructor( a, | /* public, protected, private keywords are allowed here, so show completion */ || containingNodeKind === SyntaxKind.NewExpression // new C(a, | || containingNodeKind === SyntaxKind.ArrayLiteralExpression // [a, | - || containingNodeKind === SyntaxKind.BinaryExpression // let x = (a, | + || containingNodeKind === SyntaxKind.BinaryExpression // const x = (a, | || containingNodeKind === SyntaxKind.FunctionType; // var x: (s: string, list| case SyntaxKind.OpenParenToken: return containingNodeKind === SyntaxKind.CallExpression // func( | || containingNodeKind === SyntaxKind.Constructor // constructor( | || containingNodeKind === SyntaxKind.NewExpression // new C(a| - || containingNodeKind === SyntaxKind.ParenthesizedExpression // let x = (a| + || containingNodeKind === SyntaxKind.ParenthesizedExpression // const x = (a| || containingNodeKind === SyntaxKind.ParenthesizedType; // function F(pred: (a| /* this can become an arrow function, where 'a' is the argument */ case SyntaxKind.OpenBracketToken: return containingNodeKind === SyntaxKind.ArrayLiteralExpression // [ | || containingNodeKind === SyntaxKind.IndexSignature // [ | : string ] - || containingNodeKind === SyntaxKind.ComputedPropertyName // [ | /* this can become an index signature */ + || containingNodeKind === SyntaxKind.ComputedPropertyName; // [ | /* this can become an index signature */ case SyntaxKind.ModuleKeyword: // module | case SyntaxKind.NamespaceKeyword: // namespace | @@ -3343,7 +3342,7 @@ namespace ts { return containingNodeKind === SyntaxKind.ClassDeclaration; // class A{ | case SyntaxKind.EqualsToken: - return containingNodeKind === SyntaxKind.VariableDeclaration // let x = a| + return containingNodeKind === SyntaxKind.VariableDeclaration // const x = a| || containingNodeKind === SyntaxKind.BinaryExpression; // x = a| case SyntaxKind.TemplateHead: @@ -3375,8 +3374,8 @@ namespace ts { || contextToken.kind === SyntaxKind.StringLiteralType || contextToken.kind === SyntaxKind.RegularExpressionLiteral || isTemplateLiteralKind(contextToken.kind)) { - let start = contextToken.getStart(); - let end = contextToken.getEnd(); + const start = contextToken.getStart(); + const end = contextToken.getEnd(); // To be "in" one of these literals, the position has to be: // 1. entirely within the token text. @@ -3420,7 +3419,7 @@ namespace ts { // We are *only* completing on properties from the type being destructured. isNewIdentifierLocation = false; - let rootDeclaration = getRootDeclaration(objectLikeContainer.parent); + const rootDeclaration = getRootDeclaration(objectLikeContainer.parent); if (isVariableLike(rootDeclaration)) { // We don't want to complete using the type acquired by the shape // of the binding pattern; we are only interested in types acquired @@ -3431,7 +3430,7 @@ namespace ts { } } else { - Debug.fail("Root declaration is not variable-like.") + Debug.fail("Root declaration is not variable-like."); } } else { @@ -3442,7 +3441,7 @@ namespace ts { return false; } - let typeMembers = typeChecker.getPropertiesOfType(typeForObject); + const typeMembers = typeChecker.getPropertiesOfType(typeForObject); if (typeMembers && typeMembers.length > 0) { // Add filtered items to the completion list symbols = filterObjectMembersList(typeMembers, existingMembers); @@ -3466,11 +3465,11 @@ namespace ts { * @returns true if 'symbols' was successfully populated; false otherwise. */ function tryGetImportOrExportClauseCompletionSymbols(namedImportsOrExports: NamedImportsOrExports): boolean { - let declarationKind = namedImportsOrExports.kind === SyntaxKind.NamedImports ? + const declarationKind = namedImportsOrExports.kind === SyntaxKind.NamedImports ? SyntaxKind.ImportDeclaration : SyntaxKind.ExportDeclaration; - let importOrExportDeclaration = getAncestor(namedImportsOrExports, declarationKind); - let moduleSpecifier = importOrExportDeclaration.moduleSpecifier; + const importOrExportDeclaration = getAncestor(namedImportsOrExports, declarationKind); + const moduleSpecifier = importOrExportDeclaration.moduleSpecifier; if (!moduleSpecifier) { return false; @@ -3480,7 +3479,7 @@ namespace ts { isNewIdentifierLocation = false; let exports: Symbol[]; - let moduleSpecifierSymbol = typeChecker.getSymbolAtLocation(importOrExportDeclaration.moduleSpecifier); + const moduleSpecifierSymbol = typeChecker.getSymbolAtLocation(importOrExportDeclaration.moduleSpecifier); if (moduleSpecifierSymbol) { exports = typeChecker.getExportsOfModule(moduleSpecifierSymbol); } @@ -3497,9 +3496,9 @@ namespace ts { function tryGetObjectLikeCompletionContainer(contextToken: Node): ObjectLiteralExpression | BindingPattern { if (contextToken) { switch (contextToken.kind) { - case SyntaxKind.OpenBraceToken: // let x = { | - case SyntaxKind.CommaToken: // let x = { a: 0, | - let parent = contextToken.parent; + case SyntaxKind.OpenBraceToken: // const x = { | + case SyntaxKind.CommaToken: // const x = { a: 0, | + const parent = contextToken.parent; if (parent && (parent.kind === SyntaxKind.ObjectLiteralExpression || parent.kind === SyntaxKind.ObjectBindingPattern)) { return parent; } @@ -3532,8 +3531,8 @@ namespace ts { function tryGetContainingJsxElement(contextToken: Node): JsxOpeningLikeElement { if (contextToken) { - let parent = contextToken.parent; - switch(contextToken.kind) { + const parent = contextToken.parent; + switch (contextToken.kind) { case SyntaxKind.LessThanSlashToken: case SyntaxKind.SlashToken: case SyntaxKind.Identifier: @@ -3596,7 +3595,7 @@ namespace ts { * @returns true if we are certain that the currently edited location must define a new location; false otherwise. */ function isSolelyIdentifierDefinitionLocation(contextToken: Node): boolean { - let containingNodeKind = contextToken.parent.kind; + const containingNodeKind = contextToken.parent.kind; switch (contextToken.kind) { case SyntaxKind.CommaToken: return containingNodeKind === SyntaxKind.VariableDeclaration || @@ -3626,13 +3625,13 @@ namespace ts { case SyntaxKind.OpenBraceToken: return containingNodeKind === SyntaxKind.EnumDeclaration || // enum a { | containingNodeKind === SyntaxKind.InterfaceDeclaration || // interface a { | - containingNodeKind === SyntaxKind.TypeLiteral; // let x : { | + containingNodeKind === SyntaxKind.TypeLiteral; // const x : { | case SyntaxKind.SemicolonToken: return containingNodeKind === SyntaxKind.PropertySignature && contextToken.parent && contextToken.parent.parent && (contextToken.parent.parent.kind === SyntaxKind.InterfaceDeclaration || // interface a { f; | - contextToken.parent.parent.kind === SyntaxKind.TypeLiteral); // let x : { a; | + contextToken.parent.parent.kind === SyntaxKind.TypeLiteral); // const x : { a; | case SyntaxKind.LessThanToken: return containingNodeKind === SyntaxKind.ClassDeclaration || // class A< | @@ -3699,7 +3698,7 @@ namespace ts { function isDotOfNumericLiteral(contextToken: Node): boolean { if (contextToken.kind === SyntaxKind.NumericLiteral) { - let text = contextToken.getFullText(); + const text = contextToken.getFullText(); return text.charAt(text.length - 1) === "."; } @@ -3716,15 +3715,15 @@ namespace ts { * do not occur at the current position and have not otherwise been typed. */ function filterNamedImportOrExportCompletionItems(exportsOfModule: Symbol[], namedImportsOrExports: ImportOrExportSpecifier[]): Symbol[] { - let exisingImportsOrExports: Map = {}; + const exisingImportsOrExports: Map = {}; - for (let element of namedImportsOrExports) { + for (const element of namedImportsOrExports) { // If this is the current item we are editing right now, do not filter it out if (element.getStart() <= position && position <= element.getEnd()) { continue; } - let name = element.propertyName || element.name; + const name = element.propertyName || element.name; exisingImportsOrExports[name.text] = true; } @@ -3746,8 +3745,8 @@ namespace ts { return contextualMemberSymbols; } - let existingMemberNames: Map = {}; - for (let m of existingMembers) { + const existingMemberNames: Map = {}; + for (const m of existingMembers) { // Ignore omitted expressions for missing members if (m.kind !== SyntaxKind.PropertyAssignment && m.kind !== SyntaxKind.ShorthandPropertyAssignment && @@ -3766,7 +3765,7 @@ namespace ts { if (m.kind === SyntaxKind.BindingElement && (m).propertyName) { // include only identifiers in completion list if ((m).propertyName.kind === SyntaxKind.Identifier) { - existingName = ((m).propertyName).text + existingName = ((m).propertyName).text; } } else { @@ -3789,8 +3788,8 @@ namespace ts { * do not occur at the current position and have not otherwise been typed. */ function filterJsxAttributes(symbols: Symbol[], attributes: NodeArray): Symbol[] { - let seenNames: Map = {}; - for (let attr of attributes) { + const seenNames: Map = {}; + for (const attr of attributes) { // If this is the current item we are editing right now, do not filter it out if (attr.getStart() <= position && position <= attr.getEnd()) { continue; @@ -3809,21 +3808,21 @@ namespace ts { function getCompletionsAtPosition(fileName: string, position: number): CompletionInfo { synchronizeHostData(); - let completionData = getCompletionData(fileName, position); + const completionData = getCompletionData(fileName, position); if (!completionData) { return undefined; } - let { symbols, isMemberCompletion, isNewIdentifierLocation, location, isRightOfDot, isJsDocTagName } = completionData; + const { symbols, isMemberCompletion, isNewIdentifierLocation, location, isRightOfDot, isJsDocTagName } = completionData; if (isJsDocTagName) { // If the current position is a jsDoc tag name, only tag names should be provided for completion return { isMemberCompletion: false, isNewIdentifierLocation: false, entries: getAllJsDocCompletionEntries() }; } - let sourceFile = getValidSourceFile(fileName); + const sourceFile = getValidSourceFile(fileName); - let entries: CompletionEntry[] = []; + const entries: CompletionEntry[] = []; if (isRightOfDot && isSourceFileJavaScript(sourceFile)) { const uniqueNames = getCompletionEntriesFromSymbols(symbols, entries); @@ -3845,16 +3844,16 @@ namespace ts { return { isMemberCompletion, isNewIdentifierLocation, entries }; function getJavaScriptCompletionEntries(sourceFile: SourceFile, uniqueNames: Map): CompletionEntry[] { - let entries: CompletionEntry[] = []; - let target = program.getCompilerOptions().target; + const entries: CompletionEntry[] = []; + const target = program.getCompilerOptions().target; - let nameTable = getNameTable(sourceFile); - for (let name in nameTable) { + const nameTable = getNameTable(sourceFile); + for (const name in nameTable) { if (!uniqueNames[name]) { uniqueNames[name] = name; - let displayName = getCompletionEntryDisplayName(name, target, /*performCharacterChecks:*/ true); + const displayName = getCompletionEntryDisplayName(name, target, /*performCharacterChecks*/ true); if (displayName) { - let entry = { + const entry = { name: displayName, kind: ScriptElementKind.warning, kindModifiers: "", @@ -3875,7 +3874,7 @@ namespace ts { kind: ScriptElementKind.keyword, kindModifiers: "", sortText: "0", - } + }; })); } @@ -3883,7 +3882,7 @@ namespace ts { // Try to get a valid display name for this symbol, if we could not find one, then ignore it. // We would like to only show things that can be added after a dot, so for instance numeric properties can // not be accessed with a dot (a.1 <- invalid) - let displayName = getCompletionEntryDisplayNameForSymbol(symbol, program.getCompilerOptions().target, /*performCharacterChecks:*/ true, location); + const displayName = getCompletionEntryDisplayNameForSymbol(symbol, program.getCompilerOptions().target, /*performCharacterChecks*/ true, location); if (!displayName) { return undefined; } @@ -3905,13 +3904,13 @@ namespace ts { } function getCompletionEntriesFromSymbols(symbols: Symbol[], entries: CompletionEntry[]): Map { - let start = new Date().getTime(); - let uniqueNames: Map = {}; + const start = new Date().getTime(); + const uniqueNames: Map = {}; if (symbols) { - for (let symbol of symbols) { - let entry = createCompletionEntry(symbol, location); + for (const symbol of symbols) { + const entry = createCompletionEntry(symbol, location); if (entry) { - let id = escapeIdentifier(entry.name); + const id = escapeIdentifier(entry.name); if (!lookUp(uniqueNames, id)) { entries.push(entry); uniqueNames[id] = id; @@ -3929,19 +3928,19 @@ namespace ts { synchronizeHostData(); // Compute all the completion symbols again. - let completionData = getCompletionData(fileName, position); + const completionData = getCompletionData(fileName, position); if (completionData) { - let { symbols, location } = completionData; + const { symbols, location } = completionData; // Find the symbol with the matching entry name. - let target = program.getCompilerOptions().target; + const target = program.getCompilerOptions().target; // We don't need to perform character checks here because we're only comparing the // name against 'entryName' (which is known to be good), not building a new // completion entry. - let symbol = forEach(symbols, s => getCompletionEntryDisplayNameForSymbol(s, target, /*performCharacterChecks:*/ false, location) === entryName ? s : undefined); + const symbol = forEach(symbols, s => getCompletionEntryDisplayNameForSymbol(s, target, /*performCharacterChecks*/ false, location) === entryName ? s : undefined); if (symbol) { - let { displayParts, documentation, symbolKind } = getSymbolDisplayPartsDocumentationAndSymbolKind(symbol, getValidSourceFile(fileName), location, location, SemanticMeaning.All); + const { displayParts, documentation, symbolKind } = getSymbolDisplayPartsDocumentationAndSymbolKind(symbol, getValidSourceFile(fileName), location, location, SemanticMeaning.All); return { name: entryName, kindModifiers: getSymbolModifiers(symbol), @@ -3953,7 +3952,7 @@ namespace ts { } // Didn't find a symbol with this name. See if we can find a keyword instead. - let keywordCompletion = forEach(keywordCompletions, c => c.name === entryName); + const keywordCompletion = forEach(keywordCompletions, c => c.name === entryName); if (keywordCompletion) { return { name: entryName, @@ -3969,7 +3968,7 @@ namespace ts { // TODO(drosen): use contextual SemanticMeaning. function getSymbolKind(symbol: Symbol, location: Node): string { - let flags = symbol.getFlags(); + const flags = symbol.getFlags(); if (flags & SymbolFlags.Class) return getDeclarationOfKind(symbol, SyntaxKind.ClassExpression) ? ScriptElementKind.localClassElement : ScriptElementKind.classElement; @@ -3978,7 +3977,7 @@ namespace ts { if (flags & SymbolFlags.Interface) return ScriptElementKind.interfaceElement; if (flags & SymbolFlags.TypeParameter) return ScriptElementKind.typeParameterElement; - let result = getSymbolKindOfConstructorPropertyMethodAccessorFunctionOrVar(symbol, flags, location); + const result = getSymbolKindOfConstructorPropertyMethodAccessorFunctionOrVar(symbol, flags, location); if (result === ScriptElementKind.unknown) { if (flags & SymbolFlags.TypeParameter) return ScriptElementKind.typeParameterElement; if (flags & SymbolFlags.EnumMember) return ScriptElementKind.variableElement; @@ -3990,7 +3989,7 @@ namespace ts { } function getSymbolKindOfConstructorPropertyMethodAccessorFunctionOrVar(symbol: Symbol, flags: SymbolFlags, location: Node) { - let typeChecker = program.getTypeChecker(); + const typeChecker = program.getTypeChecker(); if (typeChecker.isUndefinedSymbol(symbol)) { return ScriptElementKind.variableElement; @@ -4019,8 +4018,8 @@ namespace ts { if (flags & SymbolFlags.Property) { if (flags & SymbolFlags.SyntheticProperty) { // If union property is result of union of non method (property/accessors/variables), it is labeled as property - let unionPropertyKind = forEach(typeChecker.getRootSymbols(symbol), rootSymbol => { - let rootSymbolFlags = rootSymbol.getFlags(); + const unionPropertyKind = forEach(typeChecker.getRootSymbols(symbol), rootSymbol => { + const rootSymbolFlags = rootSymbol.getFlags(); if (rootSymbolFlags & (SymbolFlags.PropertyOrAccessor | SymbolFlags.Variable)) { return ScriptElementKind.memberVariableElement; } @@ -4028,8 +4027,8 @@ namespace ts { }); if (!unionPropertyKind) { // If this was union of all methods, - //make sure it has call signatures before we can label it as method - let typeOfUnionProperty = typeChecker.getTypeOfSymbolAtLocation(symbol, location); + // make sure it has call signatures before we can label it as method + const typeOfUnionProperty = typeChecker.getTypeOfSymbolAtLocation(symbol, location); if (typeOfUnionProperty.getCallSignatures().length) { return ScriptElementKind.memberFunctionElement; } @@ -4053,11 +4052,11 @@ namespace ts { function getSymbolDisplayPartsDocumentationAndSymbolKind(symbol: Symbol, sourceFile: SourceFile, enclosingDeclaration: Node, location: Node, semanticMeaning = getMeaningFromLocation(location)) { - let typeChecker = program.getTypeChecker(); + const typeChecker = program.getTypeChecker(); - let displayParts: SymbolDisplayPart[] = []; + const displayParts: SymbolDisplayPart[] = []; let documentation: SymbolDisplayPart[]; - let symbolFlags = symbol.flags; + const symbolFlags = symbol.flags; let symbolKind = getSymbolKindOfConstructorPropertyMethodAccessorFunctionOrVar(symbol, symbolFlags, location); let hasAddedSymbolInfo: boolean; let type: Type; @@ -4073,7 +4072,7 @@ namespace ts { type = typeChecker.getTypeOfSymbolAtLocation(symbol, location); if (type) { if (location.parent && location.parent.kind === SyntaxKind.PropertyAccessExpression) { - let right = (location.parent).name; + const right = (location.parent).name; // Either the location is on the right of a property access, or on the left and the right is missing if (right === location || (right && right.getFullWidth() === 0)) { location = location.parent; @@ -4090,15 +4089,15 @@ namespace ts { } if (callExpression) { - let candidateSignatures: Signature[] = []; + const candidateSignatures: Signature[] = []; signature = typeChecker.getResolvedSignature(callExpression, candidateSignatures); if (!signature && candidateSignatures.length) { // Use the first candidate: signature = candidateSignatures[0]; } - let useConstructSignatures = callExpression.kind === SyntaxKind.NewExpression || callExpression.expression.kind === SyntaxKind.SuperKeyword; - let allSignatures = useConstructSignatures ? type.getConstructSignatures() : type.getCallSignatures(); + const useConstructSignatures = callExpression.kind === SyntaxKind.NewExpression || callExpression.expression.kind === SyntaxKind.SuperKeyword; + const allSignatures = useConstructSignatures ? type.getConstructSignatures() : type.getCallSignatures(); if (!contains(allSignatures, signature.target) && !contains(allSignatures, signature)) { // Get the first signature if there is one -- allSignatures may contain @@ -4156,8 +4155,8 @@ namespace ts { else if ((isNameOfFunctionDeclaration(location) && !(symbol.flags & SymbolFlags.Accessor)) || // name of function declaration (location.kind === SyntaxKind.ConstructorKeyword && location.parent.kind === SyntaxKind.Constructor)) { // At constructor keyword of constructor declaration // get the signature from the declaration and write it - let functionDeclaration = location.parent; - let allSignatures = functionDeclaration.kind === SyntaxKind.Constructor ? type.getConstructSignatures() : type.getCallSignatures(); + const functionDeclaration = location.parent; + const allSignatures = functionDeclaration.kind === SyntaxKind.Constructor ? type.getConstructSignatures() : type.getCallSignatures(); if (!typeChecker.isImplementationOfOverload(functionDeclaration)) { signature = typeChecker.getSignatureFromDeclaration(functionDeclaration); } @@ -4226,8 +4225,8 @@ namespace ts { } if (symbolFlags & SymbolFlags.Module) { addNewLineIfDisplayPartsExist(); - let declaration = getDeclarationOfKind(symbol, SyntaxKind.ModuleDeclaration); - let isNamespace = declaration && declaration.name && declaration.name.kind === SyntaxKind.Identifier; + const declaration = getDeclarationOfKind(symbol, SyntaxKind.ModuleDeclaration); + const isNamespace = declaration && declaration.name && declaration.name.kind === SyntaxKind.Identifier; displayParts.push(keywordPart(isNamespace ? SyntaxKind.NamespaceKeyword : SyntaxKind.ModuleKeyword)); displayParts.push(spacePart()); addFullSymbolName(symbol); @@ -4279,9 +4278,9 @@ namespace ts { } if (symbolFlags & SymbolFlags.EnumMember) { addPrefixForAnyFunctionOrVar(symbol, "enum member"); - let declaration = symbol.declarations[0]; + const declaration = symbol.declarations[0]; if (declaration.kind === SyntaxKind.EnumMember) { - let constantValue = typeChecker.getConstantValue(declaration); + const constantValue = typeChecker.getConstantValue(declaration); if (constantValue !== undefined) { displayParts.push(spacePart()); displayParts.push(operatorPart(SyntaxKind.EqualsToken)); @@ -4297,7 +4296,7 @@ namespace ts { addFullSymbolName(symbol); ts.forEach(symbol.declarations, declaration => { if (declaration.kind === SyntaxKind.ImportEqualsDeclaration) { - let importEqualsDeclaration = declaration; + const importEqualsDeclaration = declaration; if (isExternalModuleImportEqualsDeclaration(importEqualsDeclaration)) { displayParts.push(spacePart()); displayParts.push(operatorPart(SyntaxKind.EqualsToken)); @@ -4308,7 +4307,7 @@ namespace ts { displayParts.push(punctuationPart(SyntaxKind.CloseParenToken)); } else { - let internalAliasSymbol = typeChecker.getSymbolAtLocation(importEqualsDeclaration.moduleReference); + const internalAliasSymbol = typeChecker.getSymbolAtLocation(importEqualsDeclaration.moduleReference); if (internalAliasSymbol) { displayParts.push(spacePart()); displayParts.push(operatorPart(SyntaxKind.EqualsToken)); @@ -4332,7 +4331,7 @@ namespace ts { displayParts.push(spacePart()); // If the type is type parameter, format it specially if (type.symbol && type.symbol.flags & SymbolFlags.TypeParameter) { - let typeParameterParts = mapToDisplayParts(writer => { + const typeParameterParts = mapToDisplayParts(writer => { typeChecker.getSymbolDisplayBuilder().buildTypeParameterDisplay(type, writer, enclosingDeclaration); }); addRange(displayParts, typeParameterParts); @@ -4347,7 +4346,7 @@ namespace ts { symbolFlags & SymbolFlags.Signature || symbolFlags & SymbolFlags.Accessor || symbolKind === ScriptElementKind.memberFunctionElement) { - let allSignatures = type.getCallSignatures(); + const allSignatures = type.getCallSignatures(); addSignatureDisplayParts(allSignatures[0], allSignatures); } } @@ -4370,7 +4369,7 @@ namespace ts { } function addFullSymbolName(symbol: Symbol, enclosingDeclaration?: Node) { - let fullSymbolDisplayParts = symbolToDisplayParts(typeChecker, symbol, enclosingDeclaration || sourceFile, /*meaning*/ undefined, + const fullSymbolDisplayParts = symbolToDisplayParts(typeChecker, symbol, enclosingDeclaration || sourceFile, /*meaning*/ undefined, SymbolFormatFlags.WriteTypeParametersOrArguments | SymbolFormatFlags.UseOnlyExternalAliasing); addRange(displayParts, fullSymbolDisplayParts); } @@ -4416,7 +4415,7 @@ namespace ts { } function writeTypeParametersOfSymbol(symbol: Symbol, enclosingDeclaration: Node) { - let typeParameterParts = mapToDisplayParts(writer => { + const typeParameterParts = mapToDisplayParts(writer => { typeChecker.getSymbolDisplayBuilder().buildTypeParameterDisplayFromSymbol(symbol, writer, enclosingDeclaration); }); addRange(displayParts, typeParameterParts); @@ -4426,8 +4425,8 @@ namespace ts { function getQuickInfoAtPosition(fileName: string, position: number): QuickInfo { synchronizeHostData(); - let sourceFile = getValidSourceFile(fileName); - let node = getTouchingPropertyName(sourceFile, position); + const sourceFile = getValidSourceFile(fileName); + const node = getTouchingPropertyName(sourceFile, position); if (!node) { return undefined; } @@ -4436,8 +4435,8 @@ namespace ts { return undefined; } - let typeChecker = program.getTypeChecker(); - let symbol = typeChecker.getSymbolAtLocation(node); + const typeChecker = program.getTypeChecker(); + const symbol = typeChecker.getSymbolAtLocation(node); if (!symbol) { // Try getting just type at this position and show @@ -4449,7 +4448,7 @@ namespace ts { case SyntaxKind.ThisType: case SyntaxKind.SuperKeyword: // For the identifiers/this/super etc get the type at position - let type = typeChecker.getTypeAtLocation(node); + const type = typeChecker.getTypeAtLocation(node); if (type) { return { kind: ScriptElementKind.unknown, @@ -4464,7 +4463,7 @@ namespace ts { return undefined; } - let displayPartsDocumentationsAndKind = getSymbolDisplayPartsDocumentationAndSymbolKind(symbol, sourceFile, getContainerNode(node), node); + const displayPartsDocumentationsAndKind = getSymbolDisplayPartsDocumentationAndSymbolKind(symbol, sourceFile, getContainerNode(node), node); return { kind: displayPartsDocumentationsAndKind.symbolKind, kindModifiers: getSymbolModifiers(symbol), @@ -4486,13 +4485,13 @@ namespace ts { } function getDefinitionFromSymbol(symbol: Symbol, node: Node): DefinitionInfo[] { - let typeChecker = program.getTypeChecker(); - let result: DefinitionInfo[] = []; - let declarations = symbol.getDeclarations(); - let symbolName = typeChecker.symbolToString(symbol); // Do not get scoped name, just the name of the symbol - let symbolKind = getSymbolKind(symbol, node); - let containerSymbol = symbol.parent; - let containerName = containerSymbol ? typeChecker.symbolToString(containerSymbol, node) : ""; + const typeChecker = program.getTypeChecker(); + const result: DefinitionInfo[] = []; + const declarations = symbol.getDeclarations(); + const symbolName = typeChecker.symbolToString(symbol); // Do not get scoped name, just the name of the symbol + const symbolKind = getSymbolKind(symbol, node); + const containerSymbol = symbol.parent; + const containerName = containerSymbol ? typeChecker.symbolToString(containerSymbol, node) : ""; if (!tryAddConstructSignature(symbol, node, symbolKind, symbolName, containerName, result) && !tryAddCallSignature(symbol, node, symbolKind, symbolName, containerName, result)) { @@ -4510,7 +4509,7 @@ namespace ts { if (isNewExpressionTarget(location) || location.kind === SyntaxKind.ConstructorKeyword) { if (symbol.flags & SymbolFlags.Class) { // Find the first class-like declaration and try to get the construct signature. - for (let declaration of symbol.getDeclarations()) { + for (const declaration of symbol.getDeclarations()) { if (isClassLike(declaration)) { return tryAddSignature(declaration.members, /*selectConstructors*/ true, @@ -4535,7 +4534,7 @@ namespace ts { } function tryAddSignature(signatureDeclarations: Declaration[], selectConstructors: boolean, symbolKind: string, symbolName: string, containerName: string, result: DefinitionInfo[]) { - let declarations: Declaration[] = []; + const declarations: Declaration[] = []; let definition: Declaration; forEach(signatureDeclarations, d => { @@ -4563,24 +4562,24 @@ namespace ts { function getDefinitionAtPosition(fileName: string, position: number): DefinitionInfo[] { synchronizeHostData(); - let sourceFile = getValidSourceFile(fileName); + const sourceFile = getValidSourceFile(fileName); - let node = getTouchingPropertyName(sourceFile, position); + const node = getTouchingPropertyName(sourceFile, position); if (!node) { return undefined; } // Labels if (isJumpStatementTarget(node)) { - let labelName = (node).text; - let label = getTargetLabel((node.parent), (node).text); + const labelName = (node).text; + const label = getTargetLabel((node.parent), (node).text); return label ? [createDefinitionInfo(label, ScriptElementKind.label, labelName, /*containerName*/ undefined)] : undefined; } /// Triple slash reference comments - let comment = forEach(sourceFile.referencedFiles, r => (r.pos <= position && position < r.end) ? r : undefined); + const comment = forEach(sourceFile.referencedFiles, r => (r.pos <= position && position < r.end) ? r : undefined); if (comment) { - let referenceFile = tryResolveScriptReference(program, sourceFile, comment); + const referenceFile = tryResolveScriptReference(program, sourceFile, comment); if (referenceFile) { return [{ fileName: referenceFile.fileName, @@ -4594,7 +4593,7 @@ namespace ts { return undefined; } - let typeChecker = program.getTypeChecker(); + const typeChecker = program.getTypeChecker(); let symbol = typeChecker.getSymbolAtLocation(node); // Could not find a symbol e.g. node is string or number keyword, @@ -4608,7 +4607,7 @@ namespace ts { // import {A, B} from "mod"; // to jump to the implementation directly. if (symbol.flags & SymbolFlags.Alias) { - let declaration = symbol.declarations[0]; + const declaration = symbol.declarations[0]; if (node.kind === SyntaxKind.Identifier && node.parent === declaration) { symbol = typeChecker.getAliasedSymbol(symbol); } @@ -4620,15 +4619,15 @@ namespace ts { // is performed at the location of property access, we would like to go to definition of the property in the short-hand // assignment. This case and others are handled by the following code. if (node.parent.kind === SyntaxKind.ShorthandPropertyAssignment) { - let shorthandSymbol = typeChecker.getShorthandAssignmentValueSymbol(symbol.valueDeclaration); + const shorthandSymbol = typeChecker.getShorthandAssignmentValueSymbol(symbol.valueDeclaration); if (!shorthandSymbol) { return []; } - let shorthandDeclarations = shorthandSymbol.getDeclarations(); - let shorthandSymbolKind = getSymbolKind(shorthandSymbol, node); - let shorthandSymbolName = typeChecker.symbolToString(shorthandSymbol); - let shorthandContainerName = typeChecker.symbolToString(symbol.parent, node); + const shorthandDeclarations = shorthandSymbol.getDeclarations(); + const shorthandSymbolKind = getSymbolKind(shorthandSymbol, node); + const shorthandSymbolName = typeChecker.symbolToString(shorthandSymbol); + const shorthandContainerName = typeChecker.symbolToString(symbol.parent, node); return map(shorthandDeclarations, declaration => createDefinitionInfo(declaration, shorthandSymbolKind, shorthandSymbolName, shorthandContainerName)); } @@ -4640,27 +4639,27 @@ namespace ts { function getTypeDefinitionAtPosition(fileName: string, position: number): DefinitionInfo[] { synchronizeHostData(); - let sourceFile = getValidSourceFile(fileName); + const sourceFile = getValidSourceFile(fileName); - let node = getTouchingPropertyName(sourceFile, position); + const node = getTouchingPropertyName(sourceFile, position); if (!node) { return undefined; } - let typeChecker = program.getTypeChecker(); + const typeChecker = program.getTypeChecker(); - let symbol = typeChecker.getSymbolAtLocation(node); + const symbol = typeChecker.getSymbolAtLocation(node); if (!symbol) { return undefined; } - let type = typeChecker.getTypeOfSymbolAtLocation(symbol, node); + const type = typeChecker.getTypeOfSymbolAtLocation(symbol, node); if (!type) { return undefined; } if (type.flags & TypeFlags.Union) { - let result: DefinitionInfo[] = []; + const result: DefinitionInfo[] = []; forEach((type).types, t => { if (t.symbol) { addRange(/*to*/ result, /*from*/ getDefinitionFromSymbol(t.symbol, node)); @@ -4680,7 +4679,7 @@ namespace ts { let results = getOccurrencesAtPositionCore(fileName, position); if (results) { - let sourceFile = getCanonicalFileName(normalizeSlashes(fileName)); + const sourceFile = getCanonicalFileName(normalizeSlashes(fileName)); // Get occurrences only supports reporting occurrences for the file queried. So // filter down to that list. @@ -4694,10 +4693,10 @@ namespace ts { synchronizeHostData(); filesToSearch = map(filesToSearch, normalizeSlashes); - let sourceFilesToSearch = filter(program.getSourceFiles(), f => contains(filesToSearch, f.fileName)); - let sourceFile = getValidSourceFile(fileName); + const sourceFilesToSearch = filter(program.getSourceFiles(), f => contains(filesToSearch, f.fileName)); + const sourceFile = getValidSourceFile(fileName); - let node = getTouchingWord(sourceFile, position); + const node = getTouchingWord(sourceFile, position); if (!node) { return undefined; } @@ -4705,8 +4704,8 @@ namespace ts { return getSemanticDocumentHighlights(node) || getSyntacticDocumentHighlights(node); function getHighlightSpanForNode(node: Node): HighlightSpan { - let start = node.getStart(); - let end = node.getEnd(); + const start = node.getStart(); + const end = node.getEnd(); return { fileName: sourceFile.fileName, @@ -4723,7 +4722,7 @@ namespace ts { isLiteralNameOfPropertyDeclarationOrIndexAccess(node) || isNameOfExternalModuleImportOrDeclaration(node)) { - let referencedSymbols = getReferencedSymbolsForNode(node, sourceFilesToSearch, /*findInStrings:*/ false, /*findInComments:*/ false); + const referencedSymbols = getReferencedSymbolsForNode(node, sourceFilesToSearch, /*findInStrings*/ false, /*findInComments*/ false); return convertReferencedSymbols(referencedSymbols); } @@ -4734,11 +4733,11 @@ namespace ts { return undefined; } - let fileNameToDocumentHighlights: Map = {}; - let result: DocumentHighlights[] = []; - for (let referencedSymbol of referencedSymbols) { - for (let referenceEntry of referencedSymbol.references) { - let fileName = referenceEntry.fileName; + const fileNameToDocumentHighlights: Map = {}; + const result: DocumentHighlights[] = []; + for (const referencedSymbol of referencedSymbols) { + for (const referenceEntry of referencedSymbol.references) { + const fileName = referenceEntry.fileName; let documentHighlights = getProperty(fileNameToDocumentHighlights, fileName); if (!documentHighlights) { documentHighlights = { fileName, highlightSpans: [] }; @@ -4759,9 +4758,9 @@ namespace ts { } function getSyntacticDocumentHighlights(node: Node): DocumentHighlights[] { - let fileName = sourceFile.fileName; + const fileName = sourceFile.fileName; - let highlightSpans = getHighlightSpans(node); + const highlightSpans = getHighlightSpans(node); if (!highlightSpans || highlightSpans.length === 0) { return undefined; } @@ -4865,7 +4864,7 @@ namespace ts { * into function boundaries and try-blocks with catch-clauses. */ function aggregateOwnedThrowStatements(node: Node): ThrowStatement[] { - let statementAccumulator: ThrowStatement[] = [] + const statementAccumulator: ThrowStatement[] = []; aggregate(node); return statementAccumulator; @@ -4874,7 +4873,7 @@ namespace ts { statementAccumulator.push(node); } else if (node.kind === SyntaxKind.TryStatement) { - let tryStatement = node; + const tryStatement = node; if (tryStatement.catchClause) { aggregate(tryStatement.catchClause); @@ -4905,7 +4904,7 @@ namespace ts { let child: Node = throwStatement; while (child.parent) { - let parent = child.parent; + const parent = child.parent; if (isFunctionBlock(parent) || parent.kind === SyntaxKind.SourceFile) { return parent; @@ -4914,7 +4913,7 @@ namespace ts { // A throw-statement is only owned by a try-statement if the try-statement has // a catch clause, and if the throw-statement occurs within the try block. if (parent.kind === SyntaxKind.TryStatement) { - let tryStatement = parent; + const tryStatement = parent; if (tryStatement.tryBlock === child && tryStatement.catchClause) { return child; @@ -4928,7 +4927,7 @@ namespace ts { } function aggregateAllBreakAndContinueStatements(node: Node): BreakOrContinueStatement[] { - let statementAccumulator: BreakOrContinueStatement[] = [] + const statementAccumulator: BreakOrContinueStatement[] = []; aggregate(node); return statementAccumulator; @@ -4944,7 +4943,7 @@ namespace ts { } function ownsBreakOrContinueStatement(owner: Node, statement: BreakOrContinueStatement): boolean { - let actualOwner = getBreakOrContinueOwner(statement); + const actualOwner = getBreakOrContinueOwner(statement); return actualOwner && actualOwner === owner; } @@ -4979,7 +4978,7 @@ namespace ts { } function getModifierOccurrences(modifier: SyntaxKind, declaration: Node): HighlightSpan[] { - let container = declaration.parent; + const container = declaration.parent; // Make sure we only highlight the keyword when it makes sense to do so. if (isAccessibilityModifier(modifier)) { @@ -5009,8 +5008,8 @@ namespace ts { return undefined; } - let keywords: Node[] = []; - let modifierFlag: NodeFlags = getFlagFromModifier(modifier); + const keywords: Node[] = []; + const modifierFlag: NodeFlags = getFlagFromModifier(modifier); let nodes: Node[]; switch (container.kind) { @@ -5035,7 +5034,7 @@ namespace ts { // If we're an accessibility modifier, we're in an instance member and should search // the constructor's parameter list for instance members as well. if (modifierFlag & NodeFlags.AccessibilityModifier) { - let constructor = forEach((container).members, member => { + const constructor = forEach((container).members, member => { return member.kind === SyntaxKind.Constructor && member; }); @@ -5048,7 +5047,7 @@ namespace ts { } break; default: - Debug.fail("Invalid container kind.") + Debug.fail("Invalid container kind."); } forEach(nodes, node => { @@ -5091,7 +5090,7 @@ namespace ts { } function getGetAndSetOccurrences(accessorDeclaration: AccessorDeclaration): HighlightSpan[] { - let keywords: Node[] = []; + const keywords: Node[] = []; tryPushAccessorKeyword(accessorDeclaration.symbol, SyntaxKind.GetAccessor); tryPushAccessorKeyword(accessorDeclaration.symbol, SyntaxKind.SetAccessor); @@ -5099,7 +5098,7 @@ namespace ts { return map(keywords, getHighlightSpanForNode); function tryPushAccessorKeyword(accessorSymbol: Symbol, accessorKind: SyntaxKind): void { - let accessor = getDeclarationOfKind(accessorSymbol, accessorKind); + const accessor = getDeclarationOfKind(accessorSymbol, accessorKind); if (accessor) { forEach(accessor.getChildren(), child => pushKeywordIf(keywords, child, SyntaxKind.GetKeyword, SyntaxKind.SetKeyword)); @@ -5108,9 +5107,9 @@ namespace ts { } function getConstructorOccurrences(constructorDeclaration: ConstructorDeclaration): HighlightSpan[] { - let declarations = constructorDeclaration.symbol.getDeclarations() + const declarations = constructorDeclaration.symbol.getDeclarations(); - let keywords: Node[] = []; + const keywords: Node[] = []; forEach(declarations, declaration => { forEach(declaration.getChildren(), token => { @@ -5122,12 +5121,12 @@ namespace ts { } function getLoopBreakContinueOccurrences(loopNode: IterationStatement): HighlightSpan[] { - let keywords: Node[] = []; + const keywords: Node[] = []; if (pushKeywordIf(keywords, loopNode.getFirstToken(), SyntaxKind.ForKeyword, SyntaxKind.WhileKeyword, SyntaxKind.DoKeyword)) { // If we succeeded and got a do-while loop, then start looking for a 'while' keyword. if (loopNode.kind === SyntaxKind.DoStatement) { - let loopTokens = loopNode.getChildren(); + const loopTokens = loopNode.getChildren(); for (let i = loopTokens.length - 1; i >= 0; i--) { if (pushKeywordIf(keywords, loopTokens[i], SyntaxKind.WhileKeyword)) { @@ -5137,7 +5136,7 @@ namespace ts { } } - let breaksAndContinues = aggregateAllBreakAndContinueStatements(loopNode.statement); + const breaksAndContinues = aggregateAllBreakAndContinueStatements(loopNode.statement); forEach(breaksAndContinues, statement => { if (ownsBreakOrContinueStatement(loopNode, statement)) { @@ -5149,7 +5148,7 @@ namespace ts { } function getBreakOrContinueStatementOccurrences(breakOrContinueStatement: BreakOrContinueStatement): HighlightSpan[] { - let owner = getBreakOrContinueOwner(breakOrContinueStatement); + const owner = getBreakOrContinueOwner(breakOrContinueStatement); if (owner) { switch (owner.kind) { @@ -5158,7 +5157,7 @@ namespace ts { case SyntaxKind.ForOfStatement: case SyntaxKind.DoStatement: case SyntaxKind.WhileStatement: - return getLoopBreakContinueOccurrences(owner) + return getLoopBreakContinueOccurrences(owner); case SyntaxKind.SwitchStatement: return getSwitchCaseDefaultOccurrences(owner); @@ -5169,7 +5168,7 @@ namespace ts { } function getSwitchCaseDefaultOccurrences(switchStatement: SwitchStatement): HighlightSpan[] { - let keywords: Node[] = []; + const keywords: Node[] = []; pushKeywordIf(keywords, switchStatement.getFirstToken(), SyntaxKind.SwitchKeyword); @@ -5177,7 +5176,7 @@ namespace ts { forEach(switchStatement.caseBlock.clauses, clause => { pushKeywordIf(keywords, clause.getFirstToken(), SyntaxKind.CaseKeyword, SyntaxKind.DefaultKeyword); - let breaksAndContinues = aggregateAllBreakAndContinueStatements(clause); + const breaksAndContinues = aggregateAllBreakAndContinueStatements(clause); forEach(breaksAndContinues, statement => { if (ownsBreakOrContinueStatement(switchStatement, statement)) { @@ -5190,7 +5189,7 @@ namespace ts { } function getTryCatchFinallyOccurrences(tryStatement: TryStatement): HighlightSpan[] { - let keywords: Node[] = []; + const keywords: Node[] = []; pushKeywordIf(keywords, tryStatement.getFirstToken(), SyntaxKind.TryKeyword); @@ -5199,7 +5198,7 @@ namespace ts { } if (tryStatement.finallyBlock) { - let finallyKeyword = findChildOfKind(tryStatement, SyntaxKind.FinallyKeyword, sourceFile); + const finallyKeyword = findChildOfKind(tryStatement, SyntaxKind.FinallyKeyword, sourceFile); pushKeywordIf(keywords, finallyKeyword, SyntaxKind.FinallyKeyword); } @@ -5207,13 +5206,13 @@ namespace ts { } function getThrowOccurrences(throwStatement: ThrowStatement): HighlightSpan[] { - let owner = getThrowStatementOwner(throwStatement); + const owner = getThrowStatementOwner(throwStatement); if (!owner) { return undefined; } - let keywords: Node[] = []; + const keywords: Node[] = []; forEach(aggregateOwnedThrowStatements(owner), throwStatement => { pushKeywordIf(keywords, throwStatement.getFirstToken(), SyntaxKind.ThrowKeyword); @@ -5231,14 +5230,14 @@ namespace ts { } function getReturnOccurrences(returnStatement: ReturnStatement): HighlightSpan[] { - let func = getContainingFunction(returnStatement); + const func = getContainingFunction(returnStatement); // If we didn't find a containing function with a block body, bail out. if (!(func && hasKind(func.body, SyntaxKind.Block))) { return undefined; } - let keywords: Node[] = [] + const keywords: Node[] = []; forEachReturnStatement(func.body, returnStatement => { pushKeywordIf(keywords, returnStatement.getFirstToken(), SyntaxKind.ReturnKeyword); }); @@ -5252,7 +5251,7 @@ namespace ts { } function getIfElseOccurrences(ifStatement: IfStatement): HighlightSpan[] { - let keywords: Node[] = []; + const keywords: Node[] = []; // Traverse upwards through all parent if-statements linked by their else-branches. while (hasKind(ifStatement.parent, SyntaxKind.IfStatement) && (ifStatement.parent).elseStatement === ifStatement) { @@ -5261,7 +5260,7 @@ namespace ts { // Now traverse back down through the else branches, aggregating if/else keywords of if-statements. while (ifStatement) { - let children = ifStatement.getChildren(); + const children = ifStatement.getChildren(); pushKeywordIf(keywords, children[0], SyntaxKind.IfKeyword); // Generally the 'else' keyword is second-to-last, so we traverse backwards. @@ -5272,20 +5271,20 @@ namespace ts { } if (!hasKind(ifStatement.elseStatement, SyntaxKind.IfStatement)) { - break + break; } ifStatement = ifStatement.elseStatement; } - let result: HighlightSpan[] = []; + const result: HighlightSpan[] = []; // We'd like to highlight else/ifs together if they are only separated by whitespace // (i.e. the keywords are separated by no comments, no newlines). for (let i = 0; i < keywords.length; i++) { if (keywords[i].kind === SyntaxKind.ElseKeyword && i < keywords.length - 1) { - let elseKeyword = keywords[i]; - let ifKeyword = keywords[i + 1]; // this *should* always be an 'if' keyword. + const elseKeyword = keywords[i]; + const ifKeyword = keywords[i + 1]; // this *should* always be an 'if' keyword. let shouldCombindElseAndIf = true; @@ -5328,9 +5327,9 @@ namespace ts { return undefined; } - let result: ReferenceEntry[] = []; - for (let entry of documentHighlights) { - for (let highlightSpan of entry.highlightSpans) { + const result: ReferenceEntry[] = []; + for (const entry of documentHighlights) { + for (const highlightSpan of entry.highlightSpans) { result.push({ fileName: entry.fileName, textSpan: highlightSpan.textSpan, @@ -5348,9 +5347,9 @@ namespace ts { return undefined; } - let referenceEntries: ReferenceEntry[] = []; + const referenceEntries: ReferenceEntry[] = []; - for (let referenceSymbol of referenceSymbols) { + for (const referenceSymbol of referenceSymbols) { addRange(referenceEntries, referenceSymbol.references); } @@ -5358,17 +5357,17 @@ namespace ts { } function findRenameLocations(fileName: string, position: number, findInStrings: boolean, findInComments: boolean): RenameLocation[] { - let referencedSymbols = findReferencedSymbols(fileName, position, findInStrings, findInComments); + const referencedSymbols = findReferencedSymbols(fileName, position, findInStrings, findInComments); return convertReferences(referencedSymbols); } function getReferencesAtPosition(fileName: string, position: number): ReferenceEntry[] { - let referencedSymbols = findReferencedSymbols(fileName, position, /*findInStrings:*/ false, /*findInComments:*/ false); + const referencedSymbols = findReferencedSymbols(fileName, position, /*findInStrings*/ false, /*findInComments*/ false); return convertReferences(referencedSymbols); } - function findReferences(fileName: string, position: number): ReferencedSymbol[]{ - let referencedSymbols = findReferencedSymbols(fileName, position, /*findInStrings:*/ false, /*findInComments:*/ false); + function findReferences(fileName: string, position: number): ReferencedSymbol[] { + const referencedSymbols = findReferencedSymbols(fileName, position, /*findInStrings*/ false, /*findInComments*/ false); // Only include referenced symbols that have a valid definition. return filter(referencedSymbols, rs => !!rs.definition); @@ -5377,17 +5376,17 @@ namespace ts { function findReferencedSymbols(fileName: string, position: number, findInStrings: boolean, findInComments: boolean): ReferencedSymbol[] { synchronizeHostData(); - let sourceFile = getValidSourceFile(fileName); + const sourceFile = getValidSourceFile(fileName); - let node = getTouchingPropertyName(sourceFile, position); + const node = getTouchingPropertyName(sourceFile, position); if (!node) { return undefined; } if (node.kind !== SyntaxKind.Identifier && // TODO (drosen): This should be enabled in a later release - currently breaks rename. - //node.kind !== SyntaxKind.ThisKeyword && - //node.kind !== SyntaxKind.SuperKeyword && + // node.kind !== SyntaxKind.ThisKeyword && + // node.kind !== SyntaxKind.SuperKeyword && !isLiteralNameOfPropertyDeclarationOrIndexAccess(node) && !isNameOfExternalModuleImportOrDeclaration(node)) { return undefined; @@ -5398,12 +5397,12 @@ namespace ts { } function getReferencedSymbolsForNode(node: Node, sourceFiles: SourceFile[], findInStrings: boolean, findInComments: boolean): ReferencedSymbol[] { - let typeChecker = program.getTypeChecker(); + const typeChecker = program.getTypeChecker(); // Labels if (isLabelName(node)) { if (isJumpStatementTarget(node)) { - let labelDefinition = getTargetLabel((node.parent), (node).text); + const labelDefinition = getTargetLabel((node.parent), (node).text); // if we have a label definition, look within its statement for references, if not, then // the label is undefined and we have no results.. return labelDefinition ? getLabelReferencesInNode(labelDefinition.parent, labelDefinition) : undefined; @@ -5422,7 +5421,7 @@ namespace ts { return getReferencesForSuperKeyword(node); } - let symbol = typeChecker.getSymbolAtLocation(node); + const symbol = typeChecker.getSymbolAtLocation(node); // Could not find a symbol e.g. unknown identifier if (!symbol) { @@ -5430,7 +5429,7 @@ namespace ts { return undefined; } - let declarations = symbol.declarations; + const declarations = symbol.declarations; // The symbol was an internal symbol and does not have a declaration e.g. undefined symbol if (!declarations || !declarations.length) { @@ -5440,29 +5439,29 @@ namespace ts { let result: ReferencedSymbol[]; // Compute the meaning from the location and the symbol it references - let searchMeaning = getIntersectingMeaningFromDeclarations(getMeaningFromLocation(node), declarations); + const searchMeaning = getIntersectingMeaningFromDeclarations(getMeaningFromLocation(node), declarations); // Get the text to search for. // Note: if this is an external module symbol, the name doesn't include quotes. - let declaredName = stripQuotes(getDeclaredName(typeChecker, symbol, node)); + const declaredName = stripQuotes(getDeclaredName(typeChecker, symbol, node)); // Try to get the smallest valid scope that we can limit our search to; // otherwise we'll need to search globally (i.e. include each file). - let scope = getSymbolScope(symbol); + const scope = getSymbolScope(symbol); // Maps from a symbol ID to the ReferencedSymbol entry in 'result'. - let symbolToIndex: number[] = []; + const symbolToIndex: number[] = []; if (scope) { result = []; getReferencesInNode(scope, symbol, declaredName, node, searchMeaning, findInStrings, findInComments, result, symbolToIndex); } else { - let internedName = getInternedName(symbol, node, declarations) - for (let sourceFile of sourceFiles) { + const internedName = getInternedName(symbol, node, declarations); + for (const sourceFile of sourceFiles) { cancellationToken.throwIfCancellationRequested(); - let nameTable = getNameTable(sourceFile); + const nameTable = getNameTable(sourceFile); if (lookUp(nameTable, internedName)) { result = result || []; @@ -5474,9 +5473,9 @@ namespace ts { return result; function getDefinition(symbol: Symbol): DefinitionInfo { - let info = getSymbolDisplayPartsDocumentationAndSymbolKind(symbol, node.getSourceFile(), getContainerNode(node), node); - let name = map(info.displayParts, p => p.text).join(""); - let declarations = symbol.declarations; + const info = getSymbolDisplayPartsDocumentationAndSymbolKind(symbol, node.getSourceFile(), getContainerNode(node), node); + const name = map(info.displayParts, p => p.text).join(""); + const declarations = symbol.declarations; if (!declarations || declarations.length === 0) { return undefined; } @@ -5506,7 +5505,7 @@ namespace ts { // Try to get the local symbol if we're dealing with an 'export default' // since that symbol has the "true" name. - let localExportDefaultSymbol = getLocalSymbolForExportDefault(symbol); + const localExportDefaultSymbol = getLocalSymbolForExportDefault(symbol); symbol = localExportDefaultSymbol || symbol; return stripQuotes(symbol.name); @@ -5523,14 +5522,14 @@ namespace ts { function getSymbolScope(symbol: Symbol): Node { // If this is the symbol of a named function expression or named class expression, // then named references are limited to its own scope. - let valueDeclaration = symbol.valueDeclaration; + const valueDeclaration = symbol.valueDeclaration; if (valueDeclaration && (valueDeclaration.kind === SyntaxKind.FunctionExpression || valueDeclaration.kind === SyntaxKind.ClassExpression)) { return valueDeclaration; } // If this is private property or method, the scope is the containing class if (symbol.flags & (SymbolFlags.Property | SymbolFlags.Method)) { - let privateDeclaration = forEach(symbol.getDeclarations(), d => (d.flags & NodeFlags.Private) ? d : undefined); + const privateDeclaration = forEach(symbol.getDeclarations(), d => (d.flags & NodeFlags.Private) ? d : undefined); if (privateDeclaration) { return getAncestor(privateDeclaration, SyntaxKind.ClassDeclaration); } @@ -5548,12 +5547,12 @@ namespace ts { return undefined; } - let scope: Node = undefined; + let scope: Node; - let declarations = symbol.getDeclarations(); + const declarations = symbol.getDeclarations(); if (declarations) { - for (let declaration of declarations) { - let container = getContainerNode(declaration); + for (const declaration of declarations) { + const container = getContainerNode(declaration); if (!container) { return undefined; @@ -5579,7 +5578,7 @@ namespace ts { } function getPossibleSymbolReferencePositions(sourceFile: SourceFile, symbolName: string, start: number, end: number): number[] { - let positions: number[] = []; + const positions: number[] = []; /// TODO: Cache symbol existence for files to save text search // Also, need to make this work for unicode escapes. @@ -5589,9 +5588,9 @@ namespace ts { return positions; } - let text = sourceFile.text; - let sourceLength = text.length; - let symbolNameLength = symbolName.length; + const text = sourceFile.text; + const sourceLength = text.length; + const symbolNameLength = symbolName.length; let position = text.indexOf(symbolName, start); while (position >= 0) { @@ -5602,7 +5601,7 @@ namespace ts { // We found a match. Make sure it's not part of a larger word (i.e. the char // before and after it have to be a non-identifier char). - let endPosition = position + symbolNameLength; + const endPosition = position + symbolNameLength; if ((position === 0 || !isIdentifierPart(text.charCodeAt(position - 1), ScriptTarget.Latest)) && (endPosition === sourceLength || !isIdentifierPart(text.charCodeAt(endPosition), ScriptTarget.Latest))) { @@ -5616,14 +5615,14 @@ namespace ts { } function getLabelReferencesInNode(container: Node, targetLabel: Identifier): ReferencedSymbol[] { - let references: ReferenceEntry[] = []; - let sourceFile = container.getSourceFile(); - let labelName = targetLabel.text; - let possiblePositions = getPossibleSymbolReferencePositions(sourceFile, labelName, container.getStart(), container.getEnd()); + const references: ReferenceEntry[] = []; + const sourceFile = container.getSourceFile(); + const labelName = targetLabel.text; + const possiblePositions = getPossibleSymbolReferencePositions(sourceFile, labelName, container.getStart(), container.getEnd()); forEach(possiblePositions, position => { cancellationToken.throwIfCancellationRequested(); - let node = getTouchingWord(sourceFile, position); + const node = getTouchingWord(sourceFile, position); if (!node || node.getWidth() !== labelName.length) { return; } @@ -5635,14 +5634,14 @@ namespace ts { } }); - let definition: DefinitionInfo = { + const definition: DefinitionInfo = { containerKind: "", containerName: "", fileName: targetLabel.getSourceFile().fileName, kind: ScriptElementKind.label, name: labelName, textSpan: createTextSpanFromBounds(targetLabel.getStart(), targetLabel.getEnd()) - } + }; return [{ definition, references }]; } @@ -5687,19 +5686,19 @@ namespace ts { result: ReferencedSymbol[], symbolToIndex: number[]): void { - let sourceFile = container.getSourceFile(); - let tripleSlashDirectivePrefixRegex = /^\/\/\/\s* { cancellationToken.throwIfCancellationRequested(); - let referenceLocation = getTouchingPropertyName(sourceFile, position); + const referenceLocation = getTouchingPropertyName(sourceFile, position); if (!isValidReferencePosition(referenceLocation, searchText)) { // This wasn't the start of a token. Check to see if it might be a // match in a comment or string if that's what the caller is asking @@ -5727,14 +5726,14 @@ namespace ts { return; } - let referenceSymbol = typeChecker.getSymbolAtLocation(referenceLocation); + const referenceSymbol = typeChecker.getSymbolAtLocation(referenceLocation); if (referenceSymbol) { - let referenceSymbolDeclaration = referenceSymbol.valueDeclaration; - let shorthandValueSymbol = typeChecker.getShorthandAssignmentValueSymbol(referenceSymbolDeclaration); - let relatedSymbol = getRelatedSymbol(searchSymbols, referenceSymbol, referenceLocation); + const referenceSymbolDeclaration = referenceSymbol.valueDeclaration; + const shorthandValueSymbol = typeChecker.getShorthandAssignmentValueSymbol(referenceSymbolDeclaration); + const relatedSymbol = getRelatedSymbol(searchSymbols, referenceSymbol, referenceLocation); if (relatedSymbol) { - let referencedSymbol = getReferencedSymbol(relatedSymbol); + const referencedSymbol = getReferencedSymbol(relatedSymbol); referencedSymbol.references.push(getReferenceEntryFromNode(referenceLocation)); } /* Because in short-hand property assignment, an identifier which stored as name of the short-hand property assignment @@ -5744,7 +5743,7 @@ namespace ts { * position of property accessing, the referenceEntry of such position will be handled in the first case. */ else if (!(referenceSymbol.flags & SymbolFlags.Transient) && searchSymbols.indexOf(shorthandValueSymbol) >= 0) { - let referencedSymbol = getReferencedSymbol(shorthandValueSymbol); + const referencedSymbol = getReferencedSymbol(shorthandValueSymbol); referencedSymbol.references.push(getReferenceEntryFromNode(referenceSymbolDeclaration.name)); } } @@ -5754,7 +5753,7 @@ namespace ts { return; function getReferencedSymbol(symbol: Symbol): ReferencedSymbol { - let symbolId = getSymbolId(symbol); + const symbolId = getSymbolId(symbol); let index = symbolToIndex[symbolId]; if (index === undefined) { index = result.length; @@ -5773,7 +5772,7 @@ namespace ts { return isInCommentHelper(sourceFile, position, isNonReferenceComment); function isNonReferenceComment(c: CommentRange): boolean { - let commentText = sourceFile.text.substring(c.pos, c.end); + const commentText = sourceFile.text.substring(c.pos, c.end); return !tripleSlashDirectivePrefixRegex.test(commentText); } } @@ -5802,20 +5801,20 @@ namespace ts { return undefined; } - let references: ReferenceEntry[] = []; + const references: ReferenceEntry[] = []; - let sourceFile = searchSpaceNode.getSourceFile(); - let possiblePositions = getPossibleSymbolReferencePositions(sourceFile, "super", searchSpaceNode.getStart(), searchSpaceNode.getEnd()); + const sourceFile = searchSpaceNode.getSourceFile(); + const possiblePositions = getPossibleSymbolReferencePositions(sourceFile, "super", searchSpaceNode.getStart(), searchSpaceNode.getEnd()); forEach(possiblePositions, position => { cancellationToken.throwIfCancellationRequested(); - let node = getTouchingWord(sourceFile, position); + const node = getTouchingWord(sourceFile, position); if (!node || node.kind !== SyntaxKind.SuperKeyword) { return; } - let container = getSuperContainer(node, /*includeFunctions*/ false); + const container = getSuperContainer(node, /*includeFunctions*/ false); // If we have a 'super' container, we must have an enclosing class. // Now make sure the owning class is the same as the search-space @@ -5825,7 +5824,7 @@ namespace ts { } }); - let definition = getDefinition(searchSpaceNode.symbol); + const definition = getDefinition(searchSpaceNode.symbol); return [{ definition, references }]; } @@ -5847,7 +5846,7 @@ namespace ts { case SyntaxKind.Constructor: case SyntaxKind.GetAccessor: case SyntaxKind.SetAccessor: - staticFlag &= searchSpaceNode.flags + staticFlag &= searchSpaceNode.flags; searchSpaceNode = searchSpaceNode.parent; // re-assign to be the owning class break; case SyntaxKind.SourceFile: @@ -5864,7 +5863,7 @@ namespace ts { return undefined; } - let references: ReferenceEntry[] = []; + const references: ReferenceEntry[] = []; let possiblePositions: number[]; if (searchSpaceNode.kind === SyntaxKind.SourceFile) { @@ -5874,7 +5873,7 @@ namespace ts { }); } else { - let sourceFile = searchSpaceNode.getSourceFile(); + const sourceFile = searchSpaceNode.getSourceFile(); possiblePositions = getPossibleSymbolReferencePositions(sourceFile, "this", searchSpaceNode.getStart(), searchSpaceNode.getEnd()); getThisReferencesInFile(sourceFile, searchSpaceNode, possiblePositions, references); } @@ -5895,12 +5894,12 @@ namespace ts { forEach(possiblePositions, position => { cancellationToken.throwIfCancellationRequested(); - let node = getTouchingWord(sourceFile, position); + const node = getTouchingWord(sourceFile, position); if (!node || (node.kind !== SyntaxKind.ThisKeyword && node.kind !== SyntaxKind.ThisType)) { return; } - let container = getThisContainer(node, /* includeArrowFunctions */ false); + const container = getThisContainer(node, /* includeArrowFunctions */ false); switch (searchSpaceNode.kind) { case SyntaxKind.FunctionExpression: @@ -5955,13 +5954,13 @@ namespace ts { * property name and variable declaration of the identifier. * Like in below example, when querying for all references for an identifier 'name', of the property assignment, the language service * should show both 'name' in 'obj' and 'name' in variable declaration - * let name = "Foo"; - * let obj = { name }; + * const name = "Foo"; + * const obj = { name }; * In order to do that, we will populate the search set with the value symbol of the identifier as a value of the property assignment * so that when matching with potential reference symbol, both symbols from property declaration and variable declaration * will be included correctly. */ - let shorthandValueSymbol = typeChecker.getShorthandAssignmentValueSymbol(location.parent); + const shorthandValueSymbol = typeChecker.getShorthandAssignmentValueSymbol(location.parent); if (shorthandValueSymbol) { result.push(shorthandValueSymbol); } @@ -6008,9 +6007,9 @@ namespace ts { function getPropertySymbolFromTypeReference(typeReference: ExpressionWithTypeArguments) { if (typeReference) { - let type = typeChecker.getTypeAtLocation(typeReference); + const type = typeChecker.getTypeAtLocation(typeReference); if (type) { - let propertySymbol = typeChecker.getPropertyOfType(type, propertyName); + const propertySymbol = typeChecker.getPropertyOfType(type, propertyName); if (propertySymbol) { result.push(propertySymbol); } @@ -6030,7 +6029,7 @@ namespace ts { // If the reference symbol is an alias, check if what it is aliasing is one of the search // symbols. if (isImportOrExportSpecifierImportSymbol(referenceSymbol)) { - let aliasedSymbol = typeChecker.getAliasedSymbol(referenceSymbol); + const aliasedSymbol = typeChecker.getAliasedSymbol(referenceSymbol); if (searchSymbols.indexOf(aliasedSymbol) >= 0) { return aliasedSymbol; } @@ -6056,7 +6055,7 @@ namespace ts { // Finally, try all properties with the same name in any type the containing type extended or implemented, and // see if any is in the list if (rootSymbol.parent && rootSymbol.parent.flags & (SymbolFlags.Class | SymbolFlags.Interface)) { - let result: Symbol[] = []; + const result: Symbol[] = []; getPropertySymbolsFromBaseTypes(rootSymbol.parent, rootSymbol.getName(), result); return forEach(result, s => searchSymbols.indexOf(s) >= 0 ? s : undefined); } @@ -6067,21 +6066,21 @@ namespace ts { function getPropertySymbolsFromContextualType(node: Node): Symbol[] { if (isNameOfPropertyAssignment(node)) { - let objectLiteral = node.parent.parent; - let contextualType = typeChecker.getContextualType(objectLiteral); - let name = (node).text; + const objectLiteral = node.parent.parent; + const contextualType = typeChecker.getContextualType(objectLiteral); + const name = (node).text; if (contextualType) { if (contextualType.flags & TypeFlags.Union) { // This is a union type, first see if the property we are looking for is a union property (i.e. exists in all types) // if not, search the constituent types for the property - let unionProperty = contextualType.getProperty(name) + const unionProperty = contextualType.getProperty(name); if (unionProperty) { return [unionProperty]; } else { - let result: Symbol[] = []; + const result: Symbol[] = []; forEach((contextualType).types, t => { - let symbol = t.getProperty(name); + const symbol = t.getProperty(name); if (symbol) { result.push(symbol); } @@ -6090,7 +6089,7 @@ namespace ts { } } else { - let symbol = contextualType.getProperty(name); + const symbol = contextualType.getProperty(name); if (symbol) { return [symbol]; } @@ -6119,8 +6118,8 @@ namespace ts { // Remember the last meaning lastIterationMeaning = meaning; - for (let declaration of declarations) { - let declarationMeaning = getMeaningFromDeclaration(declaration); + for (const declaration of declarations) { + const declarationMeaning = getMeaningFromDeclaration(declaration); if (declarationMeaning & meaning) { meaning |= declarationMeaning; @@ -6155,13 +6154,13 @@ namespace ts { return true; } - let parent = node.parent; + const parent = node.parent; if (parent) { if (parent.kind === SyntaxKind.PostfixUnaryExpression || parent.kind === SyntaxKind.PrefixUnaryExpression) { return true; } else if (parent.kind === SyntaxKind.BinaryExpression && (parent).left === node) { - let operator = (parent).operatorToken.kind; + const operator = (parent).operatorToken.kind; return SyntaxKind.FirstAssignment <= operator && operator <= SyntaxKind.LastAssignment; } } @@ -6183,8 +6182,8 @@ namespace ts { function getEmitOutput(fileName: string): EmitOutput { synchronizeHostData(); - let sourceFile = getValidSourceFile(fileName); - let outputFiles: OutputFile[] = []; + const sourceFile = getValidSourceFile(fileName); + const outputFiles: OutputFile[] = []; function writeFile(fileName: string, data: string, writeByteOrderMark: boolean) { outputFiles.push({ @@ -6194,7 +6193,7 @@ namespace ts { }); } - let emitOutput = program.emit(sourceFile, writeFile, cancellationToken); + const emitOutput = program.emit(sourceFile, writeFile, cancellationToken); return { outputFiles, @@ -6287,7 +6286,7 @@ namespace ts { } if (!isLastClause && root.parent.kind === SyntaxKind.ExpressionWithTypeArguments && root.parent.parent.kind === SyntaxKind.HeritageClause) { - let decl = root.parent.parent.parent; + const decl = root.parent.parent.parent; return (decl.kind === SyntaxKind.ClassDeclaration && (root.parent.parent).token === SyntaxKind.ImplementsKeyword) || (decl.kind === SyntaxKind.InterfaceDeclaration && (root.parent.parent).token === SyntaxKind.ExtendsKeyword); } @@ -6359,7 +6358,7 @@ namespace ts { function getSignatureHelpItems(fileName: string, position: number): SignatureHelpItems { synchronizeHostData(); - let sourceFile = getValidSourceFile(fileName); + const sourceFile = getValidSourceFile(fileName); return SignatureHelp.getSignatureHelpItems(program, sourceFile, position, cancellationToken); } @@ -6370,10 +6369,10 @@ namespace ts { } function getNameOrDottedNameSpan(fileName: string, startPos: number, endPos: number): TextSpan { - let sourceFile = syntaxTreeCache.getCurrentSourceFile(fileName); + const sourceFile = syntaxTreeCache.getCurrentSourceFile(fileName); // Get node at the location - let node = getTouchingPropertyName(sourceFile, startPos); + const node = getTouchingPropertyName(sourceFile, startPos); if (!node) { return; @@ -6429,13 +6428,13 @@ namespace ts { function getBreakpointStatementAtPosition(fileName: string, position: number) { // doesn't use compiler - no need to synchronize with host - let sourceFile = syntaxTreeCache.getCurrentSourceFile(fileName); + const sourceFile = syntaxTreeCache.getCurrentSourceFile(fileName); return BreakpointResolver.spanInSourceFileAtLocation(sourceFile, position); } function getNavigationBarItems(fileName: string): NavigationBarItem[] { - let sourceFile = syntaxTreeCache.getCurrentSourceFile(fileName); + const sourceFile = syntaxTreeCache.getCurrentSourceFile(fileName); return NavigationBar.getNavigationBarItems(sourceFile, host.getCompilationSettings()); } @@ -6467,11 +6466,11 @@ namespace ts { function getEncodedSemanticClassifications(fileName: string, span: TextSpan): Classifications { synchronizeHostData(); - let sourceFile = getValidSourceFile(fileName); - let typeChecker = program.getTypeChecker(); + const sourceFile = getValidSourceFile(fileName); + const typeChecker = program.getTypeChecker(); - let result: number[] = []; - let classifiableNames = program.getClassifiableNames(); + const result: number[] = []; + const classifiableNames = program.getClassifiableNames(); processNode(sourceFile); return { spans: result, endOfLineState: EndOfLineState.None }; @@ -6483,7 +6482,7 @@ namespace ts { } function classifySymbol(symbol: Symbol, meaningAtPosition: SemanticMeaning): ClassificationType { - let flags = symbol.getFlags(); + const flags = symbol.getFlags(); if ((flags & SymbolFlags.Classifiable) === SymbolFlags.None) { return; } @@ -6531,19 +6530,19 @@ namespace ts { function processNode(node: Node) { // Only walk into nodes that intersect the requested span. if (node && textSpanIntersectsWith(span, node.getFullStart(), node.getFullWidth())) { - let kind = node.kind; + const kind = node.kind; checkForClassificationCancellation(kind); if (kind === SyntaxKind.Identifier && !nodeIsMissing(node)) { - let identifier = node; + const identifier = node; // Only bother calling into the typechecker if this is an identifier that // could possibly resolve to a type name. This makes classification run // in a third of the time it would normally take. if (classifiableNames[identifier.text]) { - let symbol = typeChecker.getSymbolAtLocation(node); + const symbol = typeChecker.getSymbolAtLocation(node); if (symbol) { - let type = classifySymbol(symbol, getMeaningFromLocation(node)); + const type = classifySymbol(symbol, getMeaningFromLocation(node)); if (type) { pushClassification(node.getStart(), node.getWidth(), type); } @@ -6583,8 +6582,8 @@ namespace ts { function convertClassifications(classifications: Classifications): ClassifiedSpan[] { Debug.assert(classifications.spans.length % 3 === 0); - let dense = classifications.spans; - let result: ClassifiedSpan[] = []; + const dense = classifications.spans; + const result: ClassifiedSpan[] = []; for (let i = 0, n = dense.length; i < n; i += 3) { result.push({ textSpan: createTextSpan(dense[i], dense[i + 1]), @@ -6601,15 +6600,15 @@ namespace ts { function getEncodedSyntacticClassifications(fileName: string, span: TextSpan): Classifications { // doesn't use compiler - no need to synchronize with host - let sourceFile = syntaxTreeCache.getCurrentSourceFile(fileName); - let spanStart = span.start; - let spanLength = span.length; + const sourceFile = syntaxTreeCache.getCurrentSourceFile(fileName); + const spanStart = span.start; + const spanLength = span.length; // Make a scanner we can get trivia from. - let triviaScanner = createScanner(ScriptTarget.Latest, /*skipTrivia:*/ false, sourceFile.languageVariant, sourceFile.text); - let mergeConflictScanner = createScanner(ScriptTarget.Latest, /*skipTrivia:*/ false, sourceFile.languageVariant, sourceFile.text); + const triviaScanner = createScanner(ScriptTarget.Latest, /*skipTrivia*/ false, sourceFile.languageVariant, sourceFile.text); + const mergeConflictScanner = createScanner(ScriptTarget.Latest, /*skipTrivia*/ false, sourceFile.languageVariant, sourceFile.text); - let result: number[] = []; + const result: number[] = []; processElement(sourceFile); return { spans: result, endOfLineState: EndOfLineState.None }; @@ -6623,15 +6622,15 @@ namespace ts { function classifyLeadingTriviaAndGetTokenStart(token: Node): number { triviaScanner.setTextPos(token.pos); while (true) { - let start = triviaScanner.getTextPos(); + const start = triviaScanner.getTextPos(); // only bother scanning if we have something that could be trivia. if (!couldStartTrivia(sourceFile.text, start)) { return start; } - let kind = triviaScanner.scan(); - let end = triviaScanner.getTextPos(); - let width = end - start; + const kind = triviaScanner.scan(); + const end = triviaScanner.getTextPos(); + const width = end - start; // The moment we get something that isn't trivia, then stop processing. if (!isTrivia(kind)) { @@ -6655,8 +6654,8 @@ namespace ts { } if (kind === SyntaxKind.ConflictMarkerTrivia) { - let text = sourceFile.text; - let ch = text.charCodeAt(start); + const text = sourceFile.text; + const ch = text.charCodeAt(start); // for the <<<<<<< and >>>>>>> markers, we just add them in as comments // in the classification stream. @@ -6677,7 +6676,7 @@ namespace ts { if (kind === SyntaxKind.MultiLineCommentTrivia) { // See if this is a doc comment. If so, we'll classify certain portions of it // specially. - let docCommentAndDiagnostics = parseIsolatedJSDocComment(sourceFile.text, start, width); + const docCommentAndDiagnostics = parseIsolatedJSDocComment(sourceFile.text, start, width); if (docCommentAndDiagnostics && docCommentAndDiagnostics.jsDocComment) { docCommentAndDiagnostics.jsDocComment.parent = token; classifyJSDocComment(docCommentAndDiagnostics.jsDocComment); @@ -6696,7 +6695,7 @@ namespace ts { function classifyJSDocComment(docComment: JSDocComment) { let pos = docComment.pos; - for (let tag of docComment.tags) { + for (const tag of docComment.tags) { // As we walk through each tag, classify the portion of text from the end of // the last tag (or the start of the entire doc comment) as 'comment'. if (tag.pos !== pos) { @@ -6754,7 +6753,7 @@ namespace ts { } function processJSDocTemplateTag(tag: JSDocTemplateTag) { - for (let child of tag.getChildren()) { + for (const child of tag.getChildren()) { processElement(child); } } @@ -6776,11 +6775,11 @@ namespace ts { } function classifyDisabledCodeToken() { - let start = mergeConflictScanner.getTextPos(); - let tokenKind = mergeConflictScanner.scan(); - let end = mergeConflictScanner.getTextPos(); + const start = mergeConflictScanner.getTextPos(); + const tokenKind = mergeConflictScanner.scan(); + const end = mergeConflictScanner.getTextPos(); - let type = classifyTokenType(tokenKind); + const type = classifyTokenType(tokenKind); if (type) { pushClassification(start, end - start, type); } @@ -6791,12 +6790,12 @@ namespace ts { return; } - let tokenStart = classifyLeadingTriviaAndGetTokenStart(token); + const tokenStart = classifyLeadingTriviaAndGetTokenStart(token); - let tokenWidth = token.end - tokenStart; + const tokenWidth = token.end - tokenStart; Debug.assert(tokenWidth >= 0); if (tokenWidth > 0) { - let type = classifyTokenType(token.kind, token); + const type = classifyTokenType(token.kind, token); if (type) { pushClassification(tokenStart, tokenWidth, type); } @@ -6923,9 +6922,9 @@ namespace ts { if (decodedTextSpanIntersectsWith(spanStart, spanLength, element.pos, element.getFullWidth())) { checkForClassificationCancellation(element.kind); - let children = element.getChildren(sourceFile); + const children = element.getChildren(sourceFile); for (let i = 0, n = children.length; i < n; i++) { - let child = children[i]; + const child = children[i]; if (isToken(child)) { classifyToken(child); } @@ -6940,28 +6939,28 @@ namespace ts { function getOutliningSpans(fileName: string): OutliningSpan[] { // doesn't use compiler - no need to synchronize with host - let sourceFile = syntaxTreeCache.getCurrentSourceFile(fileName); + const sourceFile = syntaxTreeCache.getCurrentSourceFile(fileName); return OutliningElementsCollector.collectElements(sourceFile); } function getBraceMatchingAtPosition(fileName: string, position: number) { - let sourceFile = syntaxTreeCache.getCurrentSourceFile(fileName); - let result: TextSpan[] = []; + const sourceFile = syntaxTreeCache.getCurrentSourceFile(fileName); + const result: TextSpan[] = []; - let token = getTouchingToken(sourceFile, position); + const token = getTouchingToken(sourceFile, position); if (token.getStart(sourceFile) === position) { - let matchKind = getMatchingTokenKind(token); + const matchKind = getMatchingTokenKind(token); // Ensure that there is a corresponding token to match ours. if (matchKind) { - let parentElement = token.parent; + const parentElement = token.parent; - let childNodes = parentElement.getChildren(sourceFile); - for (let current of childNodes) { + const childNodes = parentElement.getChildren(sourceFile); + for (const current of childNodes) { if (current.kind === matchKind) { - let range1 = createTextSpan(token.getStart(sourceFile), token.getWidth(sourceFile)); - let range2 = createTextSpan(current.getStart(sourceFile), current.getWidth(sourceFile)); + const range1 = createTextSpan(token.getStart(sourceFile), token.getWidth(sourceFile)); + const range2 = createTextSpan(current.getStart(sourceFile), current.getWidth(sourceFile)); // We want to order the braces when we return the result. if (range1.start < range2.start) { @@ -6981,11 +6980,11 @@ namespace ts { function getMatchingTokenKind(token: Node): ts.SyntaxKind { switch (token.kind) { - case ts.SyntaxKind.OpenBraceToken: return ts.SyntaxKind.CloseBraceToken + case ts.SyntaxKind.OpenBraceToken: return ts.SyntaxKind.CloseBraceToken; case ts.SyntaxKind.OpenParenToken: return ts.SyntaxKind.CloseParenToken; case ts.SyntaxKind.OpenBracketToken: return ts.SyntaxKind.CloseBracketToken; case ts.SyntaxKind.LessThanToken: return ts.SyntaxKind.GreaterThanToken; - case ts.SyntaxKind.CloseBraceToken: return ts.SyntaxKind.OpenBraceToken + case ts.SyntaxKind.CloseBraceToken: return ts.SyntaxKind.OpenBraceToken; case ts.SyntaxKind.CloseParenToken: return ts.SyntaxKind.OpenParenToken; case ts.SyntaxKind.CloseBracketToken: return ts.SyntaxKind.OpenBracketToken; case ts.SyntaxKind.GreaterThanToken: return ts.SyntaxKind.LessThanToken; @@ -6997,29 +6996,29 @@ namespace ts { function getIndentationAtPosition(fileName: string, position: number, editorOptions: EditorOptions) { let start = new Date().getTime(); - let sourceFile = syntaxTreeCache.getCurrentSourceFile(fileName); + const sourceFile = syntaxTreeCache.getCurrentSourceFile(fileName); log("getIndentationAtPosition: getCurrentSourceFile: " + (new Date().getTime() - start)); start = new Date().getTime(); - let result = formatting.SmartIndenter.getIndentation(position, sourceFile, editorOptions); + const result = formatting.SmartIndenter.getIndentation(position, sourceFile, editorOptions); log("getIndentationAtPosition: computeIndentation : " + (new Date().getTime() - start)); return result; } function getFormattingEditsForRange(fileName: string, start: number, end: number, options: FormatCodeOptions): TextChange[] { - let sourceFile = syntaxTreeCache.getCurrentSourceFile(fileName); + const sourceFile = syntaxTreeCache.getCurrentSourceFile(fileName); return formatting.formatSelection(start, end, sourceFile, getRuleProvider(options), options); } function getFormattingEditsForDocument(fileName: string, options: FormatCodeOptions): TextChange[] { - let sourceFile = syntaxTreeCache.getCurrentSourceFile(fileName); + const sourceFile = syntaxTreeCache.getCurrentSourceFile(fileName); return formatting.formatDocument(sourceFile, getRuleProvider(options), options); } function getFormattingEditsAfterKeystroke(fileName: string, position: number, key: string, options: FormatCodeOptions): TextChange[] { - let sourceFile = syntaxTreeCache.getCurrentSourceFile(fileName); + const sourceFile = syntaxTreeCache.getCurrentSourceFile(fileName); if (key === "}") { return formatting.formatOnClosingCurly(position, sourceFile, getRuleProvider(options), options); @@ -7055,16 +7054,16 @@ namespace ts { * be performed. */ function getDocCommentTemplateAtPosition(fileName: string, position: number): TextInsertion { - let start = new Date().getTime(); - let sourceFile = syntaxTreeCache.getCurrentSourceFile(fileName); + const start = new Date().getTime(); + const sourceFile = syntaxTreeCache.getCurrentSourceFile(fileName); // Check if in a context where we don't want to perform any insertion if (isInString(sourceFile, position) || isInComment(sourceFile, position) || hasDocComment(sourceFile, position)) { return undefined; } - let tokenAtPos = getTokenAtPosition(sourceFile, position); - let tokenStart = tokenAtPos.getStart() + const tokenAtPos = getTokenAtPosition(sourceFile, position); + const tokenStart = tokenAtPos.getStart(); if (!tokenAtPos || tokenStart < position) { return undefined; } @@ -7100,11 +7099,11 @@ namespace ts { return undefined; } - let parameters = getParametersForJsDocOwningNode(commentOwner); - let posLineAndChar = sourceFile.getLineAndCharacterOfPosition(position); - let lineStart = sourceFile.getLineStarts()[posLineAndChar.line]; + const parameters = getParametersForJsDocOwningNode(commentOwner); + const posLineAndChar = sourceFile.getLineAndCharacterOfPosition(position); + const lineStart = sourceFile.getLineStarts()[posLineAndChar.line]; - let indentationStr = sourceFile.text.substr(lineStart, posLineAndChar.character); + const indentationStr = sourceFile.text.substr(lineStart, posLineAndChar.character); // TODO: call a helper method instead once PR #4133 gets merged in. const newLine = host.getNewLine ? host.getNewLine() : "\r\n"; @@ -7128,7 +7127,7 @@ namespace ts { // * if the caret was directly in front of the object, then we add an extra line and indentation. const preamble = "/**" + newLine + indentationStr + " * "; - let result = + const result = preamble + newLine + docParams + indentationStr + " */" + @@ -7172,7 +7171,7 @@ namespace ts { case SyntaxKind.ArrowFunction: return (rightHandSide).parameters; case SyntaxKind.ClassExpression: - for (let member of (rightHandSide).members) { + for (const member of (rightHandSide).members) { if (member.kind === SyntaxKind.Constructor) { return (member).parameters; } @@ -7192,15 +7191,15 @@ namespace ts { // anything away. synchronizeHostData(); - let sourceFile = getValidSourceFile(fileName); + const sourceFile = getValidSourceFile(fileName); cancellationToken.throwIfCancellationRequested(); - let fileContents = sourceFile.text; - let result: TodoComment[] = []; + const fileContents = sourceFile.text; + const result: TodoComment[] = []; if (descriptors.length > 0) { - let regExp = getTodoCommentsRegExp(); + const regExp = getTodoCommentsRegExp(); let matchArray: RegExpExecArray; while (matchArray = regExp.exec(fileContents)) { @@ -7223,15 +7222,15 @@ namespace ts { // // i.e. 'undefined' in position 3 above means TODO(jason) didn't match. // "hack" in position 4 means HACK did match. - let firstDescriptorCaptureIndex = 3; + const firstDescriptorCaptureIndex = 3; Debug.assert(matchArray.length === descriptors.length + firstDescriptorCaptureIndex); - let preamble = matchArray[1]; - let matchPosition = matchArray.index + preamble.length; + const preamble = matchArray[1]; + const matchPosition = matchArray.index + preamble.length; // OK, we have found a match in the file. This is only an acceptable match if // it is contained within a comment. - let token = getTokenAtPosition(sourceFile, matchPosition); + const token = getTokenAtPosition(sourceFile, matchPosition); if (!isInsideComment(sourceFile, token, matchPosition)) { continue; } @@ -7250,7 +7249,7 @@ namespace ts { continue; } - let message = matchArray[2]; + const message = matchArray[2]; result.push({ descriptor: descriptor, message: message, @@ -7281,14 +7280,14 @@ namespace ts { // // The following three regexps are used to match the start of the text up to the TODO // comment portion. - let singleLineCommentStart = /(?:\/\/+\s*)/.source; - let multiLineCommentStart = /(?:\/\*+\s*)/.source; - let anyNumberOfSpacesAndAsterixesAtStartOfLine = /(?:^(?:\s|\*)*)/.source; + const singleLineCommentStart = /(?:\/\/+\s*)/.source; + const multiLineCommentStart = /(?:\/\*+\s*)/.source; + const anyNumberOfSpacesAndAsterixesAtStartOfLine = /(?:^(?:\s|\*)*)/.source; // Match any of the above three TODO comment start regexps. // Note that the outermost group *is* a capture group. We want to capture the preamble // so that we can determine the starting position of the TODO comment match. - let preamble = "(" + anyNumberOfSpacesAndAsterixesAtStartOfLine + "|" + singleLineCommentStart + "|" + multiLineCommentStart + ")"; + const preamble = "(" + anyNumberOfSpacesAndAsterixesAtStartOfLine + "|" + singleLineCommentStart + "|" + multiLineCommentStart + ")"; // Takes the descriptors and forms a regexp that matches them as if they were literals. // For example, if the descriptors are "TODO(jason)" and "HACK", then this will be: @@ -7298,17 +7297,17 @@ namespace ts { // Note that the outermost group is *not* a capture group, but the innermost groups // *are* capture groups. By capturing the inner literals we can determine after // matching which descriptor we are dealing with. - let literals = "(?:" + map(descriptors, d => "(" + escapeRegExp(d.text) + ")").join("|") + ")"; + const literals = "(?:" + map(descriptors, d => "(" + escapeRegExp(d.text) + ")").join("|") + ")"; // After matching a descriptor literal, the following regexp matches the rest of the // text up to the end of the line (or */). - let endOfLineOrEndOfComment = /(?:$|\*\/)/.source - let messageRemainder = /(?:.*?)/.source + const endOfLineOrEndOfComment = /(?:$|\*\/)/.source; + const messageRemainder = /(?:.*?)/.source; // This is the portion of the match we'll return as part of the TODO comment result. We // match the literal portion up to the end of the line or end of comment. - let messagePortion = "(" + literals + messageRemainder + ")"; - let regExpString = preamble + messagePortion + endOfLineOrEndOfComment; + const messagePortion = "(" + literals + messageRemainder + ")"; + const regExpString = preamble + messagePortion + endOfLineOrEndOfComment; // The final regexp will look like this: // /((?:\/\/+\s*)|(?:\/\*+\s*)|(?:^(?:\s|\*)*))((?:(TODO\(jason\))|(HACK))(?:.*?))(?:$|\*\/)/gim @@ -7334,40 +7333,40 @@ namespace ts { function getRenameInfo(fileName: string, position: number): RenameInfo { synchronizeHostData(); - let sourceFile = getValidSourceFile(fileName); - let typeChecker = program.getTypeChecker(); + const sourceFile = getValidSourceFile(fileName); + const typeChecker = program.getTypeChecker(); - let node = getTouchingWord(sourceFile, position); + const node = getTouchingWord(sourceFile, position); // Can only rename an identifier. if (node && node.kind === SyntaxKind.Identifier) { - let symbol = typeChecker.getSymbolAtLocation(node); + const symbol = typeChecker.getSymbolAtLocation(node); // Only allow a symbol to be renamed if it actually has at least one declaration. if (symbol) { - let declarations = symbol.getDeclarations(); + const declarations = symbol.getDeclarations(); if (declarations && declarations.length > 0) { // Disallow rename for elements that are defined in the standard TypeScript library. - let defaultLibFileName = host.getDefaultLibFileName(host.getCompilationSettings()); + const defaultLibFileName = host.getDefaultLibFileName(host.getCompilationSettings()); if (defaultLibFileName) { - for (let current of declarations) { - let sourceFile = current.getSourceFile(); - var canonicalName = getCanonicalFileName(ts.normalizePath(sourceFile.fileName)); + for (const current of declarations) { + const sourceFile = current.getSourceFile(); + const canonicalName = getCanonicalFileName(ts.normalizePath(sourceFile.fileName)); if (sourceFile && getCanonicalFileName(ts.normalizePath(sourceFile.fileName)) === getCanonicalFileName(ts.normalizePath(defaultLibFileName))) { return getRenameInfoError(getLocaleSpecificMessage(Diagnostics.You_cannot_rename_elements_that_are_defined_in_the_standard_TypeScript_library)); } } } - let displayName = stripQuotes(getDeclaredName(typeChecker, symbol, node)); - let kind = getSymbolKind(symbol, node); + const displayName = stripQuotes(getDeclaredName(typeChecker, symbol, node)); + const kind = getSymbolKind(symbol, node); if (kind) { return { canRename: true, - localizedErrorMessage: undefined, + kind, displayName, + localizedErrorMessage: undefined, fullDisplayName: typeChecker.getFullyQualifiedName(symbol), - kind: kind, kindModifiers: getSymbolModifiers(symbol), triggerSpan: createTextSpan(node.getStart(), node.getWidth()) }; @@ -7434,14 +7433,14 @@ namespace ts { /* @internal */ export function getNameTable(sourceFile: SourceFile): Map { if (!sourceFile.nameTable) { - initializeNameTable(sourceFile) + initializeNameTable(sourceFile); } return sourceFile.nameTable; } function initializeNameTable(sourceFile: SourceFile): void { - let nameTable: Map = {}; + const nameTable: Map = {}; walk(sourceFile); sourceFile.nameTable = nameTable; @@ -7479,13 +7478,13 @@ namespace ts { /// Classifier export function createClassifier(): Classifier { - let scanner = createScanner(ScriptTarget.Latest, /*skipTrivia*/ false); + const scanner = createScanner(ScriptTarget.Latest, /*skipTrivia*/ false); /// We do not have a full parser support to know when we should parse a regex or not /// If we consider every slash token to be a regex, we could be missing cases like "1/2/3", where /// we have a series of divide operator. this list allows us to be more accurate by ruling out /// locations where a regexp cannot exist. - let noRegexTable: boolean[] = []; + const noRegexTable: boolean[] = []; noRegexTable[SyntaxKind.Identifier] = true; noRegexTable[SyntaxKind.StringLiteral] = true; noRegexTable[SyntaxKind.NumericLiteral] = true; @@ -7519,7 +7518,7 @@ namespace ts { // // Where on the second line, you will get the 'return' keyword, // a string literal, and a template end consisting of '} } `'. - let templateStack: SyntaxKind[] = []; + const templateStack: SyntaxKind[] = []; /** Returns true if 'keyword2' can legally follow 'keyword1' in any language construct. */ function canFollow(keyword1: SyntaxKind, keyword2: SyntaxKind) { @@ -7545,18 +7544,18 @@ namespace ts { } function convertClassifications(classifications: Classifications, text: string): ClassificationResult { - let entries: ClassificationInfo[] = []; - let dense = classifications.spans; + const entries: ClassificationInfo[] = []; + const dense = classifications.spans; let lastEnd = 0; for (let i = 0, n = dense.length; i < n; i += 3) { - let start = dense[i]; - let length = dense[i + 1]; - let type = dense[i + 2]; + const start = dense[i]; + const length = dense[i + 1]; + const type = dense[i + 2]; // Make a whitespace entry between the last item and this one. if (lastEnd >= 0) { - let whitespaceLength = start - lastEnd; + const whitespaceLength = start - lastEnd; if (whitespaceLength > 0) { entries.push({ length: whitespaceLength, classification: TokenClass.Whitespace }); } @@ -7566,7 +7565,7 @@ namespace ts { lastEnd = start + length; } - let whitespaceLength = text.length - lastEnd; + const whitespaceLength = text.length - lastEnd; if (whitespaceLength > 0) { entries.push({ length: whitespaceLength, classification: TokenClass.Whitespace }); } @@ -7620,7 +7619,7 @@ namespace ts { // (and a newline). That way when we lex we'll think we're still in a multiline comment. switch (lexState) { case EndOfLineState.InDoubleQuoteStringLiteral: - text = '"\\\n' + text; + text = "\"\\\n" + text; offset = 3; break; case EndOfLineState.InSingleQuoteStringLiteral: @@ -7646,7 +7645,7 @@ namespace ts { scanner.setText(text); - let result: Classifications = { + const result: Classifications = { endOfLineState: EndOfLineState.None, spans: [] }; @@ -7728,7 +7727,7 @@ namespace ts { // If we don't have anything on the template stack, // then we aren't trying to keep track of a previously scanned template head. if (templateStack.length > 0) { - let lastTemplateStackToken = lastOrUndefined(templateStack); + const lastTemplateStackToken = lastOrUndefined(templateStack); if (lastTemplateStackToken === SyntaxKind.TemplateHead) { token = scanner.reScanTemplateToken(); @@ -7758,17 +7757,17 @@ namespace ts { return result; function processToken(): void { - let start = scanner.getTokenPos(); - let end = scanner.getTextPos(); + const start = scanner.getTokenPos(); + const end = scanner.getTextPos(); addResult(start, end, classFromKind(token)); if (end >= text.length) { if (token === SyntaxKind.StringLiteral || token === SyntaxKind.StringLiteralType) { // Check to see if we finished up on a multiline string literal. - let tokenText = scanner.getTokenText(); + const tokenText = scanner.getTokenText(); if (scanner.isUnterminated()) { - let lastCharIndex = tokenText.length - 1; + const lastCharIndex = tokenText.length - 1; let numBackslashes = 0; while (tokenText.charCodeAt(lastCharIndex - numBackslashes) === CharacterCodes.backslash) { @@ -7777,7 +7776,7 @@ namespace ts { // If we have an odd number of backslashes, then the multiline string is unclosed if (numBackslashes & 1) { - let quoteChar = tokenText.charCodeAt(0); + const quoteChar = tokenText.charCodeAt(0); result.endOfLineState = quoteChar === CharacterCodes.doubleQuote ? EndOfLineState.InDoubleQuoteStringLiteral : EndOfLineState.InSingleQuoteStringLiteral; @@ -7826,7 +7825,7 @@ namespace ts { // relative to the original text. start -= offset; end -= offset; - let length = end - start; + const length = end - start; if (length > 0) { result.spans.push(start); @@ -7941,7 +7940,7 @@ namespace ts { } /// getDefaultLibraryFilePath - declare let __dirname: string; + declare const __dirname: string; /** * Get the path of the default library files (lib.d.ts) as distributed with the typescript From 5cbf17d989d6f746de480631fa6b05d43d1afd8f Mon Sep 17 00:00:00 2001 From: Daniel Rosenwasser Date: Mon, 14 Dec 2015 14:16:31 -0800 Subject: [PATCH 125/177] Added tests. --- .../stringLiteralTypesAsTags02.ts | 42 +++++++++++++++++ .../stringLiteralTypesAsTags03.ts | 46 +++++++++++++++++++ 2 files changed, 88 insertions(+) create mode 100644 tests/cases/conformance/types/stringLiteral/stringLiteralTypesAsTags02.ts create mode 100644 tests/cases/conformance/types/stringLiteral/stringLiteralTypesAsTags03.ts diff --git a/tests/cases/conformance/types/stringLiteral/stringLiteralTypesAsTags02.ts b/tests/cases/conformance/types/stringLiteral/stringLiteralTypesAsTags02.ts new file mode 100644 index 00000000000..9fdc942a3f2 --- /dev/null +++ b/tests/cases/conformance/types/stringLiteral/stringLiteralTypesAsTags02.ts @@ -0,0 +1,42 @@ +// @declaration: true + +type Kind = "A" | "B" + +interface Entity { + kind: Kind; +} + +interface A extends Entity { + kind: "A"; + a: number; +} + +interface B extends Entity { + kind: "B"; + b: string; +} + +function hasKind(entity: Entity, kind: "A"): entity is A; +function hasKind(entity: Entity, kind: "B"): entity is B; +function hasKind(entity: Entity, kind: Kind): entity is (A | B) { + return entity.kind === kind; +} + +let x: A = { + kind: "A", + a: 100, +} + +if (hasKind(x, "A")) { + let a = x; +} +else { + let b = x; +} + +if (!hasKind(x, "B")) { + let c = x; +} +else { + let d = x; +} \ No newline at end of file diff --git a/tests/cases/conformance/types/stringLiteral/stringLiteralTypesAsTags03.ts b/tests/cases/conformance/types/stringLiteral/stringLiteralTypesAsTags03.ts new file mode 100644 index 00000000000..96011d27255 --- /dev/null +++ b/tests/cases/conformance/types/stringLiteral/stringLiteralTypesAsTags03.ts @@ -0,0 +1,46 @@ +// @declaration: true + +type Kind = "A" | "B" + +interface Entity { + kind: Kind; +} + +interface A extends Entity { + kind: "A"; + a: number; +} + +interface B extends Entity { + kind: "B"; + b: string; +} + +// Currently (2015-12-14), we write '"A" | "A"' and '"B" | "B"' to avoid +// interpreting respective overloads as "specialized" signatures. +// That way, we can avoid the need to look for a compatible overload +// signature and simply check compatibility with the implementation. +function hasKind(entity: Entity, kind: "A" | "A"): entity is A; +function hasKind(entity: Entity, kind: "B" | "B"): entity is B; +function hasKind(entity: Entity, kind: Kind): entity is Entity { + return entity.kind === kind; +} + +let x: A = { + kind: "A", + a: 100, +} + +if (hasKind(x, "A")) { + let a = x; +} +else { + let b = x; +} + +if (!hasKind(x, "B")) { + let c = x; +} +else { + let d = x; +} \ No newline at end of file From 2efa69773d5e7fb208e2a03e52758189e058d266 Mon Sep 17 00:00:00 2001 From: Daniel Rosenwasser Date: Mon, 14 Dec 2015 14:24:55 -0800 Subject: [PATCH 126/177] Accepted baselines. --- .../stringLiteralTypesAsTags02.errors.txt | 50 ++++++++ .../reference/stringLiteralTypesAsTags02.js | 81 ++++++++++++ .../reference/stringLiteralTypesAsTags03.js | 85 +++++++++++++ .../stringLiteralTypesAsTags03.symbols | 109 ++++++++++++++++ .../stringLiteralTypesAsTags03.types | 118 ++++++++++++++++++ 5 files changed, 443 insertions(+) create mode 100644 tests/baselines/reference/stringLiteralTypesAsTags02.errors.txt create mode 100644 tests/baselines/reference/stringLiteralTypesAsTags02.js create mode 100644 tests/baselines/reference/stringLiteralTypesAsTags03.js create mode 100644 tests/baselines/reference/stringLiteralTypesAsTags03.symbols create mode 100644 tests/baselines/reference/stringLiteralTypesAsTags03.types diff --git a/tests/baselines/reference/stringLiteralTypesAsTags02.errors.txt b/tests/baselines/reference/stringLiteralTypesAsTags02.errors.txt new file mode 100644 index 00000000000..077113632d0 --- /dev/null +++ b/tests/baselines/reference/stringLiteralTypesAsTags02.errors.txt @@ -0,0 +1,50 @@ +tests/cases/conformance/types/stringLiteral/stringLiteralTypesAsTags02.ts(18,10): error TS2382: Specialized overload signature is not assignable to any non-specialized signature. +tests/cases/conformance/types/stringLiteral/stringLiteralTypesAsTags02.ts(19,10): error TS2382: Specialized overload signature is not assignable to any non-specialized signature. + + +==== tests/cases/conformance/types/stringLiteral/stringLiteralTypesAsTags02.ts (2 errors) ==== + + type Kind = "A" | "B" + + interface Entity { + kind: Kind; + } + + interface A extends Entity { + kind: "A"; + a: number; + } + + interface B extends Entity { + kind: "B"; + b: string; + } + + function hasKind(entity: Entity, kind: "A"): entity is A; + ~~~~~~~ +!!! error TS2382: Specialized overload signature is not assignable to any non-specialized signature. + function hasKind(entity: Entity, kind: "B"): entity is B; + ~~~~~~~ +!!! error TS2382: Specialized overload signature is not assignable to any non-specialized signature. + function hasKind(entity: Entity, kind: Kind): entity is (A | B) { + return entity.kind === kind; + } + + let x: A = { + kind: "A", + a: 100, + } + + if (hasKind(x, "A")) { + let a = x; + } + else { + let b = x; + } + + if (!hasKind(x, "B")) { + let c = x; + } + else { + let d = x; + } \ No newline at end of file diff --git a/tests/baselines/reference/stringLiteralTypesAsTags02.js b/tests/baselines/reference/stringLiteralTypesAsTags02.js new file mode 100644 index 00000000000..e83f1ad46ee --- /dev/null +++ b/tests/baselines/reference/stringLiteralTypesAsTags02.js @@ -0,0 +1,81 @@ +//// [stringLiteralTypesAsTags02.ts] + +type Kind = "A" | "B" + +interface Entity { + kind: Kind; +} + +interface A extends Entity { + kind: "A"; + a: number; +} + +interface B extends Entity { + kind: "B"; + b: string; +} + +function hasKind(entity: Entity, kind: "A"): entity is A; +function hasKind(entity: Entity, kind: "B"): entity is B; +function hasKind(entity: Entity, kind: Kind): entity is (A | B) { + return entity.kind === kind; +} + +let x: A = { + kind: "A", + a: 100, +} + +if (hasKind(x, "A")) { + let a = x; +} +else { + let b = x; +} + +if (!hasKind(x, "B")) { + let c = x; +} +else { + let d = x; +} + +//// [stringLiteralTypesAsTags02.js] +function hasKind(entity, kind) { + return entity.kind === kind; +} +var x = { + kind: "A", + a: 100 +}; +if (hasKind(x, "A")) { + var a = x; +} +else { + var b = x; +} +if (!hasKind(x, "B")) { + var c = x; +} +else { + var d = x; +} + + +//// [stringLiteralTypesAsTags02.d.ts] +declare type Kind = "A" | "B"; +interface Entity { + kind: Kind; +} +interface A extends Entity { + kind: "A"; + a: number; +} +interface B extends Entity { + kind: "B"; + b: string; +} +declare function hasKind(entity: Entity, kind: "A"): entity is A; +declare function hasKind(entity: Entity, kind: "B"): entity is B; +declare let x: A; diff --git a/tests/baselines/reference/stringLiteralTypesAsTags03.js b/tests/baselines/reference/stringLiteralTypesAsTags03.js new file mode 100644 index 00000000000..bb2ed56040e --- /dev/null +++ b/tests/baselines/reference/stringLiteralTypesAsTags03.js @@ -0,0 +1,85 @@ +//// [stringLiteralTypesAsTags03.ts] + +type Kind = "A" | "B" + +interface Entity { + kind: Kind; +} + +interface A extends Entity { + kind: "A"; + a: number; +} + +interface B extends Entity { + kind: "B"; + b: string; +} + +// Currently (2015-12-14), we write '"A" | "A"' and '"B" | "B"' to avoid +// interpreting respective overloads as "specialized" signatures. +// That way, we can avoid the need to look for a compatible overload +// signature and simply check compatibility with the implementation. +function hasKind(entity: Entity, kind: "A" | "A"): entity is A; +function hasKind(entity: Entity, kind: "B" | "B"): entity is B; +function hasKind(entity: Entity, kind: Kind): entity is Entity { + return entity.kind === kind; +} + +let x: A = { + kind: "A", + a: 100, +} + +if (hasKind(x, "A")) { + let a = x; +} +else { + let b = x; +} + +if (!hasKind(x, "B")) { + let c = x; +} +else { + let d = x; +} + +//// [stringLiteralTypesAsTags03.js] +function hasKind(entity, kind) { + return entity.kind === kind; +} +var x = { + kind: "A", + a: 100 +}; +if (hasKind(x, "A")) { + var a = x; +} +else { + var b = x; +} +if (!hasKind(x, "B")) { + var c = x; +} +else { + var d = x; +} + + +//// [stringLiteralTypesAsTags03.d.ts] +declare type Kind = "A" | "B"; +interface Entity { + kind: Kind; +} +interface A extends Entity { + kind: "A"; + a: number; +} +interface B extends Entity { + kind: "B"; + b: string; +} +declare function hasKind(entity: Entity, kind: "A" | "A"): entity is A; +declare function hasKind(entity: Entity, kind: "B" | "B"): entity is B; +declare let x: A; diff --git a/tests/baselines/reference/stringLiteralTypesAsTags03.symbols b/tests/baselines/reference/stringLiteralTypesAsTags03.symbols new file mode 100644 index 00000000000..3694daf8e00 --- /dev/null +++ b/tests/baselines/reference/stringLiteralTypesAsTags03.symbols @@ -0,0 +1,109 @@ +=== tests/cases/conformance/types/stringLiteral/stringLiteralTypesAsTags03.ts === + +type Kind = "A" | "B" +>Kind : Symbol(Kind, Decl(stringLiteralTypesAsTags03.ts, 0, 0)) + +interface Entity { +>Entity : Symbol(Entity, Decl(stringLiteralTypesAsTags03.ts, 1, 21)) + + kind: Kind; +>kind : Symbol(kind, Decl(stringLiteralTypesAsTags03.ts, 3, 18)) +>Kind : Symbol(Kind, Decl(stringLiteralTypesAsTags03.ts, 0, 0)) +} + +interface A extends Entity { +>A : Symbol(A, Decl(stringLiteralTypesAsTags03.ts, 5, 1)) +>Entity : Symbol(Entity, Decl(stringLiteralTypesAsTags03.ts, 1, 21)) + + kind: "A"; +>kind : Symbol(kind, Decl(stringLiteralTypesAsTags03.ts, 7, 28)) + + a: number; +>a : Symbol(a, Decl(stringLiteralTypesAsTags03.ts, 8, 14)) +} + +interface B extends Entity { +>B : Symbol(B, Decl(stringLiteralTypesAsTags03.ts, 10, 1)) +>Entity : Symbol(Entity, Decl(stringLiteralTypesAsTags03.ts, 1, 21)) + + kind: "B"; +>kind : Symbol(kind, Decl(stringLiteralTypesAsTags03.ts, 12, 28)) + + b: string; +>b : Symbol(b, Decl(stringLiteralTypesAsTags03.ts, 13, 14)) +} + +// Currently (2015-12-14), we write '"A" | "A"' and '"B" | "B"' to avoid +// interpreting respective overloads as "specialized" signatures. +// That way, we can avoid the need to look for a compatible overload +// signature and simply check compatibility with the implementation. +function hasKind(entity: Entity, kind: "A" | "A"): entity is A; +>hasKind : Symbol(hasKind, Decl(stringLiteralTypesAsTags03.ts, 15, 1), Decl(stringLiteralTypesAsTags03.ts, 21, 63), Decl(stringLiteralTypesAsTags03.ts, 22, 63)) +>entity : Symbol(entity, Decl(stringLiteralTypesAsTags03.ts, 21, 17)) +>Entity : Symbol(Entity, Decl(stringLiteralTypesAsTags03.ts, 1, 21)) +>kind : Symbol(kind, Decl(stringLiteralTypesAsTags03.ts, 21, 32)) +>entity : Symbol(entity, Decl(stringLiteralTypesAsTags03.ts, 21, 17)) +>A : Symbol(A, Decl(stringLiteralTypesAsTags03.ts, 5, 1)) + +function hasKind(entity: Entity, kind: "B" | "B"): entity is B; +>hasKind : Symbol(hasKind, Decl(stringLiteralTypesAsTags03.ts, 15, 1), Decl(stringLiteralTypesAsTags03.ts, 21, 63), Decl(stringLiteralTypesAsTags03.ts, 22, 63)) +>entity : Symbol(entity, Decl(stringLiteralTypesAsTags03.ts, 22, 17)) +>Entity : Symbol(Entity, Decl(stringLiteralTypesAsTags03.ts, 1, 21)) +>kind : Symbol(kind, Decl(stringLiteralTypesAsTags03.ts, 22, 32)) +>entity : Symbol(entity, Decl(stringLiteralTypesAsTags03.ts, 22, 17)) +>B : Symbol(B, Decl(stringLiteralTypesAsTags03.ts, 10, 1)) + +function hasKind(entity: Entity, kind: Kind): entity is Entity { +>hasKind : Symbol(hasKind, Decl(stringLiteralTypesAsTags03.ts, 15, 1), Decl(stringLiteralTypesAsTags03.ts, 21, 63), Decl(stringLiteralTypesAsTags03.ts, 22, 63)) +>entity : Symbol(entity, Decl(stringLiteralTypesAsTags03.ts, 23, 17)) +>Entity : Symbol(Entity, Decl(stringLiteralTypesAsTags03.ts, 1, 21)) +>kind : Symbol(kind, Decl(stringLiteralTypesAsTags03.ts, 23, 32)) +>Kind : Symbol(Kind, Decl(stringLiteralTypesAsTags03.ts, 0, 0)) +>entity : Symbol(entity, Decl(stringLiteralTypesAsTags03.ts, 23, 17)) +>Entity : Symbol(Entity, Decl(stringLiteralTypesAsTags03.ts, 1, 21)) + + return entity.kind === kind; +>entity.kind : Symbol(Entity.kind, Decl(stringLiteralTypesAsTags03.ts, 3, 18)) +>entity : Symbol(entity, Decl(stringLiteralTypesAsTags03.ts, 23, 17)) +>kind : Symbol(Entity.kind, Decl(stringLiteralTypesAsTags03.ts, 3, 18)) +>kind : Symbol(kind, Decl(stringLiteralTypesAsTags03.ts, 23, 32)) +} + +let x: A = { +>x : Symbol(x, Decl(stringLiteralTypesAsTags03.ts, 27, 3)) +>A : Symbol(A, Decl(stringLiteralTypesAsTags03.ts, 5, 1)) + + kind: "A", +>kind : Symbol(kind, Decl(stringLiteralTypesAsTags03.ts, 27, 12)) + + a: 100, +>a : Symbol(a, Decl(stringLiteralTypesAsTags03.ts, 28, 14)) +} + +if (hasKind(x, "A")) { +>hasKind : Symbol(hasKind, Decl(stringLiteralTypesAsTags03.ts, 15, 1), Decl(stringLiteralTypesAsTags03.ts, 21, 63), Decl(stringLiteralTypesAsTags03.ts, 22, 63)) +>x : Symbol(x, Decl(stringLiteralTypesAsTags03.ts, 27, 3)) + + let a = x; +>a : Symbol(a, Decl(stringLiteralTypesAsTags03.ts, 33, 7)) +>x : Symbol(x, Decl(stringLiteralTypesAsTags03.ts, 27, 3)) +} +else { + let b = x; +>b : Symbol(b, Decl(stringLiteralTypesAsTags03.ts, 36, 7)) +>x : Symbol(x, Decl(stringLiteralTypesAsTags03.ts, 27, 3)) +} + +if (!hasKind(x, "B")) { +>hasKind : Symbol(hasKind, Decl(stringLiteralTypesAsTags03.ts, 15, 1), Decl(stringLiteralTypesAsTags03.ts, 21, 63), Decl(stringLiteralTypesAsTags03.ts, 22, 63)) +>x : Symbol(x, Decl(stringLiteralTypesAsTags03.ts, 27, 3)) + + let c = x; +>c : Symbol(c, Decl(stringLiteralTypesAsTags03.ts, 40, 7)) +>x : Symbol(x, Decl(stringLiteralTypesAsTags03.ts, 27, 3)) +} +else { + let d = x; +>d : Symbol(d, Decl(stringLiteralTypesAsTags03.ts, 43, 7)) +>x : Symbol(x, Decl(stringLiteralTypesAsTags03.ts, 27, 3)) +} diff --git a/tests/baselines/reference/stringLiteralTypesAsTags03.types b/tests/baselines/reference/stringLiteralTypesAsTags03.types new file mode 100644 index 00000000000..a1d83a1c058 --- /dev/null +++ b/tests/baselines/reference/stringLiteralTypesAsTags03.types @@ -0,0 +1,118 @@ +=== tests/cases/conformance/types/stringLiteral/stringLiteralTypesAsTags03.ts === + +type Kind = "A" | "B" +>Kind : "A" | "B" + +interface Entity { +>Entity : Entity + + kind: Kind; +>kind : "A" | "B" +>Kind : "A" | "B" +} + +interface A extends Entity { +>A : A +>Entity : Entity + + kind: "A"; +>kind : "A" + + a: number; +>a : number +} + +interface B extends Entity { +>B : B +>Entity : Entity + + kind: "B"; +>kind : "B" + + b: string; +>b : string +} + +// Currently (2015-12-14), we write '"A" | "A"' and '"B" | "B"' to avoid +// interpreting respective overloads as "specialized" signatures. +// That way, we can avoid the need to look for a compatible overload +// signature and simply check compatibility with the implementation. +function hasKind(entity: Entity, kind: "A" | "A"): entity is A; +>hasKind : { (entity: Entity, kind: "A"): entity is A; (entity: Entity, kind: "B"): entity is B; } +>entity : Entity +>Entity : Entity +>kind : "A" +>entity : any +>A : A + +function hasKind(entity: Entity, kind: "B" | "B"): entity is B; +>hasKind : { (entity: Entity, kind: "A"): entity is A; (entity: Entity, kind: "B"): entity is B; } +>entity : Entity +>Entity : Entity +>kind : "B" +>entity : any +>B : B + +function hasKind(entity: Entity, kind: Kind): entity is Entity { +>hasKind : { (entity: Entity, kind: "A"): entity is A; (entity: Entity, kind: "B"): entity is B; } +>entity : Entity +>Entity : Entity +>kind : "A" | "B" +>Kind : "A" | "B" +>entity : any +>Entity : Entity + + return entity.kind === kind; +>entity.kind === kind : boolean +>entity.kind : "A" | "B" +>entity : Entity +>kind : "A" | "B" +>kind : "A" | "B" +} + +let x: A = { +>x : A +>A : A +>{ kind: "A", a: 100,} : { kind: "A"; a: number; } + + kind: "A", +>kind : "A" +>"A" : "A" + + a: 100, +>a : number +>100 : number +} + +if (hasKind(x, "A")) { +>hasKind(x, "A") : entity is A +>hasKind : { (entity: Entity, kind: "A"): entity is A; (entity: Entity, kind: "B"): entity is B; } +>x : A +>"A" : "A" + + let a = x; +>a : A +>x : A +} +else { + let b = x; +>b : A +>x : A +} + +if (!hasKind(x, "B")) { +>!hasKind(x, "B") : boolean +>hasKind(x, "B") : entity is B +>hasKind : { (entity: Entity, kind: "A"): entity is A; (entity: Entity, kind: "B"): entity is B; } +>x : A +>"B" : "B" + + let c = x; +>c : A +>x : A +} +else { + let d = x; +>d : A +>x : A +} From c0ff7f77a250e41a744dc56f7133c5808af1875e Mon Sep 17 00:00:00 2001 From: Yui T Date: Mon, 14 Dec 2015 14:35:27 -0800 Subject: [PATCH 127/177] Fix build error --- src/services/services.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/services/services.ts b/src/services/services.ts index 092f987eb5a..4109a4eb345 100644 --- a/src/services/services.ts +++ b/src/services/services.ts @@ -1948,7 +1948,7 @@ namespace ts { return sourceFile; } - export const disableIncrementalParsing = false; + export let disableIncrementalParsing = false; export function updateLanguageServiceSourceFile(sourceFile: SourceFile, scriptSnapshot: IScriptSnapshot, version: string, textChangeRange: TextChangeRange, aggressiveChecks?: boolean): SourceFile { // If we were given a text change range, and our version or open-ness changed, then From 023e375835886c77278328663c79bf010f8f836e Mon Sep 17 00:00:00 2001 From: Ryan Cavanaugh Date: Mon, 14 Dec 2015 16:44:26 -0800 Subject: [PATCH 128/177] Properly handle multiply-declared optional properties in JSX attr. type Fixes #6029 --- src/compiler/checker.ts | 15 +++++-- src/compiler/diagnosticMessages.json | 2 +- .../tsxAttributeResolution11.errors.txt | 33 +++++++++++++++ .../reference/tsxAttributeResolution11.js | 41 +++++++++++++++++++ .../jsx/tsxAttributeResolution11.tsx | 29 +++++++++++++ 5 files changed, 115 insertions(+), 5 deletions(-) create mode 100644 tests/baselines/reference/tsxAttributeResolution11.errors.txt create mode 100644 tests/baselines/reference/tsxAttributeResolution11.js create mode 100644 tests/cases/conformance/jsx/tsxAttributeResolution11.tsx diff --git a/src/compiler/checker.ts b/src/compiler/checker.ts index 78a7ccffbdd..09760b6b1e5 100644 --- a/src/compiler/checker.ts +++ b/src/compiler/checker.ts @@ -3766,11 +3766,13 @@ namespace ts { function createUnionOrIntersectionProperty(containingType: UnionOrIntersectionType, name: string): Symbol { const types = containingType.types; let props: Symbol[]; + let isOptional = !!(containingType.flags & TypeFlags.Intersection); for (const current of types) { const type = getApparentType(current); if (type !== unknownType) { const prop = getPropertyOfType(type, name); if (prop && !(getDeclarationFlagsFromSymbol(prop) & (NodeFlags.Private | NodeFlags.Protected))) { + isOptional = isOptional && !!(prop.flags & SymbolFlags.Optional); if (!props) { props = [prop]; } @@ -3798,7 +3800,12 @@ namespace ts { } propTypes.push(getTypeOfSymbol(prop)); } - const result = createSymbol(SymbolFlags.Property | SymbolFlags.Transient | SymbolFlags.SyntheticProperty, name); + const result = createSymbol( + SymbolFlags.Property | + SymbolFlags.Transient | + SymbolFlags.SyntheticProperty | + (isOptional ? SymbolFlags.Optional : SymbolFlags.None), + name); result.containingType = containingType; result.declarations = declarations; result.type = containingType.flags & TypeFlags.Union ? getUnionType(propTypes) : getIntersectionType(propTypes); @@ -8232,9 +8239,9 @@ namespace ts { // Props is of type 'any' or unknown return links.resolvedJsxType = attributesType; } - else if (!(attributesType.flags & TypeFlags.ObjectType)) { - // Props is not an object type - error(node.tagName, Diagnostics.JSX_element_attributes_type_0_must_be_an_object_type, typeToString(attributesType)); + else if (attributesType.flags & TypeFlags.Union) { + // Props cannot be a union type + error(node.tagName, Diagnostics.JSX_element_attributes_type_0_may_not_be_a_union_type, typeToString(attributesType)); return links.resolvedJsxType = anyType; } else { diff --git a/src/compiler/diagnosticMessages.json b/src/compiler/diagnosticMessages.json index 54123808932..1a2575e9da6 100644 --- a/src/compiler/diagnosticMessages.json +++ b/src/compiler/diagnosticMessages.json @@ -1691,7 +1691,7 @@ "category": "Error", "code": 2528 }, - "JSX element attributes type '{0}' must be an object type.": { + "JSX element attributes type '{0}' may not be a union type.": { "category": "Error", "code": 2600 }, diff --git a/tests/baselines/reference/tsxAttributeResolution11.errors.txt b/tests/baselines/reference/tsxAttributeResolution11.errors.txt new file mode 100644 index 00000000000..b043897d50d --- /dev/null +++ b/tests/baselines/reference/tsxAttributeResolution11.errors.txt @@ -0,0 +1,33 @@ +tests/cases/conformance/jsx/file.tsx(11,22): error TS2339: Property 'bar' does not exist on type 'IntrinsicAttributes & { ref?: string; }'. + + +==== tests/cases/conformance/jsx/react.d.ts (0 errors) ==== + + declare module JSX { + interface Element { } + interface IntrinsicElements { + } + interface ElementAttributesProperty { + props; + } + interface IntrinsicAttributes { + ref?: string; + } + } + +==== tests/cases/conformance/jsx/file.tsx (1 errors) ==== + class MyComponent { + render() { + } + + props: { + ref?: string; + } + } + + // Should be an OK + var x = ; + ~~~ +!!! error TS2339: Property 'bar' does not exist on type 'IntrinsicAttributes & { ref?: string; }'. + + \ No newline at end of file diff --git a/tests/baselines/reference/tsxAttributeResolution11.js b/tests/baselines/reference/tsxAttributeResolution11.js new file mode 100644 index 00000000000..03b843c209a --- /dev/null +++ b/tests/baselines/reference/tsxAttributeResolution11.js @@ -0,0 +1,41 @@ +//// [tests/cases/conformance/jsx/tsxAttributeResolution11.tsx] //// + +//// [react.d.ts] + +declare module JSX { + interface Element { } + interface IntrinsicElements { + } + interface ElementAttributesProperty { + props; + } + interface IntrinsicAttributes { + ref?: string; + } +} + +//// [file.tsx] +class MyComponent { + render() { + } + + props: { + ref?: string; + } +} + +// Should be an OK +var x = ; + + + +//// [file.jsx] +var MyComponent = (function () { + function MyComponent() { + } + MyComponent.prototype.render = function () { + }; + return MyComponent; +}()); +// Should be an OK +var x = ; diff --git a/tests/cases/conformance/jsx/tsxAttributeResolution11.tsx b/tests/cases/conformance/jsx/tsxAttributeResolution11.tsx new file mode 100644 index 00000000000..fdff3c36fc7 --- /dev/null +++ b/tests/cases/conformance/jsx/tsxAttributeResolution11.tsx @@ -0,0 +1,29 @@ +//@jsx: preserve +//@module: amd + +//@filename: react.d.ts +declare module JSX { + interface Element { } + interface IntrinsicElements { + } + interface ElementAttributesProperty { + props; + } + interface IntrinsicAttributes { + ref?: string; + } +} + +//@filename: file.tsx +class MyComponent { + render() { + } + + props: { + ref?: string; + } +} + +// Should be an OK +var x = ; + From ec95f9955af6507bba7b572ce913e48fd9639c94 Mon Sep 17 00:00:00 2001 From: Yui T Date: Tue, 15 Dec 2015 10:04:30 -0800 Subject: [PATCH 129/177] Fix linting issue --- Jakefile.js | 3 +- src/services/services.ts | 1073 +++++++++++++++++++------------------- 2 files changed, 538 insertions(+), 538 deletions(-) diff --git a/Jakefile.js b/Jakefile.js index beb16d2886f..91bd805a27b 100644 --- a/Jakefile.js +++ b/Jakefile.js @@ -924,7 +924,8 @@ function lintFileAsync(options, path, cb) { var lintTargets = compilerSources .concat(harnessCoreSources) .concat(serverCoreSources) - .concat(scriptSources); + .concat(scriptSources) + .concat([path.join(servicesDirectory,"services.ts")]); desc("Runs tslint on the compiler sources"); task("lint", ["build-rules"], function() { diff --git a/src/services/services.ts b/src/services/services.ts index a9dda549ead..8f9028486aa 100644 --- a/src/services/services.ts +++ b/src/services/services.ts @@ -12,7 +12,7 @@ namespace ts { /** The version of the language service API */ - export let servicesVersion = "0.4" + export const servicesVersion = "0.4"; export interface Node { getSourceFile(): SourceFile; @@ -48,7 +48,7 @@ namespace ts { getConstructSignatures(): Signature[]; getStringIndexType(): Type; getNumberIndexType(): Type; - getBaseTypes(): ObjectType[] + getBaseTypes(): ObjectType[]; } export interface Signature { @@ -97,7 +97,7 @@ namespace ts { dispose?(): void; } - export module ScriptSnapshot { + export namespace ScriptSnapshot { class StringScriptSnapshot implements IScriptSnapshot { constructor(private text: string) { @@ -126,12 +126,12 @@ namespace ts { referencedFiles: FileReference[]; importedFiles: FileReference[]; ambientExternalModules: string[]; - isLibFile: boolean + isLibFile: boolean; } - let scanner: Scanner = createScanner(ScriptTarget.Latest, /*skipTrivia*/ true); + const scanner: Scanner = createScanner(ScriptTarget.Latest, /*skipTrivia*/ true); - let emptyArray: any[] = []; + const emptyArray: any[] = []; const jsDocTagNames = [ "augments", @@ -174,7 +174,7 @@ namespace ts { let jsDocCompletionEntries: CompletionEntry[]; function createNode(kind: SyntaxKind, pos: number, end: number, flags: NodeFlags, parent?: Node): NodeObject { - let node = new NodeObject(kind, pos, end); + const node = new NodeObject(kind, pos, end); node.flags = flags; node.parent = parent; return node; @@ -235,8 +235,8 @@ namespace ts { private addSyntheticNodes(nodes: Node[], pos: number, end: number): number { scanner.setTextPos(pos); while (pos < end) { - let token = scanner.scan(); - let textPos = scanner.getTextPos(); + const token = scanner.scan(); + const textPos = scanner.getTextPos(); nodes.push(createNode(token, pos, textPos, NodeFlags.Synthetic, this)); pos = textPos; } @@ -244,13 +244,11 @@ namespace ts { } private createSyntaxList(nodes: NodeArray): Node { - let list = createNode(SyntaxKind.SyntaxList, nodes.pos, nodes.end, NodeFlags.Synthetic, this); + const list = createNode(SyntaxKind.SyntaxList, nodes.pos, nodes.end, NodeFlags.Synthetic, this); list._children = []; let pos = nodes.pos; - - - for (let node of nodes) { + for (const node of nodes) { if (pos < node.pos) { pos = this.addSyntheticNodes(list._children, pos, node.pos); } @@ -269,14 +267,14 @@ namespace ts { scanner.setText((sourceFile || this.getSourceFile()).text); children = []; let pos = this.pos; - let processNode = (node: Node) => { + const processNode = (node: Node) => { if (pos < node.pos) { pos = this.addSyntheticNodes(children, pos, node.pos); } children.push(node); pos = node.end; }; - let processNodes = (nodes: NodeArray) => { + const processNodes = (nodes: NodeArray) => { if (pos < nodes.pos) { pos = this.addSyntheticNodes(children, pos, nodes.pos); } @@ -308,20 +306,20 @@ namespace ts { } public getFirstToken(sourceFile?: SourceFile): Node { - let children = this.getChildren(sourceFile); + const children = this.getChildren(sourceFile); if (!children.length) { return undefined; } - let child = children[0]; + const child = children[0]; return child.kind < SyntaxKind.FirstNode ? child : child.getFirstToken(sourceFile); } public getLastToken(sourceFile?: SourceFile): Node { - let children = this.getChildren(sourceFile); + const children = this.getChildren(sourceFile); - let child = lastOrUndefined(children); + const child = lastOrUndefined(children); if (!child) { return undefined; } @@ -366,8 +364,8 @@ namespace ts { } function getJsDocCommentsFromDeclarations(declarations: Declaration[], name: string, canUseParsedParamTagComments: boolean) { - let documentationComment = []; - let docComments = getJsDocCommentsSeparatedByNewLines(); + const documentationComment = []; + const docComments = getJsDocCommentsSeparatedByNewLines(); ts.forEach(docComments, docComment => { if (documentationComment.length) { documentationComment.push(lineBreakPart()); @@ -378,22 +376,22 @@ namespace ts { return documentationComment; function getJsDocCommentsSeparatedByNewLines() { - let paramTag = "@param"; - let jsDocCommentParts: SymbolDisplayPart[] = []; + const paramTag = "@param"; + const jsDocCommentParts: SymbolDisplayPart[] = []; ts.forEach(declarations, (declaration, indexOfDeclaration) => { // Make sure we are collecting doc comment from declaration once, // In case of union property there might be same declaration multiple times // which only varies in type parameter - // Eg. let a: Array | Array; a.length + // Eg. const a: Array | Array; a.length // The property length will have two declarations of property length coming // from Array - Array and Array if (indexOf(declarations, declaration) === indexOfDeclaration) { - let sourceFileOfDeclaration = getSourceFileOfNode(declaration); + const sourceFileOfDeclaration = getSourceFileOfNode(declaration); // If it is parameter - try and get the jsDoc comment with @param tag from function declaration's jsDoc comments if (canUseParsedParamTagComments && declaration.kind === SyntaxKind.Parameter) { ts.forEach(getJsDocCommentTextRange(declaration.parent, sourceFileOfDeclaration), jsDocCommentTextRange => { - let cleanedParamJsDocComment = getCleanedParamJsDocComment(jsDocCommentTextRange.pos, jsDocCommentTextRange.end, sourceFileOfDeclaration); + const cleanedParamJsDocComment = getCleanedParamJsDocComment(jsDocCommentTextRange.pos, jsDocCommentTextRange.end, sourceFileOfDeclaration); if (cleanedParamJsDocComment) { addRange(jsDocCommentParts, cleanedParamJsDocComment); } @@ -413,7 +411,7 @@ namespace ts { // Get the cleaned js doc comment text from the declaration ts.forEach(getJsDocCommentTextRange( declaration.kind === SyntaxKind.VariableDeclaration ? declaration.parent.parent : declaration, sourceFileOfDeclaration), jsDocCommentTextRange => { - let cleanedJsDocComment = getCleanedJsDocComment(jsDocCommentTextRange.pos, jsDocCommentTextRange.end, sourceFileOfDeclaration); + const cleanedJsDocComment = getCleanedJsDocComment(jsDocCommentTextRange.pos, jsDocCommentTextRange.end, sourceFileOfDeclaration); if (cleanedJsDocComment) { addRange(jsDocCommentParts, cleanedJsDocComment); } @@ -439,7 +437,7 @@ namespace ts { } for (; pos < end; pos++) { - let ch = sourceFile.text.charCodeAt(pos); + const ch = sourceFile.text.charCodeAt(pos); if (!isWhiteSpace(ch) || isLineBreak(ch)) { // Either found lineBreak or non whiteSpace return pos; @@ -480,7 +478,7 @@ namespace ts { function getCleanedJsDocComment(pos: number, end: number, sourceFile: SourceFile) { let spacesToRemoveAfterAsterisk: number; - let docComments: SymbolDisplayPart[] = []; + const docComments: SymbolDisplayPart[] = []; let blankLineCount = 0; let isInParamTag = false; @@ -491,7 +489,7 @@ namespace ts { // If the comment starts with '*' consume the spaces on this line if (pos < end && sourceFile.text.charCodeAt(pos) === CharacterCodes.asterisk) { - let lineStartPos = pos + 1; + const lineStartPos = pos + 1; pos = consumeWhiteSpacesOnTheLine(pos + 1, end, sourceFile, spacesToRemoveAfterAsterisk); // Set the spaces to remove after asterisk as margin if not already set @@ -505,7 +503,7 @@ namespace ts { // Analyse text on this line while (pos < end && !isLineBreak(sourceFile.text.charCodeAt(pos))) { - let ch = sourceFile.text.charAt(pos); + const ch = sourceFile.text.charAt(pos); if (ch === "@") { // If it is @param tag if (isParamTag(pos, end, sourceFile)) { @@ -544,7 +542,7 @@ namespace ts { function getCleanedParamJsDocComment(pos: number, end: number, sourceFile: SourceFile) { let paramHelpStringMargin: number; - let paramDocComments: SymbolDisplayPart[] = []; + const paramDocComments: SymbolDisplayPart[] = []; while (pos < end) { if (isParamTag(pos, end, sourceFile)) { let blankLineCount = 0; @@ -559,7 +557,7 @@ namespace ts { if (sourceFile.text.charCodeAt(pos) === CharacterCodes.openBrace) { pos++; for (let curlies = 1; pos < end; pos++) { - let charCode = sourceFile.text.charCodeAt(pos); + const charCode = sourceFile.text.charCodeAt(pos); // { character means we need to find another } to match the found one if (charCode === CharacterCodes.openBrace) { @@ -603,9 +601,9 @@ namespace ts { } let paramHelpString = ""; - let firstLineParamHelpStringPos = pos; + const firstLineParamHelpStringPos = pos; while (pos < end) { - let ch = sourceFile.text.charCodeAt(pos); + const ch = sourceFile.text.charCodeAt(pos); // at line break, set this comment line text and go to next line if (isLineBreak(ch)) { @@ -674,15 +672,15 @@ namespace ts { } // Now consume white spaces max - let startOfLinePos = pos; + const startOfLinePos = pos; pos = consumeWhiteSpacesOnTheLine(pos, end, sourceFile, paramHelpStringMargin); if (pos >= end) { return; } - let consumedSpaces = pos - startOfLinePos; + const consumedSpaces = pos - startOfLinePos; if (consumedSpaces < paramHelpStringMargin) { - let ch = sourceFile.text.charCodeAt(pos); + const ch = sourceFile.text.charCodeAt(pos); if (ch === CharacterCodes.asterisk) { // Consume more spaces after asterisk pos = consumeWhiteSpacesOnTheLine(pos + 1, end, sourceFile, paramHelpStringMargin - consumedSpaces - 1); @@ -815,7 +813,7 @@ namespace ts { private namedDeclarations: Map; constructor(kind: SyntaxKind, pos: number, end: number) { - super(kind, pos, end) + super(kind, pos, end); } public update(newText: string, textChangeRange: TextChangeRange): SourceFile { @@ -843,16 +841,16 @@ namespace ts { } private computeNamedDeclarations(): Map { - let result: Map = {}; + const result: Map = {}; forEachChild(this, visit); return result; function addDeclaration(declaration: Declaration) { - let name = getDeclarationName(declaration); + const name = getDeclarationName(declaration); if (name) { - let declarations = getDeclarations(name); + const declarations = getDeclarations(name); declarations.push(declaration); } } @@ -863,13 +861,13 @@ namespace ts { function getDeclarationName(declaration: Declaration) { if (declaration.name) { - let result = getTextOfIdentifierOrLiteral(declaration.name); + const result = getTextOfIdentifierOrLiteral(declaration.name); if (result !== undefined) { return result; } if (declaration.name.kind === SyntaxKind.ComputedPropertyName) { - let expr = (declaration.name).expression; + const expr = (declaration.name).expression; if (expr.kind === SyntaxKind.PropertyAccessExpression) { return (expr).name.text; } @@ -899,12 +897,12 @@ namespace ts { case SyntaxKind.FunctionDeclaration: case SyntaxKind.MethodDeclaration: case SyntaxKind.MethodSignature: - let functionDeclaration = node; - let declarationName = getDeclarationName(functionDeclaration); + const functionDeclaration = node; + const declarationName = getDeclarationName(functionDeclaration); if (declarationName) { - let declarations = getDeclarations(declarationName); - let lastDeclaration = lastOrUndefined(declarations); + const declarations = getDeclarations(declarationName); + const lastDeclaration = lastOrUndefined(declarations); // Check whether this declaration belongs to an "overload group". if (lastDeclaration && functionDeclaration.parent === lastDeclaration.parent && functionDeclaration.symbol === lastDeclaration.symbol) { @@ -980,7 +978,7 @@ namespace ts { break; case SyntaxKind.ImportDeclaration: - let importClause = (node).importClause; + const importClause = (node).importClause; if (importClause) { // Handle default import case e.g.: // import d from "mod"; @@ -1113,8 +1111,8 @@ namespace ts { } export interface Classifications { - spans: number[], - endOfLineState: EndOfLineState + spans: number[]; + endOfLineState: EndOfLineState; } export interface ClassifiedSpan { @@ -1171,7 +1169,7 @@ namespace ts { highlightSpans: HighlightSpan[]; } - export module HighlightSpanKind { + export namespace HighlightSpanKind { export const none = "none"; export const definition = "definition"; export const reference = "reference"; @@ -1220,7 +1218,7 @@ namespace ts { InsertSpaceAfterOpeningAndBeforeClosingNonemptyBrackets: boolean; PlaceOpenBraceOnNewLineForFunctions: boolean; PlaceOpenBraceOnNewLineForControlBlocks: boolean; - [s: string]: boolean | number| string; + [s: string]: boolean | number | string; } export interface DefinitionInfo { @@ -1500,7 +1498,7 @@ namespace ts { } // TODO: move these to enums - export module ScriptElementKind { + export namespace ScriptElementKind { export const unknown = ""; export const warning = "warning"; @@ -1529,7 +1527,7 @@ namespace ts { export const enumElement = "enum"; // Inside module and script only - // let v = .. + // const v = .. export const variableElement = "var"; // Inside function @@ -1581,7 +1579,7 @@ namespace ts { export const letElement = "let"; } - export module ScriptElementKindModifier { + export namespace ScriptElementKindModifier { export const none = ""; export const publicMemberModifier = "public"; export const privateMemberModifier = "private"; @@ -1723,8 +1721,8 @@ namespace ts { this.fileNameToEntry = createFileMap(); // Initialize the list with the root file names - let rootFileNames = host.getScriptFileNames(); - for (let fileName of rootFileNames) { + const rootFileNames = host.getScriptFileNames(); + for (const fileName of rootFileNames) { this.createEntry(fileName, toPath(fileName, this.currentDirectory, getCanonicalFileName)); } @@ -1738,7 +1736,7 @@ namespace ts { private createEntry(fileName: string, path: Path) { let entry: HostFileInformation; - let scriptSnapshot = this.host.getScriptSnapshot(fileName); + const scriptSnapshot = this.host.getScriptSnapshot(fileName); if (scriptSnapshot) { entry = { hostFileName: fileName, @@ -1760,7 +1758,7 @@ namespace ts { } public getOrCreateEntry(fileName: string): HostFileInformation { - let path = toPath(fileName, this.currentDirectory, this.getCanonicalFileName) + const path = toPath(fileName, this.currentDirectory, this.getCanonicalFileName); if (this.contains(path)) { return this.getEntry(path); } @@ -1769,7 +1767,7 @@ namespace ts { } public getRootFileNames(): string[] { - let fileNames: string[] = []; + const fileNames: string[] = []; this.fileNameToEntry.forEachValue((path, value) => { if (value) { @@ -1781,12 +1779,12 @@ namespace ts { } public getVersion(path: Path): string { - let file = this.getEntry(path); + const file = this.getEntry(path); return file && file.version; } public getScriptSnapshot(path: Path): IScriptSnapshot { - let file = this.getEntry(path); + const file = this.getEntry(path); return file && file.scriptSnapshot; } } @@ -1803,22 +1801,22 @@ namespace ts { } public getCurrentSourceFile(fileName: string): SourceFile { - let scriptSnapshot = this.host.getScriptSnapshot(fileName); + const scriptSnapshot = this.host.getScriptSnapshot(fileName); if (!scriptSnapshot) { // The host does not know about this file. throw new Error("Could not find file: '" + fileName + "'."); } - let version = this.host.getScriptVersion(fileName); + const version = this.host.getScriptVersion(fileName); let sourceFile: SourceFile; if (this.currentFileName !== fileName) { // This is a new file, just parse it - sourceFile = createLanguageServiceSourceFile(fileName, scriptSnapshot, ScriptTarget.Latest, version, /*setNodeParents:*/ true); + sourceFile = createLanguageServiceSourceFile(fileName, scriptSnapshot, ScriptTarget.Latest, version, /*setNodeParents*/ true); } else if (this.currentFileVersion !== version) { // This is the same file, just a newer version. Incrementally parse the file. - let editRange = scriptSnapshot.getChangeRange(this.currentFileScriptSnapshot); + const editRange = scriptSnapshot.getChangeRange(this.currentFileScriptSnapshot); sourceFile = updateLanguageServiceSourceFile(this.currentSourceFile, scriptSnapshot, version, editRange); } @@ -1863,7 +1861,7 @@ namespace ts { * - noResolve = true */ export function transpileModule(input: string, transpileOptions: TranspileOptions): TranspileOutput { - let options = transpileOptions.compilerOptions ? clone(transpileOptions.compilerOptions) : getDefaultCompilerOptions(); + const options = transpileOptions.compilerOptions ? clone(transpileOptions.compilerOptions) : getDefaultCompilerOptions(); options.isolatedModules = true; @@ -1879,21 +1877,22 @@ namespace ts { options.noResolve = true; // if jsx is specified then treat file as .tsx - let inputFileName = transpileOptions.fileName || (options.jsx ? "module.tsx" : "module.ts"); - let sourceFile = createSourceFile(inputFileName, input, options.target); + const inputFileName = transpileOptions.fileName || (options.jsx ? "module.tsx" : "module.ts"); + const sourceFile = createSourceFile(inputFileName, input, options.target); if (transpileOptions.moduleName) { sourceFile.moduleName = transpileOptions.moduleName; } sourceFile.renamedDependencies = transpileOptions.renamedDependencies; - let newLine = getNewLineCharacter(options); + const newLine = getNewLineCharacter(options); // Output let outputText: string; let sourceMapText: string; + // Create a compilerHost object to allow the compiler to read and write files - let compilerHost: CompilerHost = { + const compilerHost: CompilerHost = { getSourceFile: (fileName, target) => fileName === normalizeSlashes(inputFileName) ? sourceFile : undefined, writeFile: (name, text, writeByteOrderMark) => { if (fileExtensionIs(name, ".map")) { @@ -1914,7 +1913,7 @@ namespace ts { readFile: (fileName): string => "" }; - let program = createProgram([inputFileName], options, compilerHost); + const program = createProgram([inputFileName], options, compilerHost); let diagnostics: Diagnostic[]; if (transpileOptions.reportDiagnostics) { @@ -1934,15 +1933,15 @@ namespace ts { * This is a shortcut function for transpileModule - it accepts transpileOptions as parameters and returns only outputText part of the result. */ export function transpile(input: string, compilerOptions?: CompilerOptions, fileName?: string, diagnostics?: Diagnostic[], moduleName?: string): string { - let output = transpileModule(input, { compilerOptions, fileName, reportDiagnostics: !!diagnostics, moduleName }); + const output = transpileModule(input, { compilerOptions, fileName, reportDiagnostics: !!diagnostics, moduleName }); // addRange correctly handles cases when wither 'from' or 'to' argument is missing addRange(diagnostics, output.diagnostics); return output.outputText; } export function createLanguageServiceSourceFile(fileName: string, scriptSnapshot: IScriptSnapshot, scriptTarget: ScriptTarget, version: string, setNodeParents: boolean): SourceFile { - let text = scriptSnapshot.getText(0, scriptSnapshot.getLength()); - let sourceFile = createSourceFile(fileName, text, scriptTarget, setNodeParents); + const text = scriptSnapshot.getText(0, scriptSnapshot.getLength()); + const sourceFile = createSourceFile(fileName, text, scriptTarget, setNodeParents); setSourceFileFields(sourceFile, scriptSnapshot, version); // after full parsing we can use table with interned strings as name table sourceFile.nameTable = sourceFile.identifiers; @@ -1961,12 +1960,12 @@ namespace ts { let newText: string; // grab the fragment from the beginning of the original text to the beginning of the span - let prefix = textChangeRange.span.start !== 0 + const prefix = textChangeRange.span.start !== 0 ? sourceFile.text.substr(0, textChangeRange.span.start) : ""; // grab the fragment from the end of the span till the end of the original text - let suffix = textSpanEnd(textChangeRange.span) !== sourceFile.text.length + const suffix = textSpanEnd(textChangeRange.span) !== sourceFile.text.length ? sourceFile.text.substr(textSpanEnd(textChangeRange.span)) : ""; @@ -1976,7 +1975,7 @@ namespace ts { } else { // it was actual edit, fetch the fragment of new text that correspond to new span - let changedText = scriptSnapshot.getText(textChangeRange.span.start, textChangeRange.span.start + textChangeRange.newLength); + const changedText = scriptSnapshot.getText(textChangeRange.span.start, textChangeRange.span.start + textChangeRange.newLength); // combine prefix, changed text and suffix newText = prefix && suffix ? prefix + changedText + suffix @@ -1985,7 +1984,7 @@ namespace ts { : (changedText + suffix); } - let newSourceFile = updateSourceFile(sourceFile, newText, textChangeRange, aggressiveChecks); + const newSourceFile = updateSourceFile(sourceFile, newText, textChangeRange, aggressiveChecks); setSourceFileFields(newSourceFile, scriptSnapshot, version); // after incremental parsing nameTable might not be up-to-date // drop it so it can be lazily recreated later @@ -2006,7 +2005,7 @@ namespace ts { } // Otherwise, just create a new source file. - return createLanguageServiceSourceFile(sourceFile.fileName, scriptSnapshot, sourceFile.languageVersion, version, /*setNodeParents:*/ true); + return createLanguageServiceSourceFile(sourceFile.fileName, scriptSnapshot, sourceFile.languageVersion, version, /*setNodeParents*/ true); } export function createGetCanonicalFileName(useCaseSensitivefileNames: boolean): (fileName: string) => string { @@ -2019,15 +2018,15 @@ namespace ts { export function createDocumentRegistry(useCaseSensitiveFileNames?: boolean, currentDirectory = ""): DocumentRegistry { // Maps from compiler setting target (ES3, ES5, etc.) to all the cached documents we have // for those settings. - let buckets: Map> = {}; - let getCanonicalFileName = createGetCanonicalFileName(!!useCaseSensitiveFileNames); + const buckets: Map> = {}; + const getCanonicalFileName = createGetCanonicalFileName(!!useCaseSensitiveFileNames); function getKeyFromCompilationSettings(settings: CompilerOptions): string { return "_" + settings.target + "|" + settings.module + "|" + settings.noResolve + "|" + settings.jsx + +"|" + settings.allowJs; } function getBucketForCompilationSettings(settings: CompilerOptions, createIfMissing: boolean): FileMap { - let key = getKeyFromCompilationSettings(settings); + const key = getKeyFromCompilationSettings(settings); let bucket = lookUp(buckets, key); if (!bucket && createIfMissing) { buckets[key] = bucket = createFileMap(); @@ -2036,9 +2035,9 @@ namespace ts { } function reportStats() { - let bucketInfoArray = Object.keys(buckets).filter(name => name && name.charAt(0) === '_').map(name => { - let entries = lookUp(buckets, name); - let sourceFiles: { name: string; refCount: number; references: string[]; }[] = []; + const bucketInfoArray = Object.keys(buckets).filter(name => name && name.charAt(0) === "_").map(name => { + const entries = lookUp(buckets, name); + const sourceFiles: { name: string; refCount: number; references: string[]; }[] = []; entries.forEachValue((key, entry) => { sourceFiles.push({ name: key, @@ -2052,15 +2051,15 @@ namespace ts { sourceFiles }; }); - return JSON.stringify(bucketInfoArray, null, 2); + return JSON.stringify(bucketInfoArray, undefined, 2); } function acquireDocument(fileName: string, compilationSettings: CompilerOptions, scriptSnapshot: IScriptSnapshot, version: string): SourceFile { - return acquireOrUpdateDocument(fileName, compilationSettings, scriptSnapshot, version, /*acquiring:*/ true); + return acquireOrUpdateDocument(fileName, compilationSettings, scriptSnapshot, version, /*acquiring*/ true); } function updateDocument(fileName: string, compilationSettings: CompilerOptions, scriptSnapshot: IScriptSnapshot, version: string): SourceFile { - return acquireOrUpdateDocument(fileName, compilationSettings, scriptSnapshot, version, /*acquiring:*/ false); + return acquireOrUpdateDocument(fileName, compilationSettings, scriptSnapshot, version, /*acquiring*/ false); } function acquireOrUpdateDocument( @@ -2070,14 +2069,14 @@ namespace ts { version: string, acquiring: boolean): SourceFile { - let bucket = getBucketForCompilationSettings(compilationSettings, /*createIfMissing*/ true); - let path = toPath(fileName, currentDirectory, getCanonicalFileName); + const bucket = getBucketForCompilationSettings(compilationSettings, /*createIfMissing*/ true); + const path = toPath(fileName, currentDirectory, getCanonicalFileName); let entry = bucket.get(path); if (!entry) { Debug.assert(acquiring, "How could we be trying to update a document that the registry doesn't have?"); // Have never seen this file with these settings. Create a new source file for it. - let sourceFile = createLanguageServiceSourceFile(fileName, scriptSnapshot, compilationSettings.target, version, /*setNodeParents:*/ false); + const sourceFile = createLanguageServiceSourceFile(fileName, scriptSnapshot, compilationSettings.target, version, /*setNodeParents*/ false); entry = { sourceFile: sourceFile, @@ -2109,12 +2108,12 @@ namespace ts { } function releaseDocument(fileName: string, compilationSettings: CompilerOptions): void { - let bucket = getBucketForCompilationSettings(compilationSettings, false); + const bucket = getBucketForCompilationSettings(compilationSettings, /*createIfMissing*/false); Debug.assert(bucket !== undefined); - let path = toPath(fileName, currentDirectory, getCanonicalFileName); + const path = toPath(fileName, currentDirectory, getCanonicalFileName); - let entry = bucket.get(path); + const entry = bucket.get(path); entry.languageServiceRefCount--; Debug.assert(entry.languageServiceRefCount >= 0); @@ -2132,19 +2131,19 @@ namespace ts { } export function preProcessFile(sourceText: string, readImportFiles = true, detectJavaScriptImports = false): PreProcessedFileInfo { - let referencedFiles: FileReference[] = []; - let importedFiles: FileReference[] = []; + const referencedFiles: FileReference[] = []; + const importedFiles: FileReference[] = []; let ambientExternalModules: string[]; let isNoDefaultLib = false; function processTripleSlashDirectives(): void { - let commentRanges = getLeadingCommentRanges(sourceText, 0); + const commentRanges = getLeadingCommentRanges(sourceText, 0); forEach(commentRanges, commentRange => { - let comment = sourceText.substring(commentRange.pos, commentRange.end); - let referencePathMatchResult = getFileReferenceFromReferencePath(comment, commentRange); + const comment = sourceText.substring(commentRange.pos, commentRange.end); + const referencePathMatchResult = getFileReferenceFromReferencePath(comment, commentRange); if (referencePathMatchResult) { isNoDefaultLib = referencePathMatchResult.isNoDefaultLib; - let fileReference = referencePathMatchResult.fileReference; + const fileReference = referencePathMatchResult.fileReference; if (fileReference) { referencedFiles.push(fileReference); } @@ -2160,8 +2159,8 @@ namespace ts { } function recordModuleName() { - let importPath = scanner.getTokenValue(); - let pos = scanner.getTokenPos(); + const importPath = scanner.getTokenValue(); + const pos = scanner.getTokenPos(); importedFiles.push({ fileName: importPath, pos: pos, @@ -2213,7 +2212,7 @@ namespace ts { } } else if (token === SyntaxKind.EqualsToken) { - if (tryConsumeRequireCall(/* skipCurrentToken */ true)) { + if (tryConsumeRequireCall(/*skipCurrentToken*/ true)) { return true; } } @@ -2311,7 +2310,7 @@ namespace ts { if (token === SyntaxKind.Identifier || isKeyword(token)) { token = scanner.scan(); if (token === SyntaxKind.EqualsToken) { - if (tryConsumeRequireCall(/* skipCurrentToken */ true)) { + if (tryConsumeRequireCall(/*skipCurrentToken*/ true)) { return true; } } @@ -2410,7 +2409,7 @@ namespace ts { if (tryConsumeDeclare() || tryConsumeImport() || tryConsumeExport() || - (detectJavaScriptImports && (tryConsumeRequireCall(/* skipCurrentToken */ false) || tryConsumeDefine()))) { + (detectJavaScriptImports && (tryConsumeRequireCall(/*skipCurrentToken*/ false) || tryConsumeDefine()))) { continue; } else { @@ -2550,8 +2549,8 @@ namespace ts { return true; } else if (position === comment.end) { - let text = sourceFile.text; - let width = comment.end - comment.pos; + const text = sourceFile.text; + const width = comment.end - comment.pos; // is single line comment or just /* if (width <= 2 || text.charCodeAt(comment.pos + 1) === CharacterCodes.slash) { return true; @@ -2583,7 +2582,7 @@ namespace ts { } // A cache of completion entries for keywords, these do not change between sessions - let keywordCompletions: CompletionEntry[] = []; + const keywordCompletions: CompletionEntry[] = []; for (let i = SyntaxKind.FirstKeyword; i <= SyntaxKind.LastKeyword; i++) { keywordCompletions.push({ name: tokenToString(i), @@ -2673,15 +2672,15 @@ namespace ts { export function createLanguageService(host: LanguageServiceHost, documentRegistry: DocumentRegistry = createDocumentRegistry(host.useCaseSensitiveFileNames && host.useCaseSensitiveFileNames(), host.getCurrentDirectory())): LanguageService { - let syntaxTreeCache: SyntaxTreeCache = new SyntaxTreeCache(host); + const syntaxTreeCache: SyntaxTreeCache = new SyntaxTreeCache(host); let ruleProvider: formatting.RulesProvider; let program: Program; let lastProjectVersion: string; - let useCaseSensitivefileNames = false; - let cancellationToken = new CancellationTokenObject(host.getCancellationToken && host.getCancellationToken()); + const useCaseSensitivefileNames = false; + const cancellationToken = new CancellationTokenObject(host.getCancellationToken && host.getCancellationToken()); - let currentDirectory = host.getCurrentDirectory(); + const currentDirectory = host.getCurrentDirectory(); // Check if the localized messages json is set, otherwise query the host for it if (!localizedDiagnosticMessages && host.getLocalizedDiagnosticMessages) { localizedDiagnosticMessages = host.getLocalizedDiagnosticMessages(); @@ -2693,10 +2692,10 @@ namespace ts { } } - let getCanonicalFileName = createGetCanonicalFileName(useCaseSensitivefileNames); + const getCanonicalFileName = createGetCanonicalFileName(useCaseSensitivefileNames); function getValidSourceFile(fileName: string): SourceFile { - let sourceFile = program.getSourceFile(fileName); + const sourceFile = program.getSourceFile(fileName); if (!sourceFile) { throw new Error("Could not find file: '" + fileName + "'."); } @@ -2716,7 +2715,7 @@ namespace ts { function synchronizeHostData(): void { // perform fast check if host supports it if (host.getProjectVersion) { - let hostProjectVersion = host.getProjectVersion(); + const hostProjectVersion = host.getProjectVersion(); if (hostProjectVersion) { if (lastProjectVersion === hostProjectVersion) { return; @@ -2740,17 +2739,17 @@ namespace ts { // the program points to old source files that have been invalidated because of // incremental parsing. - let oldSettings = program && program.getCompilerOptions(); - let newSettings = hostCache.compilationSettings(); - let changesInCompilationSettingsAffectSyntax = oldSettings && + const oldSettings = program && program.getCompilerOptions(); + const newSettings = hostCache.compilationSettings(); + const changesInCompilationSettingsAffectSyntax = oldSettings && (oldSettings.target !== newSettings.target || oldSettings.module !== newSettings.module || oldSettings.noResolve !== newSettings.noResolve || - oldSettings.jsx !== newSettings.jsx || + oldSettings.jsx !== newSettings.jsx || oldSettings.allowJs !== newSettings.allowJs); // Now create a new compiler - let compilerHost: CompilerHost = { + const compilerHost: CompilerHost = { getSourceFile: getOrCreateSourceFile, getCancellationToken: () => cancellationToken, getCanonicalFileName, @@ -2766,22 +2765,22 @@ namespace ts { }, readFile: (fileName): string => { // stub missing host functionality - let entry = hostCache.getOrCreateEntry(fileName); + const entry = hostCache.getOrCreateEntry(fileName); return entry && entry.scriptSnapshot.getText(0, entry.scriptSnapshot.getLength()); } }; if (host.resolveModuleNames) { - compilerHost.resolveModuleNames = (moduleNames, containingFile) => host.resolveModuleNames(moduleNames, containingFile) + compilerHost.resolveModuleNames = (moduleNames, containingFile) => host.resolveModuleNames(moduleNames, containingFile); } - let newProgram = createProgram(hostCache.getRootFileNames(), newSettings, compilerHost, program); + const newProgram = createProgram(hostCache.getRootFileNames(), newSettings, compilerHost, program); // Release any files we have acquired in the old program but are // not part of the new program. if (program) { - let oldSourceFiles = program.getSourceFiles(); - for (let oldSourceFile of oldSourceFiles) { + const oldSourceFiles = program.getSourceFiles(); + for (const oldSourceFile of oldSourceFiles) { if (!newProgram.getSourceFile(oldSourceFile.fileName) || changesInCompilationSettingsAffectSyntax) { documentRegistry.releaseDocument(oldSourceFile.fileName, oldSettings); } @@ -2804,7 +2803,7 @@ namespace ts { // The program is asking for this file, check first if the host can locate it. // If the host can not locate the file, then it does not exist. return undefined // to the program to allow reporting of errors for missing files. - let hostFileInformation = hostCache.getOrCreateEntry(fileName); + const hostFileInformation = hostCache.getOrCreateEntry(fileName); if (!hostFileInformation) { return undefined; } @@ -2814,7 +2813,7 @@ namespace ts { // can not be reused. we have to dump all syntax trees and create new ones. if (!changesInCompilationSettingsAffectSyntax) { // Check if the old program had this file already - let oldSourceFile = program && program.getSourceFile(fileName); + const oldSourceFile = program && program.getSourceFile(fileName); if (oldSourceFile) { // We already had a source file for this file name. Go to the registry to // ensure that we get the right up to date version of it. We need this to @@ -2851,7 +2850,7 @@ namespace ts { if (!sourceFile) { return false; } - let path = sourceFile.path || toPath(sourceFile.fileName, currentDirectory, getCanonicalFileName); + const path = sourceFile.path || toPath(sourceFile.fileName, currentDirectory, getCanonicalFileName); return sourceFile.version === hostCache.getVersion(path); } @@ -2862,13 +2861,13 @@ namespace ts { } // If number of files in the program do not match, it is not up-to-date - let rootFileNames = hostCache.getRootFileNames(); + const rootFileNames = hostCache.getRootFileNames(); if (program.getSourceFiles().length !== rootFileNames.length) { return false; } // If any file is not up-to-date, then the whole program is not up-to-date - for (let fileName of rootFileNames) { + for (const fileName of rootFileNames) { if (!sourceFileUpToDate(program.getSourceFile(fileName))) { return false; } @@ -2910,18 +2909,18 @@ namespace ts { function getSemanticDiagnostics(fileName: string): Diagnostic[] { synchronizeHostData(); - let targetSourceFile = getValidSourceFile(fileName); + const targetSourceFile = getValidSourceFile(fileName); // Only perform the action per file regardless of '-out' flag as LanguageServiceHost is expected to call this function per file. // Therefore only get diagnostics for given file. - let semanticDiagnostics = program.getSemanticDiagnostics(targetSourceFile, cancellationToken); + const semanticDiagnostics = program.getSemanticDiagnostics(targetSourceFile, cancellationToken); if (!program.getCompilerOptions().declaration) { return semanticDiagnostics; } // If '-d' is enabled, check for emitter error. One example of emitter error is export class implements non-export interface - let declarationDiagnostics = program.getDeclarationDiagnostics(targetSourceFile, cancellationToken); + const declarationDiagnostics = program.getDeclarationDiagnostics(targetSourceFile, cancellationToken); return concatenate(semanticDiagnostics, declarationDiagnostics); } @@ -2937,14 +2936,14 @@ namespace ts { * @return undefined if the name is of external module otherwise a name with striped of any quote */ function getCompletionEntryDisplayNameForSymbol(symbol: Symbol, target: ScriptTarget, performCharacterChecks: boolean, location: Node): string { - let displayName: string = getDeclaredName(program.getTypeChecker(), symbol, location); + const displayName: string = getDeclaredName(program.getTypeChecker(), symbol, location); if (displayName) { - let firstCharCode = displayName.charCodeAt(0); + const firstCharCode = displayName.charCodeAt(0); // First check of the displayName is not external module; if it is an external module, it is not valid entry if ((symbol.flags & SymbolFlags.Namespace) && (firstCharCode === CharacterCodes.singleQuote || firstCharCode === CharacterCodes.doubleQuote)) { // If the symbol is external module, don't show it in the completion list - // (i.e declare module "http" { let x; } | // <= request completion here, "http" should not be there) + // (i.e declare module "http" { const x; } | // <= request completion here, "http" should not be there) return undefined; } } @@ -2987,20 +2986,20 @@ namespace ts { } function getCompletionData(fileName: string, position: number) { - let typeChecker = program.getTypeChecker(); - let syntacticStart = new Date().getTime(); - let sourceFile = getValidSourceFile(fileName); - let isJavaScriptFile = isSourceFileJavaScript(sourceFile); + const typeChecker = program.getTypeChecker(); + const syntacticStart = new Date().getTime(); + const sourceFile = getValidSourceFile(fileName); + const isJavaScriptFile = isSourceFileJavaScript(sourceFile); let isJsDocTagName = false; let start = new Date().getTime(); - let currentToken = getTokenAtPosition(sourceFile, position); + const currentToken = getTokenAtPosition(sourceFile, position); log("getCompletionData: Get current token: " + (new Date().getTime() - start)); start = new Date().getTime(); // Completion not allowed inside comments, bail out if this is the case - let insideComment = isInsideComment(sourceFile, currentToken, position); + const insideComment = isInsideComment(sourceFile, currentToken, position); log("getCompletionData: Is inside comment: " + (new Date().getTime() - start)); if (insideComment) { @@ -3014,7 +3013,7 @@ namespace ts { // /** @type {number | string} */ // Completion should work in the brackets let insideJsDocTagExpression = false; - let tag = getJsDocTagAtPosition(sourceFile, position); + const tag = getJsDocTagAtPosition(sourceFile, position); if (tag) { if (tag.tagName.pos <= position && position <= tag.tagName.end) { isJsDocTagName = true; @@ -3024,7 +3023,7 @@ namespace ts { case SyntaxKind.JSDocTypeTag: case SyntaxKind.JSDocParameterTag: case SyntaxKind.JSDocReturnTag: - let tagWithExpression = tag; + const tagWithExpression = tag; if (tagWithExpression.typeExpression) { insideJsDocTagExpression = tagWithExpression.typeExpression.pos < position && position < tagWithExpression.typeExpression.end; } @@ -3045,7 +3044,7 @@ namespace ts { } start = new Date().getTime(); - let previousToken = findPrecedingToken(position, sourceFile); + const previousToken = findPrecedingToken(position, sourceFile); log("getCompletionData: Get previous token 1: " + (new Date().getTime() - start)); // The decision to provide completion depends on the contextToken, which is determined through the previousToken. @@ -3055,7 +3054,7 @@ namespace ts { // Check if the caret is at the end of an identifier; this is a partial identifier that we want to complete: e.g. a.toS| // Skip this partial identifier and adjust the contextToken to the token that precedes it. if (contextToken && position <= contextToken.end && isWord(contextToken.kind)) { - let start = new Date().getTime(); + const start = new Date().getTime(); contextToken = findPrecedingToken(contextToken.getFullStart(), sourceFile); log("getCompletionData: Get previous token 2: " + (new Date().getTime() - start)); } @@ -3076,7 +3075,7 @@ namespace ts { return undefined; } - let { parent, kind } = contextToken; + const { parent, kind } = contextToken; if (kind === SyntaxKind.DotToken) { if (parent.kind === SyntaxKind.PropertyAccessExpression) { node = (contextToken.parent).expression; @@ -3103,7 +3102,7 @@ namespace ts { } } - let semanticStart = new Date().getTime(); + const semanticStart = new Date().getTime(); let isMemberCompletion: boolean; let isNewIdentifierLocation: boolean; let symbols: Symbol[] = []; @@ -3112,7 +3111,7 @@ namespace ts { getTypeScriptMemberSymbols(); } else if (isRightOfOpenTag) { - let tagSymbols = typeChecker.getJsxIntrinsicTagNames(); + const tagSymbols = typeChecker.getJsxIntrinsicTagNames(); if (tryGetGlobalSymbols()) { symbols = tagSymbols.concat(symbols.filter(s => !!(s.flags & SymbolFlags.Value))); } @@ -3123,7 +3122,7 @@ namespace ts { isNewIdentifierLocation = false; } else if (isStartingCloseTag) { - let tagName = (contextToken.parent.parent).openingElement.tagName; + const tagName = (contextToken.parent.parent).openingElement.tagName; symbols = [typeChecker.getSymbolAtLocation(tagName)]; isMemberCompletion = true; @@ -3157,7 +3156,7 @@ namespace ts { if (symbol && symbol.flags & SymbolFlags.HasExports) { // Extract module or enum members - let exportedSymbols = typeChecker.getExportsOfModule(symbol); + const exportedSymbols = typeChecker.getExportsOfModule(symbol); forEach(exportedSymbols, symbol => { if (typeChecker.isValidPropertyAccess((node.parent), symbol.name)) { symbols.push(symbol); @@ -3166,14 +3165,14 @@ namespace ts { } } - let type = typeChecker.getTypeAtLocation(node); + const type = typeChecker.getTypeAtLocation(node); addTypeProperties(type); } function addTypeProperties(type: Type) { if (type) { // Filter private properties - for (let symbol of type.getApparentProperties()) { + for (const symbol of type.getApparentProperties()) { if (typeChecker.isValidPropertyAccess((node.parent), symbol.name)) { symbols.push(symbol); } @@ -3185,8 +3184,8 @@ namespace ts { // each individual type has. This is because we're going to add all identifiers // anyways. So we might as well elevate the members that were at least part // of the individual types to a higher status since we know what they are. - let unionType = type; - for (let elementType of unionType.types) { + const unionType = type; + for (const elementType of unionType.types) { addTypeProperties(elementType); } } @@ -3256,14 +3255,14 @@ namespace ts { // - 'contextToken' was adjusted to the token prior to 'previousToken' // because we were at the end of an identifier. // - 'previousToken' is defined. - let adjustedPosition = previousToken !== contextToken ? + const adjustedPosition = previousToken !== contextToken ? previousToken.getStart() : position; - let scopeNode = getScopeNode(contextToken, adjustedPosition, sourceFile) || sourceFile; + const scopeNode = getScopeNode(contextToken, adjustedPosition, sourceFile) || sourceFile; /// TODO filter meaning based on the current context - let symbolMeanings = SymbolFlags.Type | SymbolFlags.Value | SymbolFlags.Namespace | SymbolFlags.Alias; + const symbolMeanings = SymbolFlags.Type | SymbolFlags.Value | SymbolFlags.Namespace | SymbolFlags.Alias; symbols = typeChecker.getSymbolsInScope(scopeNode, symbolMeanings); return true; @@ -3282,8 +3281,8 @@ namespace ts { } function isCompletionListBlocker(contextToken: Node): boolean { - let start = new Date().getTime(); - let result = isInStringOrRegularExpressionOrTemplateLiteral(contextToken) || + const start = new Date().getTime(); + const result = isInStringOrRegularExpressionOrTemplateLiteral(contextToken) || isSolelyIdentifierDefinitionLocation(contextToken) || isDotOfNumericLiteral(contextToken) || isInJsxText(contextToken); @@ -3310,27 +3309,27 @@ namespace ts { function isNewIdentifierDefinitionLocation(previousToken: Node): boolean { if (previousToken) { - let containingNodeKind = previousToken.parent.kind; + const containingNodeKind = previousToken.parent.kind; switch (previousToken.kind) { case SyntaxKind.CommaToken: return containingNodeKind === SyntaxKind.CallExpression // func( a, | || containingNodeKind === SyntaxKind.Constructor // constructor( a, | /* public, protected, private keywords are allowed here, so show completion */ || containingNodeKind === SyntaxKind.NewExpression // new C(a, | || containingNodeKind === SyntaxKind.ArrayLiteralExpression // [a, | - || containingNodeKind === SyntaxKind.BinaryExpression // let x = (a, | + || containingNodeKind === SyntaxKind.BinaryExpression // const x = (a, | || containingNodeKind === SyntaxKind.FunctionType; // var x: (s: string, list| case SyntaxKind.OpenParenToken: return containingNodeKind === SyntaxKind.CallExpression // func( | || containingNodeKind === SyntaxKind.Constructor // constructor( | || containingNodeKind === SyntaxKind.NewExpression // new C(a| - || containingNodeKind === SyntaxKind.ParenthesizedExpression // let x = (a| + || containingNodeKind === SyntaxKind.ParenthesizedExpression // const x = (a| || containingNodeKind === SyntaxKind.ParenthesizedType; // function F(pred: (a| /* this can become an arrow function, where 'a' is the argument */ case SyntaxKind.OpenBracketToken: return containingNodeKind === SyntaxKind.ArrayLiteralExpression // [ | || containingNodeKind === SyntaxKind.IndexSignature // [ | : string ] - || containingNodeKind === SyntaxKind.ComputedPropertyName // [ | /* this can become an index signature */ + || containingNodeKind === SyntaxKind.ComputedPropertyName; // [ | /* this can become an index signature */ case SyntaxKind.ModuleKeyword: // module | case SyntaxKind.NamespaceKeyword: // namespace | @@ -3343,7 +3342,7 @@ namespace ts { return containingNodeKind === SyntaxKind.ClassDeclaration; // class A{ | case SyntaxKind.EqualsToken: - return containingNodeKind === SyntaxKind.VariableDeclaration // let x = a| + return containingNodeKind === SyntaxKind.VariableDeclaration // const x = a| || containingNodeKind === SyntaxKind.BinaryExpression; // x = a| case SyntaxKind.TemplateHead: @@ -3375,8 +3374,8 @@ namespace ts { || contextToken.kind === SyntaxKind.StringLiteralType || contextToken.kind === SyntaxKind.RegularExpressionLiteral || isTemplateLiteralKind(contextToken.kind)) { - let start = contextToken.getStart(); - let end = contextToken.getEnd(); + const start = contextToken.getStart(); + const end = contextToken.getEnd(); // To be "in" one of these literals, the position has to be: // 1. entirely within the token text. @@ -3420,7 +3419,7 @@ namespace ts { // We are *only* completing on properties from the type being destructured. isNewIdentifierLocation = false; - let rootDeclaration = getRootDeclaration(objectLikeContainer.parent); + const rootDeclaration = getRootDeclaration(objectLikeContainer.parent); if (isVariableLike(rootDeclaration)) { // We don't want to complete using the type acquired by the shape // of the binding pattern; we are only interested in types acquired @@ -3431,7 +3430,7 @@ namespace ts { } } else { - Debug.fail("Root declaration is not variable-like.") + Debug.fail("Root declaration is not variable-like."); } } else { @@ -3442,7 +3441,7 @@ namespace ts { return false; } - let typeMembers = typeChecker.getPropertiesOfType(typeForObject); + const typeMembers = typeChecker.getPropertiesOfType(typeForObject); if (typeMembers && typeMembers.length > 0) { // Add filtered items to the completion list symbols = filterObjectMembersList(typeMembers, existingMembers); @@ -3466,11 +3465,11 @@ namespace ts { * @returns true if 'symbols' was successfully populated; false otherwise. */ function tryGetImportOrExportClauseCompletionSymbols(namedImportsOrExports: NamedImportsOrExports): boolean { - let declarationKind = namedImportsOrExports.kind === SyntaxKind.NamedImports ? + const declarationKind = namedImportsOrExports.kind === SyntaxKind.NamedImports ? SyntaxKind.ImportDeclaration : SyntaxKind.ExportDeclaration; - let importOrExportDeclaration = getAncestor(namedImportsOrExports, declarationKind); - let moduleSpecifier = importOrExportDeclaration.moduleSpecifier; + const importOrExportDeclaration = getAncestor(namedImportsOrExports, declarationKind); + const moduleSpecifier = importOrExportDeclaration.moduleSpecifier; if (!moduleSpecifier) { return false; @@ -3480,7 +3479,7 @@ namespace ts { isNewIdentifierLocation = false; let exports: Symbol[]; - let moduleSpecifierSymbol = typeChecker.getSymbolAtLocation(importOrExportDeclaration.moduleSpecifier); + const moduleSpecifierSymbol = typeChecker.getSymbolAtLocation(importOrExportDeclaration.moduleSpecifier); if (moduleSpecifierSymbol) { exports = typeChecker.getExportsOfModule(moduleSpecifierSymbol); } @@ -3497,9 +3496,9 @@ namespace ts { function tryGetObjectLikeCompletionContainer(contextToken: Node): ObjectLiteralExpression | BindingPattern { if (contextToken) { switch (contextToken.kind) { - case SyntaxKind.OpenBraceToken: // let x = { | - case SyntaxKind.CommaToken: // let x = { a: 0, | - let parent = contextToken.parent; + case SyntaxKind.OpenBraceToken: // const x = { | + case SyntaxKind.CommaToken: // const x = { a: 0, | + const parent = contextToken.parent; if (parent && (parent.kind === SyntaxKind.ObjectLiteralExpression || parent.kind === SyntaxKind.ObjectBindingPattern)) { return parent; } @@ -3532,8 +3531,8 @@ namespace ts { function tryGetContainingJsxElement(contextToken: Node): JsxOpeningLikeElement { if (contextToken) { - let parent = contextToken.parent; - switch(contextToken.kind) { + const parent = contextToken.parent; + switch (contextToken.kind) { case SyntaxKind.LessThanSlashToken: case SyntaxKind.SlashToken: case SyntaxKind.Identifier: @@ -3596,7 +3595,7 @@ namespace ts { * @returns true if we are certain that the currently edited location must define a new location; false otherwise. */ function isSolelyIdentifierDefinitionLocation(contextToken: Node): boolean { - let containingNodeKind = contextToken.parent.kind; + const containingNodeKind = contextToken.parent.kind; switch (contextToken.kind) { case SyntaxKind.CommaToken: return containingNodeKind === SyntaxKind.VariableDeclaration || @@ -3626,13 +3625,13 @@ namespace ts { case SyntaxKind.OpenBraceToken: return containingNodeKind === SyntaxKind.EnumDeclaration || // enum a { | containingNodeKind === SyntaxKind.InterfaceDeclaration || // interface a { | - containingNodeKind === SyntaxKind.TypeLiteral; // let x : { | + containingNodeKind === SyntaxKind.TypeLiteral; // const x : { | case SyntaxKind.SemicolonToken: return containingNodeKind === SyntaxKind.PropertySignature && contextToken.parent && contextToken.parent.parent && (contextToken.parent.parent.kind === SyntaxKind.InterfaceDeclaration || // interface a { f; | - contextToken.parent.parent.kind === SyntaxKind.TypeLiteral); // let x : { a; | + contextToken.parent.parent.kind === SyntaxKind.TypeLiteral); // const x : { a; | case SyntaxKind.LessThanToken: return containingNodeKind === SyntaxKind.ClassDeclaration || // class A< | @@ -3699,7 +3698,7 @@ namespace ts { function isDotOfNumericLiteral(contextToken: Node): boolean { if (contextToken.kind === SyntaxKind.NumericLiteral) { - let text = contextToken.getFullText(); + const text = contextToken.getFullText(); return text.charAt(text.length - 1) === "."; } @@ -3716,15 +3715,15 @@ namespace ts { * do not occur at the current position and have not otherwise been typed. */ function filterNamedImportOrExportCompletionItems(exportsOfModule: Symbol[], namedImportsOrExports: ImportOrExportSpecifier[]): Symbol[] { - let exisingImportsOrExports: Map = {}; + const exisingImportsOrExports: Map = {}; - for (let element of namedImportsOrExports) { + for (const element of namedImportsOrExports) { // If this is the current item we are editing right now, do not filter it out if (element.getStart() <= position && position <= element.getEnd()) { continue; } - let name = element.propertyName || element.name; + const name = element.propertyName || element.name; exisingImportsOrExports[name.text] = true; } @@ -3746,8 +3745,8 @@ namespace ts { return contextualMemberSymbols; } - let existingMemberNames: Map = {}; - for (let m of existingMembers) { + const existingMemberNames: Map = {}; + for (const m of existingMembers) { // Ignore omitted expressions for missing members if (m.kind !== SyntaxKind.PropertyAssignment && m.kind !== SyntaxKind.ShorthandPropertyAssignment && @@ -3766,7 +3765,7 @@ namespace ts { if (m.kind === SyntaxKind.BindingElement && (m).propertyName) { // include only identifiers in completion list if ((m).propertyName.kind === SyntaxKind.Identifier) { - existingName = ((m).propertyName).text + existingName = ((m).propertyName).text; } } else { @@ -3789,8 +3788,8 @@ namespace ts { * do not occur at the current position and have not otherwise been typed. */ function filterJsxAttributes(symbols: Symbol[], attributes: NodeArray): Symbol[] { - let seenNames: Map = {}; - for (let attr of attributes) { + const seenNames: Map = {}; + for (const attr of attributes) { // If this is the current item we are editing right now, do not filter it out if (attr.getStart() <= position && position <= attr.getEnd()) { continue; @@ -3809,21 +3808,21 @@ namespace ts { function getCompletionsAtPosition(fileName: string, position: number): CompletionInfo { synchronizeHostData(); - let completionData = getCompletionData(fileName, position); + const completionData = getCompletionData(fileName, position); if (!completionData) { return undefined; } - let { symbols, isMemberCompletion, isNewIdentifierLocation, location, isRightOfDot, isJsDocTagName } = completionData; + const { symbols, isMemberCompletion, isNewIdentifierLocation, location, isRightOfDot, isJsDocTagName } = completionData; if (isJsDocTagName) { // If the current position is a jsDoc tag name, only tag names should be provided for completion return { isMemberCompletion: false, isNewIdentifierLocation: false, entries: getAllJsDocCompletionEntries() }; } - let sourceFile = getValidSourceFile(fileName); + const sourceFile = getValidSourceFile(fileName); - let entries: CompletionEntry[] = []; + const entries: CompletionEntry[] = []; if (isRightOfDot && isSourceFileJavaScript(sourceFile)) { const uniqueNames = getCompletionEntriesFromSymbols(symbols, entries); @@ -3845,16 +3844,16 @@ namespace ts { return { isMemberCompletion, isNewIdentifierLocation, entries }; function getJavaScriptCompletionEntries(sourceFile: SourceFile, uniqueNames: Map): CompletionEntry[] { - let entries: CompletionEntry[] = []; - let target = program.getCompilerOptions().target; + const entries: CompletionEntry[] = []; + const target = program.getCompilerOptions().target; - let nameTable = getNameTable(sourceFile); - for (let name in nameTable) { + const nameTable = getNameTable(sourceFile); + for (const name in nameTable) { if (!uniqueNames[name]) { uniqueNames[name] = name; - let displayName = getCompletionEntryDisplayName(name, target, /*performCharacterChecks:*/ true); + const displayName = getCompletionEntryDisplayName(name, target, /*performCharacterChecks*/ true); if (displayName) { - let entry = { + const entry = { name: displayName, kind: ScriptElementKind.warning, kindModifiers: "", @@ -3875,7 +3874,7 @@ namespace ts { kind: ScriptElementKind.keyword, kindModifiers: "", sortText: "0", - } + }; })); } @@ -3883,7 +3882,7 @@ namespace ts { // Try to get a valid display name for this symbol, if we could not find one, then ignore it. // We would like to only show things that can be added after a dot, so for instance numeric properties can // not be accessed with a dot (a.1 <- invalid) - let displayName = getCompletionEntryDisplayNameForSymbol(symbol, program.getCompilerOptions().target, /*performCharacterChecks:*/ true, location); + const displayName = getCompletionEntryDisplayNameForSymbol(symbol, program.getCompilerOptions().target, /*performCharacterChecks*/ true, location); if (!displayName) { return undefined; } @@ -3905,13 +3904,13 @@ namespace ts { } function getCompletionEntriesFromSymbols(symbols: Symbol[], entries: CompletionEntry[]): Map { - let start = new Date().getTime(); - let uniqueNames: Map = {}; + const start = new Date().getTime(); + const uniqueNames: Map = {}; if (symbols) { - for (let symbol of symbols) { - let entry = createCompletionEntry(symbol, location); + for (const symbol of symbols) { + const entry = createCompletionEntry(symbol, location); if (entry) { - let id = escapeIdentifier(entry.name); + const id = escapeIdentifier(entry.name); if (!lookUp(uniqueNames, id)) { entries.push(entry); uniqueNames[id] = id; @@ -3929,19 +3928,19 @@ namespace ts { synchronizeHostData(); // Compute all the completion symbols again. - let completionData = getCompletionData(fileName, position); + const completionData = getCompletionData(fileName, position); if (completionData) { - let { symbols, location } = completionData; + const { symbols, location } = completionData; // Find the symbol with the matching entry name. - let target = program.getCompilerOptions().target; + const target = program.getCompilerOptions().target; // We don't need to perform character checks here because we're only comparing the // name against 'entryName' (which is known to be good), not building a new // completion entry. - let symbol = forEach(symbols, s => getCompletionEntryDisplayNameForSymbol(s, target, /*performCharacterChecks:*/ false, location) === entryName ? s : undefined); + const symbol = forEach(symbols, s => getCompletionEntryDisplayNameForSymbol(s, target, /*performCharacterChecks*/ false, location) === entryName ? s : undefined); if (symbol) { - let { displayParts, documentation, symbolKind } = getSymbolDisplayPartsDocumentationAndSymbolKind(symbol, getValidSourceFile(fileName), location, location, SemanticMeaning.All); + const { displayParts, documentation, symbolKind } = getSymbolDisplayPartsDocumentationAndSymbolKind(symbol, getValidSourceFile(fileName), location, location, SemanticMeaning.All); return { name: entryName, kindModifiers: getSymbolModifiers(symbol), @@ -3953,7 +3952,7 @@ namespace ts { } // Didn't find a symbol with this name. See if we can find a keyword instead. - let keywordCompletion = forEach(keywordCompletions, c => c.name === entryName); + const keywordCompletion = forEach(keywordCompletions, c => c.name === entryName); if (keywordCompletion) { return { name: entryName, @@ -3969,7 +3968,7 @@ namespace ts { // TODO(drosen): use contextual SemanticMeaning. function getSymbolKind(symbol: Symbol, location: Node): string { - let flags = symbol.getFlags(); + const flags = symbol.getFlags(); if (flags & SymbolFlags.Class) return getDeclarationOfKind(symbol, SyntaxKind.ClassExpression) ? ScriptElementKind.localClassElement : ScriptElementKind.classElement; @@ -3978,7 +3977,7 @@ namespace ts { if (flags & SymbolFlags.Interface) return ScriptElementKind.interfaceElement; if (flags & SymbolFlags.TypeParameter) return ScriptElementKind.typeParameterElement; - let result = getSymbolKindOfConstructorPropertyMethodAccessorFunctionOrVar(symbol, flags, location); + const result = getSymbolKindOfConstructorPropertyMethodAccessorFunctionOrVar(symbol, flags, location); if (result === ScriptElementKind.unknown) { if (flags & SymbolFlags.TypeParameter) return ScriptElementKind.typeParameterElement; if (flags & SymbolFlags.EnumMember) return ScriptElementKind.variableElement; @@ -3990,7 +3989,7 @@ namespace ts { } function getSymbolKindOfConstructorPropertyMethodAccessorFunctionOrVar(symbol: Symbol, flags: SymbolFlags, location: Node) { - let typeChecker = program.getTypeChecker(); + const typeChecker = program.getTypeChecker(); if (typeChecker.isUndefinedSymbol(symbol)) { return ScriptElementKind.variableElement; @@ -4019,8 +4018,8 @@ namespace ts { if (flags & SymbolFlags.Property) { if (flags & SymbolFlags.SyntheticProperty) { // If union property is result of union of non method (property/accessors/variables), it is labeled as property - let unionPropertyKind = forEach(typeChecker.getRootSymbols(symbol), rootSymbol => { - let rootSymbolFlags = rootSymbol.getFlags(); + const unionPropertyKind = forEach(typeChecker.getRootSymbols(symbol), rootSymbol => { + const rootSymbolFlags = rootSymbol.getFlags(); if (rootSymbolFlags & (SymbolFlags.PropertyOrAccessor | SymbolFlags.Variable)) { return ScriptElementKind.memberVariableElement; } @@ -4028,8 +4027,8 @@ namespace ts { }); if (!unionPropertyKind) { // If this was union of all methods, - //make sure it has call signatures before we can label it as method - let typeOfUnionProperty = typeChecker.getTypeOfSymbolAtLocation(symbol, location); + // make sure it has call signatures before we can label it as method + const typeOfUnionProperty = typeChecker.getTypeOfSymbolAtLocation(symbol, location); if (typeOfUnionProperty.getCallSignatures().length) { return ScriptElementKind.memberFunctionElement; } @@ -4053,11 +4052,11 @@ namespace ts { function getSymbolDisplayPartsDocumentationAndSymbolKind(symbol: Symbol, sourceFile: SourceFile, enclosingDeclaration: Node, location: Node, semanticMeaning = getMeaningFromLocation(location)) { - let typeChecker = program.getTypeChecker(); + const typeChecker = program.getTypeChecker(); - let displayParts: SymbolDisplayPart[] = []; + const displayParts: SymbolDisplayPart[] = []; let documentation: SymbolDisplayPart[]; - let symbolFlags = symbol.flags; + const symbolFlags = symbol.flags; let symbolKind = getSymbolKindOfConstructorPropertyMethodAccessorFunctionOrVar(symbol, symbolFlags, location); let hasAddedSymbolInfo: boolean; let type: Type; @@ -4073,7 +4072,7 @@ namespace ts { type = typeChecker.getTypeOfSymbolAtLocation(symbol, location); if (type) { if (location.parent && location.parent.kind === SyntaxKind.PropertyAccessExpression) { - let right = (location.parent).name; + const right = (location.parent).name; // Either the location is on the right of a property access, or on the left and the right is missing if (right === location || (right && right.getFullWidth() === 0)) { location = location.parent; @@ -4090,15 +4089,15 @@ namespace ts { } if (callExpression) { - let candidateSignatures: Signature[] = []; + const candidateSignatures: Signature[] = []; signature = typeChecker.getResolvedSignature(callExpression, candidateSignatures); if (!signature && candidateSignatures.length) { // Use the first candidate: signature = candidateSignatures[0]; } - let useConstructSignatures = callExpression.kind === SyntaxKind.NewExpression || callExpression.expression.kind === SyntaxKind.SuperKeyword; - let allSignatures = useConstructSignatures ? type.getConstructSignatures() : type.getCallSignatures(); + const useConstructSignatures = callExpression.kind === SyntaxKind.NewExpression || callExpression.expression.kind === SyntaxKind.SuperKeyword; + const allSignatures = useConstructSignatures ? type.getConstructSignatures() : type.getCallSignatures(); if (!contains(allSignatures, signature.target) && !contains(allSignatures, signature)) { // Get the first signature if there is one -- allSignatures may contain @@ -4156,8 +4155,8 @@ namespace ts { else if ((isNameOfFunctionDeclaration(location) && !(symbol.flags & SymbolFlags.Accessor)) || // name of function declaration (location.kind === SyntaxKind.ConstructorKeyword && location.parent.kind === SyntaxKind.Constructor)) { // At constructor keyword of constructor declaration // get the signature from the declaration and write it - let functionDeclaration = location.parent; - let allSignatures = functionDeclaration.kind === SyntaxKind.Constructor ? type.getConstructSignatures() : type.getCallSignatures(); + const functionDeclaration = location.parent; + const allSignatures = functionDeclaration.kind === SyntaxKind.Constructor ? type.getConstructSignatures() : type.getCallSignatures(); if (!typeChecker.isImplementationOfOverload(functionDeclaration)) { signature = typeChecker.getSignatureFromDeclaration(functionDeclaration); } @@ -4226,8 +4225,8 @@ namespace ts { } if (symbolFlags & SymbolFlags.Module) { addNewLineIfDisplayPartsExist(); - let declaration = getDeclarationOfKind(symbol, SyntaxKind.ModuleDeclaration); - let isNamespace = declaration && declaration.name && declaration.name.kind === SyntaxKind.Identifier; + const declaration = getDeclarationOfKind(symbol, SyntaxKind.ModuleDeclaration); + const isNamespace = declaration && declaration.name && declaration.name.kind === SyntaxKind.Identifier; displayParts.push(keywordPart(isNamespace ? SyntaxKind.NamespaceKeyword : SyntaxKind.ModuleKeyword)); displayParts.push(spacePart()); addFullSymbolName(symbol); @@ -4279,9 +4278,9 @@ namespace ts { } if (symbolFlags & SymbolFlags.EnumMember) { addPrefixForAnyFunctionOrVar(symbol, "enum member"); - let declaration = symbol.declarations[0]; + const declaration = symbol.declarations[0]; if (declaration.kind === SyntaxKind.EnumMember) { - let constantValue = typeChecker.getConstantValue(declaration); + const constantValue = typeChecker.getConstantValue(declaration); if (constantValue !== undefined) { displayParts.push(spacePart()); displayParts.push(operatorPart(SyntaxKind.EqualsToken)); @@ -4297,7 +4296,7 @@ namespace ts { addFullSymbolName(symbol); ts.forEach(symbol.declarations, declaration => { if (declaration.kind === SyntaxKind.ImportEqualsDeclaration) { - let importEqualsDeclaration = declaration; + const importEqualsDeclaration = declaration; if (isExternalModuleImportEqualsDeclaration(importEqualsDeclaration)) { displayParts.push(spacePart()); displayParts.push(operatorPart(SyntaxKind.EqualsToken)); @@ -4308,7 +4307,7 @@ namespace ts { displayParts.push(punctuationPart(SyntaxKind.CloseParenToken)); } else { - let internalAliasSymbol = typeChecker.getSymbolAtLocation(importEqualsDeclaration.moduleReference); + const internalAliasSymbol = typeChecker.getSymbolAtLocation(importEqualsDeclaration.moduleReference); if (internalAliasSymbol) { displayParts.push(spacePart()); displayParts.push(operatorPart(SyntaxKind.EqualsToken)); @@ -4332,7 +4331,7 @@ namespace ts { displayParts.push(spacePart()); // If the type is type parameter, format it specially if (type.symbol && type.symbol.flags & SymbolFlags.TypeParameter) { - let typeParameterParts = mapToDisplayParts(writer => { + const typeParameterParts = mapToDisplayParts(writer => { typeChecker.getSymbolDisplayBuilder().buildTypeParameterDisplay(type, writer, enclosingDeclaration); }); addRange(displayParts, typeParameterParts); @@ -4347,7 +4346,7 @@ namespace ts { symbolFlags & SymbolFlags.Signature || symbolFlags & SymbolFlags.Accessor || symbolKind === ScriptElementKind.memberFunctionElement) { - let allSignatures = type.getCallSignatures(); + const allSignatures = type.getCallSignatures(); addSignatureDisplayParts(allSignatures[0], allSignatures); } } @@ -4370,7 +4369,7 @@ namespace ts { } function addFullSymbolName(symbol: Symbol, enclosingDeclaration?: Node) { - let fullSymbolDisplayParts = symbolToDisplayParts(typeChecker, symbol, enclosingDeclaration || sourceFile, /*meaning*/ undefined, + const fullSymbolDisplayParts = symbolToDisplayParts(typeChecker, symbol, enclosingDeclaration || sourceFile, /*meaning*/ undefined, SymbolFormatFlags.WriteTypeParametersOrArguments | SymbolFormatFlags.UseOnlyExternalAliasing); addRange(displayParts, fullSymbolDisplayParts); } @@ -4416,7 +4415,7 @@ namespace ts { } function writeTypeParametersOfSymbol(symbol: Symbol, enclosingDeclaration: Node) { - let typeParameterParts = mapToDisplayParts(writer => { + const typeParameterParts = mapToDisplayParts(writer => { typeChecker.getSymbolDisplayBuilder().buildTypeParameterDisplayFromSymbol(symbol, writer, enclosingDeclaration); }); addRange(displayParts, typeParameterParts); @@ -4426,8 +4425,8 @@ namespace ts { function getQuickInfoAtPosition(fileName: string, position: number): QuickInfo { synchronizeHostData(); - let sourceFile = getValidSourceFile(fileName); - let node = getTouchingPropertyName(sourceFile, position); + const sourceFile = getValidSourceFile(fileName); + const node = getTouchingPropertyName(sourceFile, position); if (!node) { return undefined; } @@ -4436,8 +4435,8 @@ namespace ts { return undefined; } - let typeChecker = program.getTypeChecker(); - let symbol = typeChecker.getSymbolAtLocation(node); + const typeChecker = program.getTypeChecker(); + const symbol = typeChecker.getSymbolAtLocation(node); if (!symbol) { // Try getting just type at this position and show @@ -4449,7 +4448,7 @@ namespace ts { case SyntaxKind.ThisType: case SyntaxKind.SuperKeyword: // For the identifiers/this/super etc get the type at position - let type = typeChecker.getTypeAtLocation(node); + const type = typeChecker.getTypeAtLocation(node); if (type) { return { kind: ScriptElementKind.unknown, @@ -4464,7 +4463,7 @@ namespace ts { return undefined; } - let displayPartsDocumentationsAndKind = getSymbolDisplayPartsDocumentationAndSymbolKind(symbol, sourceFile, getContainerNode(node), node); + const displayPartsDocumentationsAndKind = getSymbolDisplayPartsDocumentationAndSymbolKind(symbol, sourceFile, getContainerNode(node), node); return { kind: displayPartsDocumentationsAndKind.symbolKind, kindModifiers: getSymbolModifiers(symbol), @@ -4486,13 +4485,13 @@ namespace ts { } function getDefinitionFromSymbol(symbol: Symbol, node: Node): DefinitionInfo[] { - let typeChecker = program.getTypeChecker(); - let result: DefinitionInfo[] = []; - let declarations = symbol.getDeclarations(); - let symbolName = typeChecker.symbolToString(symbol); // Do not get scoped name, just the name of the symbol - let symbolKind = getSymbolKind(symbol, node); - let containerSymbol = symbol.parent; - let containerName = containerSymbol ? typeChecker.symbolToString(containerSymbol, node) : ""; + const typeChecker = program.getTypeChecker(); + const result: DefinitionInfo[] = []; + const declarations = symbol.getDeclarations(); + const symbolName = typeChecker.symbolToString(symbol); // Do not get scoped name, just the name of the symbol + const symbolKind = getSymbolKind(symbol, node); + const containerSymbol = symbol.parent; + const containerName = containerSymbol ? typeChecker.symbolToString(containerSymbol, node) : ""; if (!tryAddConstructSignature(symbol, node, symbolKind, symbolName, containerName, result) && !tryAddCallSignature(symbol, node, symbolKind, symbolName, containerName, result)) { @@ -4510,7 +4509,7 @@ namespace ts { if (isNewExpressionTarget(location) || location.kind === SyntaxKind.ConstructorKeyword) { if (symbol.flags & SymbolFlags.Class) { // Find the first class-like declaration and try to get the construct signature. - for (let declaration of symbol.getDeclarations()) { + for (const declaration of symbol.getDeclarations()) { if (isClassLike(declaration)) { return tryAddSignature(declaration.members, /*selectConstructors*/ true, @@ -4535,7 +4534,7 @@ namespace ts { } function tryAddSignature(signatureDeclarations: Declaration[], selectConstructors: boolean, symbolKind: string, symbolName: string, containerName: string, result: DefinitionInfo[]) { - let declarations: Declaration[] = []; + const declarations: Declaration[] = []; let definition: Declaration; forEach(signatureDeclarations, d => { @@ -4563,24 +4562,24 @@ namespace ts { function getDefinitionAtPosition(fileName: string, position: number): DefinitionInfo[] { synchronizeHostData(); - let sourceFile = getValidSourceFile(fileName); + const sourceFile = getValidSourceFile(fileName); - let node = getTouchingPropertyName(sourceFile, position); + const node = getTouchingPropertyName(sourceFile, position); if (!node) { return undefined; } // Labels if (isJumpStatementTarget(node)) { - let labelName = (node).text; - let label = getTargetLabel((node.parent), (node).text); + const labelName = (node).text; + const label = getTargetLabel((node.parent), (node).text); return label ? [createDefinitionInfo(label, ScriptElementKind.label, labelName, /*containerName*/ undefined)] : undefined; } /// Triple slash reference comments - let comment = forEach(sourceFile.referencedFiles, r => (r.pos <= position && position < r.end) ? r : undefined); + const comment = forEach(sourceFile.referencedFiles, r => (r.pos <= position && position < r.end) ? r : undefined); if (comment) { - let referenceFile = tryResolveScriptReference(program, sourceFile, comment); + const referenceFile = tryResolveScriptReference(program, sourceFile, comment); if (referenceFile) { return [{ fileName: referenceFile.fileName, @@ -4594,7 +4593,7 @@ namespace ts { return undefined; } - let typeChecker = program.getTypeChecker(); + const typeChecker = program.getTypeChecker(); let symbol = typeChecker.getSymbolAtLocation(node); // Could not find a symbol e.g. node is string or number keyword, @@ -4608,7 +4607,7 @@ namespace ts { // import {A, B} from "mod"; // to jump to the implementation directly. if (symbol.flags & SymbolFlags.Alias) { - let declaration = symbol.declarations[0]; + const declaration = symbol.declarations[0]; if (node.kind === SyntaxKind.Identifier && node.parent === declaration) { symbol = typeChecker.getAliasedSymbol(symbol); } @@ -4620,15 +4619,15 @@ namespace ts { // is performed at the location of property access, we would like to go to definition of the property in the short-hand // assignment. This case and others are handled by the following code. if (node.parent.kind === SyntaxKind.ShorthandPropertyAssignment) { - let shorthandSymbol = typeChecker.getShorthandAssignmentValueSymbol(symbol.valueDeclaration); + const shorthandSymbol = typeChecker.getShorthandAssignmentValueSymbol(symbol.valueDeclaration); if (!shorthandSymbol) { return []; } - let shorthandDeclarations = shorthandSymbol.getDeclarations(); - let shorthandSymbolKind = getSymbolKind(shorthandSymbol, node); - let shorthandSymbolName = typeChecker.symbolToString(shorthandSymbol); - let shorthandContainerName = typeChecker.symbolToString(symbol.parent, node); + const shorthandDeclarations = shorthandSymbol.getDeclarations(); + const shorthandSymbolKind = getSymbolKind(shorthandSymbol, node); + const shorthandSymbolName = typeChecker.symbolToString(shorthandSymbol); + const shorthandContainerName = typeChecker.symbolToString(symbol.parent, node); return map(shorthandDeclarations, declaration => createDefinitionInfo(declaration, shorthandSymbolKind, shorthandSymbolName, shorthandContainerName)); } @@ -4640,27 +4639,27 @@ namespace ts { function getTypeDefinitionAtPosition(fileName: string, position: number): DefinitionInfo[] { synchronizeHostData(); - let sourceFile = getValidSourceFile(fileName); + const sourceFile = getValidSourceFile(fileName); - let node = getTouchingPropertyName(sourceFile, position); + const node = getTouchingPropertyName(sourceFile, position); if (!node) { return undefined; } - let typeChecker = program.getTypeChecker(); + const typeChecker = program.getTypeChecker(); - let symbol = typeChecker.getSymbolAtLocation(node); + const symbol = typeChecker.getSymbolAtLocation(node); if (!symbol) { return undefined; } - let type = typeChecker.getTypeOfSymbolAtLocation(symbol, node); + const type = typeChecker.getTypeOfSymbolAtLocation(symbol, node); if (!type) { return undefined; } if (type.flags & TypeFlags.Union) { - let result: DefinitionInfo[] = []; + const result: DefinitionInfo[] = []; forEach((type).types, t => { if (t.symbol) { addRange(/*to*/ result, /*from*/ getDefinitionFromSymbol(t.symbol, node)); @@ -4680,7 +4679,7 @@ namespace ts { let results = getOccurrencesAtPositionCore(fileName, position); if (results) { - let sourceFile = getCanonicalFileName(normalizeSlashes(fileName)); + const sourceFile = getCanonicalFileName(normalizeSlashes(fileName)); // Get occurrences only supports reporting occurrences for the file queried. So // filter down to that list. @@ -4694,10 +4693,10 @@ namespace ts { synchronizeHostData(); filesToSearch = map(filesToSearch, normalizeSlashes); - let sourceFilesToSearch = filter(program.getSourceFiles(), f => contains(filesToSearch, f.fileName)); - let sourceFile = getValidSourceFile(fileName); + const sourceFilesToSearch = filter(program.getSourceFiles(), f => contains(filesToSearch, f.fileName)); + const sourceFile = getValidSourceFile(fileName); - let node = getTouchingWord(sourceFile, position); + const node = getTouchingWord(sourceFile, position); if (!node) { return undefined; } @@ -4705,8 +4704,8 @@ namespace ts { return getSemanticDocumentHighlights(node) || getSyntacticDocumentHighlights(node); function getHighlightSpanForNode(node: Node): HighlightSpan { - let start = node.getStart(); - let end = node.getEnd(); + const start = node.getStart(); + const end = node.getEnd(); return { fileName: sourceFile.fileName, @@ -4723,7 +4722,7 @@ namespace ts { isLiteralNameOfPropertyDeclarationOrIndexAccess(node) || isNameOfExternalModuleImportOrDeclaration(node)) { - let referencedSymbols = getReferencedSymbolsForNode(node, sourceFilesToSearch, /*findInStrings:*/ false, /*findInComments:*/ false); + const referencedSymbols = getReferencedSymbolsForNode(node, sourceFilesToSearch, /*findInStrings*/ false, /*findInComments*/ false); return convertReferencedSymbols(referencedSymbols); } @@ -4734,11 +4733,11 @@ namespace ts { return undefined; } - let fileNameToDocumentHighlights: Map = {}; - let result: DocumentHighlights[] = []; - for (let referencedSymbol of referencedSymbols) { - for (let referenceEntry of referencedSymbol.references) { - let fileName = referenceEntry.fileName; + const fileNameToDocumentHighlights: Map = {}; + const result: DocumentHighlights[] = []; + for (const referencedSymbol of referencedSymbols) { + for (const referenceEntry of referencedSymbol.references) { + const fileName = referenceEntry.fileName; let documentHighlights = getProperty(fileNameToDocumentHighlights, fileName); if (!documentHighlights) { documentHighlights = { fileName, highlightSpans: [] }; @@ -4759,9 +4758,9 @@ namespace ts { } function getSyntacticDocumentHighlights(node: Node): DocumentHighlights[] { - let fileName = sourceFile.fileName; + const fileName = sourceFile.fileName; - let highlightSpans = getHighlightSpans(node); + const highlightSpans = getHighlightSpans(node); if (!highlightSpans || highlightSpans.length === 0) { return undefined; } @@ -4865,7 +4864,7 @@ namespace ts { * into function boundaries and try-blocks with catch-clauses. */ function aggregateOwnedThrowStatements(node: Node): ThrowStatement[] { - let statementAccumulator: ThrowStatement[] = [] + const statementAccumulator: ThrowStatement[] = []; aggregate(node); return statementAccumulator; @@ -4874,7 +4873,7 @@ namespace ts { statementAccumulator.push(node); } else if (node.kind === SyntaxKind.TryStatement) { - let tryStatement = node; + const tryStatement = node; if (tryStatement.catchClause) { aggregate(tryStatement.catchClause); @@ -4905,7 +4904,7 @@ namespace ts { let child: Node = throwStatement; while (child.parent) { - let parent = child.parent; + const parent = child.parent; if (isFunctionBlock(parent) || parent.kind === SyntaxKind.SourceFile) { return parent; @@ -4914,7 +4913,7 @@ namespace ts { // A throw-statement is only owned by a try-statement if the try-statement has // a catch clause, and if the throw-statement occurs within the try block. if (parent.kind === SyntaxKind.TryStatement) { - let tryStatement = parent; + const tryStatement = parent; if (tryStatement.tryBlock === child && tryStatement.catchClause) { return child; @@ -4928,7 +4927,7 @@ namespace ts { } function aggregateAllBreakAndContinueStatements(node: Node): BreakOrContinueStatement[] { - let statementAccumulator: BreakOrContinueStatement[] = [] + const statementAccumulator: BreakOrContinueStatement[] = []; aggregate(node); return statementAccumulator; @@ -4944,7 +4943,7 @@ namespace ts { } function ownsBreakOrContinueStatement(owner: Node, statement: BreakOrContinueStatement): boolean { - let actualOwner = getBreakOrContinueOwner(statement); + const actualOwner = getBreakOrContinueOwner(statement); return actualOwner && actualOwner === owner; } @@ -4979,7 +4978,7 @@ namespace ts { } function getModifierOccurrences(modifier: SyntaxKind, declaration: Node): HighlightSpan[] { - let container = declaration.parent; + const container = declaration.parent; // Make sure we only highlight the keyword when it makes sense to do so. if (isAccessibilityModifier(modifier)) { @@ -5009,8 +5008,8 @@ namespace ts { return undefined; } - let keywords: Node[] = []; - let modifierFlag: NodeFlags = getFlagFromModifier(modifier); + const keywords: Node[] = []; + const modifierFlag: NodeFlags = getFlagFromModifier(modifier); let nodes: Node[]; switch (container.kind) { @@ -5035,7 +5034,7 @@ namespace ts { // If we're an accessibility modifier, we're in an instance member and should search // the constructor's parameter list for instance members as well. if (modifierFlag & NodeFlags.AccessibilityModifier) { - let constructor = forEach((container).members, member => { + const constructor = forEach((container).members, member => { return member.kind === SyntaxKind.Constructor && member; }); @@ -5048,7 +5047,7 @@ namespace ts { } break; default: - Debug.fail("Invalid container kind.") + Debug.fail("Invalid container kind."); } forEach(nodes, node => { @@ -5091,7 +5090,7 @@ namespace ts { } function getGetAndSetOccurrences(accessorDeclaration: AccessorDeclaration): HighlightSpan[] { - let keywords: Node[] = []; + const keywords: Node[] = []; tryPushAccessorKeyword(accessorDeclaration.symbol, SyntaxKind.GetAccessor); tryPushAccessorKeyword(accessorDeclaration.symbol, SyntaxKind.SetAccessor); @@ -5099,7 +5098,7 @@ namespace ts { return map(keywords, getHighlightSpanForNode); function tryPushAccessorKeyword(accessorSymbol: Symbol, accessorKind: SyntaxKind): void { - let accessor = getDeclarationOfKind(accessorSymbol, accessorKind); + const accessor = getDeclarationOfKind(accessorSymbol, accessorKind); if (accessor) { forEach(accessor.getChildren(), child => pushKeywordIf(keywords, child, SyntaxKind.GetKeyword, SyntaxKind.SetKeyword)); @@ -5108,9 +5107,9 @@ namespace ts { } function getConstructorOccurrences(constructorDeclaration: ConstructorDeclaration): HighlightSpan[] { - let declarations = constructorDeclaration.symbol.getDeclarations() + const declarations = constructorDeclaration.symbol.getDeclarations(); - let keywords: Node[] = []; + const keywords: Node[] = []; forEach(declarations, declaration => { forEach(declaration.getChildren(), token => { @@ -5122,12 +5121,12 @@ namespace ts { } function getLoopBreakContinueOccurrences(loopNode: IterationStatement): HighlightSpan[] { - let keywords: Node[] = []; + const keywords: Node[] = []; if (pushKeywordIf(keywords, loopNode.getFirstToken(), SyntaxKind.ForKeyword, SyntaxKind.WhileKeyword, SyntaxKind.DoKeyword)) { // If we succeeded and got a do-while loop, then start looking for a 'while' keyword. if (loopNode.kind === SyntaxKind.DoStatement) { - let loopTokens = loopNode.getChildren(); + const loopTokens = loopNode.getChildren(); for (let i = loopTokens.length - 1; i >= 0; i--) { if (pushKeywordIf(keywords, loopTokens[i], SyntaxKind.WhileKeyword)) { @@ -5137,7 +5136,7 @@ namespace ts { } } - let breaksAndContinues = aggregateAllBreakAndContinueStatements(loopNode.statement); + const breaksAndContinues = aggregateAllBreakAndContinueStatements(loopNode.statement); forEach(breaksAndContinues, statement => { if (ownsBreakOrContinueStatement(loopNode, statement)) { @@ -5149,7 +5148,7 @@ namespace ts { } function getBreakOrContinueStatementOccurrences(breakOrContinueStatement: BreakOrContinueStatement): HighlightSpan[] { - let owner = getBreakOrContinueOwner(breakOrContinueStatement); + const owner = getBreakOrContinueOwner(breakOrContinueStatement); if (owner) { switch (owner.kind) { @@ -5158,7 +5157,7 @@ namespace ts { case SyntaxKind.ForOfStatement: case SyntaxKind.DoStatement: case SyntaxKind.WhileStatement: - return getLoopBreakContinueOccurrences(owner) + return getLoopBreakContinueOccurrences(owner); case SyntaxKind.SwitchStatement: return getSwitchCaseDefaultOccurrences(owner); @@ -5169,7 +5168,7 @@ namespace ts { } function getSwitchCaseDefaultOccurrences(switchStatement: SwitchStatement): HighlightSpan[] { - let keywords: Node[] = []; + const keywords: Node[] = []; pushKeywordIf(keywords, switchStatement.getFirstToken(), SyntaxKind.SwitchKeyword); @@ -5177,7 +5176,7 @@ namespace ts { forEach(switchStatement.caseBlock.clauses, clause => { pushKeywordIf(keywords, clause.getFirstToken(), SyntaxKind.CaseKeyword, SyntaxKind.DefaultKeyword); - let breaksAndContinues = aggregateAllBreakAndContinueStatements(clause); + const breaksAndContinues = aggregateAllBreakAndContinueStatements(clause); forEach(breaksAndContinues, statement => { if (ownsBreakOrContinueStatement(switchStatement, statement)) { @@ -5190,7 +5189,7 @@ namespace ts { } function getTryCatchFinallyOccurrences(tryStatement: TryStatement): HighlightSpan[] { - let keywords: Node[] = []; + const keywords: Node[] = []; pushKeywordIf(keywords, tryStatement.getFirstToken(), SyntaxKind.TryKeyword); @@ -5199,7 +5198,7 @@ namespace ts { } if (tryStatement.finallyBlock) { - let finallyKeyword = findChildOfKind(tryStatement, SyntaxKind.FinallyKeyword, sourceFile); + const finallyKeyword = findChildOfKind(tryStatement, SyntaxKind.FinallyKeyword, sourceFile); pushKeywordIf(keywords, finallyKeyword, SyntaxKind.FinallyKeyword); } @@ -5207,13 +5206,13 @@ namespace ts { } function getThrowOccurrences(throwStatement: ThrowStatement): HighlightSpan[] { - let owner = getThrowStatementOwner(throwStatement); + const owner = getThrowStatementOwner(throwStatement); if (!owner) { return undefined; } - let keywords: Node[] = []; + const keywords: Node[] = []; forEach(aggregateOwnedThrowStatements(owner), throwStatement => { pushKeywordIf(keywords, throwStatement.getFirstToken(), SyntaxKind.ThrowKeyword); @@ -5231,14 +5230,14 @@ namespace ts { } function getReturnOccurrences(returnStatement: ReturnStatement): HighlightSpan[] { - let func = getContainingFunction(returnStatement); + const func = getContainingFunction(returnStatement); // If we didn't find a containing function with a block body, bail out. if (!(func && hasKind(func.body, SyntaxKind.Block))) { return undefined; } - let keywords: Node[] = [] + const keywords: Node[] = []; forEachReturnStatement(func.body, returnStatement => { pushKeywordIf(keywords, returnStatement.getFirstToken(), SyntaxKind.ReturnKeyword); }); @@ -5252,7 +5251,7 @@ namespace ts { } function getIfElseOccurrences(ifStatement: IfStatement): HighlightSpan[] { - let keywords: Node[] = []; + const keywords: Node[] = []; // Traverse upwards through all parent if-statements linked by their else-branches. while (hasKind(ifStatement.parent, SyntaxKind.IfStatement) && (ifStatement.parent).elseStatement === ifStatement) { @@ -5261,7 +5260,7 @@ namespace ts { // Now traverse back down through the else branches, aggregating if/else keywords of if-statements. while (ifStatement) { - let children = ifStatement.getChildren(); + const children = ifStatement.getChildren(); pushKeywordIf(keywords, children[0], SyntaxKind.IfKeyword); // Generally the 'else' keyword is second-to-last, so we traverse backwards. @@ -5272,20 +5271,20 @@ namespace ts { } if (!hasKind(ifStatement.elseStatement, SyntaxKind.IfStatement)) { - break + break; } ifStatement = ifStatement.elseStatement; } - let result: HighlightSpan[] = []; + const result: HighlightSpan[] = []; // We'd like to highlight else/ifs together if they are only separated by whitespace // (i.e. the keywords are separated by no comments, no newlines). for (let i = 0; i < keywords.length; i++) { if (keywords[i].kind === SyntaxKind.ElseKeyword && i < keywords.length - 1) { - let elseKeyword = keywords[i]; - let ifKeyword = keywords[i + 1]; // this *should* always be an 'if' keyword. + const elseKeyword = keywords[i]; + const ifKeyword = keywords[i + 1]; // this *should* always be an 'if' keyword. let shouldCombindElseAndIf = true; @@ -5328,9 +5327,9 @@ namespace ts { return undefined; } - let result: ReferenceEntry[] = []; - for (let entry of documentHighlights) { - for (let highlightSpan of entry.highlightSpans) { + const result: ReferenceEntry[] = []; + for (const entry of documentHighlights) { + for (const highlightSpan of entry.highlightSpans) { result.push({ fileName: entry.fileName, textSpan: highlightSpan.textSpan, @@ -5348,9 +5347,9 @@ namespace ts { return undefined; } - let referenceEntries: ReferenceEntry[] = []; + const referenceEntries: ReferenceEntry[] = []; - for (let referenceSymbol of referenceSymbols) { + for (const referenceSymbol of referenceSymbols) { addRange(referenceEntries, referenceSymbol.references); } @@ -5358,17 +5357,17 @@ namespace ts { } function findRenameLocations(fileName: string, position: number, findInStrings: boolean, findInComments: boolean): RenameLocation[] { - let referencedSymbols = findReferencedSymbols(fileName, position, findInStrings, findInComments); + const referencedSymbols = findReferencedSymbols(fileName, position, findInStrings, findInComments); return convertReferences(referencedSymbols); } function getReferencesAtPosition(fileName: string, position: number): ReferenceEntry[] { - let referencedSymbols = findReferencedSymbols(fileName, position, /*findInStrings:*/ false, /*findInComments:*/ false); + const referencedSymbols = findReferencedSymbols(fileName, position, /*findInStrings*/ false, /*findInComments*/ false); return convertReferences(referencedSymbols); } - function findReferences(fileName: string, position: number): ReferencedSymbol[]{ - let referencedSymbols = findReferencedSymbols(fileName, position, /*findInStrings:*/ false, /*findInComments:*/ false); + function findReferences(fileName: string, position: number): ReferencedSymbol[] { + const referencedSymbols = findReferencedSymbols(fileName, position, /*findInStrings*/ false, /*findInComments*/ false); // Only include referenced symbols that have a valid definition. return filter(referencedSymbols, rs => !!rs.definition); @@ -5377,17 +5376,17 @@ namespace ts { function findReferencedSymbols(fileName: string, position: number, findInStrings: boolean, findInComments: boolean): ReferencedSymbol[] { synchronizeHostData(); - let sourceFile = getValidSourceFile(fileName); + const sourceFile = getValidSourceFile(fileName); - let node = getTouchingPropertyName(sourceFile, position); + const node = getTouchingPropertyName(sourceFile, position); if (!node) { return undefined; } if (node.kind !== SyntaxKind.Identifier && // TODO (drosen): This should be enabled in a later release - currently breaks rename. - //node.kind !== SyntaxKind.ThisKeyword && - //node.kind !== SyntaxKind.SuperKeyword && + // node.kind !== SyntaxKind.ThisKeyword && + // node.kind !== SyntaxKind.SuperKeyword && !isLiteralNameOfPropertyDeclarationOrIndexAccess(node) && !isNameOfExternalModuleImportOrDeclaration(node)) { return undefined; @@ -5398,12 +5397,12 @@ namespace ts { } function getReferencedSymbolsForNode(node: Node, sourceFiles: SourceFile[], findInStrings: boolean, findInComments: boolean): ReferencedSymbol[] { - let typeChecker = program.getTypeChecker(); + const typeChecker = program.getTypeChecker(); // Labels if (isLabelName(node)) { if (isJumpStatementTarget(node)) { - let labelDefinition = getTargetLabel((node.parent), (node).text); + const labelDefinition = getTargetLabel((node.parent), (node).text); // if we have a label definition, look within its statement for references, if not, then // the label is undefined and we have no results.. return labelDefinition ? getLabelReferencesInNode(labelDefinition.parent, labelDefinition) : undefined; @@ -5422,7 +5421,7 @@ namespace ts { return getReferencesForSuperKeyword(node); } - let symbol = typeChecker.getSymbolAtLocation(node); + const symbol = typeChecker.getSymbolAtLocation(node); // Could not find a symbol e.g. unknown identifier if (!symbol) { @@ -5430,7 +5429,7 @@ namespace ts { return undefined; } - let declarations = symbol.declarations; + const declarations = symbol.declarations; // The symbol was an internal symbol and does not have a declaration e.g. undefined symbol if (!declarations || !declarations.length) { @@ -5440,29 +5439,29 @@ namespace ts { let result: ReferencedSymbol[]; // Compute the meaning from the location and the symbol it references - let searchMeaning = getIntersectingMeaningFromDeclarations(getMeaningFromLocation(node), declarations); + const searchMeaning = getIntersectingMeaningFromDeclarations(getMeaningFromLocation(node), declarations); // Get the text to search for. // Note: if this is an external module symbol, the name doesn't include quotes. - let declaredName = stripQuotes(getDeclaredName(typeChecker, symbol, node)); + const declaredName = stripQuotes(getDeclaredName(typeChecker, symbol, node)); // Try to get the smallest valid scope that we can limit our search to; // otherwise we'll need to search globally (i.e. include each file). - let scope = getSymbolScope(symbol); + const scope = getSymbolScope(symbol); // Maps from a symbol ID to the ReferencedSymbol entry in 'result'. - let symbolToIndex: number[] = []; + const symbolToIndex: number[] = []; if (scope) { result = []; getReferencesInNode(scope, symbol, declaredName, node, searchMeaning, findInStrings, findInComments, result, symbolToIndex); } else { - let internedName = getInternedName(symbol, node, declarations) - for (let sourceFile of sourceFiles) { + const internedName = getInternedName(symbol, node, declarations); + for (const sourceFile of sourceFiles) { cancellationToken.throwIfCancellationRequested(); - let nameTable = getNameTable(sourceFile); + const nameTable = getNameTable(sourceFile); if (lookUp(nameTable, internedName)) { result = result || []; @@ -5474,9 +5473,9 @@ namespace ts { return result; function getDefinition(symbol: Symbol): DefinitionInfo { - let info = getSymbolDisplayPartsDocumentationAndSymbolKind(symbol, node.getSourceFile(), getContainerNode(node), node); - let name = map(info.displayParts, p => p.text).join(""); - let declarations = symbol.declarations; + const info = getSymbolDisplayPartsDocumentationAndSymbolKind(symbol, node.getSourceFile(), getContainerNode(node), node); + const name = map(info.displayParts, p => p.text).join(""); + const declarations = symbol.declarations; if (!declarations || declarations.length === 0) { return undefined; } @@ -5506,7 +5505,7 @@ namespace ts { // Try to get the local symbol if we're dealing with an 'export default' // since that symbol has the "true" name. - let localExportDefaultSymbol = getLocalSymbolForExportDefault(symbol); + const localExportDefaultSymbol = getLocalSymbolForExportDefault(symbol); symbol = localExportDefaultSymbol || symbol; return stripQuotes(symbol.name); @@ -5523,14 +5522,14 @@ namespace ts { function getSymbolScope(symbol: Symbol): Node { // If this is the symbol of a named function expression or named class expression, // then named references are limited to its own scope. - let valueDeclaration = symbol.valueDeclaration; + const valueDeclaration = symbol.valueDeclaration; if (valueDeclaration && (valueDeclaration.kind === SyntaxKind.FunctionExpression || valueDeclaration.kind === SyntaxKind.ClassExpression)) { return valueDeclaration; } // If this is private property or method, the scope is the containing class if (symbol.flags & (SymbolFlags.Property | SymbolFlags.Method)) { - let privateDeclaration = forEach(symbol.getDeclarations(), d => (d.flags & NodeFlags.Private) ? d : undefined); + const privateDeclaration = forEach(symbol.getDeclarations(), d => (d.flags & NodeFlags.Private) ? d : undefined); if (privateDeclaration) { return getAncestor(privateDeclaration, SyntaxKind.ClassDeclaration); } @@ -5548,12 +5547,12 @@ namespace ts { return undefined; } - let scope: Node = undefined; + let scope: Node; - let declarations = symbol.getDeclarations(); + const declarations = symbol.getDeclarations(); if (declarations) { - for (let declaration of declarations) { - let container = getContainerNode(declaration); + for (const declaration of declarations) { + const container = getContainerNode(declaration); if (!container) { return undefined; @@ -5579,7 +5578,7 @@ namespace ts { } function getPossibleSymbolReferencePositions(sourceFile: SourceFile, symbolName: string, start: number, end: number): number[] { - let positions: number[] = []; + const positions: number[] = []; /// TODO: Cache symbol existence for files to save text search // Also, need to make this work for unicode escapes. @@ -5589,9 +5588,9 @@ namespace ts { return positions; } - let text = sourceFile.text; - let sourceLength = text.length; - let symbolNameLength = symbolName.length; + const text = sourceFile.text; + const sourceLength = text.length; + const symbolNameLength = symbolName.length; let position = text.indexOf(symbolName, start); while (position >= 0) { @@ -5602,7 +5601,7 @@ namespace ts { // We found a match. Make sure it's not part of a larger word (i.e. the char // before and after it have to be a non-identifier char). - let endPosition = position + symbolNameLength; + const endPosition = position + symbolNameLength; if ((position === 0 || !isIdentifierPart(text.charCodeAt(position - 1), ScriptTarget.Latest)) && (endPosition === sourceLength || !isIdentifierPart(text.charCodeAt(endPosition), ScriptTarget.Latest))) { @@ -5616,14 +5615,14 @@ namespace ts { } function getLabelReferencesInNode(container: Node, targetLabel: Identifier): ReferencedSymbol[] { - let references: ReferenceEntry[] = []; - let sourceFile = container.getSourceFile(); - let labelName = targetLabel.text; - let possiblePositions = getPossibleSymbolReferencePositions(sourceFile, labelName, container.getStart(), container.getEnd()); + const references: ReferenceEntry[] = []; + const sourceFile = container.getSourceFile(); + const labelName = targetLabel.text; + const possiblePositions = getPossibleSymbolReferencePositions(sourceFile, labelName, container.getStart(), container.getEnd()); forEach(possiblePositions, position => { cancellationToken.throwIfCancellationRequested(); - let node = getTouchingWord(sourceFile, position); + const node = getTouchingWord(sourceFile, position); if (!node || node.getWidth() !== labelName.length) { return; } @@ -5635,14 +5634,14 @@ namespace ts { } }); - let definition: DefinitionInfo = { + const definition: DefinitionInfo = { containerKind: "", containerName: "", fileName: targetLabel.getSourceFile().fileName, kind: ScriptElementKind.label, name: labelName, textSpan: createTextSpanFromBounds(targetLabel.getStart(), targetLabel.getEnd()) - } + }; return [{ definition, references }]; } @@ -5687,19 +5686,19 @@ namespace ts { result: ReferencedSymbol[], symbolToIndex: number[]): void { - let sourceFile = container.getSourceFile(); - let tripleSlashDirectivePrefixRegex = /^\/\/\/\s* { cancellationToken.throwIfCancellationRequested(); - let referenceLocation = getTouchingPropertyName(sourceFile, position); + const referenceLocation = getTouchingPropertyName(sourceFile, position); if (!isValidReferencePosition(referenceLocation, searchText)) { // This wasn't the start of a token. Check to see if it might be a // match in a comment or string if that's what the caller is asking @@ -5727,14 +5726,14 @@ namespace ts { return; } - let referenceSymbol = typeChecker.getSymbolAtLocation(referenceLocation); + const referenceSymbol = typeChecker.getSymbolAtLocation(referenceLocation); if (referenceSymbol) { - let referenceSymbolDeclaration = referenceSymbol.valueDeclaration; - let shorthandValueSymbol = typeChecker.getShorthandAssignmentValueSymbol(referenceSymbolDeclaration); - let relatedSymbol = getRelatedSymbol(searchSymbols, referenceSymbol, referenceLocation); + const referenceSymbolDeclaration = referenceSymbol.valueDeclaration; + const shorthandValueSymbol = typeChecker.getShorthandAssignmentValueSymbol(referenceSymbolDeclaration); + const relatedSymbol = getRelatedSymbol(searchSymbols, referenceSymbol, referenceLocation); if (relatedSymbol) { - let referencedSymbol = getReferencedSymbol(relatedSymbol); + const referencedSymbol = getReferencedSymbol(relatedSymbol); referencedSymbol.references.push(getReferenceEntryFromNode(referenceLocation)); } /* Because in short-hand property assignment, an identifier which stored as name of the short-hand property assignment @@ -5744,7 +5743,7 @@ namespace ts { * position of property accessing, the referenceEntry of such position will be handled in the first case. */ else if (!(referenceSymbol.flags & SymbolFlags.Transient) && searchSymbols.indexOf(shorthandValueSymbol) >= 0) { - let referencedSymbol = getReferencedSymbol(shorthandValueSymbol); + const referencedSymbol = getReferencedSymbol(shorthandValueSymbol); referencedSymbol.references.push(getReferenceEntryFromNode(referenceSymbolDeclaration.name)); } } @@ -5754,7 +5753,7 @@ namespace ts { return; function getReferencedSymbol(symbol: Symbol): ReferencedSymbol { - let symbolId = getSymbolId(symbol); + const symbolId = getSymbolId(symbol); let index = symbolToIndex[symbolId]; if (index === undefined) { index = result.length; @@ -5773,7 +5772,7 @@ namespace ts { return isInCommentHelper(sourceFile, position, isNonReferenceComment); function isNonReferenceComment(c: CommentRange): boolean { - let commentText = sourceFile.text.substring(c.pos, c.end); + const commentText = sourceFile.text.substring(c.pos, c.end); return !tripleSlashDirectivePrefixRegex.test(commentText); } } @@ -5802,20 +5801,20 @@ namespace ts { return undefined; } - let references: ReferenceEntry[] = []; + const references: ReferenceEntry[] = []; - let sourceFile = searchSpaceNode.getSourceFile(); - let possiblePositions = getPossibleSymbolReferencePositions(sourceFile, "super", searchSpaceNode.getStart(), searchSpaceNode.getEnd()); + const sourceFile = searchSpaceNode.getSourceFile(); + const possiblePositions = getPossibleSymbolReferencePositions(sourceFile, "super", searchSpaceNode.getStart(), searchSpaceNode.getEnd()); forEach(possiblePositions, position => { cancellationToken.throwIfCancellationRequested(); - let node = getTouchingWord(sourceFile, position); + const node = getTouchingWord(sourceFile, position); if (!node || node.kind !== SyntaxKind.SuperKeyword) { return; } - let container = getSuperContainer(node, /*includeFunctions*/ false); + const container = getSuperContainer(node, /*includeFunctions*/ false); // If we have a 'super' container, we must have an enclosing class. // Now make sure the owning class is the same as the search-space @@ -5825,7 +5824,7 @@ namespace ts { } }); - let definition = getDefinition(searchSpaceNode.symbol); + const definition = getDefinition(searchSpaceNode.symbol); return [{ definition, references }]; } @@ -5847,7 +5846,7 @@ namespace ts { case SyntaxKind.Constructor: case SyntaxKind.GetAccessor: case SyntaxKind.SetAccessor: - staticFlag &= searchSpaceNode.flags + staticFlag &= searchSpaceNode.flags; searchSpaceNode = searchSpaceNode.parent; // re-assign to be the owning class break; case SyntaxKind.SourceFile: @@ -5864,7 +5863,7 @@ namespace ts { return undefined; } - let references: ReferenceEntry[] = []; + const references: ReferenceEntry[] = []; let possiblePositions: number[]; if (searchSpaceNode.kind === SyntaxKind.SourceFile) { @@ -5874,7 +5873,7 @@ namespace ts { }); } else { - let sourceFile = searchSpaceNode.getSourceFile(); + const sourceFile = searchSpaceNode.getSourceFile(); possiblePositions = getPossibleSymbolReferencePositions(sourceFile, "this", searchSpaceNode.getStart(), searchSpaceNode.getEnd()); getThisReferencesInFile(sourceFile, searchSpaceNode, possiblePositions, references); } @@ -5895,12 +5894,12 @@ namespace ts { forEach(possiblePositions, position => { cancellationToken.throwIfCancellationRequested(); - let node = getTouchingWord(sourceFile, position); + const node = getTouchingWord(sourceFile, position); if (!node || (node.kind !== SyntaxKind.ThisKeyword && node.kind !== SyntaxKind.ThisType)) { return; } - let container = getThisContainer(node, /* includeArrowFunctions */ false); + const container = getThisContainer(node, /* includeArrowFunctions */ false); switch (searchSpaceNode.kind) { case SyntaxKind.FunctionExpression: @@ -5935,7 +5934,7 @@ namespace ts { function populateSearchSymbolSet(symbol: Symbol, location: Node): Symbol[] { // The search set contains at least the current symbol - let result = [symbol]; + const result = [symbol]; // If the symbol is an alias, add what it alaises to the list if (isImportOrExportSpecifierImportSymbol(symbol)) { @@ -5955,13 +5954,13 @@ namespace ts { * property name and variable declaration of the identifier. * Like in below example, when querying for all references for an identifier 'name', of the property assignment, the language service * should show both 'name' in 'obj' and 'name' in variable declaration - * let name = "Foo"; - * let obj = { name }; + * const name = "Foo"; + * const obj = { name }; * In order to do that, we will populate the search set with the value symbol of the identifier as a value of the property assignment * so that when matching with potential reference symbol, both symbols from property declaration and variable declaration * will be included correctly. */ - let shorthandValueSymbol = typeChecker.getShorthandAssignmentValueSymbol(location.parent); + const shorthandValueSymbol = typeChecker.getShorthandAssignmentValueSymbol(location.parent); if (shorthandValueSymbol) { result.push(shorthandValueSymbol); } @@ -5999,9 +5998,9 @@ namespace ts { function getPropertySymbolFromTypeReference(typeReference: ExpressionWithTypeArguments) { if (typeReference) { - let type = typeChecker.getTypeAtLocation(typeReference); + const type = typeChecker.getTypeAtLocation(typeReference); if (type) { - let propertySymbol = typeChecker.getPropertyOfType(type, propertyName); + const propertySymbol = typeChecker.getPropertyOfType(type, propertyName); if (propertySymbol) { result.push(propertySymbol); } @@ -6021,7 +6020,7 @@ namespace ts { // If the reference symbol is an alias, check if what it is aliasing is one of the search // symbols. if (isImportOrExportSpecifierImportSymbol(referenceSymbol)) { - let aliasedSymbol = typeChecker.getAliasedSymbol(referenceSymbol); + const aliasedSymbol = typeChecker.getAliasedSymbol(referenceSymbol); if (searchSymbols.indexOf(aliasedSymbol) >= 0) { return aliasedSymbol; } @@ -6047,7 +6046,7 @@ namespace ts { // Finally, try all properties with the same name in any type the containing type extended or implemented, and // see if any is in the list if (rootSymbol.parent && rootSymbol.parent.flags & (SymbolFlags.Class | SymbolFlags.Interface)) { - let result: Symbol[] = []; + const result: Symbol[] = []; getPropertySymbolsFromBaseTypes(rootSymbol.parent, rootSymbol.getName(), result); return forEach(result, s => searchSymbols.indexOf(s) >= 0 ? s : undefined); } @@ -6058,21 +6057,21 @@ namespace ts { function getPropertySymbolsFromContextualType(node: Node): Symbol[] { if (isNameOfPropertyAssignment(node)) { - let objectLiteral = node.parent.parent; - let contextualType = typeChecker.getContextualType(objectLiteral); - let name = (node).text; + const objectLiteral = node.parent.parent; + const contextualType = typeChecker.getContextualType(objectLiteral); + const name = (node).text; if (contextualType) { if (contextualType.flags & TypeFlags.Union) { // This is a union type, first see if the property we are looking for is a union property (i.e. exists in all types) // if not, search the constituent types for the property - let unionProperty = contextualType.getProperty(name) + const unionProperty = contextualType.getProperty(name); if (unionProperty) { return [unionProperty]; } else { - let result: Symbol[] = []; + const result: Symbol[] = []; forEach((contextualType).types, t => { - let symbol = t.getProperty(name); + const symbol = t.getProperty(name); if (symbol) { result.push(symbol); } @@ -6081,7 +6080,7 @@ namespace ts { } } else { - let symbol = contextualType.getProperty(name); + const symbol = contextualType.getProperty(name); if (symbol) { return [symbol]; } @@ -6110,8 +6109,8 @@ namespace ts { // Remember the last meaning lastIterationMeaning = meaning; - for (let declaration of declarations) { - let declarationMeaning = getMeaningFromDeclaration(declaration); + for (const declaration of declarations) { + const declarationMeaning = getMeaningFromDeclaration(declaration); if (declarationMeaning & meaning) { meaning |= declarationMeaning; @@ -6146,13 +6145,13 @@ namespace ts { return true; } - let parent = node.parent; + const parent = node.parent; if (parent) { if (parent.kind === SyntaxKind.PostfixUnaryExpression || parent.kind === SyntaxKind.PrefixUnaryExpression) { return true; } else if (parent.kind === SyntaxKind.BinaryExpression && (parent).left === node) { - let operator = (parent).operatorToken.kind; + const operator = (parent).operatorToken.kind; return SyntaxKind.FirstAssignment <= operator && operator <= SyntaxKind.LastAssignment; } } @@ -6174,8 +6173,8 @@ namespace ts { function getEmitOutput(fileName: string): EmitOutput { synchronizeHostData(); - let sourceFile = getValidSourceFile(fileName); - let outputFiles: OutputFile[] = []; + const sourceFile = getValidSourceFile(fileName); + const outputFiles: OutputFile[] = []; function writeFile(fileName: string, data: string, writeByteOrderMark: boolean) { outputFiles.push({ @@ -6185,7 +6184,7 @@ namespace ts { }); } - let emitOutput = program.emit(sourceFile, writeFile, cancellationToken); + const emitOutput = program.emit(sourceFile, writeFile, cancellationToken); return { outputFiles, @@ -6278,7 +6277,7 @@ namespace ts { } if (!isLastClause && root.parent.kind === SyntaxKind.ExpressionWithTypeArguments && root.parent.parent.kind === SyntaxKind.HeritageClause) { - let decl = root.parent.parent.parent; + const decl = root.parent.parent.parent; return (decl.kind === SyntaxKind.ClassDeclaration && (root.parent.parent).token === SyntaxKind.ImplementsKeyword) || (decl.kind === SyntaxKind.InterfaceDeclaration && (root.parent.parent).token === SyntaxKind.ExtendsKeyword); } @@ -6350,7 +6349,7 @@ namespace ts { function getSignatureHelpItems(fileName: string, position: number): SignatureHelpItems { synchronizeHostData(); - let sourceFile = getValidSourceFile(fileName); + const sourceFile = getValidSourceFile(fileName); return SignatureHelp.getSignatureHelpItems(program, sourceFile, position, cancellationToken); } @@ -6361,10 +6360,10 @@ namespace ts { } function getNameOrDottedNameSpan(fileName: string, startPos: number, endPos: number): TextSpan { - let sourceFile = syntaxTreeCache.getCurrentSourceFile(fileName); + const sourceFile = syntaxTreeCache.getCurrentSourceFile(fileName); // Get node at the location - let node = getTouchingPropertyName(sourceFile, startPos); + const node = getTouchingPropertyName(sourceFile, startPos); if (!node) { return; @@ -6420,13 +6419,13 @@ namespace ts { function getBreakpointStatementAtPosition(fileName: string, position: number) { // doesn't use compiler - no need to synchronize with host - let sourceFile = syntaxTreeCache.getCurrentSourceFile(fileName); + const sourceFile = syntaxTreeCache.getCurrentSourceFile(fileName); return BreakpointResolver.spanInSourceFileAtLocation(sourceFile, position); } function getNavigationBarItems(fileName: string): NavigationBarItem[] { - let sourceFile = syntaxTreeCache.getCurrentSourceFile(fileName); + const sourceFile = syntaxTreeCache.getCurrentSourceFile(fileName); return NavigationBar.getNavigationBarItems(sourceFile, host.getCompilationSettings()); } @@ -6458,11 +6457,11 @@ namespace ts { function getEncodedSemanticClassifications(fileName: string, span: TextSpan): Classifications { synchronizeHostData(); - let sourceFile = getValidSourceFile(fileName); - let typeChecker = program.getTypeChecker(); + const sourceFile = getValidSourceFile(fileName); + const typeChecker = program.getTypeChecker(); - let result: number[] = []; - let classifiableNames = program.getClassifiableNames(); + const result: number[] = []; + const classifiableNames = program.getClassifiableNames(); processNode(sourceFile); return { spans: result, endOfLineState: EndOfLineState.None }; @@ -6474,7 +6473,7 @@ namespace ts { } function classifySymbol(symbol: Symbol, meaningAtPosition: SemanticMeaning): ClassificationType { - let flags = symbol.getFlags(); + const flags = symbol.getFlags(); if ((flags & SymbolFlags.Classifiable) === SymbolFlags.None) { return; } @@ -6522,19 +6521,19 @@ namespace ts { function processNode(node: Node) { // Only walk into nodes that intersect the requested span. if (node && textSpanIntersectsWith(span, node.getFullStart(), node.getFullWidth())) { - let kind = node.kind; + const kind = node.kind; checkForClassificationCancellation(kind); if (kind === SyntaxKind.Identifier && !nodeIsMissing(node)) { - let identifier = node; + const identifier = node; // Only bother calling into the typechecker if this is an identifier that // could possibly resolve to a type name. This makes classification run // in a third of the time it would normally take. if (classifiableNames[identifier.text]) { - let symbol = typeChecker.getSymbolAtLocation(node); + const symbol = typeChecker.getSymbolAtLocation(node); if (symbol) { - let type = classifySymbol(symbol, getMeaningFromLocation(node)); + const type = classifySymbol(symbol, getMeaningFromLocation(node)); if (type) { pushClassification(node.getStart(), node.getWidth(), type); } @@ -6574,8 +6573,8 @@ namespace ts { function convertClassifications(classifications: Classifications): ClassifiedSpan[] { Debug.assert(classifications.spans.length % 3 === 0); - let dense = classifications.spans; - let result: ClassifiedSpan[] = []; + const dense = classifications.spans; + const result: ClassifiedSpan[] = []; for (let i = 0, n = dense.length; i < n; i += 3) { result.push({ textSpan: createTextSpan(dense[i], dense[i + 1]), @@ -6592,15 +6591,15 @@ namespace ts { function getEncodedSyntacticClassifications(fileName: string, span: TextSpan): Classifications { // doesn't use compiler - no need to synchronize with host - let sourceFile = syntaxTreeCache.getCurrentSourceFile(fileName); - let spanStart = span.start; - let spanLength = span.length; + const sourceFile = syntaxTreeCache.getCurrentSourceFile(fileName); + const spanStart = span.start; + const spanLength = span.length; // Make a scanner we can get trivia from. - let triviaScanner = createScanner(ScriptTarget.Latest, /*skipTrivia:*/ false, sourceFile.languageVariant, sourceFile.text); - let mergeConflictScanner = createScanner(ScriptTarget.Latest, /*skipTrivia:*/ false, sourceFile.languageVariant, sourceFile.text); + const triviaScanner = createScanner(ScriptTarget.Latest, /*skipTrivia*/ false, sourceFile.languageVariant, sourceFile.text); + const mergeConflictScanner = createScanner(ScriptTarget.Latest, /*skipTrivia*/ false, sourceFile.languageVariant, sourceFile.text); - let result: number[] = []; + const result: number[] = []; processElement(sourceFile); return { spans: result, endOfLineState: EndOfLineState.None }; @@ -6614,15 +6613,15 @@ namespace ts { function classifyLeadingTriviaAndGetTokenStart(token: Node): number { triviaScanner.setTextPos(token.pos); while (true) { - let start = triviaScanner.getTextPos(); + const start = triviaScanner.getTextPos(); // only bother scanning if we have something that could be trivia. if (!couldStartTrivia(sourceFile.text, start)) { return start; } - let kind = triviaScanner.scan(); - let end = triviaScanner.getTextPos(); - let width = end - start; + const kind = triviaScanner.scan(); + const end = triviaScanner.getTextPos(); + const width = end - start; // The moment we get something that isn't trivia, then stop processing. if (!isTrivia(kind)) { @@ -6646,8 +6645,8 @@ namespace ts { } if (kind === SyntaxKind.ConflictMarkerTrivia) { - let text = sourceFile.text; - let ch = text.charCodeAt(start); + const text = sourceFile.text; + const ch = text.charCodeAt(start); // for the <<<<<<< and >>>>>>> markers, we just add them in as comments // in the classification stream. @@ -6668,7 +6667,7 @@ namespace ts { if (kind === SyntaxKind.MultiLineCommentTrivia) { // See if this is a doc comment. If so, we'll classify certain portions of it // specially. - let docCommentAndDiagnostics = parseIsolatedJSDocComment(sourceFile.text, start, width); + const docCommentAndDiagnostics = parseIsolatedJSDocComment(sourceFile.text, start, width); if (docCommentAndDiagnostics && docCommentAndDiagnostics.jsDocComment) { docCommentAndDiagnostics.jsDocComment.parent = token; classifyJSDocComment(docCommentAndDiagnostics.jsDocComment); @@ -6687,7 +6686,7 @@ namespace ts { function classifyJSDocComment(docComment: JSDocComment) { let pos = docComment.pos; - for (let tag of docComment.tags) { + for (const tag of docComment.tags) { // As we walk through each tag, classify the portion of text from the end of // the last tag (or the start of the entire doc comment) as 'comment'. if (tag.pos !== pos) { @@ -6745,7 +6744,7 @@ namespace ts { } function processJSDocTemplateTag(tag: JSDocTemplateTag) { - for (let child of tag.getChildren()) { + for (const child of tag.getChildren()) { processElement(child); } } @@ -6767,11 +6766,11 @@ namespace ts { } function classifyDisabledCodeToken() { - let start = mergeConflictScanner.getTextPos(); - let tokenKind = mergeConflictScanner.scan(); - let end = mergeConflictScanner.getTextPos(); + const start = mergeConflictScanner.getTextPos(); + const tokenKind = mergeConflictScanner.scan(); + const end = mergeConflictScanner.getTextPos(); - let type = classifyTokenType(tokenKind); + const type = classifyTokenType(tokenKind); if (type) { pushClassification(start, end - start, type); } @@ -6782,12 +6781,12 @@ namespace ts { return; } - let tokenStart = classifyLeadingTriviaAndGetTokenStart(token); + const tokenStart = classifyLeadingTriviaAndGetTokenStart(token); - let tokenWidth = token.end - tokenStart; + const tokenWidth = token.end - tokenStart; Debug.assert(tokenWidth >= 0); if (tokenWidth > 0) { - let type = classifyTokenType(token.kind, token); + const type = classifyTokenType(token.kind, token); if (type) { pushClassification(tokenStart, tokenWidth, type); } @@ -6914,9 +6913,9 @@ namespace ts { if (decodedTextSpanIntersectsWith(spanStart, spanLength, element.pos, element.getFullWidth())) { checkForClassificationCancellation(element.kind); - let children = element.getChildren(sourceFile); + const children = element.getChildren(sourceFile); for (let i = 0, n = children.length; i < n; i++) { - let child = children[i]; + const child = children[i]; if (isToken(child)) { classifyToken(child); } @@ -6931,28 +6930,28 @@ namespace ts { function getOutliningSpans(fileName: string): OutliningSpan[] { // doesn't use compiler - no need to synchronize with host - let sourceFile = syntaxTreeCache.getCurrentSourceFile(fileName); + const sourceFile = syntaxTreeCache.getCurrentSourceFile(fileName); return OutliningElementsCollector.collectElements(sourceFile); } function getBraceMatchingAtPosition(fileName: string, position: number) { - let sourceFile = syntaxTreeCache.getCurrentSourceFile(fileName); - let result: TextSpan[] = []; + const sourceFile = syntaxTreeCache.getCurrentSourceFile(fileName); + const result: TextSpan[] = []; - let token = getTouchingToken(sourceFile, position); + const token = getTouchingToken(sourceFile, position); if (token.getStart(sourceFile) === position) { - let matchKind = getMatchingTokenKind(token); + const matchKind = getMatchingTokenKind(token); // Ensure that there is a corresponding token to match ours. if (matchKind) { - let parentElement = token.parent; + const parentElement = token.parent; - let childNodes = parentElement.getChildren(sourceFile); - for (let current of childNodes) { + const childNodes = parentElement.getChildren(sourceFile); + for (const current of childNodes) { if (current.kind === matchKind) { - let range1 = createTextSpan(token.getStart(sourceFile), token.getWidth(sourceFile)); - let range2 = createTextSpan(current.getStart(sourceFile), current.getWidth(sourceFile)); + const range1 = createTextSpan(token.getStart(sourceFile), token.getWidth(sourceFile)); + const range2 = createTextSpan(current.getStart(sourceFile), current.getWidth(sourceFile)); // We want to order the braces when we return the result. if (range1.start < range2.start) { @@ -6972,11 +6971,11 @@ namespace ts { function getMatchingTokenKind(token: Node): ts.SyntaxKind { switch (token.kind) { - case ts.SyntaxKind.OpenBraceToken: return ts.SyntaxKind.CloseBraceToken + case ts.SyntaxKind.OpenBraceToken: return ts.SyntaxKind.CloseBraceToken; case ts.SyntaxKind.OpenParenToken: return ts.SyntaxKind.CloseParenToken; case ts.SyntaxKind.OpenBracketToken: return ts.SyntaxKind.CloseBracketToken; case ts.SyntaxKind.LessThanToken: return ts.SyntaxKind.GreaterThanToken; - case ts.SyntaxKind.CloseBraceToken: return ts.SyntaxKind.OpenBraceToken + case ts.SyntaxKind.CloseBraceToken: return ts.SyntaxKind.OpenBraceToken; case ts.SyntaxKind.CloseParenToken: return ts.SyntaxKind.OpenParenToken; case ts.SyntaxKind.CloseBracketToken: return ts.SyntaxKind.OpenBracketToken; case ts.SyntaxKind.GreaterThanToken: return ts.SyntaxKind.LessThanToken; @@ -6988,29 +6987,29 @@ namespace ts { function getIndentationAtPosition(fileName: string, position: number, editorOptions: EditorOptions) { let start = new Date().getTime(); - let sourceFile = syntaxTreeCache.getCurrentSourceFile(fileName); + const sourceFile = syntaxTreeCache.getCurrentSourceFile(fileName); log("getIndentationAtPosition: getCurrentSourceFile: " + (new Date().getTime() - start)); start = new Date().getTime(); - let result = formatting.SmartIndenter.getIndentation(position, sourceFile, editorOptions); + const result = formatting.SmartIndenter.getIndentation(position, sourceFile, editorOptions); log("getIndentationAtPosition: computeIndentation : " + (new Date().getTime() - start)); return result; } function getFormattingEditsForRange(fileName: string, start: number, end: number, options: FormatCodeOptions): TextChange[] { - let sourceFile = syntaxTreeCache.getCurrentSourceFile(fileName); + const sourceFile = syntaxTreeCache.getCurrentSourceFile(fileName); return formatting.formatSelection(start, end, sourceFile, getRuleProvider(options), options); } function getFormattingEditsForDocument(fileName: string, options: FormatCodeOptions): TextChange[] { - let sourceFile = syntaxTreeCache.getCurrentSourceFile(fileName); + const sourceFile = syntaxTreeCache.getCurrentSourceFile(fileName); return formatting.formatDocument(sourceFile, getRuleProvider(options), options); } function getFormattingEditsAfterKeystroke(fileName: string, position: number, key: string, options: FormatCodeOptions): TextChange[] { - let sourceFile = syntaxTreeCache.getCurrentSourceFile(fileName); + const sourceFile = syntaxTreeCache.getCurrentSourceFile(fileName); if (key === "}") { return formatting.formatOnClosingCurly(position, sourceFile, getRuleProvider(options), options); @@ -7046,16 +7045,16 @@ namespace ts { * be performed. */ function getDocCommentTemplateAtPosition(fileName: string, position: number): TextInsertion { - let start = new Date().getTime(); - let sourceFile = syntaxTreeCache.getCurrentSourceFile(fileName); + const start = new Date().getTime(); + const sourceFile = syntaxTreeCache.getCurrentSourceFile(fileName); // Check if in a context where we don't want to perform any insertion if (isInString(sourceFile, position) || isInComment(sourceFile, position) || hasDocComment(sourceFile, position)) { return undefined; } - let tokenAtPos = getTokenAtPosition(sourceFile, position); - let tokenStart = tokenAtPos.getStart() + const tokenAtPos = getTokenAtPosition(sourceFile, position); + const tokenStart = tokenAtPos.getStart(); if (!tokenAtPos || tokenStart < position) { return undefined; } @@ -7091,11 +7090,11 @@ namespace ts { return undefined; } - let parameters = getParametersForJsDocOwningNode(commentOwner); - let posLineAndChar = sourceFile.getLineAndCharacterOfPosition(position); - let lineStart = sourceFile.getLineStarts()[posLineAndChar.line]; + const parameters = getParametersForJsDocOwningNode(commentOwner); + const posLineAndChar = sourceFile.getLineAndCharacterOfPosition(position); + const lineStart = sourceFile.getLineStarts()[posLineAndChar.line]; - let indentationStr = sourceFile.text.substr(lineStart, posLineAndChar.character); + const indentationStr = sourceFile.text.substr(lineStart, posLineAndChar.character); // TODO: call a helper method instead once PR #4133 gets merged in. const newLine = host.getNewLine ? host.getNewLine() : "\r\n"; @@ -7119,7 +7118,7 @@ namespace ts { // * if the caret was directly in front of the object, then we add an extra line and indentation. const preamble = "/**" + newLine + indentationStr + " * "; - let result = + const result = preamble + newLine + docParams + indentationStr + " */" + @@ -7163,7 +7162,7 @@ namespace ts { case SyntaxKind.ArrowFunction: return (rightHandSide).parameters; case SyntaxKind.ClassExpression: - for (let member of (rightHandSide).members) { + for (const member of (rightHandSide).members) { if (member.kind === SyntaxKind.Constructor) { return (member).parameters; } @@ -7183,15 +7182,15 @@ namespace ts { // anything away. synchronizeHostData(); - let sourceFile = getValidSourceFile(fileName); + const sourceFile = getValidSourceFile(fileName); cancellationToken.throwIfCancellationRequested(); - let fileContents = sourceFile.text; - let result: TodoComment[] = []; + const fileContents = sourceFile.text; + const result: TodoComment[] = []; if (descriptors.length > 0) { - let regExp = getTodoCommentsRegExp(); + const regExp = getTodoCommentsRegExp(); let matchArray: RegExpExecArray; while (matchArray = regExp.exec(fileContents)) { @@ -7214,15 +7213,15 @@ namespace ts { // // i.e. 'undefined' in position 3 above means TODO(jason) didn't match. // "hack" in position 4 means HACK did match. - let firstDescriptorCaptureIndex = 3; + const firstDescriptorCaptureIndex = 3; Debug.assert(matchArray.length === descriptors.length + firstDescriptorCaptureIndex); - let preamble = matchArray[1]; - let matchPosition = matchArray.index + preamble.length; + const preamble = matchArray[1]; + const matchPosition = matchArray.index + preamble.length; // OK, we have found a match in the file. This is only an acceptable match if // it is contained within a comment. - let token = getTokenAtPosition(sourceFile, matchPosition); + const token = getTokenAtPosition(sourceFile, matchPosition); if (!isInsideComment(sourceFile, token, matchPosition)) { continue; } @@ -7241,7 +7240,7 @@ namespace ts { continue; } - let message = matchArray[2]; + const message = matchArray[2]; result.push({ descriptor: descriptor, message: message, @@ -7272,14 +7271,14 @@ namespace ts { // // The following three regexps are used to match the start of the text up to the TODO // comment portion. - let singleLineCommentStart = /(?:\/\/+\s*)/.source; - let multiLineCommentStart = /(?:\/\*+\s*)/.source; - let anyNumberOfSpacesAndAsterixesAtStartOfLine = /(?:^(?:\s|\*)*)/.source; + const singleLineCommentStart = /(?:\/\/+\s*)/.source; + const multiLineCommentStart = /(?:\/\*+\s*)/.source; + const anyNumberOfSpacesAndAsterixesAtStartOfLine = /(?:^(?:\s|\*)*)/.source; // Match any of the above three TODO comment start regexps. // Note that the outermost group *is* a capture group. We want to capture the preamble // so that we can determine the starting position of the TODO comment match. - let preamble = "(" + anyNumberOfSpacesAndAsterixesAtStartOfLine + "|" + singleLineCommentStart + "|" + multiLineCommentStart + ")"; + const preamble = "(" + anyNumberOfSpacesAndAsterixesAtStartOfLine + "|" + singleLineCommentStart + "|" + multiLineCommentStart + ")"; // Takes the descriptors and forms a regexp that matches them as if they were literals. // For example, if the descriptors are "TODO(jason)" and "HACK", then this will be: @@ -7289,17 +7288,17 @@ namespace ts { // Note that the outermost group is *not* a capture group, but the innermost groups // *are* capture groups. By capturing the inner literals we can determine after // matching which descriptor we are dealing with. - let literals = "(?:" + map(descriptors, d => "(" + escapeRegExp(d.text) + ")").join("|") + ")"; + const literals = "(?:" + map(descriptors, d => "(" + escapeRegExp(d.text) + ")").join("|") + ")"; // After matching a descriptor literal, the following regexp matches the rest of the // text up to the end of the line (or */). - let endOfLineOrEndOfComment = /(?:$|\*\/)/.source - let messageRemainder = /(?:.*?)/.source + const endOfLineOrEndOfComment = /(?:$|\*\/)/.source; + const messageRemainder = /(?:.*?)/.source; // This is the portion of the match we'll return as part of the TODO comment result. We // match the literal portion up to the end of the line or end of comment. - let messagePortion = "(" + literals + messageRemainder + ")"; - let regExpString = preamble + messagePortion + endOfLineOrEndOfComment; + const messagePortion = "(" + literals + messageRemainder + ")"; + const regExpString = preamble + messagePortion + endOfLineOrEndOfComment; // The final regexp will look like this: // /((?:\/\/+\s*)|(?:\/\*+\s*)|(?:^(?:\s|\*)*))((?:(TODO\(jason\))|(HACK))(?:.*?))(?:$|\*\/)/gim @@ -7325,40 +7324,40 @@ namespace ts { function getRenameInfo(fileName: string, position: number): RenameInfo { synchronizeHostData(); - let sourceFile = getValidSourceFile(fileName); - let typeChecker = program.getTypeChecker(); + const sourceFile = getValidSourceFile(fileName); + const typeChecker = program.getTypeChecker(); - let node = getTouchingWord(sourceFile, position); + const node = getTouchingWord(sourceFile, position); // Can only rename an identifier. if (node && node.kind === SyntaxKind.Identifier) { - let symbol = typeChecker.getSymbolAtLocation(node); + const symbol = typeChecker.getSymbolAtLocation(node); // Only allow a symbol to be renamed if it actually has at least one declaration. if (symbol) { - let declarations = symbol.getDeclarations(); + const declarations = symbol.getDeclarations(); if (declarations && declarations.length > 0) { // Disallow rename for elements that are defined in the standard TypeScript library. - let defaultLibFileName = host.getDefaultLibFileName(host.getCompilationSettings()); + const defaultLibFileName = host.getDefaultLibFileName(host.getCompilationSettings()); if (defaultLibFileName) { - for (let current of declarations) { - let sourceFile = current.getSourceFile(); - var canonicalName = getCanonicalFileName(ts.normalizePath(sourceFile.fileName)); + for (const current of declarations) { + const sourceFile = current.getSourceFile(); + const canonicalName = getCanonicalFileName(ts.normalizePath(sourceFile.fileName)); if (sourceFile && getCanonicalFileName(ts.normalizePath(sourceFile.fileName)) === getCanonicalFileName(ts.normalizePath(defaultLibFileName))) { return getRenameInfoError(getLocaleSpecificMessage(Diagnostics.You_cannot_rename_elements_that_are_defined_in_the_standard_TypeScript_library)); } } } - let displayName = stripQuotes(getDeclaredName(typeChecker, symbol, node)); - let kind = getSymbolKind(symbol, node); + const displayName = stripQuotes(getDeclaredName(typeChecker, symbol, node)); + const kind = getSymbolKind(symbol, node); if (kind) { return { canRename: true, - localizedErrorMessage: undefined, + kind, displayName, + localizedErrorMessage: undefined, fullDisplayName: typeChecker.getFullyQualifiedName(symbol), - kind: kind, kindModifiers: getSymbolModifiers(symbol), triggerSpan: createTextSpan(node.getStart(), node.getWidth()) }; @@ -7425,14 +7424,14 @@ namespace ts { /* @internal */ export function getNameTable(sourceFile: SourceFile): Map { if (!sourceFile.nameTable) { - initializeNameTable(sourceFile) + initializeNameTable(sourceFile); } return sourceFile.nameTable; } function initializeNameTable(sourceFile: SourceFile): void { - let nameTable: Map = {}; + const nameTable: Map = {}; walk(sourceFile); sourceFile.nameTable = nameTable; @@ -7470,13 +7469,13 @@ namespace ts { /// Classifier export function createClassifier(): Classifier { - let scanner = createScanner(ScriptTarget.Latest, /*skipTrivia*/ false); + const scanner = createScanner(ScriptTarget.Latest, /*skipTrivia*/ false); /// We do not have a full parser support to know when we should parse a regex or not /// If we consider every slash token to be a regex, we could be missing cases like "1/2/3", where /// we have a series of divide operator. this list allows us to be more accurate by ruling out /// locations where a regexp cannot exist. - let noRegexTable: boolean[] = []; + const noRegexTable: boolean[] = []; noRegexTable[SyntaxKind.Identifier] = true; noRegexTable[SyntaxKind.StringLiteral] = true; noRegexTable[SyntaxKind.NumericLiteral] = true; @@ -7510,7 +7509,7 @@ namespace ts { // // Where on the second line, you will get the 'return' keyword, // a string literal, and a template end consisting of '} } `'. - let templateStack: SyntaxKind[] = []; + const templateStack: SyntaxKind[] = []; /** Returns true if 'keyword2' can legally follow 'keyword1' in any language construct. */ function canFollow(keyword1: SyntaxKind, keyword2: SyntaxKind) { @@ -7536,18 +7535,18 @@ namespace ts { } function convertClassifications(classifications: Classifications, text: string): ClassificationResult { - let entries: ClassificationInfo[] = []; - let dense = classifications.spans; + const entries: ClassificationInfo[] = []; + const dense = classifications.spans; let lastEnd = 0; for (let i = 0, n = dense.length; i < n; i += 3) { - let start = dense[i]; - let length = dense[i + 1]; - let type = dense[i + 2]; + const start = dense[i]; + const length = dense[i + 1]; + const type = dense[i + 2]; // Make a whitespace entry between the last item and this one. if (lastEnd >= 0) { - let whitespaceLength = start - lastEnd; + const whitespaceLength = start - lastEnd; if (whitespaceLength > 0) { entries.push({ length: whitespaceLength, classification: TokenClass.Whitespace }); } @@ -7557,7 +7556,7 @@ namespace ts { lastEnd = start + length; } - let whitespaceLength = text.length - lastEnd; + const whitespaceLength = text.length - lastEnd; if (whitespaceLength > 0) { entries.push({ length: whitespaceLength, classification: TokenClass.Whitespace }); } @@ -7611,7 +7610,7 @@ namespace ts { // (and a newline). That way when we lex we'll think we're still in a multiline comment. switch (lexState) { case EndOfLineState.InDoubleQuoteStringLiteral: - text = '"\\\n' + text; + text = "\"\\\n" + text; offset = 3; break; case EndOfLineState.InSingleQuoteStringLiteral: @@ -7637,7 +7636,7 @@ namespace ts { scanner.setText(text); - let result: Classifications = { + const result: Classifications = { endOfLineState: EndOfLineState.None, spans: [] }; @@ -7719,7 +7718,7 @@ namespace ts { // If we don't have anything on the template stack, // then we aren't trying to keep track of a previously scanned template head. if (templateStack.length > 0) { - let lastTemplateStackToken = lastOrUndefined(templateStack); + const lastTemplateStackToken = lastOrUndefined(templateStack); if (lastTemplateStackToken === SyntaxKind.TemplateHead) { token = scanner.reScanTemplateToken(); @@ -7749,17 +7748,17 @@ namespace ts { return result; function processToken(): void { - let start = scanner.getTokenPos(); - let end = scanner.getTextPos(); + const start = scanner.getTokenPos(); + const end = scanner.getTextPos(); addResult(start, end, classFromKind(token)); if (end >= text.length) { if (token === SyntaxKind.StringLiteral || token === SyntaxKind.StringLiteralType) { // Check to see if we finished up on a multiline string literal. - let tokenText = scanner.getTokenText(); + const tokenText = scanner.getTokenText(); if (scanner.isUnterminated()) { - let lastCharIndex = tokenText.length - 1; + const lastCharIndex = tokenText.length - 1; let numBackslashes = 0; while (tokenText.charCodeAt(lastCharIndex - numBackslashes) === CharacterCodes.backslash) { @@ -7768,7 +7767,7 @@ namespace ts { // If we have an odd number of backslashes, then the multiline string is unclosed if (numBackslashes & 1) { - let quoteChar = tokenText.charCodeAt(0); + const quoteChar = tokenText.charCodeAt(0); result.endOfLineState = quoteChar === CharacterCodes.doubleQuote ? EndOfLineState.InDoubleQuoteStringLiteral : EndOfLineState.InSingleQuoteStringLiteral; @@ -7817,7 +7816,7 @@ namespace ts { // relative to the original text. start -= offset; end -= offset; - let length = end - start; + const length = end - start; if (length > 0) { result.spans.push(start); @@ -7932,7 +7931,7 @@ namespace ts { } /// getDefaultLibraryFilePath - declare let __dirname: string; + declare const __dirname: string; /** * Get the path of the default library files (lib.d.ts) as distributed with the typescript From e3075bab784a6577e354cb96e84f8d061e15a91b Mon Sep 17 00:00:00 2001 From: Yui T Date: Tue, 15 Dec 2015 10:57:56 -0800 Subject: [PATCH 130/177] Revert linting services --- Jakefile.js | 3 +- src/services/services.ts | 1071 +++++++++++++++++++------------------- 2 files changed, 537 insertions(+), 537 deletions(-) diff --git a/Jakefile.js b/Jakefile.js index 91bd805a27b..beb16d2886f 100644 --- a/Jakefile.js +++ b/Jakefile.js @@ -924,8 +924,7 @@ function lintFileAsync(options, path, cb) { var lintTargets = compilerSources .concat(harnessCoreSources) .concat(serverCoreSources) - .concat(scriptSources) - .concat([path.join(servicesDirectory,"services.ts")]); + .concat(scriptSources); desc("Runs tslint on the compiler sources"); task("lint", ["build-rules"], function() { diff --git a/src/services/services.ts b/src/services/services.ts index 4109a4eb345..8e2e4913edd 100644 --- a/src/services/services.ts +++ b/src/services/services.ts @@ -12,7 +12,7 @@ namespace ts { /** The version of the language service API */ - export const servicesVersion = "0.4"; + export let servicesVersion = "0.4" export interface Node { getSourceFile(): SourceFile; @@ -48,7 +48,7 @@ namespace ts { getConstructSignatures(): Signature[]; getStringIndexType(): Type; getNumberIndexType(): Type; - getBaseTypes(): ObjectType[]; + getBaseTypes(): ObjectType[] } export interface Signature { @@ -97,7 +97,7 @@ namespace ts { dispose?(): void; } - export namespace ScriptSnapshot { + export module ScriptSnapshot { class StringScriptSnapshot implements IScriptSnapshot { constructor(private text: string) { @@ -126,12 +126,12 @@ namespace ts { referencedFiles: FileReference[]; importedFiles: FileReference[]; ambientExternalModules: string[]; - isLibFile: boolean; + isLibFile: boolean } - const scanner: Scanner = createScanner(ScriptTarget.Latest, /*skipTrivia*/ true); + let scanner: Scanner = createScanner(ScriptTarget.Latest, /*skipTrivia*/ true); - const emptyArray: any[] = []; + let emptyArray: any[] = []; const jsDocTagNames = [ "augments", @@ -174,7 +174,7 @@ namespace ts { let jsDocCompletionEntries: CompletionEntry[]; function createNode(kind: SyntaxKind, pos: number, end: number, flags: NodeFlags, parent?: Node): NodeObject { - const node = new NodeObject(kind, pos, end); + let node = new NodeObject(kind, pos, end); node.flags = flags; node.parent = parent; return node; @@ -235,8 +235,8 @@ namespace ts { private addSyntheticNodes(nodes: Node[], pos: number, end: number): number { scanner.setTextPos(pos); while (pos < end) { - const token = scanner.scan(); - const textPos = scanner.getTextPos(); + let token = scanner.scan(); + let textPos = scanner.getTextPos(); nodes.push(createNode(token, pos, textPos, NodeFlags.Synthetic, this)); pos = textPos; } @@ -244,11 +244,13 @@ namespace ts { } private createSyntaxList(nodes: NodeArray): Node { - const list = createNode(SyntaxKind.SyntaxList, nodes.pos, nodes.end, NodeFlags.Synthetic, this); + let list = createNode(SyntaxKind.SyntaxList, nodes.pos, nodes.end, NodeFlags.Synthetic, this); list._children = []; let pos = nodes.pos; - for (const node of nodes) { + + + for (let node of nodes) { if (pos < node.pos) { pos = this.addSyntheticNodes(list._children, pos, node.pos); } @@ -267,14 +269,14 @@ namespace ts { scanner.setText((sourceFile || this.getSourceFile()).text); children = []; let pos = this.pos; - const processNode = (node: Node) => { + let processNode = (node: Node) => { if (pos < node.pos) { pos = this.addSyntheticNodes(children, pos, node.pos); } children.push(node); pos = node.end; }; - const processNodes = (nodes: NodeArray) => { + let processNodes = (nodes: NodeArray) => { if (pos < nodes.pos) { pos = this.addSyntheticNodes(children, pos, nodes.pos); } @@ -306,20 +308,20 @@ namespace ts { } public getFirstToken(sourceFile?: SourceFile): Node { - const children = this.getChildren(sourceFile); + let children = this.getChildren(sourceFile); if (!children.length) { return undefined; } - const child = children[0]; + let child = children[0]; return child.kind < SyntaxKind.FirstNode ? child : child.getFirstToken(sourceFile); } public getLastToken(sourceFile?: SourceFile): Node { - const children = this.getChildren(sourceFile); + let children = this.getChildren(sourceFile); - const child = lastOrUndefined(children); + let child = lastOrUndefined(children); if (!child) { return undefined; } @@ -364,8 +366,8 @@ namespace ts { } function getJsDocCommentsFromDeclarations(declarations: Declaration[], name: string, canUseParsedParamTagComments: boolean) { - const documentationComment = []; - const docComments = getJsDocCommentsSeparatedByNewLines(); + let documentationComment = []; + let docComments = getJsDocCommentsSeparatedByNewLines(); ts.forEach(docComments, docComment => { if (documentationComment.length) { documentationComment.push(lineBreakPart()); @@ -376,22 +378,22 @@ namespace ts { return documentationComment; function getJsDocCommentsSeparatedByNewLines() { - const paramTag = "@param"; - const jsDocCommentParts: SymbolDisplayPart[] = []; + let paramTag = "@param"; + let jsDocCommentParts: SymbolDisplayPart[] = []; ts.forEach(declarations, (declaration, indexOfDeclaration) => { // Make sure we are collecting doc comment from declaration once, // In case of union property there might be same declaration multiple times // which only varies in type parameter - // Eg. const a: Array | Array; a.length + // Eg. let a: Array | Array; a.length // The property length will have two declarations of property length coming // from Array - Array and Array if (indexOf(declarations, declaration) === indexOfDeclaration) { - const sourceFileOfDeclaration = getSourceFileOfNode(declaration); + let sourceFileOfDeclaration = getSourceFileOfNode(declaration); // If it is parameter - try and get the jsDoc comment with @param tag from function declaration's jsDoc comments if (canUseParsedParamTagComments && declaration.kind === SyntaxKind.Parameter) { ts.forEach(getJsDocCommentTextRange(declaration.parent, sourceFileOfDeclaration), jsDocCommentTextRange => { - const cleanedParamJsDocComment = getCleanedParamJsDocComment(jsDocCommentTextRange.pos, jsDocCommentTextRange.end, sourceFileOfDeclaration); + let cleanedParamJsDocComment = getCleanedParamJsDocComment(jsDocCommentTextRange.pos, jsDocCommentTextRange.end, sourceFileOfDeclaration); if (cleanedParamJsDocComment) { addRange(jsDocCommentParts, cleanedParamJsDocComment); } @@ -411,7 +413,7 @@ namespace ts { // Get the cleaned js doc comment text from the declaration ts.forEach(getJsDocCommentTextRange( declaration.kind === SyntaxKind.VariableDeclaration ? declaration.parent.parent : declaration, sourceFileOfDeclaration), jsDocCommentTextRange => { - const cleanedJsDocComment = getCleanedJsDocComment(jsDocCommentTextRange.pos, jsDocCommentTextRange.end, sourceFileOfDeclaration); + let cleanedJsDocComment = getCleanedJsDocComment(jsDocCommentTextRange.pos, jsDocCommentTextRange.end, sourceFileOfDeclaration); if (cleanedJsDocComment) { addRange(jsDocCommentParts, cleanedJsDocComment); } @@ -437,7 +439,7 @@ namespace ts { } for (; pos < end; pos++) { - const ch = sourceFile.text.charCodeAt(pos); + let ch = sourceFile.text.charCodeAt(pos); if (!isWhiteSpace(ch) || isLineBreak(ch)) { // Either found lineBreak or non whiteSpace return pos; @@ -478,7 +480,7 @@ namespace ts { function getCleanedJsDocComment(pos: number, end: number, sourceFile: SourceFile) { let spacesToRemoveAfterAsterisk: number; - const docComments: SymbolDisplayPart[] = []; + let docComments: SymbolDisplayPart[] = []; let blankLineCount = 0; let isInParamTag = false; @@ -489,7 +491,7 @@ namespace ts { // If the comment starts with '*' consume the spaces on this line if (pos < end && sourceFile.text.charCodeAt(pos) === CharacterCodes.asterisk) { - const lineStartPos = pos + 1; + let lineStartPos = pos + 1; pos = consumeWhiteSpacesOnTheLine(pos + 1, end, sourceFile, spacesToRemoveAfterAsterisk); // Set the spaces to remove after asterisk as margin if not already set @@ -503,7 +505,7 @@ namespace ts { // Analyse text on this line while (pos < end && !isLineBreak(sourceFile.text.charCodeAt(pos))) { - const ch = sourceFile.text.charAt(pos); + let ch = sourceFile.text.charAt(pos); if (ch === "@") { // If it is @param tag if (isParamTag(pos, end, sourceFile)) { @@ -542,7 +544,7 @@ namespace ts { function getCleanedParamJsDocComment(pos: number, end: number, sourceFile: SourceFile) { let paramHelpStringMargin: number; - const paramDocComments: SymbolDisplayPart[] = []; + let paramDocComments: SymbolDisplayPart[] = []; while (pos < end) { if (isParamTag(pos, end, sourceFile)) { let blankLineCount = 0; @@ -557,7 +559,7 @@ namespace ts { if (sourceFile.text.charCodeAt(pos) === CharacterCodes.openBrace) { pos++; for (let curlies = 1; pos < end; pos++) { - const charCode = sourceFile.text.charCodeAt(pos); + let charCode = sourceFile.text.charCodeAt(pos); // { character means we need to find another } to match the found one if (charCode === CharacterCodes.openBrace) { @@ -601,9 +603,9 @@ namespace ts { } let paramHelpString = ""; - const firstLineParamHelpStringPos = pos; + let firstLineParamHelpStringPos = pos; while (pos < end) { - const ch = sourceFile.text.charCodeAt(pos); + let ch = sourceFile.text.charCodeAt(pos); // at line break, set this comment line text and go to next line if (isLineBreak(ch)) { @@ -672,15 +674,15 @@ namespace ts { } // Now consume white spaces max - const startOfLinePos = pos; + let startOfLinePos = pos; pos = consumeWhiteSpacesOnTheLine(pos, end, sourceFile, paramHelpStringMargin); if (pos >= end) { return; } - const consumedSpaces = pos - startOfLinePos; + let consumedSpaces = pos - startOfLinePos; if (consumedSpaces < paramHelpStringMargin) { - const ch = sourceFile.text.charCodeAt(pos); + let ch = sourceFile.text.charCodeAt(pos); if (ch === CharacterCodes.asterisk) { // Consume more spaces after asterisk pos = consumeWhiteSpacesOnTheLine(pos + 1, end, sourceFile, paramHelpStringMargin - consumedSpaces - 1); @@ -813,7 +815,7 @@ namespace ts { private namedDeclarations: Map; constructor(kind: SyntaxKind, pos: number, end: number) { - super(kind, pos, end); + super(kind, pos, end) } public update(newText: string, textChangeRange: TextChangeRange): SourceFile { @@ -841,16 +843,16 @@ namespace ts { } private computeNamedDeclarations(): Map { - const result: Map = {}; + let result: Map = {}; forEachChild(this, visit); return result; function addDeclaration(declaration: Declaration) { - const name = getDeclarationName(declaration); + let name = getDeclarationName(declaration); if (name) { - const declarations = getDeclarations(name); + let declarations = getDeclarations(name); declarations.push(declaration); } } @@ -861,13 +863,13 @@ namespace ts { function getDeclarationName(declaration: Declaration) { if (declaration.name) { - const result = getTextOfIdentifierOrLiteral(declaration.name); + let result = getTextOfIdentifierOrLiteral(declaration.name); if (result !== undefined) { return result; } if (declaration.name.kind === SyntaxKind.ComputedPropertyName) { - const expr = (declaration.name).expression; + let expr = (declaration.name).expression; if (expr.kind === SyntaxKind.PropertyAccessExpression) { return (expr).name.text; } @@ -897,12 +899,12 @@ namespace ts { case SyntaxKind.FunctionDeclaration: case SyntaxKind.MethodDeclaration: case SyntaxKind.MethodSignature: - const functionDeclaration = node; - const declarationName = getDeclarationName(functionDeclaration); + let functionDeclaration = node; + let declarationName = getDeclarationName(functionDeclaration); if (declarationName) { - const declarations = getDeclarations(declarationName); - const lastDeclaration = lastOrUndefined(declarations); + let declarations = getDeclarations(declarationName); + let lastDeclaration = lastOrUndefined(declarations); // Check whether this declaration belongs to an "overload group". if (lastDeclaration && functionDeclaration.parent === lastDeclaration.parent && functionDeclaration.symbol === lastDeclaration.symbol) { @@ -978,7 +980,7 @@ namespace ts { break; case SyntaxKind.ImportDeclaration: - const importClause = (node).importClause; + let importClause = (node).importClause; if (importClause) { // Handle default import case e.g.: // import d from "mod"; @@ -1111,8 +1113,8 @@ namespace ts { } export interface Classifications { - spans: number[]; - endOfLineState: EndOfLineState; + spans: number[], + endOfLineState: EndOfLineState } export interface ClassifiedSpan { @@ -1169,7 +1171,7 @@ namespace ts { highlightSpans: HighlightSpan[]; } - export namespace HighlightSpanKind { + export module HighlightSpanKind { export const none = "none"; export const definition = "definition"; export const reference = "reference"; @@ -1218,7 +1220,7 @@ namespace ts { InsertSpaceAfterOpeningAndBeforeClosingNonemptyBrackets: boolean; PlaceOpenBraceOnNewLineForFunctions: boolean; PlaceOpenBraceOnNewLineForControlBlocks: boolean; - [s: string]: boolean | number | string; + [s: string]: boolean | number| string; } export interface DefinitionInfo { @@ -1498,7 +1500,7 @@ namespace ts { } // TODO: move these to enums - export namespace ScriptElementKind { + export module ScriptElementKind { export const unknown = ""; export const warning = "warning"; @@ -1527,7 +1529,7 @@ namespace ts { export const enumElement = "enum"; // Inside module and script only - // const v = .. + // let v = .. export const variableElement = "var"; // Inside function @@ -1579,7 +1581,7 @@ namespace ts { export const letElement = "let"; } - export namespace ScriptElementKindModifier { + export module ScriptElementKindModifier { export const none = ""; export const publicMemberModifier = "public"; export const privateMemberModifier = "private"; @@ -1721,8 +1723,8 @@ namespace ts { this.fileNameToEntry = createFileMap(); // Initialize the list with the root file names - const rootFileNames = host.getScriptFileNames(); - for (const fileName of rootFileNames) { + let rootFileNames = host.getScriptFileNames(); + for (let fileName of rootFileNames) { this.createEntry(fileName, toPath(fileName, this.currentDirectory, getCanonicalFileName)); } @@ -1736,7 +1738,7 @@ namespace ts { private createEntry(fileName: string, path: Path) { let entry: HostFileInformation; - const scriptSnapshot = this.host.getScriptSnapshot(fileName); + let scriptSnapshot = this.host.getScriptSnapshot(fileName); if (scriptSnapshot) { entry = { hostFileName: fileName, @@ -1758,7 +1760,7 @@ namespace ts { } public getOrCreateEntry(fileName: string): HostFileInformation { - const path = toPath(fileName, this.currentDirectory, this.getCanonicalFileName); + let path = toPath(fileName, this.currentDirectory, this.getCanonicalFileName) if (this.contains(path)) { return this.getEntry(path); } @@ -1767,7 +1769,7 @@ namespace ts { } public getRootFileNames(): string[] { - const fileNames: string[] = []; + let fileNames: string[] = []; this.fileNameToEntry.forEachValue((path, value) => { if (value) { @@ -1779,12 +1781,12 @@ namespace ts { } public getVersion(path: Path): string { - const file = this.getEntry(path); + let file = this.getEntry(path); return file && file.version; } public getScriptSnapshot(path: Path): IScriptSnapshot { - const file = this.getEntry(path); + let file = this.getEntry(path); return file && file.scriptSnapshot; } } @@ -1801,22 +1803,22 @@ namespace ts { } public getCurrentSourceFile(fileName: string): SourceFile { - const scriptSnapshot = this.host.getScriptSnapshot(fileName); + let scriptSnapshot = this.host.getScriptSnapshot(fileName); if (!scriptSnapshot) { // The host does not know about this file. throw new Error("Could not find file: '" + fileName + "'."); } - const version = this.host.getScriptVersion(fileName); + let version = this.host.getScriptVersion(fileName); let sourceFile: SourceFile; if (this.currentFileName !== fileName) { // This is a new file, just parse it - sourceFile = createLanguageServiceSourceFile(fileName, scriptSnapshot, ScriptTarget.Latest, version, /*setNodeParents*/ true); + sourceFile = createLanguageServiceSourceFile(fileName, scriptSnapshot, ScriptTarget.Latest, version, /*setNodeParents:*/ true); } else if (this.currentFileVersion !== version) { // This is the same file, just a newer version. Incrementally parse the file. - const editRange = scriptSnapshot.getChangeRange(this.currentFileScriptSnapshot); + let editRange = scriptSnapshot.getChangeRange(this.currentFileScriptSnapshot); sourceFile = updateLanguageServiceSourceFile(this.currentSourceFile, scriptSnapshot, version, editRange); } @@ -1861,7 +1863,7 @@ namespace ts { * - noResolve = true */ export function transpileModule(input: string, transpileOptions: TranspileOptions): TranspileOutput { - const options = transpileOptions.compilerOptions ? clone(transpileOptions.compilerOptions) : getDefaultCompilerOptions(); + let options = transpileOptions.compilerOptions ? clone(transpileOptions.compilerOptions) : getDefaultCompilerOptions(); options.isolatedModules = true; @@ -1877,22 +1879,21 @@ namespace ts { options.noResolve = true; // if jsx is specified then treat file as .tsx - const inputFileName = transpileOptions.fileName || (options.jsx ? "module.tsx" : "module.ts"); - const sourceFile = createSourceFile(inputFileName, input, options.target); + let inputFileName = transpileOptions.fileName || (options.jsx ? "module.tsx" : "module.ts"); + let sourceFile = createSourceFile(inputFileName, input, options.target); if (transpileOptions.moduleName) { sourceFile.moduleName = transpileOptions.moduleName; } sourceFile.renamedDependencies = transpileOptions.renamedDependencies; - const newLine = getNewLineCharacter(options); + let newLine = getNewLineCharacter(options); // Output let outputText: string; let sourceMapText: string; - // Create a compilerHost object to allow the compiler to read and write files - const compilerHost: CompilerHost = { + let compilerHost: CompilerHost = { getSourceFile: (fileName, target) => fileName === normalizeSlashes(inputFileName) ? sourceFile : undefined, writeFile: (name, text, writeByteOrderMark) => { if (fileExtensionIs(name, ".map")) { @@ -1913,7 +1914,7 @@ namespace ts { readFile: (fileName): string => "" }; - const program = createProgram([inputFileName], options, compilerHost); + let program = createProgram([inputFileName], options, compilerHost); let diagnostics: Diagnostic[]; if (transpileOptions.reportDiagnostics) { @@ -1933,15 +1934,15 @@ namespace ts { * This is a shortcut function for transpileModule - it accepts transpileOptions as parameters and returns only outputText part of the result. */ export function transpile(input: string, compilerOptions?: CompilerOptions, fileName?: string, diagnostics?: Diagnostic[], moduleName?: string): string { - const output = transpileModule(input, { compilerOptions, fileName, reportDiagnostics: !!diagnostics, moduleName }); + let output = transpileModule(input, { compilerOptions, fileName, reportDiagnostics: !!diagnostics, moduleName }); // addRange correctly handles cases when wither 'from' or 'to' argument is missing addRange(diagnostics, output.diagnostics); return output.outputText; } export function createLanguageServiceSourceFile(fileName: string, scriptSnapshot: IScriptSnapshot, scriptTarget: ScriptTarget, version: string, setNodeParents: boolean): SourceFile { - const text = scriptSnapshot.getText(0, scriptSnapshot.getLength()); - const sourceFile = createSourceFile(fileName, text, scriptTarget, setNodeParents); + let text = scriptSnapshot.getText(0, scriptSnapshot.getLength()); + let sourceFile = createSourceFile(fileName, text, scriptTarget, setNodeParents); setSourceFileFields(sourceFile, scriptSnapshot, version); // after full parsing we can use table with interned strings as name table sourceFile.nameTable = sourceFile.identifiers; @@ -1960,12 +1961,12 @@ namespace ts { let newText: string; // grab the fragment from the beginning of the original text to the beginning of the span - const prefix = textChangeRange.span.start !== 0 + let prefix = textChangeRange.span.start !== 0 ? sourceFile.text.substr(0, textChangeRange.span.start) : ""; // grab the fragment from the end of the span till the end of the original text - const suffix = textSpanEnd(textChangeRange.span) !== sourceFile.text.length + let suffix = textSpanEnd(textChangeRange.span) !== sourceFile.text.length ? sourceFile.text.substr(textSpanEnd(textChangeRange.span)) : ""; @@ -1975,7 +1976,7 @@ namespace ts { } else { // it was actual edit, fetch the fragment of new text that correspond to new span - const changedText = scriptSnapshot.getText(textChangeRange.span.start, textChangeRange.span.start + textChangeRange.newLength); + let changedText = scriptSnapshot.getText(textChangeRange.span.start, textChangeRange.span.start + textChangeRange.newLength); // combine prefix, changed text and suffix newText = prefix && suffix ? prefix + changedText + suffix @@ -1984,7 +1985,7 @@ namespace ts { : (changedText + suffix); } - const newSourceFile = updateSourceFile(sourceFile, newText, textChangeRange, aggressiveChecks); + let newSourceFile = updateSourceFile(sourceFile, newText, textChangeRange, aggressiveChecks); setSourceFileFields(newSourceFile, scriptSnapshot, version); // after incremental parsing nameTable might not be up-to-date // drop it so it can be lazily recreated later @@ -2005,7 +2006,7 @@ namespace ts { } // Otherwise, just create a new source file. - return createLanguageServiceSourceFile(sourceFile.fileName, scriptSnapshot, sourceFile.languageVersion, version, /*setNodeParents*/ true); + return createLanguageServiceSourceFile(sourceFile.fileName, scriptSnapshot, sourceFile.languageVersion, version, /*setNodeParents:*/ true); } export function createGetCanonicalFileName(useCaseSensitivefileNames: boolean): (fileName: string) => string { @@ -2018,15 +2019,15 @@ namespace ts { export function createDocumentRegistry(useCaseSensitiveFileNames?: boolean, currentDirectory = ""): DocumentRegistry { // Maps from compiler setting target (ES3, ES5, etc.) to all the cached documents we have // for those settings. - const buckets: Map> = {}; - const getCanonicalFileName = createGetCanonicalFileName(!!useCaseSensitiveFileNames); + let buckets: Map> = {}; + let getCanonicalFileName = createGetCanonicalFileName(!!useCaseSensitiveFileNames); function getKeyFromCompilationSettings(settings: CompilerOptions): string { return "_" + settings.target + "|" + settings.module + "|" + settings.noResolve + "|" + settings.jsx + +"|" + settings.allowJs; } function getBucketForCompilationSettings(settings: CompilerOptions, createIfMissing: boolean): FileMap { - const key = getKeyFromCompilationSettings(settings); + let key = getKeyFromCompilationSettings(settings); let bucket = lookUp(buckets, key); if (!bucket && createIfMissing) { buckets[key] = bucket = createFileMap(); @@ -2035,9 +2036,9 @@ namespace ts { } function reportStats() { - const bucketInfoArray = Object.keys(buckets).filter(name => name && name.charAt(0) === "_").map(name => { - const entries = lookUp(buckets, name); - const sourceFiles: { name: string; refCount: number; references: string[]; }[] = []; + let bucketInfoArray = Object.keys(buckets).filter(name => name && name.charAt(0) === '_').map(name => { + let entries = lookUp(buckets, name); + let sourceFiles: { name: string; refCount: number; references: string[]; }[] = []; entries.forEachValue((key, entry) => { sourceFiles.push({ name: key, @@ -2051,15 +2052,15 @@ namespace ts { sourceFiles }; }); - return JSON.stringify(bucketInfoArray, undefined, 2); + return JSON.stringify(bucketInfoArray, null, 2); } function acquireDocument(fileName: string, compilationSettings: CompilerOptions, scriptSnapshot: IScriptSnapshot, version: string): SourceFile { - return acquireOrUpdateDocument(fileName, compilationSettings, scriptSnapshot, version, /*acquiring*/ true); + return acquireOrUpdateDocument(fileName, compilationSettings, scriptSnapshot, version, /*acquiring:*/ true); } function updateDocument(fileName: string, compilationSettings: CompilerOptions, scriptSnapshot: IScriptSnapshot, version: string): SourceFile { - return acquireOrUpdateDocument(fileName, compilationSettings, scriptSnapshot, version, /*acquiring*/ false); + return acquireOrUpdateDocument(fileName, compilationSettings, scriptSnapshot, version, /*acquiring:*/ false); } function acquireOrUpdateDocument( @@ -2069,14 +2070,14 @@ namespace ts { version: string, acquiring: boolean): SourceFile { - const bucket = getBucketForCompilationSettings(compilationSettings, /*createIfMissing*/ true); - const path = toPath(fileName, currentDirectory, getCanonicalFileName); + let bucket = getBucketForCompilationSettings(compilationSettings, /*createIfMissing*/ true); + let path = toPath(fileName, currentDirectory, getCanonicalFileName); let entry = bucket.get(path); if (!entry) { Debug.assert(acquiring, "How could we be trying to update a document that the registry doesn't have?"); // Have never seen this file with these settings. Create a new source file for it. - const sourceFile = createLanguageServiceSourceFile(fileName, scriptSnapshot, compilationSettings.target, version, /*setNodeParents*/ false); + let sourceFile = createLanguageServiceSourceFile(fileName, scriptSnapshot, compilationSettings.target, version, /*setNodeParents:*/ false); entry = { sourceFile: sourceFile, @@ -2108,12 +2109,12 @@ namespace ts { } function releaseDocument(fileName: string, compilationSettings: CompilerOptions): void { - const bucket = getBucketForCompilationSettings(compilationSettings, /*createIfMissing*/false); + let bucket = getBucketForCompilationSettings(compilationSettings, false); Debug.assert(bucket !== undefined); - const path = toPath(fileName, currentDirectory, getCanonicalFileName); + let path = toPath(fileName, currentDirectory, getCanonicalFileName); - const entry = bucket.get(path); + let entry = bucket.get(path); entry.languageServiceRefCount--; Debug.assert(entry.languageServiceRefCount >= 0); @@ -2131,19 +2132,19 @@ namespace ts { } export function preProcessFile(sourceText: string, readImportFiles = true, detectJavaScriptImports = false): PreProcessedFileInfo { - const referencedFiles: FileReference[] = []; - const importedFiles: FileReference[] = []; + let referencedFiles: FileReference[] = []; + let importedFiles: FileReference[] = []; let ambientExternalModules: string[]; let isNoDefaultLib = false; function processTripleSlashDirectives(): void { - const commentRanges = getLeadingCommentRanges(sourceText, 0); + let commentRanges = getLeadingCommentRanges(sourceText, 0); forEach(commentRanges, commentRange => { - const comment = sourceText.substring(commentRange.pos, commentRange.end); - const referencePathMatchResult = getFileReferenceFromReferencePath(comment, commentRange); + let comment = sourceText.substring(commentRange.pos, commentRange.end); + let referencePathMatchResult = getFileReferenceFromReferencePath(comment, commentRange); if (referencePathMatchResult) { isNoDefaultLib = referencePathMatchResult.isNoDefaultLib; - const fileReference = referencePathMatchResult.fileReference; + let fileReference = referencePathMatchResult.fileReference; if (fileReference) { referencedFiles.push(fileReference); } @@ -2159,8 +2160,8 @@ namespace ts { } function recordModuleName() { - const importPath = scanner.getTokenValue(); - const pos = scanner.getTokenPos(); + let importPath = scanner.getTokenValue(); + let pos = scanner.getTokenPos(); importedFiles.push({ fileName: importPath, pos: pos, @@ -2212,7 +2213,7 @@ namespace ts { } } else if (token === SyntaxKind.EqualsToken) { - if (tryConsumeRequireCall(/*skipCurrentToken*/ true)) { + if (tryConsumeRequireCall(/* skipCurrentToken */ true)) { return true; } } @@ -2310,7 +2311,7 @@ namespace ts { if (token === SyntaxKind.Identifier || isKeyword(token)) { token = scanner.scan(); if (token === SyntaxKind.EqualsToken) { - if (tryConsumeRequireCall(/*skipCurrentToken*/ true)) { + if (tryConsumeRequireCall(/* skipCurrentToken */ true)) { return true; } } @@ -2409,7 +2410,7 @@ namespace ts { if (tryConsumeDeclare() || tryConsumeImport() || tryConsumeExport() || - (detectJavaScriptImports && (tryConsumeRequireCall(/*skipCurrentToken*/ false) || tryConsumeDefine()))) { + (detectJavaScriptImports && (tryConsumeRequireCall(/* skipCurrentToken */ false) || tryConsumeDefine()))) { continue; } else { @@ -2549,8 +2550,8 @@ namespace ts { return true; } else if (position === comment.end) { - const text = sourceFile.text; - const width = comment.end - comment.pos; + let text = sourceFile.text; + let width = comment.end - comment.pos; // is single line comment or just /* if (width <= 2 || text.charCodeAt(comment.pos + 1) === CharacterCodes.slash) { return true; @@ -2582,7 +2583,7 @@ namespace ts { } // A cache of completion entries for keywords, these do not change between sessions - const keywordCompletions: CompletionEntry[] = []; + let keywordCompletions: CompletionEntry[] = []; for (let i = SyntaxKind.FirstKeyword; i <= SyntaxKind.LastKeyword; i++) { keywordCompletions.push({ name: tokenToString(i), @@ -2672,15 +2673,15 @@ namespace ts { export function createLanguageService(host: LanguageServiceHost, documentRegistry: DocumentRegistry = createDocumentRegistry(host.useCaseSensitiveFileNames && host.useCaseSensitiveFileNames(), host.getCurrentDirectory())): LanguageService { - const syntaxTreeCache: SyntaxTreeCache = new SyntaxTreeCache(host); + let syntaxTreeCache: SyntaxTreeCache = new SyntaxTreeCache(host); let ruleProvider: formatting.RulesProvider; let program: Program; let lastProjectVersion: string; - const useCaseSensitivefileNames = false; - const cancellationToken = new CancellationTokenObject(host.getCancellationToken && host.getCancellationToken()); + let useCaseSensitivefileNames = false; + let cancellationToken = new CancellationTokenObject(host.getCancellationToken && host.getCancellationToken()); - const currentDirectory = host.getCurrentDirectory(); + let currentDirectory = host.getCurrentDirectory(); // Check if the localized messages json is set, otherwise query the host for it if (!localizedDiagnosticMessages && host.getLocalizedDiagnosticMessages) { localizedDiagnosticMessages = host.getLocalizedDiagnosticMessages(); @@ -2692,10 +2693,10 @@ namespace ts { } } - const getCanonicalFileName = createGetCanonicalFileName(useCaseSensitivefileNames); + let getCanonicalFileName = createGetCanonicalFileName(useCaseSensitivefileNames); function getValidSourceFile(fileName: string): SourceFile { - const sourceFile = program.getSourceFile(fileName); + let sourceFile = program.getSourceFile(fileName); if (!sourceFile) { throw new Error("Could not find file: '" + fileName + "'."); } @@ -2715,7 +2716,7 @@ namespace ts { function synchronizeHostData(): void { // perform fast check if host supports it if (host.getProjectVersion) { - const hostProjectVersion = host.getProjectVersion(); + let hostProjectVersion = host.getProjectVersion(); if (hostProjectVersion) { if (lastProjectVersion === hostProjectVersion) { return; @@ -2739,17 +2740,17 @@ namespace ts { // the program points to old source files that have been invalidated because of // incremental parsing. - const oldSettings = program && program.getCompilerOptions(); - const newSettings = hostCache.compilationSettings(); - const changesInCompilationSettingsAffectSyntax = oldSettings && + let oldSettings = program && program.getCompilerOptions(); + let newSettings = hostCache.compilationSettings(); + let changesInCompilationSettingsAffectSyntax = oldSettings && (oldSettings.target !== newSettings.target || oldSettings.module !== newSettings.module || oldSettings.noResolve !== newSettings.noResolve || - oldSettings.jsx !== newSettings.jsx || + oldSettings.jsx !== newSettings.jsx || oldSettings.allowJs !== newSettings.allowJs); // Now create a new compiler - const compilerHost: CompilerHost = { + let compilerHost: CompilerHost = { getSourceFile: getOrCreateSourceFile, getCancellationToken: () => cancellationToken, getCanonicalFileName, @@ -2765,22 +2766,22 @@ namespace ts { }, readFile: (fileName): string => { // stub missing host functionality - const entry = hostCache.getOrCreateEntry(fileName); + let entry = hostCache.getOrCreateEntry(fileName); return entry && entry.scriptSnapshot.getText(0, entry.scriptSnapshot.getLength()); } }; if (host.resolveModuleNames) { - compilerHost.resolveModuleNames = (moduleNames, containingFile) => host.resolveModuleNames(moduleNames, containingFile); + compilerHost.resolveModuleNames = (moduleNames, containingFile) => host.resolveModuleNames(moduleNames, containingFile) } - const newProgram = createProgram(hostCache.getRootFileNames(), newSettings, compilerHost, program); + let newProgram = createProgram(hostCache.getRootFileNames(), newSettings, compilerHost, program); // Release any files we have acquired in the old program but are // not part of the new program. if (program) { - const oldSourceFiles = program.getSourceFiles(); - for (const oldSourceFile of oldSourceFiles) { + let oldSourceFiles = program.getSourceFiles(); + for (let oldSourceFile of oldSourceFiles) { if (!newProgram.getSourceFile(oldSourceFile.fileName) || changesInCompilationSettingsAffectSyntax) { documentRegistry.releaseDocument(oldSourceFile.fileName, oldSettings); } @@ -2803,7 +2804,7 @@ namespace ts { // The program is asking for this file, check first if the host can locate it. // If the host can not locate the file, then it does not exist. return undefined // to the program to allow reporting of errors for missing files. - const hostFileInformation = hostCache.getOrCreateEntry(fileName); + let hostFileInformation = hostCache.getOrCreateEntry(fileName); if (!hostFileInformation) { return undefined; } @@ -2813,7 +2814,7 @@ namespace ts { // can not be reused. we have to dump all syntax trees and create new ones. if (!changesInCompilationSettingsAffectSyntax) { // Check if the old program had this file already - const oldSourceFile = program && program.getSourceFile(fileName); + let oldSourceFile = program && program.getSourceFile(fileName); if (oldSourceFile) { // We already had a source file for this file name. Go to the registry to // ensure that we get the right up to date version of it. We need this to @@ -2850,7 +2851,7 @@ namespace ts { if (!sourceFile) { return false; } - const path = sourceFile.path || toPath(sourceFile.fileName, currentDirectory, getCanonicalFileName); + let path = sourceFile.path || toPath(sourceFile.fileName, currentDirectory, getCanonicalFileName); return sourceFile.version === hostCache.getVersion(path); } @@ -2861,13 +2862,13 @@ namespace ts { } // If number of files in the program do not match, it is not up-to-date - const rootFileNames = hostCache.getRootFileNames(); + let rootFileNames = hostCache.getRootFileNames(); if (program.getSourceFiles().length !== rootFileNames.length) { return false; } // If any file is not up-to-date, then the whole program is not up-to-date - for (const fileName of rootFileNames) { + for (let fileName of rootFileNames) { if (!sourceFileUpToDate(program.getSourceFile(fileName))) { return false; } @@ -2909,18 +2910,18 @@ namespace ts { function getSemanticDiagnostics(fileName: string): Diagnostic[] { synchronizeHostData(); - const targetSourceFile = getValidSourceFile(fileName); + let targetSourceFile = getValidSourceFile(fileName); // Only perform the action per file regardless of '-out' flag as LanguageServiceHost is expected to call this function per file. // Therefore only get diagnostics for given file. - const semanticDiagnostics = program.getSemanticDiagnostics(targetSourceFile, cancellationToken); + let semanticDiagnostics = program.getSemanticDiagnostics(targetSourceFile, cancellationToken); if (!program.getCompilerOptions().declaration) { return semanticDiagnostics; } // If '-d' is enabled, check for emitter error. One example of emitter error is export class implements non-export interface - const declarationDiagnostics = program.getDeclarationDiagnostics(targetSourceFile, cancellationToken); + let declarationDiagnostics = program.getDeclarationDiagnostics(targetSourceFile, cancellationToken); return concatenate(semanticDiagnostics, declarationDiagnostics); } @@ -2936,14 +2937,14 @@ namespace ts { * @return undefined if the name is of external module otherwise a name with striped of any quote */ function getCompletionEntryDisplayNameForSymbol(symbol: Symbol, target: ScriptTarget, performCharacterChecks: boolean, location: Node): string { - const displayName: string = getDeclaredName(program.getTypeChecker(), symbol, location); + let displayName: string = getDeclaredName(program.getTypeChecker(), symbol, location); if (displayName) { - const firstCharCode = displayName.charCodeAt(0); + let firstCharCode = displayName.charCodeAt(0); // First check of the displayName is not external module; if it is an external module, it is not valid entry if ((symbol.flags & SymbolFlags.Namespace) && (firstCharCode === CharacterCodes.singleQuote || firstCharCode === CharacterCodes.doubleQuote)) { // If the symbol is external module, don't show it in the completion list - // (i.e declare module "http" { const x; } | // <= request completion here, "http" should not be there) + // (i.e declare module "http" { let x; } | // <= request completion here, "http" should not be there) return undefined; } } @@ -2986,20 +2987,20 @@ namespace ts { } function getCompletionData(fileName: string, position: number) { - const typeChecker = program.getTypeChecker(); - const syntacticStart = new Date().getTime(); - const sourceFile = getValidSourceFile(fileName); - const isJavaScriptFile = isSourceFileJavaScript(sourceFile); + let typeChecker = program.getTypeChecker(); + let syntacticStart = new Date().getTime(); + let sourceFile = getValidSourceFile(fileName); + let isJavaScriptFile = isSourceFileJavaScript(sourceFile); let isJsDocTagName = false; let start = new Date().getTime(); - const currentToken = getTokenAtPosition(sourceFile, position); + let currentToken = getTokenAtPosition(sourceFile, position); log("getCompletionData: Get current token: " + (new Date().getTime() - start)); start = new Date().getTime(); // Completion not allowed inside comments, bail out if this is the case - const insideComment = isInsideComment(sourceFile, currentToken, position); + let insideComment = isInsideComment(sourceFile, currentToken, position); log("getCompletionData: Is inside comment: " + (new Date().getTime() - start)); if (insideComment) { @@ -3013,7 +3014,7 @@ namespace ts { // /** @type {number | string} */ // Completion should work in the brackets let insideJsDocTagExpression = false; - const tag = getJsDocTagAtPosition(sourceFile, position); + let tag = getJsDocTagAtPosition(sourceFile, position); if (tag) { if (tag.tagName.pos <= position && position <= tag.tagName.end) { isJsDocTagName = true; @@ -3023,7 +3024,7 @@ namespace ts { case SyntaxKind.JSDocTypeTag: case SyntaxKind.JSDocParameterTag: case SyntaxKind.JSDocReturnTag: - const tagWithExpression = tag; + let tagWithExpression = tag; if (tagWithExpression.typeExpression) { insideJsDocTagExpression = tagWithExpression.typeExpression.pos < position && position < tagWithExpression.typeExpression.end; } @@ -3044,7 +3045,7 @@ namespace ts { } start = new Date().getTime(); - const previousToken = findPrecedingToken(position, sourceFile); + let previousToken = findPrecedingToken(position, sourceFile); log("getCompletionData: Get previous token 1: " + (new Date().getTime() - start)); // The decision to provide completion depends on the contextToken, which is determined through the previousToken. @@ -3054,7 +3055,7 @@ namespace ts { // Check if the caret is at the end of an identifier; this is a partial identifier that we want to complete: e.g. a.toS| // Skip this partial identifier and adjust the contextToken to the token that precedes it. if (contextToken && position <= contextToken.end && isWord(contextToken.kind)) { - const start = new Date().getTime(); + let start = new Date().getTime(); contextToken = findPrecedingToken(contextToken.getFullStart(), sourceFile); log("getCompletionData: Get previous token 2: " + (new Date().getTime() - start)); } @@ -3075,7 +3076,7 @@ namespace ts { return undefined; } - const { parent, kind } = contextToken; + let { parent, kind } = contextToken; if (kind === SyntaxKind.DotToken) { if (parent.kind === SyntaxKind.PropertyAccessExpression) { node = (contextToken.parent).expression; @@ -3102,7 +3103,7 @@ namespace ts { } } - const semanticStart = new Date().getTime(); + let semanticStart = new Date().getTime(); let isMemberCompletion: boolean; let isNewIdentifierLocation: boolean; let symbols: Symbol[] = []; @@ -3111,7 +3112,7 @@ namespace ts { getTypeScriptMemberSymbols(); } else if (isRightOfOpenTag) { - const tagSymbols = typeChecker.getJsxIntrinsicTagNames(); + let tagSymbols = typeChecker.getJsxIntrinsicTagNames(); if (tryGetGlobalSymbols()) { symbols = tagSymbols.concat(symbols.filter(s => !!(s.flags & SymbolFlags.Value))); } @@ -3122,7 +3123,7 @@ namespace ts { isNewIdentifierLocation = false; } else if (isStartingCloseTag) { - const tagName = (contextToken.parent.parent).openingElement.tagName; + let tagName = (contextToken.parent.parent).openingElement.tagName; symbols = [typeChecker.getSymbolAtLocation(tagName)]; isMemberCompletion = true; @@ -3156,7 +3157,7 @@ namespace ts { if (symbol && symbol.flags & SymbolFlags.HasExports) { // Extract module or enum members - const exportedSymbols = typeChecker.getExportsOfModule(symbol); + let exportedSymbols = typeChecker.getExportsOfModule(symbol); forEach(exportedSymbols, symbol => { if (typeChecker.isValidPropertyAccess((node.parent), symbol.name)) { symbols.push(symbol); @@ -3165,14 +3166,14 @@ namespace ts { } } - const type = typeChecker.getTypeAtLocation(node); + let type = typeChecker.getTypeAtLocation(node); addTypeProperties(type); } function addTypeProperties(type: Type) { if (type) { // Filter private properties - for (const symbol of type.getApparentProperties()) { + for (let symbol of type.getApparentProperties()) { if (typeChecker.isValidPropertyAccess((node.parent), symbol.name)) { symbols.push(symbol); } @@ -3184,8 +3185,8 @@ namespace ts { // each individual type has. This is because we're going to add all identifiers // anyways. So we might as well elevate the members that were at least part // of the individual types to a higher status since we know what they are. - const unionType = type; - for (const elementType of unionType.types) { + let unionType = type; + for (let elementType of unionType.types) { addTypeProperties(elementType); } } @@ -3255,14 +3256,14 @@ namespace ts { // - 'contextToken' was adjusted to the token prior to 'previousToken' // because we were at the end of an identifier. // - 'previousToken' is defined. - const adjustedPosition = previousToken !== contextToken ? + let adjustedPosition = previousToken !== contextToken ? previousToken.getStart() : position; - const scopeNode = getScopeNode(contextToken, adjustedPosition, sourceFile) || sourceFile; + let scopeNode = getScopeNode(contextToken, adjustedPosition, sourceFile) || sourceFile; /// TODO filter meaning based on the current context - const symbolMeanings = SymbolFlags.Type | SymbolFlags.Value | SymbolFlags.Namespace | SymbolFlags.Alias; + let symbolMeanings = SymbolFlags.Type | SymbolFlags.Value | SymbolFlags.Namespace | SymbolFlags.Alias; symbols = typeChecker.getSymbolsInScope(scopeNode, symbolMeanings); return true; @@ -3281,8 +3282,8 @@ namespace ts { } function isCompletionListBlocker(contextToken: Node): boolean { - const start = new Date().getTime(); - const result = isInStringOrRegularExpressionOrTemplateLiteral(contextToken) || + let start = new Date().getTime(); + let result = isInStringOrRegularExpressionOrTemplateLiteral(contextToken) || isSolelyIdentifierDefinitionLocation(contextToken) || isDotOfNumericLiteral(contextToken) || isInJsxText(contextToken); @@ -3309,27 +3310,27 @@ namespace ts { function isNewIdentifierDefinitionLocation(previousToken: Node): boolean { if (previousToken) { - const containingNodeKind = previousToken.parent.kind; + let containingNodeKind = previousToken.parent.kind; switch (previousToken.kind) { case SyntaxKind.CommaToken: return containingNodeKind === SyntaxKind.CallExpression // func( a, | || containingNodeKind === SyntaxKind.Constructor // constructor( a, | /* public, protected, private keywords are allowed here, so show completion */ || containingNodeKind === SyntaxKind.NewExpression // new C(a, | || containingNodeKind === SyntaxKind.ArrayLiteralExpression // [a, | - || containingNodeKind === SyntaxKind.BinaryExpression // const x = (a, | + || containingNodeKind === SyntaxKind.BinaryExpression // let x = (a, | || containingNodeKind === SyntaxKind.FunctionType; // var x: (s: string, list| case SyntaxKind.OpenParenToken: return containingNodeKind === SyntaxKind.CallExpression // func( | || containingNodeKind === SyntaxKind.Constructor // constructor( | || containingNodeKind === SyntaxKind.NewExpression // new C(a| - || containingNodeKind === SyntaxKind.ParenthesizedExpression // const x = (a| + || containingNodeKind === SyntaxKind.ParenthesizedExpression // let x = (a| || containingNodeKind === SyntaxKind.ParenthesizedType; // function F(pred: (a| /* this can become an arrow function, where 'a' is the argument */ case SyntaxKind.OpenBracketToken: return containingNodeKind === SyntaxKind.ArrayLiteralExpression // [ | || containingNodeKind === SyntaxKind.IndexSignature // [ | : string ] - || containingNodeKind === SyntaxKind.ComputedPropertyName; // [ | /* this can become an index signature */ + || containingNodeKind === SyntaxKind.ComputedPropertyName // [ | /* this can become an index signature */ case SyntaxKind.ModuleKeyword: // module | case SyntaxKind.NamespaceKeyword: // namespace | @@ -3342,7 +3343,7 @@ namespace ts { return containingNodeKind === SyntaxKind.ClassDeclaration; // class A{ | case SyntaxKind.EqualsToken: - return containingNodeKind === SyntaxKind.VariableDeclaration // const x = a| + return containingNodeKind === SyntaxKind.VariableDeclaration // let x = a| || containingNodeKind === SyntaxKind.BinaryExpression; // x = a| case SyntaxKind.TemplateHead: @@ -3374,8 +3375,8 @@ namespace ts { || contextToken.kind === SyntaxKind.StringLiteralType || contextToken.kind === SyntaxKind.RegularExpressionLiteral || isTemplateLiteralKind(contextToken.kind)) { - const start = contextToken.getStart(); - const end = contextToken.getEnd(); + let start = contextToken.getStart(); + let end = contextToken.getEnd(); // To be "in" one of these literals, the position has to be: // 1. entirely within the token text. @@ -3419,7 +3420,7 @@ namespace ts { // We are *only* completing on properties from the type being destructured. isNewIdentifierLocation = false; - const rootDeclaration = getRootDeclaration(objectLikeContainer.parent); + let rootDeclaration = getRootDeclaration(objectLikeContainer.parent); if (isVariableLike(rootDeclaration)) { // We don't want to complete using the type acquired by the shape // of the binding pattern; we are only interested in types acquired @@ -3430,7 +3431,7 @@ namespace ts { } } else { - Debug.fail("Root declaration is not variable-like."); + Debug.fail("Root declaration is not variable-like.") } } else { @@ -3441,7 +3442,7 @@ namespace ts { return false; } - const typeMembers = typeChecker.getPropertiesOfType(typeForObject); + let typeMembers = typeChecker.getPropertiesOfType(typeForObject); if (typeMembers && typeMembers.length > 0) { // Add filtered items to the completion list symbols = filterObjectMembersList(typeMembers, existingMembers); @@ -3465,11 +3466,11 @@ namespace ts { * @returns true if 'symbols' was successfully populated; false otherwise. */ function tryGetImportOrExportClauseCompletionSymbols(namedImportsOrExports: NamedImportsOrExports): boolean { - const declarationKind = namedImportsOrExports.kind === SyntaxKind.NamedImports ? + let declarationKind = namedImportsOrExports.kind === SyntaxKind.NamedImports ? SyntaxKind.ImportDeclaration : SyntaxKind.ExportDeclaration; - const importOrExportDeclaration = getAncestor(namedImportsOrExports, declarationKind); - const moduleSpecifier = importOrExportDeclaration.moduleSpecifier; + let importOrExportDeclaration = getAncestor(namedImportsOrExports, declarationKind); + let moduleSpecifier = importOrExportDeclaration.moduleSpecifier; if (!moduleSpecifier) { return false; @@ -3479,7 +3480,7 @@ namespace ts { isNewIdentifierLocation = false; let exports: Symbol[]; - const moduleSpecifierSymbol = typeChecker.getSymbolAtLocation(importOrExportDeclaration.moduleSpecifier); + let moduleSpecifierSymbol = typeChecker.getSymbolAtLocation(importOrExportDeclaration.moduleSpecifier); if (moduleSpecifierSymbol) { exports = typeChecker.getExportsOfModule(moduleSpecifierSymbol); } @@ -3496,9 +3497,9 @@ namespace ts { function tryGetObjectLikeCompletionContainer(contextToken: Node): ObjectLiteralExpression | BindingPattern { if (contextToken) { switch (contextToken.kind) { - case SyntaxKind.OpenBraceToken: // const x = { | - case SyntaxKind.CommaToken: // const x = { a: 0, | - const parent = contextToken.parent; + case SyntaxKind.OpenBraceToken: // let x = { | + case SyntaxKind.CommaToken: // let x = { a: 0, | + let parent = contextToken.parent; if (parent && (parent.kind === SyntaxKind.ObjectLiteralExpression || parent.kind === SyntaxKind.ObjectBindingPattern)) { return parent; } @@ -3531,8 +3532,8 @@ namespace ts { function tryGetContainingJsxElement(contextToken: Node): JsxOpeningLikeElement { if (contextToken) { - const parent = contextToken.parent; - switch (contextToken.kind) { + let parent = contextToken.parent; + switch(contextToken.kind) { case SyntaxKind.LessThanSlashToken: case SyntaxKind.SlashToken: case SyntaxKind.Identifier: @@ -3595,7 +3596,7 @@ namespace ts { * @returns true if we are certain that the currently edited location must define a new location; false otherwise. */ function isSolelyIdentifierDefinitionLocation(contextToken: Node): boolean { - const containingNodeKind = contextToken.parent.kind; + let containingNodeKind = contextToken.parent.kind; switch (contextToken.kind) { case SyntaxKind.CommaToken: return containingNodeKind === SyntaxKind.VariableDeclaration || @@ -3625,13 +3626,13 @@ namespace ts { case SyntaxKind.OpenBraceToken: return containingNodeKind === SyntaxKind.EnumDeclaration || // enum a { | containingNodeKind === SyntaxKind.InterfaceDeclaration || // interface a { | - containingNodeKind === SyntaxKind.TypeLiteral; // const x : { | + containingNodeKind === SyntaxKind.TypeLiteral; // let x : { | case SyntaxKind.SemicolonToken: return containingNodeKind === SyntaxKind.PropertySignature && contextToken.parent && contextToken.parent.parent && (contextToken.parent.parent.kind === SyntaxKind.InterfaceDeclaration || // interface a { f; | - contextToken.parent.parent.kind === SyntaxKind.TypeLiteral); // const x : { a; | + contextToken.parent.parent.kind === SyntaxKind.TypeLiteral); // let x : { a; | case SyntaxKind.LessThanToken: return containingNodeKind === SyntaxKind.ClassDeclaration || // class A< | @@ -3698,7 +3699,7 @@ namespace ts { function isDotOfNumericLiteral(contextToken: Node): boolean { if (contextToken.kind === SyntaxKind.NumericLiteral) { - const text = contextToken.getFullText(); + let text = contextToken.getFullText(); return text.charAt(text.length - 1) === "."; } @@ -3715,15 +3716,15 @@ namespace ts { * do not occur at the current position and have not otherwise been typed. */ function filterNamedImportOrExportCompletionItems(exportsOfModule: Symbol[], namedImportsOrExports: ImportOrExportSpecifier[]): Symbol[] { - const exisingImportsOrExports: Map = {}; + let exisingImportsOrExports: Map = {}; - for (const element of namedImportsOrExports) { + for (let element of namedImportsOrExports) { // If this is the current item we are editing right now, do not filter it out if (element.getStart() <= position && position <= element.getEnd()) { continue; } - const name = element.propertyName || element.name; + let name = element.propertyName || element.name; exisingImportsOrExports[name.text] = true; } @@ -3745,8 +3746,8 @@ namespace ts { return contextualMemberSymbols; } - const existingMemberNames: Map = {}; - for (const m of existingMembers) { + let existingMemberNames: Map = {}; + for (let m of existingMembers) { // Ignore omitted expressions for missing members if (m.kind !== SyntaxKind.PropertyAssignment && m.kind !== SyntaxKind.ShorthandPropertyAssignment && @@ -3765,7 +3766,7 @@ namespace ts { if (m.kind === SyntaxKind.BindingElement && (m).propertyName) { // include only identifiers in completion list if ((m).propertyName.kind === SyntaxKind.Identifier) { - existingName = ((m).propertyName).text; + existingName = ((m).propertyName).text } } else { @@ -3788,8 +3789,8 @@ namespace ts { * do not occur at the current position and have not otherwise been typed. */ function filterJsxAttributes(symbols: Symbol[], attributes: NodeArray): Symbol[] { - const seenNames: Map = {}; - for (const attr of attributes) { + let seenNames: Map = {}; + for (let attr of attributes) { // If this is the current item we are editing right now, do not filter it out if (attr.getStart() <= position && position <= attr.getEnd()) { continue; @@ -3808,21 +3809,21 @@ namespace ts { function getCompletionsAtPosition(fileName: string, position: number): CompletionInfo { synchronizeHostData(); - const completionData = getCompletionData(fileName, position); + let completionData = getCompletionData(fileName, position); if (!completionData) { return undefined; } - const { symbols, isMemberCompletion, isNewIdentifierLocation, location, isRightOfDot, isJsDocTagName } = completionData; + let { symbols, isMemberCompletion, isNewIdentifierLocation, location, isRightOfDot, isJsDocTagName } = completionData; if (isJsDocTagName) { // If the current position is a jsDoc tag name, only tag names should be provided for completion return { isMemberCompletion: false, isNewIdentifierLocation: false, entries: getAllJsDocCompletionEntries() }; } - const sourceFile = getValidSourceFile(fileName); + let sourceFile = getValidSourceFile(fileName); - const entries: CompletionEntry[] = []; + let entries: CompletionEntry[] = []; if (isRightOfDot && isSourceFileJavaScript(sourceFile)) { const uniqueNames = getCompletionEntriesFromSymbols(symbols, entries); @@ -3844,16 +3845,16 @@ namespace ts { return { isMemberCompletion, isNewIdentifierLocation, entries }; function getJavaScriptCompletionEntries(sourceFile: SourceFile, uniqueNames: Map): CompletionEntry[] { - const entries: CompletionEntry[] = []; - const target = program.getCompilerOptions().target; + let entries: CompletionEntry[] = []; + let target = program.getCompilerOptions().target; - const nameTable = getNameTable(sourceFile); - for (const name in nameTable) { + let nameTable = getNameTable(sourceFile); + for (let name in nameTable) { if (!uniqueNames[name]) { uniqueNames[name] = name; - const displayName = getCompletionEntryDisplayName(name, target, /*performCharacterChecks*/ true); + let displayName = getCompletionEntryDisplayName(name, target, /*performCharacterChecks:*/ true); if (displayName) { - const entry = { + let entry = { name: displayName, kind: ScriptElementKind.warning, kindModifiers: "", @@ -3874,7 +3875,7 @@ namespace ts { kind: ScriptElementKind.keyword, kindModifiers: "", sortText: "0", - }; + } })); } @@ -3882,7 +3883,7 @@ namespace ts { // Try to get a valid display name for this symbol, if we could not find one, then ignore it. // We would like to only show things that can be added after a dot, so for instance numeric properties can // not be accessed with a dot (a.1 <- invalid) - const displayName = getCompletionEntryDisplayNameForSymbol(symbol, program.getCompilerOptions().target, /*performCharacterChecks*/ true, location); + let displayName = getCompletionEntryDisplayNameForSymbol(symbol, program.getCompilerOptions().target, /*performCharacterChecks:*/ true, location); if (!displayName) { return undefined; } @@ -3904,13 +3905,13 @@ namespace ts { } function getCompletionEntriesFromSymbols(symbols: Symbol[], entries: CompletionEntry[]): Map { - const start = new Date().getTime(); - const uniqueNames: Map = {}; + let start = new Date().getTime(); + let uniqueNames: Map = {}; if (symbols) { - for (const symbol of symbols) { - const entry = createCompletionEntry(symbol, location); + for (let symbol of symbols) { + let entry = createCompletionEntry(symbol, location); if (entry) { - const id = escapeIdentifier(entry.name); + let id = escapeIdentifier(entry.name); if (!lookUp(uniqueNames, id)) { entries.push(entry); uniqueNames[id] = id; @@ -3928,19 +3929,19 @@ namespace ts { synchronizeHostData(); // Compute all the completion symbols again. - const completionData = getCompletionData(fileName, position); + let completionData = getCompletionData(fileName, position); if (completionData) { - const { symbols, location } = completionData; + let { symbols, location } = completionData; // Find the symbol with the matching entry name. - const target = program.getCompilerOptions().target; + let target = program.getCompilerOptions().target; // We don't need to perform character checks here because we're only comparing the // name against 'entryName' (which is known to be good), not building a new // completion entry. - const symbol = forEach(symbols, s => getCompletionEntryDisplayNameForSymbol(s, target, /*performCharacterChecks*/ false, location) === entryName ? s : undefined); + let symbol = forEach(symbols, s => getCompletionEntryDisplayNameForSymbol(s, target, /*performCharacterChecks:*/ false, location) === entryName ? s : undefined); if (symbol) { - const { displayParts, documentation, symbolKind } = getSymbolDisplayPartsDocumentationAndSymbolKind(symbol, getValidSourceFile(fileName), location, location, SemanticMeaning.All); + let { displayParts, documentation, symbolKind } = getSymbolDisplayPartsDocumentationAndSymbolKind(symbol, getValidSourceFile(fileName), location, location, SemanticMeaning.All); return { name: entryName, kindModifiers: getSymbolModifiers(symbol), @@ -3952,7 +3953,7 @@ namespace ts { } // Didn't find a symbol with this name. See if we can find a keyword instead. - const keywordCompletion = forEach(keywordCompletions, c => c.name === entryName); + let keywordCompletion = forEach(keywordCompletions, c => c.name === entryName); if (keywordCompletion) { return { name: entryName, @@ -3968,7 +3969,7 @@ namespace ts { // TODO(drosen): use contextual SemanticMeaning. function getSymbolKind(symbol: Symbol, location: Node): string { - const flags = symbol.getFlags(); + let flags = symbol.getFlags(); if (flags & SymbolFlags.Class) return getDeclarationOfKind(symbol, SyntaxKind.ClassExpression) ? ScriptElementKind.localClassElement : ScriptElementKind.classElement; @@ -3977,7 +3978,7 @@ namespace ts { if (flags & SymbolFlags.Interface) return ScriptElementKind.interfaceElement; if (flags & SymbolFlags.TypeParameter) return ScriptElementKind.typeParameterElement; - const result = getSymbolKindOfConstructorPropertyMethodAccessorFunctionOrVar(symbol, flags, location); + let result = getSymbolKindOfConstructorPropertyMethodAccessorFunctionOrVar(symbol, flags, location); if (result === ScriptElementKind.unknown) { if (flags & SymbolFlags.TypeParameter) return ScriptElementKind.typeParameterElement; if (flags & SymbolFlags.EnumMember) return ScriptElementKind.variableElement; @@ -3989,7 +3990,7 @@ namespace ts { } function getSymbolKindOfConstructorPropertyMethodAccessorFunctionOrVar(symbol: Symbol, flags: SymbolFlags, location: Node) { - const typeChecker = program.getTypeChecker(); + let typeChecker = program.getTypeChecker(); if (typeChecker.isUndefinedSymbol(symbol)) { return ScriptElementKind.variableElement; @@ -4018,8 +4019,8 @@ namespace ts { if (flags & SymbolFlags.Property) { if (flags & SymbolFlags.SyntheticProperty) { // If union property is result of union of non method (property/accessors/variables), it is labeled as property - const unionPropertyKind = forEach(typeChecker.getRootSymbols(symbol), rootSymbol => { - const rootSymbolFlags = rootSymbol.getFlags(); + let unionPropertyKind = forEach(typeChecker.getRootSymbols(symbol), rootSymbol => { + let rootSymbolFlags = rootSymbol.getFlags(); if (rootSymbolFlags & (SymbolFlags.PropertyOrAccessor | SymbolFlags.Variable)) { return ScriptElementKind.memberVariableElement; } @@ -4027,8 +4028,8 @@ namespace ts { }); if (!unionPropertyKind) { // If this was union of all methods, - // make sure it has call signatures before we can label it as method - const typeOfUnionProperty = typeChecker.getTypeOfSymbolAtLocation(symbol, location); + //make sure it has call signatures before we can label it as method + let typeOfUnionProperty = typeChecker.getTypeOfSymbolAtLocation(symbol, location); if (typeOfUnionProperty.getCallSignatures().length) { return ScriptElementKind.memberFunctionElement; } @@ -4052,11 +4053,11 @@ namespace ts { function getSymbolDisplayPartsDocumentationAndSymbolKind(symbol: Symbol, sourceFile: SourceFile, enclosingDeclaration: Node, location: Node, semanticMeaning = getMeaningFromLocation(location)) { - const typeChecker = program.getTypeChecker(); + let typeChecker = program.getTypeChecker(); - const displayParts: SymbolDisplayPart[] = []; + let displayParts: SymbolDisplayPart[] = []; let documentation: SymbolDisplayPart[]; - const symbolFlags = symbol.flags; + let symbolFlags = symbol.flags; let symbolKind = getSymbolKindOfConstructorPropertyMethodAccessorFunctionOrVar(symbol, symbolFlags, location); let hasAddedSymbolInfo: boolean; let type: Type; @@ -4072,7 +4073,7 @@ namespace ts { type = typeChecker.getTypeOfSymbolAtLocation(symbol, location); if (type) { if (location.parent && location.parent.kind === SyntaxKind.PropertyAccessExpression) { - const right = (location.parent).name; + let right = (location.parent).name; // Either the location is on the right of a property access, or on the left and the right is missing if (right === location || (right && right.getFullWidth() === 0)) { location = location.parent; @@ -4089,15 +4090,15 @@ namespace ts { } if (callExpression) { - const candidateSignatures: Signature[] = []; + let candidateSignatures: Signature[] = []; signature = typeChecker.getResolvedSignature(callExpression, candidateSignatures); if (!signature && candidateSignatures.length) { // Use the first candidate: signature = candidateSignatures[0]; } - const useConstructSignatures = callExpression.kind === SyntaxKind.NewExpression || callExpression.expression.kind === SyntaxKind.SuperKeyword; - const allSignatures = useConstructSignatures ? type.getConstructSignatures() : type.getCallSignatures(); + let useConstructSignatures = callExpression.kind === SyntaxKind.NewExpression || callExpression.expression.kind === SyntaxKind.SuperKeyword; + let allSignatures = useConstructSignatures ? type.getConstructSignatures() : type.getCallSignatures(); if (!contains(allSignatures, signature.target) && !contains(allSignatures, signature)) { // Get the first signature if there is one -- allSignatures may contain @@ -4155,8 +4156,8 @@ namespace ts { else if ((isNameOfFunctionDeclaration(location) && !(symbol.flags & SymbolFlags.Accessor)) || // name of function declaration (location.kind === SyntaxKind.ConstructorKeyword && location.parent.kind === SyntaxKind.Constructor)) { // At constructor keyword of constructor declaration // get the signature from the declaration and write it - const functionDeclaration = location.parent; - const allSignatures = functionDeclaration.kind === SyntaxKind.Constructor ? type.getConstructSignatures() : type.getCallSignatures(); + let functionDeclaration = location.parent; + let allSignatures = functionDeclaration.kind === SyntaxKind.Constructor ? type.getConstructSignatures() : type.getCallSignatures(); if (!typeChecker.isImplementationOfOverload(functionDeclaration)) { signature = typeChecker.getSignatureFromDeclaration(functionDeclaration); } @@ -4225,8 +4226,8 @@ namespace ts { } if (symbolFlags & SymbolFlags.Module) { addNewLineIfDisplayPartsExist(); - const declaration = getDeclarationOfKind(symbol, SyntaxKind.ModuleDeclaration); - const isNamespace = declaration && declaration.name && declaration.name.kind === SyntaxKind.Identifier; + let declaration = getDeclarationOfKind(symbol, SyntaxKind.ModuleDeclaration); + let isNamespace = declaration && declaration.name && declaration.name.kind === SyntaxKind.Identifier; displayParts.push(keywordPart(isNamespace ? SyntaxKind.NamespaceKeyword : SyntaxKind.ModuleKeyword)); displayParts.push(spacePart()); addFullSymbolName(symbol); @@ -4278,9 +4279,9 @@ namespace ts { } if (symbolFlags & SymbolFlags.EnumMember) { addPrefixForAnyFunctionOrVar(symbol, "enum member"); - const declaration = symbol.declarations[0]; + let declaration = symbol.declarations[0]; if (declaration.kind === SyntaxKind.EnumMember) { - const constantValue = typeChecker.getConstantValue(declaration); + let constantValue = typeChecker.getConstantValue(declaration); if (constantValue !== undefined) { displayParts.push(spacePart()); displayParts.push(operatorPart(SyntaxKind.EqualsToken)); @@ -4296,7 +4297,7 @@ namespace ts { addFullSymbolName(symbol); ts.forEach(symbol.declarations, declaration => { if (declaration.kind === SyntaxKind.ImportEqualsDeclaration) { - const importEqualsDeclaration = declaration; + let importEqualsDeclaration = declaration; if (isExternalModuleImportEqualsDeclaration(importEqualsDeclaration)) { displayParts.push(spacePart()); displayParts.push(operatorPart(SyntaxKind.EqualsToken)); @@ -4307,7 +4308,7 @@ namespace ts { displayParts.push(punctuationPart(SyntaxKind.CloseParenToken)); } else { - const internalAliasSymbol = typeChecker.getSymbolAtLocation(importEqualsDeclaration.moduleReference); + let internalAliasSymbol = typeChecker.getSymbolAtLocation(importEqualsDeclaration.moduleReference); if (internalAliasSymbol) { displayParts.push(spacePart()); displayParts.push(operatorPart(SyntaxKind.EqualsToken)); @@ -4331,7 +4332,7 @@ namespace ts { displayParts.push(spacePart()); // If the type is type parameter, format it specially if (type.symbol && type.symbol.flags & SymbolFlags.TypeParameter) { - const typeParameterParts = mapToDisplayParts(writer => { + let typeParameterParts = mapToDisplayParts(writer => { typeChecker.getSymbolDisplayBuilder().buildTypeParameterDisplay(type, writer, enclosingDeclaration); }); addRange(displayParts, typeParameterParts); @@ -4346,7 +4347,7 @@ namespace ts { symbolFlags & SymbolFlags.Signature || symbolFlags & SymbolFlags.Accessor || symbolKind === ScriptElementKind.memberFunctionElement) { - const allSignatures = type.getCallSignatures(); + let allSignatures = type.getCallSignatures(); addSignatureDisplayParts(allSignatures[0], allSignatures); } } @@ -4369,7 +4370,7 @@ namespace ts { } function addFullSymbolName(symbol: Symbol, enclosingDeclaration?: Node) { - const fullSymbolDisplayParts = symbolToDisplayParts(typeChecker, symbol, enclosingDeclaration || sourceFile, /*meaning*/ undefined, + let fullSymbolDisplayParts = symbolToDisplayParts(typeChecker, symbol, enclosingDeclaration || sourceFile, /*meaning*/ undefined, SymbolFormatFlags.WriteTypeParametersOrArguments | SymbolFormatFlags.UseOnlyExternalAliasing); addRange(displayParts, fullSymbolDisplayParts); } @@ -4415,7 +4416,7 @@ namespace ts { } function writeTypeParametersOfSymbol(symbol: Symbol, enclosingDeclaration: Node) { - const typeParameterParts = mapToDisplayParts(writer => { + let typeParameterParts = mapToDisplayParts(writer => { typeChecker.getSymbolDisplayBuilder().buildTypeParameterDisplayFromSymbol(symbol, writer, enclosingDeclaration); }); addRange(displayParts, typeParameterParts); @@ -4425,8 +4426,8 @@ namespace ts { function getQuickInfoAtPosition(fileName: string, position: number): QuickInfo { synchronizeHostData(); - const sourceFile = getValidSourceFile(fileName); - const node = getTouchingPropertyName(sourceFile, position); + let sourceFile = getValidSourceFile(fileName); + let node = getTouchingPropertyName(sourceFile, position); if (!node) { return undefined; } @@ -4435,8 +4436,8 @@ namespace ts { return undefined; } - const typeChecker = program.getTypeChecker(); - const symbol = typeChecker.getSymbolAtLocation(node); + let typeChecker = program.getTypeChecker(); + let symbol = typeChecker.getSymbolAtLocation(node); if (!symbol) { // Try getting just type at this position and show @@ -4448,7 +4449,7 @@ namespace ts { case SyntaxKind.ThisType: case SyntaxKind.SuperKeyword: // For the identifiers/this/super etc get the type at position - const type = typeChecker.getTypeAtLocation(node); + let type = typeChecker.getTypeAtLocation(node); if (type) { return { kind: ScriptElementKind.unknown, @@ -4463,7 +4464,7 @@ namespace ts { return undefined; } - const displayPartsDocumentationsAndKind = getSymbolDisplayPartsDocumentationAndSymbolKind(symbol, sourceFile, getContainerNode(node), node); + let displayPartsDocumentationsAndKind = getSymbolDisplayPartsDocumentationAndSymbolKind(symbol, sourceFile, getContainerNode(node), node); return { kind: displayPartsDocumentationsAndKind.symbolKind, kindModifiers: getSymbolModifiers(symbol), @@ -4485,13 +4486,13 @@ namespace ts { } function getDefinitionFromSymbol(symbol: Symbol, node: Node): DefinitionInfo[] { - const typeChecker = program.getTypeChecker(); - const result: DefinitionInfo[] = []; - const declarations = symbol.getDeclarations(); - const symbolName = typeChecker.symbolToString(symbol); // Do not get scoped name, just the name of the symbol - const symbolKind = getSymbolKind(symbol, node); - const containerSymbol = symbol.parent; - const containerName = containerSymbol ? typeChecker.symbolToString(containerSymbol, node) : ""; + let typeChecker = program.getTypeChecker(); + let result: DefinitionInfo[] = []; + let declarations = symbol.getDeclarations(); + let symbolName = typeChecker.symbolToString(symbol); // Do not get scoped name, just the name of the symbol + let symbolKind = getSymbolKind(symbol, node); + let containerSymbol = symbol.parent; + let containerName = containerSymbol ? typeChecker.symbolToString(containerSymbol, node) : ""; if (!tryAddConstructSignature(symbol, node, symbolKind, symbolName, containerName, result) && !tryAddCallSignature(symbol, node, symbolKind, symbolName, containerName, result)) { @@ -4509,7 +4510,7 @@ namespace ts { if (isNewExpressionTarget(location) || location.kind === SyntaxKind.ConstructorKeyword) { if (symbol.flags & SymbolFlags.Class) { // Find the first class-like declaration and try to get the construct signature. - for (const declaration of symbol.getDeclarations()) { + for (let declaration of symbol.getDeclarations()) { if (isClassLike(declaration)) { return tryAddSignature(declaration.members, /*selectConstructors*/ true, @@ -4534,7 +4535,7 @@ namespace ts { } function tryAddSignature(signatureDeclarations: Declaration[], selectConstructors: boolean, symbolKind: string, symbolName: string, containerName: string, result: DefinitionInfo[]) { - const declarations: Declaration[] = []; + let declarations: Declaration[] = []; let definition: Declaration; forEach(signatureDeclarations, d => { @@ -4562,24 +4563,24 @@ namespace ts { function getDefinitionAtPosition(fileName: string, position: number): DefinitionInfo[] { synchronizeHostData(); - const sourceFile = getValidSourceFile(fileName); + let sourceFile = getValidSourceFile(fileName); - const node = getTouchingPropertyName(sourceFile, position); + let node = getTouchingPropertyName(sourceFile, position); if (!node) { return undefined; } // Labels if (isJumpStatementTarget(node)) { - const labelName = (node).text; - const label = getTargetLabel((node.parent), (node).text); + let labelName = (node).text; + let label = getTargetLabel((node.parent), (node).text); return label ? [createDefinitionInfo(label, ScriptElementKind.label, labelName, /*containerName*/ undefined)] : undefined; } /// Triple slash reference comments - const comment = forEach(sourceFile.referencedFiles, r => (r.pos <= position && position < r.end) ? r : undefined); + let comment = forEach(sourceFile.referencedFiles, r => (r.pos <= position && position < r.end) ? r : undefined); if (comment) { - const referenceFile = tryResolveScriptReference(program, sourceFile, comment); + let referenceFile = tryResolveScriptReference(program, sourceFile, comment); if (referenceFile) { return [{ fileName: referenceFile.fileName, @@ -4593,7 +4594,7 @@ namespace ts { return undefined; } - const typeChecker = program.getTypeChecker(); + let typeChecker = program.getTypeChecker(); let symbol = typeChecker.getSymbolAtLocation(node); // Could not find a symbol e.g. node is string or number keyword, @@ -4607,7 +4608,7 @@ namespace ts { // import {A, B} from "mod"; // to jump to the implementation directly. if (symbol.flags & SymbolFlags.Alias) { - const declaration = symbol.declarations[0]; + let declaration = symbol.declarations[0]; if (node.kind === SyntaxKind.Identifier && node.parent === declaration) { symbol = typeChecker.getAliasedSymbol(symbol); } @@ -4619,15 +4620,15 @@ namespace ts { // is performed at the location of property access, we would like to go to definition of the property in the short-hand // assignment. This case and others are handled by the following code. if (node.parent.kind === SyntaxKind.ShorthandPropertyAssignment) { - const shorthandSymbol = typeChecker.getShorthandAssignmentValueSymbol(symbol.valueDeclaration); + let shorthandSymbol = typeChecker.getShorthandAssignmentValueSymbol(symbol.valueDeclaration); if (!shorthandSymbol) { return []; } - const shorthandDeclarations = shorthandSymbol.getDeclarations(); - const shorthandSymbolKind = getSymbolKind(shorthandSymbol, node); - const shorthandSymbolName = typeChecker.symbolToString(shorthandSymbol); - const shorthandContainerName = typeChecker.symbolToString(symbol.parent, node); + let shorthandDeclarations = shorthandSymbol.getDeclarations(); + let shorthandSymbolKind = getSymbolKind(shorthandSymbol, node); + let shorthandSymbolName = typeChecker.symbolToString(shorthandSymbol); + let shorthandContainerName = typeChecker.symbolToString(symbol.parent, node); return map(shorthandDeclarations, declaration => createDefinitionInfo(declaration, shorthandSymbolKind, shorthandSymbolName, shorthandContainerName)); } @@ -4639,27 +4640,27 @@ namespace ts { function getTypeDefinitionAtPosition(fileName: string, position: number): DefinitionInfo[] { synchronizeHostData(); - const sourceFile = getValidSourceFile(fileName); + let sourceFile = getValidSourceFile(fileName); - const node = getTouchingPropertyName(sourceFile, position); + let node = getTouchingPropertyName(sourceFile, position); if (!node) { return undefined; } - const typeChecker = program.getTypeChecker(); + let typeChecker = program.getTypeChecker(); - const symbol = typeChecker.getSymbolAtLocation(node); + let symbol = typeChecker.getSymbolAtLocation(node); if (!symbol) { return undefined; } - const type = typeChecker.getTypeOfSymbolAtLocation(symbol, node); + let type = typeChecker.getTypeOfSymbolAtLocation(symbol, node); if (!type) { return undefined; } if (type.flags & TypeFlags.Union) { - const result: DefinitionInfo[] = []; + let result: DefinitionInfo[] = []; forEach((type).types, t => { if (t.symbol) { addRange(/*to*/ result, /*from*/ getDefinitionFromSymbol(t.symbol, node)); @@ -4679,7 +4680,7 @@ namespace ts { let results = getOccurrencesAtPositionCore(fileName, position); if (results) { - const sourceFile = getCanonicalFileName(normalizeSlashes(fileName)); + let sourceFile = getCanonicalFileName(normalizeSlashes(fileName)); // Get occurrences only supports reporting occurrences for the file queried. So // filter down to that list. @@ -4693,10 +4694,10 @@ namespace ts { synchronizeHostData(); filesToSearch = map(filesToSearch, normalizeSlashes); - const sourceFilesToSearch = filter(program.getSourceFiles(), f => contains(filesToSearch, f.fileName)); - const sourceFile = getValidSourceFile(fileName); + let sourceFilesToSearch = filter(program.getSourceFiles(), f => contains(filesToSearch, f.fileName)); + let sourceFile = getValidSourceFile(fileName); - const node = getTouchingWord(sourceFile, position); + let node = getTouchingWord(sourceFile, position); if (!node) { return undefined; } @@ -4704,8 +4705,8 @@ namespace ts { return getSemanticDocumentHighlights(node) || getSyntacticDocumentHighlights(node); function getHighlightSpanForNode(node: Node): HighlightSpan { - const start = node.getStart(); - const end = node.getEnd(); + let start = node.getStart(); + let end = node.getEnd(); return { fileName: sourceFile.fileName, @@ -4722,7 +4723,7 @@ namespace ts { isLiteralNameOfPropertyDeclarationOrIndexAccess(node) || isNameOfExternalModuleImportOrDeclaration(node)) { - const referencedSymbols = getReferencedSymbolsForNode(node, sourceFilesToSearch, /*findInStrings*/ false, /*findInComments*/ false); + let referencedSymbols = getReferencedSymbolsForNode(node, sourceFilesToSearch, /*findInStrings:*/ false, /*findInComments:*/ false); return convertReferencedSymbols(referencedSymbols); } @@ -4733,11 +4734,11 @@ namespace ts { return undefined; } - const fileNameToDocumentHighlights: Map = {}; - const result: DocumentHighlights[] = []; - for (const referencedSymbol of referencedSymbols) { - for (const referenceEntry of referencedSymbol.references) { - const fileName = referenceEntry.fileName; + let fileNameToDocumentHighlights: Map = {}; + let result: DocumentHighlights[] = []; + for (let referencedSymbol of referencedSymbols) { + for (let referenceEntry of referencedSymbol.references) { + let fileName = referenceEntry.fileName; let documentHighlights = getProperty(fileNameToDocumentHighlights, fileName); if (!documentHighlights) { documentHighlights = { fileName, highlightSpans: [] }; @@ -4758,9 +4759,9 @@ namespace ts { } function getSyntacticDocumentHighlights(node: Node): DocumentHighlights[] { - const fileName = sourceFile.fileName; + let fileName = sourceFile.fileName; - const highlightSpans = getHighlightSpans(node); + let highlightSpans = getHighlightSpans(node); if (!highlightSpans || highlightSpans.length === 0) { return undefined; } @@ -4864,7 +4865,7 @@ namespace ts { * into function boundaries and try-blocks with catch-clauses. */ function aggregateOwnedThrowStatements(node: Node): ThrowStatement[] { - const statementAccumulator: ThrowStatement[] = []; + let statementAccumulator: ThrowStatement[] = [] aggregate(node); return statementAccumulator; @@ -4873,7 +4874,7 @@ namespace ts { statementAccumulator.push(node); } else if (node.kind === SyntaxKind.TryStatement) { - const tryStatement = node; + let tryStatement = node; if (tryStatement.catchClause) { aggregate(tryStatement.catchClause); @@ -4904,7 +4905,7 @@ namespace ts { let child: Node = throwStatement; while (child.parent) { - const parent = child.parent; + let parent = child.parent; if (isFunctionBlock(parent) || parent.kind === SyntaxKind.SourceFile) { return parent; @@ -4913,7 +4914,7 @@ namespace ts { // A throw-statement is only owned by a try-statement if the try-statement has // a catch clause, and if the throw-statement occurs within the try block. if (parent.kind === SyntaxKind.TryStatement) { - const tryStatement = parent; + let tryStatement = parent; if (tryStatement.tryBlock === child && tryStatement.catchClause) { return child; @@ -4927,7 +4928,7 @@ namespace ts { } function aggregateAllBreakAndContinueStatements(node: Node): BreakOrContinueStatement[] { - const statementAccumulator: BreakOrContinueStatement[] = []; + let statementAccumulator: BreakOrContinueStatement[] = [] aggregate(node); return statementAccumulator; @@ -4943,7 +4944,7 @@ namespace ts { } function ownsBreakOrContinueStatement(owner: Node, statement: BreakOrContinueStatement): boolean { - const actualOwner = getBreakOrContinueOwner(statement); + let actualOwner = getBreakOrContinueOwner(statement); return actualOwner && actualOwner === owner; } @@ -4978,7 +4979,7 @@ namespace ts { } function getModifierOccurrences(modifier: SyntaxKind, declaration: Node): HighlightSpan[] { - const container = declaration.parent; + let container = declaration.parent; // Make sure we only highlight the keyword when it makes sense to do so. if (isAccessibilityModifier(modifier)) { @@ -5008,8 +5009,8 @@ namespace ts { return undefined; } - const keywords: Node[] = []; - const modifierFlag: NodeFlags = getFlagFromModifier(modifier); + let keywords: Node[] = []; + let modifierFlag: NodeFlags = getFlagFromModifier(modifier); let nodes: Node[]; switch (container.kind) { @@ -5034,7 +5035,7 @@ namespace ts { // If we're an accessibility modifier, we're in an instance member and should search // the constructor's parameter list for instance members as well. if (modifierFlag & NodeFlags.AccessibilityModifier) { - const constructor = forEach((container).members, member => { + let constructor = forEach((container).members, member => { return member.kind === SyntaxKind.Constructor && member; }); @@ -5047,7 +5048,7 @@ namespace ts { } break; default: - Debug.fail("Invalid container kind."); + Debug.fail("Invalid container kind.") } forEach(nodes, node => { @@ -5090,7 +5091,7 @@ namespace ts { } function getGetAndSetOccurrences(accessorDeclaration: AccessorDeclaration): HighlightSpan[] { - const keywords: Node[] = []; + let keywords: Node[] = []; tryPushAccessorKeyword(accessorDeclaration.symbol, SyntaxKind.GetAccessor); tryPushAccessorKeyword(accessorDeclaration.symbol, SyntaxKind.SetAccessor); @@ -5098,7 +5099,7 @@ namespace ts { return map(keywords, getHighlightSpanForNode); function tryPushAccessorKeyword(accessorSymbol: Symbol, accessorKind: SyntaxKind): void { - const accessor = getDeclarationOfKind(accessorSymbol, accessorKind); + let accessor = getDeclarationOfKind(accessorSymbol, accessorKind); if (accessor) { forEach(accessor.getChildren(), child => pushKeywordIf(keywords, child, SyntaxKind.GetKeyword, SyntaxKind.SetKeyword)); @@ -5107,9 +5108,9 @@ namespace ts { } function getConstructorOccurrences(constructorDeclaration: ConstructorDeclaration): HighlightSpan[] { - const declarations = constructorDeclaration.symbol.getDeclarations(); + let declarations = constructorDeclaration.symbol.getDeclarations() - const keywords: Node[] = []; + let keywords: Node[] = []; forEach(declarations, declaration => { forEach(declaration.getChildren(), token => { @@ -5121,12 +5122,12 @@ namespace ts { } function getLoopBreakContinueOccurrences(loopNode: IterationStatement): HighlightSpan[] { - const keywords: Node[] = []; + let keywords: Node[] = []; if (pushKeywordIf(keywords, loopNode.getFirstToken(), SyntaxKind.ForKeyword, SyntaxKind.WhileKeyword, SyntaxKind.DoKeyword)) { // If we succeeded and got a do-while loop, then start looking for a 'while' keyword. if (loopNode.kind === SyntaxKind.DoStatement) { - const loopTokens = loopNode.getChildren(); + let loopTokens = loopNode.getChildren(); for (let i = loopTokens.length - 1; i >= 0; i--) { if (pushKeywordIf(keywords, loopTokens[i], SyntaxKind.WhileKeyword)) { @@ -5136,7 +5137,7 @@ namespace ts { } } - const breaksAndContinues = aggregateAllBreakAndContinueStatements(loopNode.statement); + let breaksAndContinues = aggregateAllBreakAndContinueStatements(loopNode.statement); forEach(breaksAndContinues, statement => { if (ownsBreakOrContinueStatement(loopNode, statement)) { @@ -5148,7 +5149,7 @@ namespace ts { } function getBreakOrContinueStatementOccurrences(breakOrContinueStatement: BreakOrContinueStatement): HighlightSpan[] { - const owner = getBreakOrContinueOwner(breakOrContinueStatement); + let owner = getBreakOrContinueOwner(breakOrContinueStatement); if (owner) { switch (owner.kind) { @@ -5157,7 +5158,7 @@ namespace ts { case SyntaxKind.ForOfStatement: case SyntaxKind.DoStatement: case SyntaxKind.WhileStatement: - return getLoopBreakContinueOccurrences(owner); + return getLoopBreakContinueOccurrences(owner) case SyntaxKind.SwitchStatement: return getSwitchCaseDefaultOccurrences(owner); @@ -5168,7 +5169,7 @@ namespace ts { } function getSwitchCaseDefaultOccurrences(switchStatement: SwitchStatement): HighlightSpan[] { - const keywords: Node[] = []; + let keywords: Node[] = []; pushKeywordIf(keywords, switchStatement.getFirstToken(), SyntaxKind.SwitchKeyword); @@ -5176,7 +5177,7 @@ namespace ts { forEach(switchStatement.caseBlock.clauses, clause => { pushKeywordIf(keywords, clause.getFirstToken(), SyntaxKind.CaseKeyword, SyntaxKind.DefaultKeyword); - const breaksAndContinues = aggregateAllBreakAndContinueStatements(clause); + let breaksAndContinues = aggregateAllBreakAndContinueStatements(clause); forEach(breaksAndContinues, statement => { if (ownsBreakOrContinueStatement(switchStatement, statement)) { @@ -5189,7 +5190,7 @@ namespace ts { } function getTryCatchFinallyOccurrences(tryStatement: TryStatement): HighlightSpan[] { - const keywords: Node[] = []; + let keywords: Node[] = []; pushKeywordIf(keywords, tryStatement.getFirstToken(), SyntaxKind.TryKeyword); @@ -5198,7 +5199,7 @@ namespace ts { } if (tryStatement.finallyBlock) { - const finallyKeyword = findChildOfKind(tryStatement, SyntaxKind.FinallyKeyword, sourceFile); + let finallyKeyword = findChildOfKind(tryStatement, SyntaxKind.FinallyKeyword, sourceFile); pushKeywordIf(keywords, finallyKeyword, SyntaxKind.FinallyKeyword); } @@ -5206,13 +5207,13 @@ namespace ts { } function getThrowOccurrences(throwStatement: ThrowStatement): HighlightSpan[] { - const owner = getThrowStatementOwner(throwStatement); + let owner = getThrowStatementOwner(throwStatement); if (!owner) { return undefined; } - const keywords: Node[] = []; + let keywords: Node[] = []; forEach(aggregateOwnedThrowStatements(owner), throwStatement => { pushKeywordIf(keywords, throwStatement.getFirstToken(), SyntaxKind.ThrowKeyword); @@ -5230,14 +5231,14 @@ namespace ts { } function getReturnOccurrences(returnStatement: ReturnStatement): HighlightSpan[] { - const func = getContainingFunction(returnStatement); + let func = getContainingFunction(returnStatement); // If we didn't find a containing function with a block body, bail out. if (!(func && hasKind(func.body, SyntaxKind.Block))) { return undefined; } - const keywords: Node[] = []; + let keywords: Node[] = [] forEachReturnStatement(func.body, returnStatement => { pushKeywordIf(keywords, returnStatement.getFirstToken(), SyntaxKind.ReturnKeyword); }); @@ -5251,7 +5252,7 @@ namespace ts { } function getIfElseOccurrences(ifStatement: IfStatement): HighlightSpan[] { - const keywords: Node[] = []; + let keywords: Node[] = []; // Traverse upwards through all parent if-statements linked by their else-branches. while (hasKind(ifStatement.parent, SyntaxKind.IfStatement) && (ifStatement.parent).elseStatement === ifStatement) { @@ -5260,7 +5261,7 @@ namespace ts { // Now traverse back down through the else branches, aggregating if/else keywords of if-statements. while (ifStatement) { - const children = ifStatement.getChildren(); + let children = ifStatement.getChildren(); pushKeywordIf(keywords, children[0], SyntaxKind.IfKeyword); // Generally the 'else' keyword is second-to-last, so we traverse backwards. @@ -5271,20 +5272,20 @@ namespace ts { } if (!hasKind(ifStatement.elseStatement, SyntaxKind.IfStatement)) { - break; + break } ifStatement = ifStatement.elseStatement; } - const result: HighlightSpan[] = []; + let result: HighlightSpan[] = []; // We'd like to highlight else/ifs together if they are only separated by whitespace // (i.e. the keywords are separated by no comments, no newlines). for (let i = 0; i < keywords.length; i++) { if (keywords[i].kind === SyntaxKind.ElseKeyword && i < keywords.length - 1) { - const elseKeyword = keywords[i]; - const ifKeyword = keywords[i + 1]; // this *should* always be an 'if' keyword. + let elseKeyword = keywords[i]; + let ifKeyword = keywords[i + 1]; // this *should* always be an 'if' keyword. let shouldCombindElseAndIf = true; @@ -5327,9 +5328,9 @@ namespace ts { return undefined; } - const result: ReferenceEntry[] = []; - for (const entry of documentHighlights) { - for (const highlightSpan of entry.highlightSpans) { + let result: ReferenceEntry[] = []; + for (let entry of documentHighlights) { + for (let highlightSpan of entry.highlightSpans) { result.push({ fileName: entry.fileName, textSpan: highlightSpan.textSpan, @@ -5347,9 +5348,9 @@ namespace ts { return undefined; } - const referenceEntries: ReferenceEntry[] = []; + let referenceEntries: ReferenceEntry[] = []; - for (const referenceSymbol of referenceSymbols) { + for (let referenceSymbol of referenceSymbols) { addRange(referenceEntries, referenceSymbol.references); } @@ -5357,17 +5358,17 @@ namespace ts { } function findRenameLocations(fileName: string, position: number, findInStrings: boolean, findInComments: boolean): RenameLocation[] { - const referencedSymbols = findReferencedSymbols(fileName, position, findInStrings, findInComments); + let referencedSymbols = findReferencedSymbols(fileName, position, findInStrings, findInComments); return convertReferences(referencedSymbols); } function getReferencesAtPosition(fileName: string, position: number): ReferenceEntry[] { - const referencedSymbols = findReferencedSymbols(fileName, position, /*findInStrings*/ false, /*findInComments*/ false); + let referencedSymbols = findReferencedSymbols(fileName, position, /*findInStrings:*/ false, /*findInComments:*/ false); return convertReferences(referencedSymbols); } - function findReferences(fileName: string, position: number): ReferencedSymbol[] { - const referencedSymbols = findReferencedSymbols(fileName, position, /*findInStrings*/ false, /*findInComments*/ false); + function findReferences(fileName: string, position: number): ReferencedSymbol[]{ + let referencedSymbols = findReferencedSymbols(fileName, position, /*findInStrings:*/ false, /*findInComments:*/ false); // Only include referenced symbols that have a valid definition. return filter(referencedSymbols, rs => !!rs.definition); @@ -5376,17 +5377,17 @@ namespace ts { function findReferencedSymbols(fileName: string, position: number, findInStrings: boolean, findInComments: boolean): ReferencedSymbol[] { synchronizeHostData(); - const sourceFile = getValidSourceFile(fileName); + let sourceFile = getValidSourceFile(fileName); - const node = getTouchingPropertyName(sourceFile, position); + let node = getTouchingPropertyName(sourceFile, position); if (!node) { return undefined; } if (node.kind !== SyntaxKind.Identifier && // TODO (drosen): This should be enabled in a later release - currently breaks rename. - // node.kind !== SyntaxKind.ThisKeyword && - // node.kind !== SyntaxKind.SuperKeyword && + //node.kind !== SyntaxKind.ThisKeyword && + //node.kind !== SyntaxKind.SuperKeyword && !isLiteralNameOfPropertyDeclarationOrIndexAccess(node) && !isNameOfExternalModuleImportOrDeclaration(node)) { return undefined; @@ -5397,12 +5398,12 @@ namespace ts { } function getReferencedSymbolsForNode(node: Node, sourceFiles: SourceFile[], findInStrings: boolean, findInComments: boolean): ReferencedSymbol[] { - const typeChecker = program.getTypeChecker(); + let typeChecker = program.getTypeChecker(); // Labels if (isLabelName(node)) { if (isJumpStatementTarget(node)) { - const labelDefinition = getTargetLabel((node.parent), (node).text); + let labelDefinition = getTargetLabel((node.parent), (node).text); // if we have a label definition, look within its statement for references, if not, then // the label is undefined and we have no results.. return labelDefinition ? getLabelReferencesInNode(labelDefinition.parent, labelDefinition) : undefined; @@ -5421,7 +5422,7 @@ namespace ts { return getReferencesForSuperKeyword(node); } - const symbol = typeChecker.getSymbolAtLocation(node); + let symbol = typeChecker.getSymbolAtLocation(node); // Could not find a symbol e.g. unknown identifier if (!symbol) { @@ -5429,7 +5430,7 @@ namespace ts { return undefined; } - const declarations = symbol.declarations; + let declarations = symbol.declarations; // The symbol was an internal symbol and does not have a declaration e.g. undefined symbol if (!declarations || !declarations.length) { @@ -5439,29 +5440,29 @@ namespace ts { let result: ReferencedSymbol[]; // Compute the meaning from the location and the symbol it references - const searchMeaning = getIntersectingMeaningFromDeclarations(getMeaningFromLocation(node), declarations); + let searchMeaning = getIntersectingMeaningFromDeclarations(getMeaningFromLocation(node), declarations); // Get the text to search for. // Note: if this is an external module symbol, the name doesn't include quotes. - const declaredName = stripQuotes(getDeclaredName(typeChecker, symbol, node)); + let declaredName = stripQuotes(getDeclaredName(typeChecker, symbol, node)); // Try to get the smallest valid scope that we can limit our search to; // otherwise we'll need to search globally (i.e. include each file). - const scope = getSymbolScope(symbol); + let scope = getSymbolScope(symbol); // Maps from a symbol ID to the ReferencedSymbol entry in 'result'. - const symbolToIndex: number[] = []; + let symbolToIndex: number[] = []; if (scope) { result = []; getReferencesInNode(scope, symbol, declaredName, node, searchMeaning, findInStrings, findInComments, result, symbolToIndex); } else { - const internedName = getInternedName(symbol, node, declarations); - for (const sourceFile of sourceFiles) { + let internedName = getInternedName(symbol, node, declarations) + for (let sourceFile of sourceFiles) { cancellationToken.throwIfCancellationRequested(); - const nameTable = getNameTable(sourceFile); + let nameTable = getNameTable(sourceFile); if (lookUp(nameTable, internedName)) { result = result || []; @@ -5473,9 +5474,9 @@ namespace ts { return result; function getDefinition(symbol: Symbol): DefinitionInfo { - const info = getSymbolDisplayPartsDocumentationAndSymbolKind(symbol, node.getSourceFile(), getContainerNode(node), node); - const name = map(info.displayParts, p => p.text).join(""); - const declarations = symbol.declarations; + let info = getSymbolDisplayPartsDocumentationAndSymbolKind(symbol, node.getSourceFile(), getContainerNode(node), node); + let name = map(info.displayParts, p => p.text).join(""); + let declarations = symbol.declarations; if (!declarations || declarations.length === 0) { return undefined; } @@ -5505,7 +5506,7 @@ namespace ts { // Try to get the local symbol if we're dealing with an 'export default' // since that symbol has the "true" name. - const localExportDefaultSymbol = getLocalSymbolForExportDefault(symbol); + let localExportDefaultSymbol = getLocalSymbolForExportDefault(symbol); symbol = localExportDefaultSymbol || symbol; return stripQuotes(symbol.name); @@ -5522,14 +5523,14 @@ namespace ts { function getSymbolScope(symbol: Symbol): Node { // If this is the symbol of a named function expression or named class expression, // then named references are limited to its own scope. - const valueDeclaration = symbol.valueDeclaration; + let valueDeclaration = symbol.valueDeclaration; if (valueDeclaration && (valueDeclaration.kind === SyntaxKind.FunctionExpression || valueDeclaration.kind === SyntaxKind.ClassExpression)) { return valueDeclaration; } // If this is private property or method, the scope is the containing class if (symbol.flags & (SymbolFlags.Property | SymbolFlags.Method)) { - const privateDeclaration = forEach(symbol.getDeclarations(), d => (d.flags & NodeFlags.Private) ? d : undefined); + let privateDeclaration = forEach(symbol.getDeclarations(), d => (d.flags & NodeFlags.Private) ? d : undefined); if (privateDeclaration) { return getAncestor(privateDeclaration, SyntaxKind.ClassDeclaration); } @@ -5547,12 +5548,12 @@ namespace ts { return undefined; } - let scope: Node; + let scope: Node = undefined; - const declarations = symbol.getDeclarations(); + let declarations = symbol.getDeclarations(); if (declarations) { - for (const declaration of declarations) { - const container = getContainerNode(declaration); + for (let declaration of declarations) { + let container = getContainerNode(declaration); if (!container) { return undefined; @@ -5578,7 +5579,7 @@ namespace ts { } function getPossibleSymbolReferencePositions(sourceFile: SourceFile, symbolName: string, start: number, end: number): number[] { - const positions: number[] = []; + let positions: number[] = []; /// TODO: Cache symbol existence for files to save text search // Also, need to make this work for unicode escapes. @@ -5588,9 +5589,9 @@ namespace ts { return positions; } - const text = sourceFile.text; - const sourceLength = text.length; - const symbolNameLength = symbolName.length; + let text = sourceFile.text; + let sourceLength = text.length; + let symbolNameLength = symbolName.length; let position = text.indexOf(symbolName, start); while (position >= 0) { @@ -5601,7 +5602,7 @@ namespace ts { // We found a match. Make sure it's not part of a larger word (i.e. the char // before and after it have to be a non-identifier char). - const endPosition = position + symbolNameLength; + let endPosition = position + symbolNameLength; if ((position === 0 || !isIdentifierPart(text.charCodeAt(position - 1), ScriptTarget.Latest)) && (endPosition === sourceLength || !isIdentifierPart(text.charCodeAt(endPosition), ScriptTarget.Latest))) { @@ -5615,14 +5616,14 @@ namespace ts { } function getLabelReferencesInNode(container: Node, targetLabel: Identifier): ReferencedSymbol[] { - const references: ReferenceEntry[] = []; - const sourceFile = container.getSourceFile(); - const labelName = targetLabel.text; - const possiblePositions = getPossibleSymbolReferencePositions(sourceFile, labelName, container.getStart(), container.getEnd()); + let references: ReferenceEntry[] = []; + let sourceFile = container.getSourceFile(); + let labelName = targetLabel.text; + let possiblePositions = getPossibleSymbolReferencePositions(sourceFile, labelName, container.getStart(), container.getEnd()); forEach(possiblePositions, position => { cancellationToken.throwIfCancellationRequested(); - const node = getTouchingWord(sourceFile, position); + let node = getTouchingWord(sourceFile, position); if (!node || node.getWidth() !== labelName.length) { return; } @@ -5634,14 +5635,14 @@ namespace ts { } }); - const definition: DefinitionInfo = { + let definition: DefinitionInfo = { containerKind: "", containerName: "", fileName: targetLabel.getSourceFile().fileName, kind: ScriptElementKind.label, name: labelName, textSpan: createTextSpanFromBounds(targetLabel.getStart(), targetLabel.getEnd()) - }; + } return [{ definition, references }]; } @@ -5686,19 +5687,19 @@ namespace ts { result: ReferencedSymbol[], symbolToIndex: number[]): void { - const sourceFile = container.getSourceFile(); - const tripleSlashDirectivePrefixRegex = /^\/\/\/\s* { cancellationToken.throwIfCancellationRequested(); - const referenceLocation = getTouchingPropertyName(sourceFile, position); + let referenceLocation = getTouchingPropertyName(sourceFile, position); if (!isValidReferencePosition(referenceLocation, searchText)) { // This wasn't the start of a token. Check to see if it might be a // match in a comment or string if that's what the caller is asking @@ -5726,14 +5727,14 @@ namespace ts { return; } - const referenceSymbol = typeChecker.getSymbolAtLocation(referenceLocation); + let referenceSymbol = typeChecker.getSymbolAtLocation(referenceLocation); if (referenceSymbol) { - const referenceSymbolDeclaration = referenceSymbol.valueDeclaration; - const shorthandValueSymbol = typeChecker.getShorthandAssignmentValueSymbol(referenceSymbolDeclaration); - const relatedSymbol = getRelatedSymbol(searchSymbols, referenceSymbol, referenceLocation); + let referenceSymbolDeclaration = referenceSymbol.valueDeclaration; + let shorthandValueSymbol = typeChecker.getShorthandAssignmentValueSymbol(referenceSymbolDeclaration); + let relatedSymbol = getRelatedSymbol(searchSymbols, referenceSymbol, referenceLocation); if (relatedSymbol) { - const referencedSymbol = getReferencedSymbol(relatedSymbol); + let referencedSymbol = getReferencedSymbol(relatedSymbol); referencedSymbol.references.push(getReferenceEntryFromNode(referenceLocation)); } /* Because in short-hand property assignment, an identifier which stored as name of the short-hand property assignment @@ -5743,7 +5744,7 @@ namespace ts { * position of property accessing, the referenceEntry of such position will be handled in the first case. */ else if (!(referenceSymbol.flags & SymbolFlags.Transient) && searchSymbols.indexOf(shorthandValueSymbol) >= 0) { - const referencedSymbol = getReferencedSymbol(shorthandValueSymbol); + let referencedSymbol = getReferencedSymbol(shorthandValueSymbol); referencedSymbol.references.push(getReferenceEntryFromNode(referenceSymbolDeclaration.name)); } } @@ -5753,7 +5754,7 @@ namespace ts { return; function getReferencedSymbol(symbol: Symbol): ReferencedSymbol { - const symbolId = getSymbolId(symbol); + let symbolId = getSymbolId(symbol); let index = symbolToIndex[symbolId]; if (index === undefined) { index = result.length; @@ -5772,7 +5773,7 @@ namespace ts { return isInCommentHelper(sourceFile, position, isNonReferenceComment); function isNonReferenceComment(c: CommentRange): boolean { - const commentText = sourceFile.text.substring(c.pos, c.end); + let commentText = sourceFile.text.substring(c.pos, c.end); return !tripleSlashDirectivePrefixRegex.test(commentText); } } @@ -5801,20 +5802,20 @@ namespace ts { return undefined; } - const references: ReferenceEntry[] = []; + let references: ReferenceEntry[] = []; - const sourceFile = searchSpaceNode.getSourceFile(); - const possiblePositions = getPossibleSymbolReferencePositions(sourceFile, "super", searchSpaceNode.getStart(), searchSpaceNode.getEnd()); + let sourceFile = searchSpaceNode.getSourceFile(); + let possiblePositions = getPossibleSymbolReferencePositions(sourceFile, "super", searchSpaceNode.getStart(), searchSpaceNode.getEnd()); forEach(possiblePositions, position => { cancellationToken.throwIfCancellationRequested(); - const node = getTouchingWord(sourceFile, position); + let node = getTouchingWord(sourceFile, position); if (!node || node.kind !== SyntaxKind.SuperKeyword) { return; } - const container = getSuperContainer(node, /*includeFunctions*/ false); + let container = getSuperContainer(node, /*includeFunctions*/ false); // If we have a 'super' container, we must have an enclosing class. // Now make sure the owning class is the same as the search-space @@ -5824,7 +5825,7 @@ namespace ts { } }); - const definition = getDefinition(searchSpaceNode.symbol); + let definition = getDefinition(searchSpaceNode.symbol); return [{ definition, references }]; } @@ -5846,7 +5847,7 @@ namespace ts { case SyntaxKind.Constructor: case SyntaxKind.GetAccessor: case SyntaxKind.SetAccessor: - staticFlag &= searchSpaceNode.flags; + staticFlag &= searchSpaceNode.flags searchSpaceNode = searchSpaceNode.parent; // re-assign to be the owning class break; case SyntaxKind.SourceFile: @@ -5863,7 +5864,7 @@ namespace ts { return undefined; } - const references: ReferenceEntry[] = []; + let references: ReferenceEntry[] = []; let possiblePositions: number[]; if (searchSpaceNode.kind === SyntaxKind.SourceFile) { @@ -5873,7 +5874,7 @@ namespace ts { }); } else { - const sourceFile = searchSpaceNode.getSourceFile(); + let sourceFile = searchSpaceNode.getSourceFile(); possiblePositions = getPossibleSymbolReferencePositions(sourceFile, "this", searchSpaceNode.getStart(), searchSpaceNode.getEnd()); getThisReferencesInFile(sourceFile, searchSpaceNode, possiblePositions, references); } @@ -5894,12 +5895,12 @@ namespace ts { forEach(possiblePositions, position => { cancellationToken.throwIfCancellationRequested(); - const node = getTouchingWord(sourceFile, position); + let node = getTouchingWord(sourceFile, position); if (!node || (node.kind !== SyntaxKind.ThisKeyword && node.kind !== SyntaxKind.ThisType)) { return; } - const container = getThisContainer(node, /* includeArrowFunctions */ false); + let container = getThisContainer(node, /* includeArrowFunctions */ false); switch (searchSpaceNode.kind) { case SyntaxKind.FunctionExpression: @@ -5954,13 +5955,13 @@ namespace ts { * property name and variable declaration of the identifier. * Like in below example, when querying for all references for an identifier 'name', of the property assignment, the language service * should show both 'name' in 'obj' and 'name' in variable declaration - * const name = "Foo"; - * const obj = { name }; + * let name = "Foo"; + * let obj = { name }; * In order to do that, we will populate the search set with the value symbol of the identifier as a value of the property assignment * so that when matching with potential reference symbol, both symbols from property declaration and variable declaration * will be included correctly. */ - const shorthandValueSymbol = typeChecker.getShorthandAssignmentValueSymbol(location.parent); + let shorthandValueSymbol = typeChecker.getShorthandAssignmentValueSymbol(location.parent); if (shorthandValueSymbol) { result.push(shorthandValueSymbol); } @@ -6007,9 +6008,9 @@ namespace ts { function getPropertySymbolFromTypeReference(typeReference: ExpressionWithTypeArguments) { if (typeReference) { - const type = typeChecker.getTypeAtLocation(typeReference); + let type = typeChecker.getTypeAtLocation(typeReference); if (type) { - const propertySymbol = typeChecker.getPropertyOfType(type, propertyName); + let propertySymbol = typeChecker.getPropertyOfType(type, propertyName); if (propertySymbol) { result.push(propertySymbol); } @@ -6029,7 +6030,7 @@ namespace ts { // If the reference symbol is an alias, check if what it is aliasing is one of the search // symbols. if (isImportOrExportSpecifierImportSymbol(referenceSymbol)) { - const aliasedSymbol = typeChecker.getAliasedSymbol(referenceSymbol); + let aliasedSymbol = typeChecker.getAliasedSymbol(referenceSymbol); if (searchSymbols.indexOf(aliasedSymbol) >= 0) { return aliasedSymbol; } @@ -6055,7 +6056,7 @@ namespace ts { // Finally, try all properties with the same name in any type the containing type extended or implemented, and // see if any is in the list if (rootSymbol.parent && rootSymbol.parent.flags & (SymbolFlags.Class | SymbolFlags.Interface)) { - const result: Symbol[] = []; + let result: Symbol[] = []; getPropertySymbolsFromBaseTypes(rootSymbol.parent, rootSymbol.getName(), result); return forEach(result, s => searchSymbols.indexOf(s) >= 0 ? s : undefined); } @@ -6066,21 +6067,21 @@ namespace ts { function getPropertySymbolsFromContextualType(node: Node): Symbol[] { if (isNameOfPropertyAssignment(node)) { - const objectLiteral = node.parent.parent; - const contextualType = typeChecker.getContextualType(objectLiteral); - const name = (node).text; + let objectLiteral = node.parent.parent; + let contextualType = typeChecker.getContextualType(objectLiteral); + let name = (node).text; if (contextualType) { if (contextualType.flags & TypeFlags.Union) { // This is a union type, first see if the property we are looking for is a union property (i.e. exists in all types) // if not, search the constituent types for the property - const unionProperty = contextualType.getProperty(name); + let unionProperty = contextualType.getProperty(name) if (unionProperty) { return [unionProperty]; } else { - const result: Symbol[] = []; + let result: Symbol[] = []; forEach((contextualType).types, t => { - const symbol = t.getProperty(name); + let symbol = t.getProperty(name); if (symbol) { result.push(symbol); } @@ -6089,7 +6090,7 @@ namespace ts { } } else { - const symbol = contextualType.getProperty(name); + let symbol = contextualType.getProperty(name); if (symbol) { return [symbol]; } @@ -6118,8 +6119,8 @@ namespace ts { // Remember the last meaning lastIterationMeaning = meaning; - for (const declaration of declarations) { - const declarationMeaning = getMeaningFromDeclaration(declaration); + for (let declaration of declarations) { + let declarationMeaning = getMeaningFromDeclaration(declaration); if (declarationMeaning & meaning) { meaning |= declarationMeaning; @@ -6154,13 +6155,13 @@ namespace ts { return true; } - const parent = node.parent; + let parent = node.parent; if (parent) { if (parent.kind === SyntaxKind.PostfixUnaryExpression || parent.kind === SyntaxKind.PrefixUnaryExpression) { return true; } else if (parent.kind === SyntaxKind.BinaryExpression && (parent).left === node) { - const operator = (parent).operatorToken.kind; + let operator = (parent).operatorToken.kind; return SyntaxKind.FirstAssignment <= operator && operator <= SyntaxKind.LastAssignment; } } @@ -6182,8 +6183,8 @@ namespace ts { function getEmitOutput(fileName: string): EmitOutput { synchronizeHostData(); - const sourceFile = getValidSourceFile(fileName); - const outputFiles: OutputFile[] = []; + let sourceFile = getValidSourceFile(fileName); + let outputFiles: OutputFile[] = []; function writeFile(fileName: string, data: string, writeByteOrderMark: boolean) { outputFiles.push({ @@ -6193,7 +6194,7 @@ namespace ts { }); } - const emitOutput = program.emit(sourceFile, writeFile, cancellationToken); + let emitOutput = program.emit(sourceFile, writeFile, cancellationToken); return { outputFiles, @@ -6286,7 +6287,7 @@ namespace ts { } if (!isLastClause && root.parent.kind === SyntaxKind.ExpressionWithTypeArguments && root.parent.parent.kind === SyntaxKind.HeritageClause) { - const decl = root.parent.parent.parent; + let decl = root.parent.parent.parent; return (decl.kind === SyntaxKind.ClassDeclaration && (root.parent.parent).token === SyntaxKind.ImplementsKeyword) || (decl.kind === SyntaxKind.InterfaceDeclaration && (root.parent.parent).token === SyntaxKind.ExtendsKeyword); } @@ -6358,7 +6359,7 @@ namespace ts { function getSignatureHelpItems(fileName: string, position: number): SignatureHelpItems { synchronizeHostData(); - const sourceFile = getValidSourceFile(fileName); + let sourceFile = getValidSourceFile(fileName); return SignatureHelp.getSignatureHelpItems(program, sourceFile, position, cancellationToken); } @@ -6369,10 +6370,10 @@ namespace ts { } function getNameOrDottedNameSpan(fileName: string, startPos: number, endPos: number): TextSpan { - const sourceFile = syntaxTreeCache.getCurrentSourceFile(fileName); + let sourceFile = syntaxTreeCache.getCurrentSourceFile(fileName); // Get node at the location - const node = getTouchingPropertyName(sourceFile, startPos); + let node = getTouchingPropertyName(sourceFile, startPos); if (!node) { return; @@ -6428,13 +6429,13 @@ namespace ts { function getBreakpointStatementAtPosition(fileName: string, position: number) { // doesn't use compiler - no need to synchronize with host - const sourceFile = syntaxTreeCache.getCurrentSourceFile(fileName); + let sourceFile = syntaxTreeCache.getCurrentSourceFile(fileName); return BreakpointResolver.spanInSourceFileAtLocation(sourceFile, position); } function getNavigationBarItems(fileName: string): NavigationBarItem[] { - const sourceFile = syntaxTreeCache.getCurrentSourceFile(fileName); + let sourceFile = syntaxTreeCache.getCurrentSourceFile(fileName); return NavigationBar.getNavigationBarItems(sourceFile, host.getCompilationSettings()); } @@ -6466,11 +6467,11 @@ namespace ts { function getEncodedSemanticClassifications(fileName: string, span: TextSpan): Classifications { synchronizeHostData(); - const sourceFile = getValidSourceFile(fileName); - const typeChecker = program.getTypeChecker(); + let sourceFile = getValidSourceFile(fileName); + let typeChecker = program.getTypeChecker(); - const result: number[] = []; - const classifiableNames = program.getClassifiableNames(); + let result: number[] = []; + let classifiableNames = program.getClassifiableNames(); processNode(sourceFile); return { spans: result, endOfLineState: EndOfLineState.None }; @@ -6482,7 +6483,7 @@ namespace ts { } function classifySymbol(symbol: Symbol, meaningAtPosition: SemanticMeaning): ClassificationType { - const flags = symbol.getFlags(); + let flags = symbol.getFlags(); if ((flags & SymbolFlags.Classifiable) === SymbolFlags.None) { return; } @@ -6530,19 +6531,19 @@ namespace ts { function processNode(node: Node) { // Only walk into nodes that intersect the requested span. if (node && textSpanIntersectsWith(span, node.getFullStart(), node.getFullWidth())) { - const kind = node.kind; + let kind = node.kind; checkForClassificationCancellation(kind); if (kind === SyntaxKind.Identifier && !nodeIsMissing(node)) { - const identifier = node; + let identifier = node; // Only bother calling into the typechecker if this is an identifier that // could possibly resolve to a type name. This makes classification run // in a third of the time it would normally take. if (classifiableNames[identifier.text]) { - const symbol = typeChecker.getSymbolAtLocation(node); + let symbol = typeChecker.getSymbolAtLocation(node); if (symbol) { - const type = classifySymbol(symbol, getMeaningFromLocation(node)); + let type = classifySymbol(symbol, getMeaningFromLocation(node)); if (type) { pushClassification(node.getStart(), node.getWidth(), type); } @@ -6582,8 +6583,8 @@ namespace ts { function convertClassifications(classifications: Classifications): ClassifiedSpan[] { Debug.assert(classifications.spans.length % 3 === 0); - const dense = classifications.spans; - const result: ClassifiedSpan[] = []; + let dense = classifications.spans; + let result: ClassifiedSpan[] = []; for (let i = 0, n = dense.length; i < n; i += 3) { result.push({ textSpan: createTextSpan(dense[i], dense[i + 1]), @@ -6600,15 +6601,15 @@ namespace ts { function getEncodedSyntacticClassifications(fileName: string, span: TextSpan): Classifications { // doesn't use compiler - no need to synchronize with host - const sourceFile = syntaxTreeCache.getCurrentSourceFile(fileName); - const spanStart = span.start; - const spanLength = span.length; + let sourceFile = syntaxTreeCache.getCurrentSourceFile(fileName); + let spanStart = span.start; + let spanLength = span.length; // Make a scanner we can get trivia from. - const triviaScanner = createScanner(ScriptTarget.Latest, /*skipTrivia*/ false, sourceFile.languageVariant, sourceFile.text); - const mergeConflictScanner = createScanner(ScriptTarget.Latest, /*skipTrivia*/ false, sourceFile.languageVariant, sourceFile.text); + let triviaScanner = createScanner(ScriptTarget.Latest, /*skipTrivia:*/ false, sourceFile.languageVariant, sourceFile.text); + let mergeConflictScanner = createScanner(ScriptTarget.Latest, /*skipTrivia:*/ false, sourceFile.languageVariant, sourceFile.text); - const result: number[] = []; + let result: number[] = []; processElement(sourceFile); return { spans: result, endOfLineState: EndOfLineState.None }; @@ -6622,15 +6623,15 @@ namespace ts { function classifyLeadingTriviaAndGetTokenStart(token: Node): number { triviaScanner.setTextPos(token.pos); while (true) { - const start = triviaScanner.getTextPos(); + let start = triviaScanner.getTextPos(); // only bother scanning if we have something that could be trivia. if (!couldStartTrivia(sourceFile.text, start)) { return start; } - const kind = triviaScanner.scan(); - const end = triviaScanner.getTextPos(); - const width = end - start; + let kind = triviaScanner.scan(); + let end = triviaScanner.getTextPos(); + let width = end - start; // The moment we get something that isn't trivia, then stop processing. if (!isTrivia(kind)) { @@ -6654,8 +6655,8 @@ namespace ts { } if (kind === SyntaxKind.ConflictMarkerTrivia) { - const text = sourceFile.text; - const ch = text.charCodeAt(start); + let text = sourceFile.text; + let ch = text.charCodeAt(start); // for the <<<<<<< and >>>>>>> markers, we just add them in as comments // in the classification stream. @@ -6676,7 +6677,7 @@ namespace ts { if (kind === SyntaxKind.MultiLineCommentTrivia) { // See if this is a doc comment. If so, we'll classify certain portions of it // specially. - const docCommentAndDiagnostics = parseIsolatedJSDocComment(sourceFile.text, start, width); + let docCommentAndDiagnostics = parseIsolatedJSDocComment(sourceFile.text, start, width); if (docCommentAndDiagnostics && docCommentAndDiagnostics.jsDocComment) { docCommentAndDiagnostics.jsDocComment.parent = token; classifyJSDocComment(docCommentAndDiagnostics.jsDocComment); @@ -6695,7 +6696,7 @@ namespace ts { function classifyJSDocComment(docComment: JSDocComment) { let pos = docComment.pos; - for (const tag of docComment.tags) { + for (let tag of docComment.tags) { // As we walk through each tag, classify the portion of text from the end of // the last tag (or the start of the entire doc comment) as 'comment'. if (tag.pos !== pos) { @@ -6753,7 +6754,7 @@ namespace ts { } function processJSDocTemplateTag(tag: JSDocTemplateTag) { - for (const child of tag.getChildren()) { + for (let child of tag.getChildren()) { processElement(child); } } @@ -6775,11 +6776,11 @@ namespace ts { } function classifyDisabledCodeToken() { - const start = mergeConflictScanner.getTextPos(); - const tokenKind = mergeConflictScanner.scan(); - const end = mergeConflictScanner.getTextPos(); + let start = mergeConflictScanner.getTextPos(); + let tokenKind = mergeConflictScanner.scan(); + let end = mergeConflictScanner.getTextPos(); - const type = classifyTokenType(tokenKind); + let type = classifyTokenType(tokenKind); if (type) { pushClassification(start, end - start, type); } @@ -6790,12 +6791,12 @@ namespace ts { return; } - const tokenStart = classifyLeadingTriviaAndGetTokenStart(token); + let tokenStart = classifyLeadingTriviaAndGetTokenStart(token); - const tokenWidth = token.end - tokenStart; + let tokenWidth = token.end - tokenStart; Debug.assert(tokenWidth >= 0); if (tokenWidth > 0) { - const type = classifyTokenType(token.kind, token); + let type = classifyTokenType(token.kind, token); if (type) { pushClassification(tokenStart, tokenWidth, type); } @@ -6922,9 +6923,9 @@ namespace ts { if (decodedTextSpanIntersectsWith(spanStart, spanLength, element.pos, element.getFullWidth())) { checkForClassificationCancellation(element.kind); - const children = element.getChildren(sourceFile); + let children = element.getChildren(sourceFile); for (let i = 0, n = children.length; i < n; i++) { - const child = children[i]; + let child = children[i]; if (isToken(child)) { classifyToken(child); } @@ -6939,28 +6940,28 @@ namespace ts { function getOutliningSpans(fileName: string): OutliningSpan[] { // doesn't use compiler - no need to synchronize with host - const sourceFile = syntaxTreeCache.getCurrentSourceFile(fileName); + let sourceFile = syntaxTreeCache.getCurrentSourceFile(fileName); return OutliningElementsCollector.collectElements(sourceFile); } function getBraceMatchingAtPosition(fileName: string, position: number) { - const sourceFile = syntaxTreeCache.getCurrentSourceFile(fileName); - const result: TextSpan[] = []; + let sourceFile = syntaxTreeCache.getCurrentSourceFile(fileName); + let result: TextSpan[] = []; - const token = getTouchingToken(sourceFile, position); + let token = getTouchingToken(sourceFile, position); if (token.getStart(sourceFile) === position) { - const matchKind = getMatchingTokenKind(token); + let matchKind = getMatchingTokenKind(token); // Ensure that there is a corresponding token to match ours. if (matchKind) { - const parentElement = token.parent; + let parentElement = token.parent; - const childNodes = parentElement.getChildren(sourceFile); - for (const current of childNodes) { + let childNodes = parentElement.getChildren(sourceFile); + for (let current of childNodes) { if (current.kind === matchKind) { - const range1 = createTextSpan(token.getStart(sourceFile), token.getWidth(sourceFile)); - const range2 = createTextSpan(current.getStart(sourceFile), current.getWidth(sourceFile)); + let range1 = createTextSpan(token.getStart(sourceFile), token.getWidth(sourceFile)); + let range2 = createTextSpan(current.getStart(sourceFile), current.getWidth(sourceFile)); // We want to order the braces when we return the result. if (range1.start < range2.start) { @@ -6980,11 +6981,11 @@ namespace ts { function getMatchingTokenKind(token: Node): ts.SyntaxKind { switch (token.kind) { - case ts.SyntaxKind.OpenBraceToken: return ts.SyntaxKind.CloseBraceToken; + case ts.SyntaxKind.OpenBraceToken: return ts.SyntaxKind.CloseBraceToken case ts.SyntaxKind.OpenParenToken: return ts.SyntaxKind.CloseParenToken; case ts.SyntaxKind.OpenBracketToken: return ts.SyntaxKind.CloseBracketToken; case ts.SyntaxKind.LessThanToken: return ts.SyntaxKind.GreaterThanToken; - case ts.SyntaxKind.CloseBraceToken: return ts.SyntaxKind.OpenBraceToken; + case ts.SyntaxKind.CloseBraceToken: return ts.SyntaxKind.OpenBraceToken case ts.SyntaxKind.CloseParenToken: return ts.SyntaxKind.OpenParenToken; case ts.SyntaxKind.CloseBracketToken: return ts.SyntaxKind.OpenBracketToken; case ts.SyntaxKind.GreaterThanToken: return ts.SyntaxKind.LessThanToken; @@ -6996,29 +6997,29 @@ namespace ts { function getIndentationAtPosition(fileName: string, position: number, editorOptions: EditorOptions) { let start = new Date().getTime(); - const sourceFile = syntaxTreeCache.getCurrentSourceFile(fileName); + let sourceFile = syntaxTreeCache.getCurrentSourceFile(fileName); log("getIndentationAtPosition: getCurrentSourceFile: " + (new Date().getTime() - start)); start = new Date().getTime(); - const result = formatting.SmartIndenter.getIndentation(position, sourceFile, editorOptions); + let result = formatting.SmartIndenter.getIndentation(position, sourceFile, editorOptions); log("getIndentationAtPosition: computeIndentation : " + (new Date().getTime() - start)); return result; } function getFormattingEditsForRange(fileName: string, start: number, end: number, options: FormatCodeOptions): TextChange[] { - const sourceFile = syntaxTreeCache.getCurrentSourceFile(fileName); + let sourceFile = syntaxTreeCache.getCurrentSourceFile(fileName); return formatting.formatSelection(start, end, sourceFile, getRuleProvider(options), options); } function getFormattingEditsForDocument(fileName: string, options: FormatCodeOptions): TextChange[] { - const sourceFile = syntaxTreeCache.getCurrentSourceFile(fileName); + let sourceFile = syntaxTreeCache.getCurrentSourceFile(fileName); return formatting.formatDocument(sourceFile, getRuleProvider(options), options); } function getFormattingEditsAfterKeystroke(fileName: string, position: number, key: string, options: FormatCodeOptions): TextChange[] { - const sourceFile = syntaxTreeCache.getCurrentSourceFile(fileName); + let sourceFile = syntaxTreeCache.getCurrentSourceFile(fileName); if (key === "}") { return formatting.formatOnClosingCurly(position, sourceFile, getRuleProvider(options), options); @@ -7054,16 +7055,16 @@ namespace ts { * be performed. */ function getDocCommentTemplateAtPosition(fileName: string, position: number): TextInsertion { - const start = new Date().getTime(); - const sourceFile = syntaxTreeCache.getCurrentSourceFile(fileName); + let start = new Date().getTime(); + let sourceFile = syntaxTreeCache.getCurrentSourceFile(fileName); // Check if in a context where we don't want to perform any insertion if (isInString(sourceFile, position) || isInComment(sourceFile, position) || hasDocComment(sourceFile, position)) { return undefined; } - const tokenAtPos = getTokenAtPosition(sourceFile, position); - const tokenStart = tokenAtPos.getStart(); + let tokenAtPos = getTokenAtPosition(sourceFile, position); + let tokenStart = tokenAtPos.getStart() if (!tokenAtPos || tokenStart < position) { return undefined; } @@ -7099,11 +7100,11 @@ namespace ts { return undefined; } - const parameters = getParametersForJsDocOwningNode(commentOwner); - const posLineAndChar = sourceFile.getLineAndCharacterOfPosition(position); - const lineStart = sourceFile.getLineStarts()[posLineAndChar.line]; + let parameters = getParametersForJsDocOwningNode(commentOwner); + let posLineAndChar = sourceFile.getLineAndCharacterOfPosition(position); + let lineStart = sourceFile.getLineStarts()[posLineAndChar.line]; - const indentationStr = sourceFile.text.substr(lineStart, posLineAndChar.character); + let indentationStr = sourceFile.text.substr(lineStart, posLineAndChar.character); // TODO: call a helper method instead once PR #4133 gets merged in. const newLine = host.getNewLine ? host.getNewLine() : "\r\n"; @@ -7127,7 +7128,7 @@ namespace ts { // * if the caret was directly in front of the object, then we add an extra line and indentation. const preamble = "/**" + newLine + indentationStr + " * "; - const result = + let result = preamble + newLine + docParams + indentationStr + " */" + @@ -7171,7 +7172,7 @@ namespace ts { case SyntaxKind.ArrowFunction: return (rightHandSide).parameters; case SyntaxKind.ClassExpression: - for (const member of (rightHandSide).members) { + for (let member of (rightHandSide).members) { if (member.kind === SyntaxKind.Constructor) { return (member).parameters; } @@ -7191,15 +7192,15 @@ namespace ts { // anything away. synchronizeHostData(); - const sourceFile = getValidSourceFile(fileName); + let sourceFile = getValidSourceFile(fileName); cancellationToken.throwIfCancellationRequested(); - const fileContents = sourceFile.text; - const result: TodoComment[] = []; + let fileContents = sourceFile.text; + let result: TodoComment[] = []; if (descriptors.length > 0) { - const regExp = getTodoCommentsRegExp(); + let regExp = getTodoCommentsRegExp(); let matchArray: RegExpExecArray; while (matchArray = regExp.exec(fileContents)) { @@ -7222,15 +7223,15 @@ namespace ts { // // i.e. 'undefined' in position 3 above means TODO(jason) didn't match. // "hack" in position 4 means HACK did match. - const firstDescriptorCaptureIndex = 3; + let firstDescriptorCaptureIndex = 3; Debug.assert(matchArray.length === descriptors.length + firstDescriptorCaptureIndex); - const preamble = matchArray[1]; - const matchPosition = matchArray.index + preamble.length; + let preamble = matchArray[1]; + let matchPosition = matchArray.index + preamble.length; // OK, we have found a match in the file. This is only an acceptable match if // it is contained within a comment. - const token = getTokenAtPosition(sourceFile, matchPosition); + let token = getTokenAtPosition(sourceFile, matchPosition); if (!isInsideComment(sourceFile, token, matchPosition)) { continue; } @@ -7249,7 +7250,7 @@ namespace ts { continue; } - const message = matchArray[2]; + let message = matchArray[2]; result.push({ descriptor: descriptor, message: message, @@ -7280,14 +7281,14 @@ namespace ts { // // The following three regexps are used to match the start of the text up to the TODO // comment portion. - const singleLineCommentStart = /(?:\/\/+\s*)/.source; - const multiLineCommentStart = /(?:\/\*+\s*)/.source; - const anyNumberOfSpacesAndAsterixesAtStartOfLine = /(?:^(?:\s|\*)*)/.source; + let singleLineCommentStart = /(?:\/\/+\s*)/.source; + let multiLineCommentStart = /(?:\/\*+\s*)/.source; + let anyNumberOfSpacesAndAsterixesAtStartOfLine = /(?:^(?:\s|\*)*)/.source; // Match any of the above three TODO comment start regexps. // Note that the outermost group *is* a capture group. We want to capture the preamble // so that we can determine the starting position of the TODO comment match. - const preamble = "(" + anyNumberOfSpacesAndAsterixesAtStartOfLine + "|" + singleLineCommentStart + "|" + multiLineCommentStart + ")"; + let preamble = "(" + anyNumberOfSpacesAndAsterixesAtStartOfLine + "|" + singleLineCommentStart + "|" + multiLineCommentStart + ")"; // Takes the descriptors and forms a regexp that matches them as if they were literals. // For example, if the descriptors are "TODO(jason)" and "HACK", then this will be: @@ -7297,17 +7298,17 @@ namespace ts { // Note that the outermost group is *not* a capture group, but the innermost groups // *are* capture groups. By capturing the inner literals we can determine after // matching which descriptor we are dealing with. - const literals = "(?:" + map(descriptors, d => "(" + escapeRegExp(d.text) + ")").join("|") + ")"; + let literals = "(?:" + map(descriptors, d => "(" + escapeRegExp(d.text) + ")").join("|") + ")"; // After matching a descriptor literal, the following regexp matches the rest of the // text up to the end of the line (or */). - const endOfLineOrEndOfComment = /(?:$|\*\/)/.source; - const messageRemainder = /(?:.*?)/.source; + let endOfLineOrEndOfComment = /(?:$|\*\/)/.source + let messageRemainder = /(?:.*?)/.source // This is the portion of the match we'll return as part of the TODO comment result. We // match the literal portion up to the end of the line or end of comment. - const messagePortion = "(" + literals + messageRemainder + ")"; - const regExpString = preamble + messagePortion + endOfLineOrEndOfComment; + let messagePortion = "(" + literals + messageRemainder + ")"; + let regExpString = preamble + messagePortion + endOfLineOrEndOfComment; // The final regexp will look like this: // /((?:\/\/+\s*)|(?:\/\*+\s*)|(?:^(?:\s|\*)*))((?:(TODO\(jason\))|(HACK))(?:.*?))(?:$|\*\/)/gim @@ -7333,40 +7334,40 @@ namespace ts { function getRenameInfo(fileName: string, position: number): RenameInfo { synchronizeHostData(); - const sourceFile = getValidSourceFile(fileName); - const typeChecker = program.getTypeChecker(); + let sourceFile = getValidSourceFile(fileName); + let typeChecker = program.getTypeChecker(); - const node = getTouchingWord(sourceFile, position); + let node = getTouchingWord(sourceFile, position); // Can only rename an identifier. if (node && node.kind === SyntaxKind.Identifier) { - const symbol = typeChecker.getSymbolAtLocation(node); + let symbol = typeChecker.getSymbolAtLocation(node); // Only allow a symbol to be renamed if it actually has at least one declaration. if (symbol) { - const declarations = symbol.getDeclarations(); + let declarations = symbol.getDeclarations(); if (declarations && declarations.length > 0) { // Disallow rename for elements that are defined in the standard TypeScript library. - const defaultLibFileName = host.getDefaultLibFileName(host.getCompilationSettings()); + let defaultLibFileName = host.getDefaultLibFileName(host.getCompilationSettings()); if (defaultLibFileName) { - for (const current of declarations) { - const sourceFile = current.getSourceFile(); - const canonicalName = getCanonicalFileName(ts.normalizePath(sourceFile.fileName)); + for (let current of declarations) { + let sourceFile = current.getSourceFile(); + var canonicalName = getCanonicalFileName(ts.normalizePath(sourceFile.fileName)); if (sourceFile && getCanonicalFileName(ts.normalizePath(sourceFile.fileName)) === getCanonicalFileName(ts.normalizePath(defaultLibFileName))) { return getRenameInfoError(getLocaleSpecificMessage(Diagnostics.You_cannot_rename_elements_that_are_defined_in_the_standard_TypeScript_library)); } } } - const displayName = stripQuotes(getDeclaredName(typeChecker, symbol, node)); - const kind = getSymbolKind(symbol, node); + let displayName = stripQuotes(getDeclaredName(typeChecker, symbol, node)); + let kind = getSymbolKind(symbol, node); if (kind) { return { canRename: true, - kind, - displayName, localizedErrorMessage: undefined, + displayName, fullDisplayName: typeChecker.getFullyQualifiedName(symbol), + kind: kind, kindModifiers: getSymbolModifiers(symbol), triggerSpan: createTextSpan(node.getStart(), node.getWidth()) }; @@ -7433,14 +7434,14 @@ namespace ts { /* @internal */ export function getNameTable(sourceFile: SourceFile): Map { if (!sourceFile.nameTable) { - initializeNameTable(sourceFile); + initializeNameTable(sourceFile) } return sourceFile.nameTable; } function initializeNameTable(sourceFile: SourceFile): void { - const nameTable: Map = {}; + let nameTable: Map = {}; walk(sourceFile); sourceFile.nameTable = nameTable; @@ -7478,13 +7479,13 @@ namespace ts { /// Classifier export function createClassifier(): Classifier { - const scanner = createScanner(ScriptTarget.Latest, /*skipTrivia*/ false); + let scanner = createScanner(ScriptTarget.Latest, /*skipTrivia*/ false); /// We do not have a full parser support to know when we should parse a regex or not /// If we consider every slash token to be a regex, we could be missing cases like "1/2/3", where /// we have a series of divide operator. this list allows us to be more accurate by ruling out /// locations where a regexp cannot exist. - const noRegexTable: boolean[] = []; + let noRegexTable: boolean[] = []; noRegexTable[SyntaxKind.Identifier] = true; noRegexTable[SyntaxKind.StringLiteral] = true; noRegexTable[SyntaxKind.NumericLiteral] = true; @@ -7518,7 +7519,7 @@ namespace ts { // // Where on the second line, you will get the 'return' keyword, // a string literal, and a template end consisting of '} } `'. - const templateStack: SyntaxKind[] = []; + let templateStack: SyntaxKind[] = []; /** Returns true if 'keyword2' can legally follow 'keyword1' in any language construct. */ function canFollow(keyword1: SyntaxKind, keyword2: SyntaxKind) { @@ -7544,18 +7545,18 @@ namespace ts { } function convertClassifications(classifications: Classifications, text: string): ClassificationResult { - const entries: ClassificationInfo[] = []; - const dense = classifications.spans; + let entries: ClassificationInfo[] = []; + let dense = classifications.spans; let lastEnd = 0; for (let i = 0, n = dense.length; i < n; i += 3) { - const start = dense[i]; - const length = dense[i + 1]; - const type = dense[i + 2]; + let start = dense[i]; + let length = dense[i + 1]; + let type = dense[i + 2]; // Make a whitespace entry between the last item and this one. if (lastEnd >= 0) { - const whitespaceLength = start - lastEnd; + let whitespaceLength = start - lastEnd; if (whitespaceLength > 0) { entries.push({ length: whitespaceLength, classification: TokenClass.Whitespace }); } @@ -7565,7 +7566,7 @@ namespace ts { lastEnd = start + length; } - const whitespaceLength = text.length - lastEnd; + let whitespaceLength = text.length - lastEnd; if (whitespaceLength > 0) { entries.push({ length: whitespaceLength, classification: TokenClass.Whitespace }); } @@ -7619,7 +7620,7 @@ namespace ts { // (and a newline). That way when we lex we'll think we're still in a multiline comment. switch (lexState) { case EndOfLineState.InDoubleQuoteStringLiteral: - text = "\"\\\n" + text; + text = '"\\\n' + text; offset = 3; break; case EndOfLineState.InSingleQuoteStringLiteral: @@ -7645,7 +7646,7 @@ namespace ts { scanner.setText(text); - const result: Classifications = { + let result: Classifications = { endOfLineState: EndOfLineState.None, spans: [] }; @@ -7727,7 +7728,7 @@ namespace ts { // If we don't have anything on the template stack, // then we aren't trying to keep track of a previously scanned template head. if (templateStack.length > 0) { - const lastTemplateStackToken = lastOrUndefined(templateStack); + let lastTemplateStackToken = lastOrUndefined(templateStack); if (lastTemplateStackToken === SyntaxKind.TemplateHead) { token = scanner.reScanTemplateToken(); @@ -7757,17 +7758,17 @@ namespace ts { return result; function processToken(): void { - const start = scanner.getTokenPos(); - const end = scanner.getTextPos(); + let start = scanner.getTokenPos(); + let end = scanner.getTextPos(); addResult(start, end, classFromKind(token)); if (end >= text.length) { if (token === SyntaxKind.StringLiteral || token === SyntaxKind.StringLiteralType) { // Check to see if we finished up on a multiline string literal. - const tokenText = scanner.getTokenText(); + let tokenText = scanner.getTokenText(); if (scanner.isUnterminated()) { - const lastCharIndex = tokenText.length - 1; + let lastCharIndex = tokenText.length - 1; let numBackslashes = 0; while (tokenText.charCodeAt(lastCharIndex - numBackslashes) === CharacterCodes.backslash) { @@ -7776,7 +7777,7 @@ namespace ts { // If we have an odd number of backslashes, then the multiline string is unclosed if (numBackslashes & 1) { - const quoteChar = tokenText.charCodeAt(0); + let quoteChar = tokenText.charCodeAt(0); result.endOfLineState = quoteChar === CharacterCodes.doubleQuote ? EndOfLineState.InDoubleQuoteStringLiteral : EndOfLineState.InSingleQuoteStringLiteral; @@ -7825,7 +7826,7 @@ namespace ts { // relative to the original text. start -= offset; end -= offset; - const length = end - start; + let length = end - start; if (length > 0) { result.spans.push(start); @@ -7940,7 +7941,7 @@ namespace ts { } /// getDefaultLibraryFilePath - declare const __dirname: string; + declare let __dirname: string; /** * Get the path of the default library files (lib.d.ts) as distributed with the typescript From a2b6e8c2c0f6e5bf9ac259c16b399791e3f1ca13 Mon Sep 17 00:00:00 2001 From: Ryan Cavanaugh Date: Tue, 15 Dec 2015 11:39:54 -0800 Subject: [PATCH 131/177] Use nicer flag collection method --- src/compiler/checker.ts | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/src/compiler/checker.ts b/src/compiler/checker.ts index 09760b6b1e5..0700a82a6b8 100644 --- a/src/compiler/checker.ts +++ b/src/compiler/checker.ts @@ -3766,13 +3766,14 @@ namespace ts { function createUnionOrIntersectionProperty(containingType: UnionOrIntersectionType, name: string): Symbol { const types = containingType.types; let props: Symbol[]; - let isOptional = !!(containingType.flags & TypeFlags.Intersection); + // Flags we want to propagate to the result if they exist in all source symbols + let commonFlags = (containingType.flags & TypeFlags.Intersection) ? SymbolFlags.Optional : SymbolFlags.None; for (const current of types) { const type = getApparentType(current); if (type !== unknownType) { const prop = getPropertyOfType(type, name); if (prop && !(getDeclarationFlagsFromSymbol(prop) & (NodeFlags.Private | NodeFlags.Protected))) { - isOptional = isOptional && !!(prop.flags & SymbolFlags.Optional); + commonFlags &= prop.flags; if (!props) { props = [prop]; } @@ -3804,7 +3805,7 @@ namespace ts { SymbolFlags.Property | SymbolFlags.Transient | SymbolFlags.SyntheticProperty | - (isOptional ? SymbolFlags.Optional : SymbolFlags.None), + commonFlags, name); result.containingType = containingType; result.declarations = declarations; From fd52e9ae157e0136ed8a66e08a1c24227fcfb85a Mon Sep 17 00:00:00 2001 From: Anders Hejlsberg Date: Tue, 15 Dec 2015 15:49:00 -0800 Subject: [PATCH 132/177] Simplify abstract constructor type assignability checking --- src/compiler/checker.ts | 82 ++++++++++++++--------------------------- 1 file changed, 27 insertions(+), 55 deletions(-) diff --git a/src/compiler/checker.ts b/src/compiler/checker.ts index 1fdac127c50..5da30b18192 100644 --- a/src/compiler/checker.ts +++ b/src/compiler/checker.ts @@ -5528,32 +5528,24 @@ namespace ts { if (target === anyFunctionType || source === anyFunctionType) { return Ternary.True; } + const sourceSignatures = getSignaturesOfType(source, kind); const targetSignatures = getSignaturesOfType(target, kind); + if (kind === SignatureKind.Construct && sourceSignatures.length && targetSignatures.length && + isAbstractConstructorType(source) && !isAbstractConstructorType(target)) { + // An abstract constructor type is not assignable to a non-abstract constructor type + // as it would otherwise be possible to new an abstract class. Note that the assignablity + // check we perform for an extends clause excludes construct signatures from the target, + // so this check never proceeds. + if (reportErrors) { + reportError(Diagnostics.Cannot_assign_an_abstract_constructor_type_to_a_non_abstract_constructor_type); + } + return Ternary.False; + } + let result = Ternary.True; const saveErrorInfo = errorInfo; - - - if (kind === SignatureKind.Construct) { - // Only want to compare the construct signatures for abstractness guarantees. - - // Because the "abstractness" of a class is the same across all construct signatures - // (internally we are checking the corresponding declaration), it is enough to perform - // the check and report an error once over all pairs of source and target construct signatures. - // - // sourceSig and targetSig are (possibly) undefined. - // - // Note that in an extends-clause, targetSignatures is stripped, so the check never proceeds. - const sourceSig = sourceSignatures[0]; - const targetSig = targetSignatures[0]; - - result &= abstractSignatureRelatedTo(source, sourceSig, target, targetSig); - if (result !== Ternary.True) { - return result; - } - } - outer: for (const t of targetSignatures) { if (!t.hasStringLiterals || target.flags & TypeFlags.FromSignature) { // Only elaborate errors from the first failure @@ -5580,40 +5572,6 @@ namespace ts { } } return result; - - function abstractSignatureRelatedTo(source: Type, sourceSig: Signature, target: Type, targetSig: Signature) { - if (sourceSig && targetSig) { - - const sourceDecl = source.symbol && getClassLikeDeclarationOfSymbol(source.symbol); - const targetDecl = target.symbol && getClassLikeDeclarationOfSymbol(target.symbol); - - if (!sourceDecl) { - // If the source object isn't itself a class declaration, it can be freely assigned, regardless - // of whether the constructed object is abstract or not. - return Ternary.True; - } - - const sourceErasedSignature = getErasedSignature(sourceSig); - const targetErasedSignature = getErasedSignature(targetSig); - - const sourceReturnType = sourceErasedSignature && getReturnTypeOfSignature(sourceErasedSignature); - const targetReturnType = targetErasedSignature && getReturnTypeOfSignature(targetErasedSignature); - - const sourceReturnDecl = sourceReturnType && sourceReturnType.symbol && getClassLikeDeclarationOfSymbol(sourceReturnType.symbol); - const targetReturnDecl = targetReturnType && targetReturnType.symbol && getClassLikeDeclarationOfSymbol(targetReturnType.symbol); - const sourceIsAbstract = sourceReturnDecl && sourceReturnDecl.flags & NodeFlags.Abstract; - const targetIsAbstract = targetReturnDecl && targetReturnDecl.flags & NodeFlags.Abstract; - - if (sourceIsAbstract && !(targetIsAbstract && targetDecl)) { - // if target isn't a class-declaration type, then it can be new'd, so we forbid the assignment. - if (reportErrors) { - reportError(Diagnostics.Cannot_assign_an_abstract_constructor_type_to_a_non_abstract_constructor_type); - } - return Ternary.False; - } - } - return Ternary.True; - } } function signatureRelatedTo(source: Signature, target: Signature, reportErrors: boolean): Ternary { @@ -5782,6 +5740,20 @@ namespace ts { } } + // Return true if the given type is the constructor type for an abstract class + function isAbstractConstructorType(type: Type) { + if (type.flags & TypeFlags.Anonymous) { + const symbol = type.symbol; + if (symbol && symbol.flags & SymbolFlags.Class) { + const declaration = getClassLikeDeclarationOfSymbol(symbol); + if (declaration && declaration.flags & NodeFlags.Abstract) { + return true; + } + } + } + return false; + } + // Return true if the given type is part of a deeply nested chain of generic instantiations. We consider this to be the case // when structural type comparisons have been started for 10 or more instantiations of the same generic type. It is possible, // though highly unlikely, for this test to be true in a situation where a chain of instantiations is not infinitely expanding. From c21193a0b871de5368fdd73327adb5d659dd8b0b Mon Sep 17 00:00:00 2001 From: Anders Hejlsberg Date: Tue, 15 Dec 2015 17:33:51 -0800 Subject: [PATCH 133/177] Removing unused function --- src/compiler/checker.ts | 14 -------------- 1 file changed, 14 deletions(-) diff --git a/src/compiler/checker.ts b/src/compiler/checker.ts index 5da30b18192..1a1a01d6dd0 100644 --- a/src/compiler/checker.ts +++ b/src/compiler/checker.ts @@ -15368,20 +15368,6 @@ namespace ts { return symbol && getExportSymbolOfValueSymbolIfExported(symbol).valueDeclaration; } - function instantiateSingleCallFunctionType(functionType: Type, typeArguments: Type[]): Type { - if (functionType === unknownType) { - return unknownType; - } - - const signature = getSingleCallSignature(functionType); - if (!signature) { - return unknownType; - } - - const instantiatedSignature = getSignatureInstantiation(signature, typeArguments); - return getOrCreateTypeFromSignature(instantiatedSignature); - } - function createResolver(): EmitResolver { return { getReferencedExportContainer, From d8db60a9a2be9c4ca82170bc6bb457b70b20f7b5 Mon Sep 17 00:00:00 2001 From: Daniel Rosenwasser Date: Tue, 15 Dec 2015 17:52:26 -0800 Subject: [PATCH 134/177] Use a comparison function instead of creating a new type for each signature. --- src/compiler/checker.ts | 125 ++++++++++++++++++++++++++++++---------- src/compiler/types.ts | 2 - 2 files changed, 94 insertions(+), 33 deletions(-) diff --git a/src/compiler/checker.ts b/src/compiler/checker.ts index fac21177aae..e1b400310b5 100644 --- a/src/compiler/checker.ts +++ b/src/compiler/checker.ts @@ -3501,7 +3501,7 @@ namespace ts { function findMatchingSignature(signatureList: Signature[], signature: Signature, partialMatch: boolean, ignoreReturnTypes: boolean): Signature { for (const s of signatureList) { - if (compareSignatures(s, signature, partialMatch, ignoreReturnTypes, compareTypes)) { + if (compareSignaturesIdentical(s, signature, partialMatch, ignoreReturnTypes, compareTypesIdentical)) { return s; } } @@ -4115,16 +4115,6 @@ namespace ts { return signature.erasedSignatureCache; } - function getAnyReturningErasedSignature(signature: Signature): Signature { - if (!signature.anyReturningErasedSignatureCache) { - const erasedSignature = getErasedSignature(signature); - const anyReturningErasedSignature = cloneSignature(erasedSignature); - anyReturningErasedSignature.resolvedReturnType = anyType; - signature.anyReturningErasedSignatureCache = anyReturningErasedSignature; - } - return signature.anyReturningErasedSignatureCache; - } - function getOrCreateTypeFromSignature(signature: Signature): ObjectType { // There are two ways to declare a construct signature, one is by declaring a class constructor // using the constructor keyword, and the other is declaring a bare construct signature in an @@ -4965,7 +4955,7 @@ namespace ts { return checkTypeRelatedTo(source, target, identityRelation, /*errorNode*/ undefined); } - function compareTypes(source: Type, target: Type): Ternary { + function compareTypesIdentical(source: Type, target: Type): Ternary { return checkTypeRelatedTo(source, target, identityRelation, /*errorNode*/ undefined) ? Ternary.True : Ternary.False; } @@ -4985,10 +4975,53 @@ namespace ts { return checkTypeRelatedTo(source, target, assignableRelation, errorNode, headMessage, containingMessageChain); } - function isSignatureAssignableTo(source: Signature, target: Signature): boolean { - const sourceType = getOrCreateTypeFromSignature(source); - const targetType = getOrCreateTypeFromSignature(target); - return checkTypeRelatedTo(sourceType, targetType, assignableRelation, /*errorNode*/ undefined); + /** + * See signatureRelatedTo, compareSignaturesIdentical + */ + function isSignatureAssignableTo(source: Signature, target: Signature, ignoreReturnTypes: boolean): boolean { + // TODO (drosen): De-duplicate code between related functions. + if (source === target) { + return true; + } + if (!target.hasRestParameter && source.minArgumentCount > target.parameters.length) { + return false; + } + + // Spec 1.0 Section 3.8.3 & 3.8.4: + // M and N (the signatures) are instantiated using type Any as the type argument for all type parameters declared by M and N + source = getErasedSignature(source); + target = getErasedSignature(target); + + const sourceMax = getNumNonRestParameters(source); + const targetMax = getNumNonRestParameters(target); + const checkCount = getNumParametersToCheckForSignatureRelatability(source, sourceMax, target, targetMax); + for (let i = 0; i < checkCount; i++) { + const s = i < sourceMax ? getTypeOfSymbol(source.parameters[i]) : getRestTypeOfSignature(source); + const t = i < targetMax ? getTypeOfSymbol(target.parameters[i]) : getRestTypeOfSignature(target); + const related = isTypeAssignableTo(t, s) || isTypeAssignableTo(s, t); + if (!related) { + return false; + } + } + + if (!ignoreReturnTypes) { + const targetReturnType = getReturnTypeOfSignature(target); + if (targetReturnType === voidType) { + return true; + } + const sourceReturnType = getReturnTypeOfSignature(source); + + // The following block preserves behavior forbidding boolean returning functions from being assignable to type guard returning functions + if (targetReturnType.flags & TypeFlags.PredicateType && (targetReturnType as PredicateType).predicate.kind === TypePredicateKind.Identifier) { + if (!(sourceReturnType.flags & TypeFlags.PredicateType)) { + return false; + } + } + + return isTypeAssignableTo(sourceReturnType, targetReturnType); + } + + return true; } function isImplementationCompatibleWithOverload(implementation: Signature, overload: Signature): boolean { @@ -5002,15 +5035,35 @@ namespace ts { || checkTypeRelatedTo(targetReturnType, sourceReturnType, assignableRelation, /*errorNode*/ undefined) || checkTypeRelatedTo(sourceReturnType, targetReturnType, assignableRelation, /*errorNode*/ undefined)) { - // The return types are compatible, so create versions of the signature with 'any' as the return type. - // We need to do this so that we can check assignability while disregarding the return type. - const anyReturningSource = getAnyReturningErasedSignature(implementation); - const anyReturningTarget = getAnyReturningErasedSignature(overload); + return isSignatureAssignableTo(erasedSource, erasedTarget, /*ignoreReturnTypes*/ true); + } - // Create object types to actually perform relation checks. - const anyReturningSourceType = getOrCreateTypeFromSignature(anyReturningSource); - const anyReturningTargetType = getOrCreateTypeFromSignature(anyReturningTarget); - return checkTypeRelatedTo(anyReturningSourceType, anyReturningTargetType, assignableRelation, /*errorNode*/ undefined); + return false; + } + + function getNumNonRestParameters(signature: Signature) { + const numParams = signature.parameters.length; + return signature.hasRestParameter ? + numParams - 1 : + numParams; + } + + function getNumParametersToCheckForSignatureRelatability(source: Signature, sourceNonRestParamCount: number, target: Signature, targetNonRestParamCount: number) { + if (source.hasRestParameter === target.hasRestParameter) { + if (source.hasRestParameter) { + // If both have rest parameters, get the max and add 1 to + // compensate for the rest parameter. + return Math.max(sourceNonRestParamCount, targetNonRestParamCount) + 1; + } + else { + return Math.min(sourceNonRestParamCount, targetNonRestParamCount); + } + } + else { + // Return the count for whichever signature doesn't have rest parameters. + return source.hasRestParameter ? + targetNonRestParamCount : + sourceNonRestParamCount; } } @@ -5645,7 +5698,11 @@ namespace ts { } } + /** + * See signatureAssignableTo, signatureAssignableTo + */ function signatureRelatedTo(source: Signature, target: Signature, reportErrors: boolean): Ternary { + // TODO (drosen): De-duplicate code between related functions. if (source === target) { return Ternary.True; } @@ -5697,10 +5754,12 @@ namespace ts { } const targetReturnType = getReturnTypeOfSignature(target); - if (targetReturnType === voidType) return result; + if (targetReturnType === voidType) { + return result; + } const sourceReturnType = getReturnTypeOfSignature(source); - // The follow block preserves old behavior forbidding boolean returning functions from being assignable to type guard returning functions + // The following block preserves behavior forbidding boolean returning functions from being assignable to type guard returning functions if (targetReturnType.flags & TypeFlags.PredicateType && (targetReturnType as PredicateType).predicate.kind === TypePredicateKind.Identifier) { if (!(sourceReturnType.flags & TypeFlags.PredicateType)) { if (reportErrors) { @@ -5721,7 +5780,7 @@ namespace ts { } let result = Ternary.True; for (let i = 0, len = sourceSignatures.length; i < len; ++i) { - const related = compareSignatures(sourceSignatures[i], targetSignatures[i], /*partialMatch*/ false, /*ignoreReturnTypes*/ false, isRelatedTo); + const related = compareSignaturesIdentical(sourceSignatures[i], targetSignatures[i], /*partialMatch*/ false, /*ignoreReturnTypes*/ false, isRelatedTo); if (!related) { return Ternary.False; } @@ -5833,7 +5892,7 @@ namespace ts { } function isPropertyIdenticalTo(sourceProp: Symbol, targetProp: Symbol): boolean { - return compareProperties(sourceProp, targetProp, compareTypes) !== Ternary.False; + return compareProperties(sourceProp, targetProp, compareTypesIdentical) !== Ternary.False; } function compareProperties(sourceProp: Symbol, targetProp: Symbol, compareTypes: (source: Type, target: Type) => Ternary): Ternary { @@ -5880,7 +5939,11 @@ namespace ts { return false; } - function compareSignatures(source: Signature, target: Signature, partialMatch: boolean, ignoreReturnTypes: boolean, compareTypes: (s: Type, t: Type) => Ternary): Ternary { + /** + * See signatureRelatedTo, compareSignaturesIdentical + */ + function compareSignaturesIdentical(source: Signature, target: Signature, partialMatch: boolean, ignoreReturnTypes: boolean, compareTypes: (s: Type, t: Type) => Ternary): Ternary { + // TODO (drosen): De-duplicate code between related functions. if (source === target) { return Ternary.True; } @@ -7571,7 +7634,7 @@ namespace ts { // This signature will contribute to contextual union signature signatureList = [signature]; } - else if (!compareSignatures(signatureList[0], signature, /*partialMatch*/ false, /*ignoreReturnTypes*/ true, compareTypes)) { + else if (!compareSignaturesIdentical(signatureList[0], signature, /*partialMatch*/ false, /*ignoreReturnTypes*/ true, compareTypesIdentical)) { // Signatures aren't identical, do not use return undefined; } @@ -11564,7 +11627,7 @@ namespace ts { } for (const otherSignature of signaturesToCheck) { - if (!otherSignature.hasStringLiterals && isSignatureAssignableTo(signature, otherSignature)) { + if (!otherSignature.hasStringLiterals && isSignatureAssignableTo(signature, otherSignature, /*ignoreReturnTypes*/ false)) { return; } } diff --git a/src/compiler/types.ts b/src/compiler/types.ts index c6c78709300..ff8ffa4ebd2 100644 --- a/src/compiler/types.ts +++ b/src/compiler/types.ts @@ -2280,8 +2280,6 @@ namespace ts { /* @internal */ erasedSignatureCache?: Signature; // Erased version of signature (deferred) /* @internal */ - anyReturningErasedSignatureCache?: Signature; // A version of the erased signature whose type returns 'any' - /* @internal */ isolatedSignatureType?: ObjectType; // A manufactured type that just contains the signature for purposes of signature comparison } From 731925bffeb356e3ee18628bc8d8997d6c79c83f Mon Sep 17 00:00:00 2001 From: Daniel Rosenwasser Date: Tue, 15 Dec 2015 20:55:54 -0800 Subject: [PATCH 135/177] Fix linter nits. --- src/compiler/checker.ts | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/compiler/checker.ts b/src/compiler/checker.ts index e1b400310b5..c017f9e7921 100644 --- a/src/compiler/checker.ts +++ b/src/compiler/checker.ts @@ -5040,7 +5040,7 @@ namespace ts { return false; } - + function getNumNonRestParameters(signature: Signature) { const numParams = signature.parameters.length; return signature.hasRestParameter ? @@ -5651,7 +5651,7 @@ namespace ts { shouldElaborateErrors = false; } } - // don't elaborate the primitive apparent types (like Number) + // don't elaborate the primitive apparent types (like Number) // because the actual primitives will have already been reported. if (shouldElaborateErrors && !isPrimitiveApparentType(source)) { reportError(Diagnostics.Type_0_provides_no_match_for_the_signature_1, From aa1a7664e73c444a5c9ecf147d85b856f94eee79 Mon Sep 17 00:00:00 2001 From: Nathan Shively-Sanders Date: Wed, 16 Dec 2015 12:11:24 -0800 Subject: [PATCH 136/177] Add enum/module merge test --- .../enumAssignmentCompat3.errors.txt | 32 +++++++++++++------ .../reference/enumAssignmentCompat3.js | 30 ++++++++++++++++- tests/cases/compiler/enumAssignmentCompat3.ts | 14 +++++++- 3 files changed, 64 insertions(+), 12 deletions(-) diff --git a/tests/baselines/reference/enumAssignmentCompat3.errors.txt b/tests/baselines/reference/enumAssignmentCompat3.errors.txt index c34ad434347..02cb4314777 100644 --- a/tests/baselines/reference/enumAssignmentCompat3.errors.txt +++ b/tests/baselines/reference/enumAssignmentCompat3.errors.txt @@ -1,16 +1,16 @@ -tests/cases/compiler/enumAssignmentCompat3.ts(58,1): error TS2322: Type 'Abcd.E' is not assignable to type 'First.E'. +tests/cases/compiler/enumAssignmentCompat3.ts(68,1): error TS2322: Type 'Abcd.E' is not assignable to type 'First.E'. Property 'd' is missing in type 'First.E'. -tests/cases/compiler/enumAssignmentCompat3.ts(60,1): error TS2322: Type 'Cd.E' is not assignable to type 'First.E'. +tests/cases/compiler/enumAssignmentCompat3.ts(70,1): error TS2322: Type 'Cd.E' is not assignable to type 'First.E'. Property 'd' is missing in type 'First.E'. -tests/cases/compiler/enumAssignmentCompat3.ts(61,1): error TS2322: Type 'Nope' is not assignable to type 'E'. -tests/cases/compiler/enumAssignmentCompat3.ts(65,1): error TS2322: Type 'First.E' is not assignable to type 'Ab.E'. +tests/cases/compiler/enumAssignmentCompat3.ts(71,1): error TS2322: Type 'Nope' is not assignable to type 'E'. +tests/cases/compiler/enumAssignmentCompat3.ts(75,1): error TS2322: Type 'First.E' is not assignable to type 'Ab.E'. Property 'c' is missing in type 'Ab.E'. -tests/cases/compiler/enumAssignmentCompat3.ts(66,1): error TS2322: Type 'First.E' is not assignable to type 'Cd.E'. +tests/cases/compiler/enumAssignmentCompat3.ts(76,1): error TS2322: Type 'First.E' is not assignable to type 'Cd.E'. Property 'a' is missing in type 'Cd.E'. -tests/cases/compiler/enumAssignmentCompat3.ts(67,1): error TS2322: Type 'E' is not assignable to type 'Nope'. -tests/cases/compiler/enumAssignmentCompat3.ts(72,1): error TS2322: Type 'Const.E' is not assignable to type 'First.E'. -tests/cases/compiler/enumAssignmentCompat3.ts(73,1): error TS2322: Type 'First.E' is not assignable to type 'Const.E'. -tests/cases/compiler/enumAssignmentCompat3.ts(76,1): error TS2322: Type 'Merged.E' is not assignable to type 'First.E'. +tests/cases/compiler/enumAssignmentCompat3.ts(77,1): error TS2322: Type 'E' is not assignable to type 'Nope'. +tests/cases/compiler/enumAssignmentCompat3.ts(82,1): error TS2322: Type 'Const.E' is not assignable to type 'First.E'. +tests/cases/compiler/enumAssignmentCompat3.ts(83,1): error TS2322: Type 'First.E' is not assignable to type 'Const.E'. +tests/cases/compiler/enumAssignmentCompat3.ts(86,1): error TS2322: Type 'Merged.E' is not assignable to type 'First.E'. Property 'd' is missing in type 'First.E'. @@ -62,6 +62,15 @@ tests/cases/compiler/enumAssignmentCompat3.ts(76,1): error TS2322: Type 'Merged. } } + namespace Merged2 { + export enum E { + a, b, c + } + export module E { + export let d = 5; + } + } + var abc: First.E; var secondAbc: Abc.E; var secondAbcd: Abcd.E; @@ -71,6 +80,7 @@ tests/cases/compiler/enumAssignmentCompat3.ts(76,1): error TS2322: Type 'Merged. var k: Const.E; var decl: Decl.E; var merged: Merged.E; + var merged2: Merged2.E; abc = secondAbc; // ok abc = secondAbcd; // missing 'd' ~~~ @@ -114,4 +124,6 @@ tests/cases/compiler/enumAssignmentCompat3.ts(76,1): error TS2322: Type 'Merged. ~~~ !!! error TS2322: Type 'Merged.E' is not assignable to type 'First.E'. !!! error TS2322: Property 'd' is missing in type 'First.E'. - merged = abc; // ok \ No newline at end of file + merged = abc; // ok + abc = merged2; // ok + merged2 = abc; // ok \ No newline at end of file diff --git a/tests/baselines/reference/enumAssignmentCompat3.js b/tests/baselines/reference/enumAssignmentCompat3.js index e43874911ce..74f74ab1652 100644 --- a/tests/baselines/reference/enumAssignmentCompat3.js +++ b/tests/baselines/reference/enumAssignmentCompat3.js @@ -46,6 +46,15 @@ namespace Merged { } } +namespace Merged2 { + export enum E { + a, b, c + } + export module E { + export let d = 5; + } +} + var abc: First.E; var secondAbc: Abc.E; var secondAbcd: Abcd.E; @@ -55,6 +64,7 @@ var nope: Abc.Nope; var k: Const.E; var decl: Decl.E; var merged: Merged.E; +var merged2: Merged2.E; abc = secondAbc; // ok abc = secondAbcd; // missing 'd' abc = secondAb; // ok @@ -75,7 +85,9 @@ k = abc; // merged enums compare all their members abc = merged; // missing 'd' -merged = abc; // ok +merged = abc; // ok +abc = merged2; // ok +merged2 = abc; // ok //// [enumAssignmentCompat3.js] var First; @@ -144,6 +156,19 @@ var Merged; })(Merged.E || (Merged.E = {})); var E = Merged.E; })(Merged || (Merged = {})); +var Merged2; +(function (Merged2) { + (function (E) { + E[E["a"] = 0] = "a"; + E[E["b"] = 1] = "b"; + E[E["c"] = 2] = "c"; + })(Merged2.E || (Merged2.E = {})); + var E = Merged2.E; + var E; + (function (E) { + E.d = 5; + })(E = Merged2.E || (Merged2.E = {})); +})(Merged2 || (Merged2 = {})); var abc; var secondAbc; var secondAbcd; @@ -153,6 +178,7 @@ var nope; var k; var decl; var merged; +var merged2; abc = secondAbc; // ok abc = secondAbcd; // missing 'd' abc = secondAb; // ok @@ -172,3 +198,5 @@ k = abc; // merged enums compare all their members abc = merged; // missing 'd' merged = abc; // ok +abc = merged2; // ok +merged2 = abc; // ok diff --git a/tests/cases/compiler/enumAssignmentCompat3.ts b/tests/cases/compiler/enumAssignmentCompat3.ts index 33070572661..97a136468e3 100644 --- a/tests/cases/compiler/enumAssignmentCompat3.ts +++ b/tests/cases/compiler/enumAssignmentCompat3.ts @@ -45,6 +45,15 @@ namespace Merged { } } +namespace Merged2 { + export enum E { + a, b, c + } + export module E { + export let d = 5; + } +} + var abc: First.E; var secondAbc: Abc.E; var secondAbcd: Abcd.E; @@ -54,6 +63,7 @@ var nope: Abc.Nope; var k: Const.E; var decl: Decl.E; var merged: Merged.E; +var merged2: Merged2.E; abc = secondAbc; // ok abc = secondAbcd; // missing 'd' abc = secondAb; // ok @@ -74,4 +84,6 @@ k = abc; // merged enums compare all their members abc = merged; // missing 'd' -merged = abc; // ok \ No newline at end of file +merged = abc; // ok +abc = merged2; // ok +merged2 = abc; // ok \ No newline at end of file From a3cce3868b7e7e92eab3ed7cd3b1637087ef137b Mon Sep 17 00:00:00 2001 From: Vladimir Matveev Date: Wed, 16 Dec 2015 13:19:57 -0800 Subject: [PATCH 137/177] addressed PR feedback --- src/compiler/checker.ts | 2 +- src/compiler/diagnosticMessages.json | 2 +- .../superInObjectLiterals_ES5.errors.txt | 24 ++++++------- ...ect-literal-getters-and-setters.errors.txt | 12 +++---- tests/cases/fourslash/getOccurrencesSuper3.ts | 34 +++++++++++++++++++ 5 files changed, 54 insertions(+), 20 deletions(-) create mode 100644 tests/cases/fourslash/getOccurrencesSuper3.ts diff --git a/src/compiler/checker.ts b/src/compiler/checker.ts index 2dd567cbe90..8a81ac167b0 100644 --- a/src/compiler/checker.ts +++ b/src/compiler/checker.ts @@ -7095,7 +7095,7 @@ namespace ts { if (container.parent.kind === SyntaxKind.ObjectLiteralExpression) { if (languageVersion < ScriptTarget.ES6) { - error(node, Diagnostics.super_in_members_of_object_literal_expressions_is_only_allowed_when_option_target_is_ES2015_or_higher); + error(node, Diagnostics.super_is_only_allowed_in_members_of_object_literal_expressions_when_option_target_is_ES2015_or_higher); return unknownType; } else { diff --git a/src/compiler/diagnosticMessages.json b/src/compiler/diagnosticMessages.json index 30b46e5cde2..34552a26b20 100644 --- a/src/compiler/diagnosticMessages.json +++ b/src/compiler/diagnosticMessages.json @@ -1759,7 +1759,7 @@ "category": "Error", "code": 2658 }, - "'super' in members of object literal expressions is only allowed when option 'target' is 'ES2015' or higher.": { + "'super' is only allowed in members of object literal expressions when option 'target' is 'ES2015' or higher.": { "category": "Error", "code": 2659 }, diff --git a/tests/baselines/reference/superInObjectLiterals_ES5.errors.txt b/tests/baselines/reference/superInObjectLiterals_ES5.errors.txt index 944766cb5ae..a3149ce8cd5 100644 --- a/tests/baselines/reference/superInObjectLiterals_ES5.errors.txt +++ b/tests/baselines/reference/superInObjectLiterals_ES5.errors.txt @@ -1,12 +1,12 @@ -tests/cases/compiler/superInObjectLiterals_ES5.ts(7,9): error TS2659: 'super' in members of object literal expressions is only allowed when option 'target' is 'ES2015' or higher. -tests/cases/compiler/superInObjectLiterals_ES5.ts(10,9): error TS2659: 'super' in members of object literal expressions is only allowed when option 'target' is 'ES2015' or higher. -tests/cases/compiler/superInObjectLiterals_ES5.ts(14,9): error TS2659: 'super' in members of object literal expressions is only allowed when option 'target' is 'ES2015' or higher. +tests/cases/compiler/superInObjectLiterals_ES5.ts(7,9): error TS2659: 'super' is only allowed in members of object literal expressions when option 'target' is 'ES2015' or higher. +tests/cases/compiler/superInObjectLiterals_ES5.ts(10,9): error TS2659: 'super' is only allowed in members of object literal expressions when option 'target' is 'ES2015' or higher. +tests/cases/compiler/superInObjectLiterals_ES5.ts(14,9): error TS2659: 'super' is only allowed in members of object literal expressions when option 'target' is 'ES2015' or higher. tests/cases/compiler/superInObjectLiterals_ES5.ts(17,9): error TS2660: 'super' can only be referenced in members of derived classes or object literal expressions. tests/cases/compiler/superInObjectLiterals_ES5.ts(20,9): error TS2660: 'super' can only be referenced in members of derived classes or object literal expressions. tests/cases/compiler/superInObjectLiterals_ES5.ts(23,9): error TS2660: 'super' can only be referenced in members of derived classes or object literal expressions. -tests/cases/compiler/superInObjectLiterals_ES5.ts(39,17): error TS2659: 'super' in members of object literal expressions is only allowed when option 'target' is 'ES2015' or higher. -tests/cases/compiler/superInObjectLiterals_ES5.ts(42,17): error TS2659: 'super' in members of object literal expressions is only allowed when option 'target' is 'ES2015' or higher. -tests/cases/compiler/superInObjectLiterals_ES5.ts(46,17): error TS2659: 'super' in members of object literal expressions is only allowed when option 'target' is 'ES2015' or higher. +tests/cases/compiler/superInObjectLiterals_ES5.ts(39,17): error TS2659: 'super' is only allowed in members of object literal expressions when option 'target' is 'ES2015' or higher. +tests/cases/compiler/superInObjectLiterals_ES5.ts(42,17): error TS2659: 'super' is only allowed in members of object literal expressions when option 'target' is 'ES2015' or higher. +tests/cases/compiler/superInObjectLiterals_ES5.ts(46,17): error TS2659: 'super' is only allowed in members of object literal expressions when option 'target' is 'ES2015' or higher. tests/cases/compiler/superInObjectLiterals_ES5.ts(49,17): error TS2660: 'super' can only be referenced in members of derived classes or object literal expressions. tests/cases/compiler/superInObjectLiterals_ES5.ts(52,17): error TS2660: 'super' can only be referenced in members of derived classes or object literal expressions. @@ -20,18 +20,18 @@ tests/cases/compiler/superInObjectLiterals_ES5.ts(52,17): error TS2660: 'super' method() { super.method(); ~~~~~ -!!! error TS2659: 'super' in members of object literal expressions is only allowed when option 'target' is 'ES2015' or higher. +!!! error TS2659: 'super' is only allowed in members of object literal expressions when option 'target' is 'ES2015' or higher. }, get prop() { super.method(); ~~~~~ -!!! error TS2659: 'super' in members of object literal expressions is only allowed when option 'target' is 'ES2015' or higher. +!!! error TS2659: 'super' is only allowed in members of object literal expressions when option 'target' is 'ES2015' or higher. return 10; }, set prop(value) { super.method(); ~~~~~ -!!! error TS2659: 'super' in members of object literal expressions is only allowed when option 'target' is 'ES2015' or higher. +!!! error TS2659: 'super' is only allowed in members of object literal expressions when option 'target' is 'ES2015' or higher. }, p1: function () { super.method(); @@ -64,18 +64,18 @@ tests/cases/compiler/superInObjectLiterals_ES5.ts(52,17): error TS2660: 'super' method() { super.method(); ~~~~~ -!!! error TS2659: 'super' in members of object literal expressions is only allowed when option 'target' is 'ES2015' or higher. +!!! error TS2659: 'super' is only allowed in members of object literal expressions when option 'target' is 'ES2015' or higher. }, get prop() { super.method(); ~~~~~ -!!! error TS2659: 'super' in members of object literal expressions is only allowed when option 'target' is 'ES2015' or higher. +!!! error TS2659: 'super' is only allowed in members of object literal expressions when option 'target' is 'ES2015' or higher. return 10; }, set prop(value) { super.method(); ~~~~~ -!!! error TS2659: 'super' in members of object literal expressions is only allowed when option 'target' is 'ES2015' or higher. +!!! error TS2659: 'super' is only allowed in members of object literal expressions when option 'target' is 'ES2015' or higher. }, p1: function () { super.method(); diff --git a/tests/baselines/reference/super_inside-object-literal-getters-and-setters.errors.txt b/tests/baselines/reference/super_inside-object-literal-getters-and-setters.errors.txt index 16a66bf6fa4..5fe7fa59ff6 100644 --- a/tests/baselines/reference/super_inside-object-literal-getters-and-setters.errors.txt +++ b/tests/baselines/reference/super_inside-object-literal-getters-and-setters.errors.txt @@ -1,10 +1,10 @@ tests/cases/compiler/super_inside-object-literal-getters-and-setters.ts(4,13): error TS1056: Accessors are only available when targeting ECMAScript 5 and higher. -tests/cases/compiler/super_inside-object-literal-getters-and-setters.ts(5,20): error TS2659: 'super' in members of object literal expressions is only allowed when option 'target' is 'ES2015' or higher. +tests/cases/compiler/super_inside-object-literal-getters-and-setters.ts(5,20): error TS2659: 'super' is only allowed in members of object literal expressions when option 'target' is 'ES2015' or higher. tests/cases/compiler/super_inside-object-literal-getters-and-setters.ts(7,13): error TS1056: Accessors are only available when targeting ECMAScript 5 and higher. -tests/cases/compiler/super_inside-object-literal-getters-and-setters.ts(8,13): error TS2659: 'super' in members of object literal expressions is only allowed when option 'target' is 'ES2015' or higher. +tests/cases/compiler/super_inside-object-literal-getters-and-setters.ts(8,13): error TS2659: 'super' is only allowed in members of object literal expressions when option 'target' is 'ES2015' or higher. tests/cases/compiler/super_inside-object-literal-getters-and-setters.ts(11,20): error TS2660: 'super' can only be referenced in members of derived classes or object literal expressions. tests/cases/compiler/super_inside-object-literal-getters-and-setters.ts(20,17): error TS1056: Accessors are only available when targeting ECMAScript 5 and higher. -tests/cases/compiler/super_inside-object-literal-getters-and-setters.ts(21,24): error TS2659: 'super' in members of object literal expressions is only allowed when option 'target' is 'ES2015' or higher. +tests/cases/compiler/super_inside-object-literal-getters-and-setters.ts(21,24): error TS2659: 'super' is only allowed in members of object literal expressions when option 'target' is 'ES2015' or higher. ==== tests/cases/compiler/super_inside-object-literal-getters-and-setters.ts (7 errors) ==== @@ -16,14 +16,14 @@ tests/cases/compiler/super_inside-object-literal-getters-and-setters.ts(21,24): !!! error TS1056: Accessors are only available when targeting ECMAScript 5 and higher. return super._foo; ~~~~~ -!!! error TS2659: 'super' in members of object literal expressions is only allowed when option 'target' is 'ES2015' or higher. +!!! error TS2659: 'super' is only allowed in members of object literal expressions when option 'target' is 'ES2015' or higher. }, set foo(value: string) { ~~~ !!! error TS1056: Accessors are only available when targeting ECMAScript 5 and higher. super._foo = value; ~~~~~ -!!! error TS2659: 'super' in members of object literal expressions is only allowed when option 'target' is 'ES2015' or higher. +!!! error TS2659: 'super' is only allowed in members of object literal expressions when option 'target' is 'ES2015' or higher. }, test: function () { return super._foo; @@ -42,7 +42,7 @@ tests/cases/compiler/super_inside-object-literal-getters-and-setters.ts(21,24): !!! error TS1056: Accessors are only available when targeting ECMAScript 5 and higher. return super.test(); ~~~~~ -!!! error TS2659: 'super' in members of object literal expressions is only allowed when option 'target' is 'ES2015' or higher. +!!! error TS2659: 'super' is only allowed in members of object literal expressions when option 'target' is 'ES2015' or higher. } }; } diff --git a/tests/cases/fourslash/getOccurrencesSuper3.ts b/tests/cases/fourslash/getOccurrencesSuper3.ts new file mode 100644 index 00000000000..bceac02a392 --- /dev/null +++ b/tests/cases/fourslash/getOccurrencesSuper3.ts @@ -0,0 +1,34 @@ +/// + +////let x = { +//// a() { +//// return [|s/**/uper|].b(); +//// }, +//// b() { +//// return [|super|].a(); +//// }, +//// c: function () { +//// return [|super|].a(); +//// } +//// d: () => [|super|].b(); +////} + +function checkRange(r: FourSlashInterface.Range, expectedOccurences: FourSlashInterface.Range[]): void { + goTo.position(r.start); + if (expectedOccurences.length) { + for (const expected of expectedOccurences) { + verify.occurrencesAtPositionContains(expected); + } + } + else { + verify.occurrencesAtPositionCount(0); + } +} + +let [r0, r1, r2, r3] = test.ranges(); + +checkRange(r0, [r0, r1]); +checkRange(r1, [r0, r1]); +checkRange(r0, [r0, r1]); +checkRange(r2, []); +checkRange(r3, []); \ No newline at end of file From ddbf1030ff5a0b4c0a1c568959c1297663ce9af0 Mon Sep 17 00:00:00 2001 From: Yui T Date: Wed, 16 Dec 2015 16:06:55 -0800 Subject: [PATCH 138/177] Fix fourslash range annotation --- .../fourslash/findAllRefsParameterPropertyDeclaration1.ts | 6 +++--- .../fourslash/findAllRefsParameterPropertyDeclaration2.ts | 6 +++--- .../fourslash/findAllRefsParameterPropertyDeclaration3.ts | 6 +++--- .../cases/fourslash/renameParameterPropertyDeclaration1.ts | 6 +++--- .../cases/fourslash/renameParameterPropertyDeclaration2.ts | 6 +++--- .../cases/fourslash/renameParameterPropertyDeclaration3.ts | 6 +++--- .../cases/fourslash/renameParameterPropertyDeclaration4.ts | 4 ++-- .../cases/fourslash/renameParameterPropertyDeclaration5.ts | 4 ++-- 8 files changed, 22 insertions(+), 22 deletions(-) diff --git a/tests/cases/fourslash/findAllRefsParameterPropertyDeclaration1.ts b/tests/cases/fourslash/findAllRefsParameterPropertyDeclaration1.ts index d0854262828..5034a57ae1d 100644 --- a/tests/cases/fourslash/findAllRefsParameterPropertyDeclaration1.ts +++ b/tests/cases/fourslash/findAllRefsParameterPropertyDeclaration1.ts @@ -1,9 +1,9 @@ /// //// class Foo { -//// constructor(private |privateParam|: number) { -//// let localPrivate = |privateParam|; -//// this.|privateParam| += 10; +//// constructor(private [|privateParam|]: number) { +//// let localPrivate = [|privateParam|]; +//// this.[|privateParam|] += 10; //// } //// } diff --git a/tests/cases/fourslash/findAllRefsParameterPropertyDeclaration2.ts b/tests/cases/fourslash/findAllRefsParameterPropertyDeclaration2.ts index 7e59567364a..7db5ba13585 100644 --- a/tests/cases/fourslash/findAllRefsParameterPropertyDeclaration2.ts +++ b/tests/cases/fourslash/findAllRefsParameterPropertyDeclaration2.ts @@ -1,9 +1,9 @@ /// //// class Foo { -//// constructor(public |publicParam|: number) { -//// let localPublic = |publicParam|; -//// this.|publicParam| += 10; +//// constructor(public [|publicParam|]: number) { +//// let localPublic = [|publicParam|]; +//// this.[|publicParam|] += 10; //// } //// } diff --git a/tests/cases/fourslash/findAllRefsParameterPropertyDeclaration3.ts b/tests/cases/fourslash/findAllRefsParameterPropertyDeclaration3.ts index 2d78e9793f7..c2d8a06f658 100644 --- a/tests/cases/fourslash/findAllRefsParameterPropertyDeclaration3.ts +++ b/tests/cases/fourslash/findAllRefsParameterPropertyDeclaration3.ts @@ -1,9 +1,9 @@ /// //// class Foo { -//// constructor(protected |protectedParam|: number) { -//// let localProtected = |protectedParam|; -//// this.|protectedParam| += 10; +//// constructor(protected [|protectedParam|]: number) { +//// let localProtected = [|protectedParam|]; +//// this.[|protectedParam|] += 10; //// } //// } diff --git a/tests/cases/fourslash/renameParameterPropertyDeclaration1.ts b/tests/cases/fourslash/renameParameterPropertyDeclaration1.ts index 1faed546d91..4ca09b71e4b 100644 --- a/tests/cases/fourslash/renameParameterPropertyDeclaration1.ts +++ b/tests/cases/fourslash/renameParameterPropertyDeclaration1.ts @@ -1,9 +1,9 @@ /// //// class Foo { -//// constructor(private |privateParam|: number) { -//// let localPrivate = |privateParam|; -//// this.|privateParam| += 10; +//// constructor(private [|privateParam|]: number) { +//// let localPrivate = [|privateParam|]; +//// this.[|privateParam|] += 10; //// } //// } diff --git a/tests/cases/fourslash/renameParameterPropertyDeclaration2.ts b/tests/cases/fourslash/renameParameterPropertyDeclaration2.ts index e8eec5d3a0a..695e3729f94 100644 --- a/tests/cases/fourslash/renameParameterPropertyDeclaration2.ts +++ b/tests/cases/fourslash/renameParameterPropertyDeclaration2.ts @@ -1,9 +1,9 @@ /// //// class Foo { -//// constructor(public |publicParam|: number) { -//// let publicParam = |publicParam|; -//// this.|publicParam| += 10; +//// constructor(public [|publicParam|]: number) { +//// let publicParam = [|publicParam|]; +//// this.[|publicParam|] += 10; //// } //// } diff --git a/tests/cases/fourslash/renameParameterPropertyDeclaration3.ts b/tests/cases/fourslash/renameParameterPropertyDeclaration3.ts index 44f4cf68858..23971f0be27 100644 --- a/tests/cases/fourslash/renameParameterPropertyDeclaration3.ts +++ b/tests/cases/fourslash/renameParameterPropertyDeclaration3.ts @@ -1,9 +1,9 @@ /// //// class Foo { -//// constructor(protected |protectedParam|: number) { -//// let protectedParam = |protectedParam|; -//// this.|protectedParam| += 10; +//// constructor(protected [|protectedParam|]: number) { +//// let protectedParam = [|protectedParam|]; +//// this.[|protectedParam|] += 10; //// } //// } diff --git a/tests/cases/fourslash/renameParameterPropertyDeclaration4.ts b/tests/cases/fourslash/renameParameterPropertyDeclaration4.ts index 21ba7da4141..4646de6123c 100644 --- a/tests/cases/fourslash/renameParameterPropertyDeclaration4.ts +++ b/tests/cases/fourslash/renameParameterPropertyDeclaration4.ts @@ -1,8 +1,8 @@ /// //// class Foo { -//// constructor(protected { |protectedParam| }) { -//// let myProtectedParam = |protectedParam|; +//// constructor(protected { [|protectedParam|] }) { +//// let myProtectedParam = [|protectedParam|]; //// } //// } diff --git a/tests/cases/fourslash/renameParameterPropertyDeclaration5.ts b/tests/cases/fourslash/renameParameterPropertyDeclaration5.ts index a4bc00b697b..6d73c7af072 100644 --- a/tests/cases/fourslash/renameParameterPropertyDeclaration5.ts +++ b/tests/cases/fourslash/renameParameterPropertyDeclaration5.ts @@ -1,8 +1,8 @@ /// //// class Foo { -//// constructor(protected [ |protectedParam| ]) { -//// let myProtectedParam = |protectedParam|; +//// constructor(protected [ [|protectedParam|] ]) { +//// let myProtectedParam = [|protectedParam|]; //// } //// } From 479f7af4df24491ce766f1471c30bd19dab8d86e Mon Sep 17 00:00:00 2001 From: Yui T Date: Wed, 16 Dec 2015 16:24:18 -0800 Subject: [PATCH 139/177] Add debug fail when getting parameter-property declaration --- src/compiler/checker.ts | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/src/compiler/checker.ts b/src/compiler/checker.ts index 9d14bb39206..b6f03cd77d1 100644 --- a/src/compiler/checker.ts +++ b/src/compiler/checker.ts @@ -442,7 +442,11 @@ namespace ts { const parameterSymbol = getSymbol(constructoDeclaration.locals, parameterName, SymbolFlags.Value); const propertySymbol = getSymbol(classDeclaration.symbol.members, parameterName, SymbolFlags.Value); - return parameterSymbol && propertySymbol ? [parameterSymbol, propertySymbol] : undefined; + if (parameterSymbol && propertySymbol) { + return [parameterSymbol, propertySymbol]; + } + + Debug.fail("There should exist two symbols, one as property declaration and one as parameter declaration"); } function isBlockScopedNameDeclaredBeforeUse(declaration: Declaration, usage: Node): boolean { From 411e90df44c64d067a0a352be5b643e652424482 Mon Sep 17 00:00:00 2001 From: Tim Perry Date: Thu, 17 Dec 2015 11:56:02 +0100 Subject: [PATCH 140/177] Improve decorator on overload error message (fixes #6064) --- src/compiler/checker.ts | 7 ++++++- src/compiler/diagnosticMessages.json | 4 ++++ .../decoratorOnClassMethodOverload1.errors.txt | 13 +++++++++++++ .../reference/decoratorOnClassMethodOverload1.js | 16 ++++++++++++++++ .../method/decoratorOnClassMethodOverload1.ts | 9 +++++++++ 5 files changed, 48 insertions(+), 1 deletion(-) create mode 100644 tests/baselines/reference/decoratorOnClassMethodOverload1.errors.txt create mode 100644 tests/baselines/reference/decoratorOnClassMethodOverload1.js create mode 100644 tests/cases/conformance/decorators/class/method/decoratorOnClassMethodOverload1.ts diff --git a/src/compiler/checker.ts b/src/compiler/checker.ts index 1fdac127c50..6b0586f4004 100644 --- a/src/compiler/checker.ts +++ b/src/compiler/checker.ts @@ -15544,7 +15544,12 @@ namespace ts { return false; } if (!nodeCanBeDecorated(node)) { - return grammarErrorOnFirstToken(node, Diagnostics.Decorators_are_not_valid_here); + if (node.kind === SyntaxKind.MethodDeclaration && !ts.nodeIsPresent((node).body)) { + return grammarErrorOnFirstToken(node, Diagnostics.A_decorator_can_only_decorate_a_method_implementation_not_an_overload); + } + else { + return grammarErrorOnFirstToken(node, Diagnostics.Decorators_are_not_valid_here); + } } else if (node.kind === SyntaxKind.GetAccessor || node.kind === SyntaxKind.SetAccessor) { const accessors = getAllAccessorDeclarations((node.parent).members, node); diff --git a/src/compiler/diagnosticMessages.json b/src/compiler/diagnosticMessages.json index 54123808932..c9b25478a1b 100644 --- a/src/compiler/diagnosticMessages.json +++ b/src/compiler/diagnosticMessages.json @@ -795,6 +795,10 @@ "category": "Error", "code": 1248 }, + "A decorator can only decorate a method implementation, not an overload.": { + "category": "Error", + "code": 1249 + }, "'with' statements are not allowed in an async function block.": { "category": "Error", "code": 1300 diff --git a/tests/baselines/reference/decoratorOnClassMethodOverload1.errors.txt b/tests/baselines/reference/decoratorOnClassMethodOverload1.errors.txt new file mode 100644 index 00000000000..d1670bd6bb9 --- /dev/null +++ b/tests/baselines/reference/decoratorOnClassMethodOverload1.errors.txt @@ -0,0 +1,13 @@ +tests/cases/conformance/decorators/class/method/decoratorOnClassMethodOverload1.ts(4,5): error TS1249: A decorator can only decorate a method implementation, not an overload. + + +==== tests/cases/conformance/decorators/class/method/decoratorOnClassMethodOverload1.ts (1 errors) ==== + declare function dec(target: any, propertyKey: string, descriptor: TypedPropertyDescriptor): TypedPropertyDescriptor; + + class C { + @dec + ~ +!!! error TS1249: A decorator can only decorate a method implementation, not an overload. + method() + method() { } + } \ No newline at end of file diff --git a/tests/baselines/reference/decoratorOnClassMethodOverload1.js b/tests/baselines/reference/decoratorOnClassMethodOverload1.js new file mode 100644 index 00000000000..cb2e29b3d00 --- /dev/null +++ b/tests/baselines/reference/decoratorOnClassMethodOverload1.js @@ -0,0 +1,16 @@ +//// [decoratorOnClassMethodOverload1.ts] +declare function dec(target: any, propertyKey: string, descriptor: TypedPropertyDescriptor): TypedPropertyDescriptor; + +class C { + @dec + method() + method() { } +} + +//// [decoratorOnClassMethodOverload1.js] +var C = (function () { + function C() { + } + C.prototype.method = function () { }; + return C; +}()); diff --git a/tests/cases/conformance/decorators/class/method/decoratorOnClassMethodOverload1.ts b/tests/cases/conformance/decorators/class/method/decoratorOnClassMethodOverload1.ts new file mode 100644 index 00000000000..722463b33da --- /dev/null +++ b/tests/cases/conformance/decorators/class/method/decoratorOnClassMethodOverload1.ts @@ -0,0 +1,9 @@ +// @target: ES5 +// @experimentaldecorators: true +declare function dec(target: any, propertyKey: string, descriptor: TypedPropertyDescriptor): TypedPropertyDescriptor; + +class C { + @dec + method() + method() { } +} \ No newline at end of file From 3558d7d423c6d7837c5a0e7a304ec7edcf100eb0 Mon Sep 17 00:00:00 2001 From: Daniel Rosenwasser Date: Thu, 17 Dec 2015 11:34:54 -0800 Subject: [PATCH 141/177] Added README.md to 'doc' folder. --- doc/README.md | 7 +++++++ 1 file changed, 7 insertions(+) create mode 100644 doc/README.md diff --git a/doc/README.md b/doc/README.md new file mode 100644 index 00000000000..164fb69ee20 --- /dev/null +++ b/doc/README.md @@ -0,0 +1,7 @@ +This directory contains miscellaneous documentation such as the TypeScript language specification and logo. +If you are looking for more introductory material, you might want to take a look at the [TypeScript Handbook](https://github.com/Microsoft/TypeScript-Handbook). + +# Spec Contributions + +The specification is first authored as a Microsoft Word (docx) file and then generated into Markdown and PDF formats. +Due to the binary format of docx files, and the merging difficulties that may come with it, it is preferred that any suggestions or problems found in the spec should be [filed as issues](https://github.com/Microsoft/TypeScript/issues/new) rather than sent as pull requests. \ No newline at end of file From cf621399a49745d693b6874eab9b792d1055d6ab Mon Sep 17 00:00:00 2001 From: Daniel Rosenwasser Date: Thu, 17 Dec 2015 14:32:02 -0800 Subject: [PATCH 142/177] Add 'no-unused-variable' to 'tslint.json'. --- tslint.json | 1 + 1 file changed, 1 insertion(+) diff --git a/tslint.json b/tslint.json index 9b010d9a896..71efb21ad7b 100644 --- a/tslint.json +++ b/tslint.json @@ -38,6 +38,7 @@ "no-trailing-whitespace": true, "no-inferrable-types": true, "no-null": true, + "no-unused-variable": true, "boolean-trivia": true, "type-operator-spacing": true, "prefer-const": true, From 0a470add811a0c8edcb69fe977daad6451c9836b Mon Sep 17 00:00:00 2001 From: Daniel Rosenwasser Date: Thu, 17 Dec 2015 14:33:55 -0800 Subject: [PATCH 143/177] Removed unused declarations from 'sys.ts'. --- src/compiler/sys.ts | 5 ----- 1 file changed, 5 deletions(-) diff --git a/src/compiler/sys.ts b/src/compiler/sys.ts index 836b2daeab2..c99c28bc0dd 100644 --- a/src/compiler/sys.ts +++ b/src/compiler/sys.ts @@ -218,7 +218,6 @@ namespace ts { const _fs = require("fs"); const _path = require("path"); const _os = require("os"); - const _tty = require("tty"); // average async stat takes about 30 microseconds // set chunk size to do 30 files in < 1 millisecond @@ -313,10 +312,6 @@ namespace ts { // time dynamically to match the large reference set? const watchedFileSet = createWatchedFileSet(); - function isNode4OrLater(): Boolean { - return parseInt(process.version.charAt(1)) >= 4; - } - const platform: string = _os.platform(); // win32\win64 are case insensitive platforms, MacOS (darwin) by default is also case insensitive const useCaseSensitiveFileNames = platform !== "win32" && platform !== "win64" && platform !== "darwin"; From 0843c82543da7552de929c5ef576ae6989f1d6fe Mon Sep 17 00:00:00 2001 From: Daniel Rosenwasser Date: Thu, 17 Dec 2015 14:37:54 -0800 Subject: [PATCH 144/177] Removed unused declarations from 'core.ts'. --- src/compiler/core.ts | 17 ----------------- 1 file changed, 17 deletions(-) diff --git a/src/compiler/core.ts b/src/compiler/core.ts index cae7bd82103..ad434d4cfad 100644 --- a/src/compiler/core.ts +++ b/src/compiler/core.ts @@ -794,23 +794,6 @@ namespace ts { return path; } - const backslashOrDoubleQuote = /[\"\\]/g; - const escapedCharsRegExp = /[\u0000-\u001f\t\v\f\b\r\n\u2028\u2029\u0085]/g; - const escapedCharsMap: Map = { - "\0": "\\0", - "\t": "\\t", - "\v": "\\v", - "\f": "\\f", - "\b": "\\b", - "\r": "\\r", - "\n": "\\n", - "\\": "\\\\", - "\"": "\\\"", - "\u2028": "\\u2028", // lineSeparator - "\u2029": "\\u2029", // paragraphSeparator - "\u0085": "\\u0085" // nextLine - }; - export interface ObjectAllocator { getNodeConstructor(): new (kind: SyntaxKind, pos?: number, end?: number) => Node; getSourceFileConstructor(): new (kind: SyntaxKind, pos?: number, end?: number) => SourceFile; From 80c7f3a529baffdfb2eee060a497a879a711d6bd Mon Sep 17 00:00:00 2001 From: Daniel Rosenwasser Date: Thu, 17 Dec 2015 14:39:15 -0800 Subject: [PATCH 145/177] Removed unused declarations from 'declarationEmitter.ts'. --- src/compiler/declarationEmitter.ts | 8 -------- 1 file changed, 8 deletions(-) diff --git a/src/compiler/declarationEmitter.ts b/src/compiler/declarationEmitter.ts index 3348b51dff7..d0c5cbff48b 100644 --- a/src/compiler/declarationEmitter.ts +++ b/src/compiler/declarationEmitter.ts @@ -1534,14 +1534,6 @@ namespace ts { } function emitBindingElement(bindingElement: BindingElement) { - function getBindingElementTypeVisibilityError(symbolAccesibilityResult: SymbolAccessiblityResult): SymbolAccessibilityDiagnostic { - const diagnosticMessage = getParameterDeclarationTypeVisibilityDiagnosticMessage(symbolAccesibilityResult); - return diagnosticMessage !== undefined ? { - diagnosticMessage, - errorNode: bindingElement, - typeName: bindingElement.name - } : undefined; - } if (bindingElement.kind === SyntaxKind.OmittedExpression) { // If bindingElement is an omittedExpression (i.e. containing elision), From b1ccf69d34c9fa20f96321793400048ffdde1fc1 Mon Sep 17 00:00:00 2001 From: Daniel Rosenwasser Date: Thu, 17 Dec 2015 14:50:27 -0800 Subject: [PATCH 146/177] Removed unused declarations in 'checker.ts'. --- src/compiler/checker.ts | 180 ++++------------------------------------ 1 file changed, 16 insertions(+), 164 deletions(-) diff --git a/src/compiler/checker.ts b/src/compiler/checker.ts index 1fdac127c50..96852d25efb 100644 --- a/src/compiler/checker.ts +++ b/src/compiler/checker.ts @@ -819,15 +819,6 @@ namespace ts { return resolveESModuleSymbol(resolveExternalModuleName(node, moduleSpecifier), moduleSpecifier); } - function getMemberOfModuleVariable(moduleSymbol: Symbol, name: string): Symbol { - if (moduleSymbol.flags & SymbolFlags.Variable) { - const typeAnnotation = (moduleSymbol.valueDeclaration).type; - if (typeAnnotation) { - return getPropertyOfType(getTypeFromTypeNode(typeAnnotation), name); - } - } - } - // This function creates a synthetic symbol that combines the value side of one symbol with the // type/namespace side of another symbol. Consider this example: // @@ -1063,7 +1054,6 @@ namespace ts { } const moduleReferenceLiteral = moduleReferenceExpression; - const searchPath = getDirectoryPath(getSourceFile(location).fileName); // Module names are escaped in our symbol table. However, string literal values aren't. // Escape the name in the "require(...)" clause to ensure we find the right symbol. @@ -2183,65 +2173,15 @@ namespace ts { } function isDeclarationVisible(node: Declaration): boolean { - function getContainingExternalModule(node: Node) { - for (; node; node = node.parent) { - if (node.kind === SyntaxKind.ModuleDeclaration) { - if ((node).name.kind === SyntaxKind.StringLiteral) { - return node; - } - } - else if (node.kind === SyntaxKind.SourceFile) { - return isExternalOrCommonJsModule(node) ? node : undefined; - } + if (node) { + const links = getNodeLinks(node); + if (links.isVisible === undefined) { + links.isVisible = !!determineIfDeclarationIsVisible(); } - Debug.fail("getContainingModule cant reach here"); + return links.isVisible; } - function isUsedInExportAssignment(node: Node) { - // Get source File and see if it is external module and has export assigned symbol - const externalModule = getContainingExternalModule(node); - let exportAssignmentSymbol: Symbol; - let resolvedExportSymbol: Symbol; - if (externalModule) { - // This is export assigned symbol node - const externalModuleSymbol = getSymbolOfNode(externalModule); - exportAssignmentSymbol = getExportAssignmentSymbol(externalModuleSymbol); - const symbolOfNode = getSymbolOfNode(node); - if (isSymbolUsedInExportAssignment(symbolOfNode)) { - return true; - } - - // if symbolOfNode is alias declaration, resolve the symbol declaration and check - if (symbolOfNode.flags & SymbolFlags.Alias) { - return isSymbolUsedInExportAssignment(resolveAlias(symbolOfNode)); - } - } - - // Check if the symbol is used in export assignment - function isSymbolUsedInExportAssignment(symbol: Symbol) { - if (exportAssignmentSymbol === symbol) { - return true; - } - - if (exportAssignmentSymbol && !!(exportAssignmentSymbol.flags & SymbolFlags.Alias)) { - // if export assigned symbol is alias declaration, resolve the alias - resolvedExportSymbol = resolvedExportSymbol || resolveAlias(exportAssignmentSymbol); - if (resolvedExportSymbol === symbol) { - return true; - } - - // Container of resolvedExportSymbol is visible - return forEach(resolvedExportSymbol.declarations, (current: Node) => { - while (current) { - if (current === node) { - return true; - } - current = current.parent; - } - }); - } - } - } + return false; function determineIfDeclarationIsVisible() { switch (node.kind) { @@ -2320,14 +2260,6 @@ namespace ts { Debug.fail("isDeclarationVisible unknown: SyntaxKind: " + node.kind); } } - - if (node) { - const links = getNodeLinks(node); - if (links.isVisible === undefined) { - links.isVisible = !!determineIfDeclarationIsVisible(); - } - return links.isVisible; - } } function collectLinkedAliases(node: Identifier): Node[] { @@ -3373,14 +3305,6 @@ namespace ts { } } - function addInheritedSignatures(signatures: Signature[], baseSignatures: Signature[]) { - if (baseSignatures) { - for (const signature of baseSignatures) { - signatures.push(signature); - } - } - } - function resolveDeclaredMembers(type: InterfaceType): InterfaceTypeWithDeclaredMembers { if (!(type).declaredProperties) { const symbol = type.symbol; @@ -3861,25 +3785,6 @@ namespace ts { function getSignaturesOfType(type: Type, kind: SignatureKind): Signature[] { return getSignaturesOfStructuredType(getApparentType(type), kind); } - - function typeHasConstructSignatures(type: Type): boolean { - const apparentType = getApparentType(type); - if (apparentType.flags & (TypeFlags.ObjectType | TypeFlags.Union)) { - const resolved = resolveStructuredTypeMembers(type); - return resolved.constructSignatures.length > 0; - } - return false; - } - - function typeHasCallOrConstructSignatures(type: Type): boolean { - const apparentType = getApparentType(type); - if (apparentType.flags & TypeFlags.StructuredType) { - const resolved = resolveStructuredTypeMembers(type); - return resolved.callSignatures.length > 0 || resolved.constructSignatures.length > 0; - } - return false; - } - function getIndexTypeOfStructuredType(type: Type, kind: IndexKind): Type { if (type.flags & TypeFlags.StructuredType) { const resolved = resolveStructuredTypeMembers(type); @@ -4381,10 +4286,6 @@ namespace ts { return getTypeOfGlobalSymbol(getGlobalTypeSymbol(name), arity); } - function tryGetGlobalType(name: string, arity = 0): ObjectType { - return getTypeOfGlobalSymbol(getGlobalSymbol(name, SymbolFlags.Type, /*diagnostic*/ undefined), arity); - } - /** * Returns a type that is inside a namespace at the global scope, e.g. * getExportedTypeFromNamespace('JSX', 'Element') returns the JSX.Element type @@ -6148,12 +6049,8 @@ namespace ts { } function createInferenceContext(typeParameters: TypeParameter[], inferUnionTypes: boolean): InferenceContext { - const inferences: TypeInferences[] = []; - for (const unused of typeParameters) { - inferences.push({ - primary: undefined, secondary: undefined, isFixed: false - }); - } + const inferences = map(typeParameters, createTypeInferencesObject); + return { typeParameters, inferUnionTypes, @@ -6162,6 +6059,14 @@ namespace ts { }; } + function createTypeInferencesObject(): TypeInferences { + return { + primary: undefined, + secondary: undefined, + isFixed: false, + }; + } + function inferTypes(context: InferenceContext, source: Type, target: Type) { let sourceStack: Type[]; let targetStack: Type[]; @@ -6432,10 +6337,6 @@ namespace ts { return context.inferredTypes; } - function hasAncestor(node: Node, kind: SyntaxKind): boolean { - return getAncestor(node, kind) !== undefined; - } - // EXPRESSION TYPE CHECKING function getResolvedSymbol(node: Identifier): Symbol { @@ -8035,7 +7936,6 @@ namespace ts { /// type or factory function. /// Otherwise, returns unknownSymbol. function getJsxElementTagSymbol(node: JsxOpeningLikeElement | JsxClosingElement): Symbol { - const flags: JsxFlags = JsxFlags.UnknownElement; const links = getNodeLinks(node); if (!links.resolvedSymbol) { if (isJsxIntrinsicIdentifier(node.tagName)) { @@ -14308,16 +14208,6 @@ namespace ts { } } - function getModuleStatements(node: Declaration): Statement[] { - if (node.kind === SyntaxKind.SourceFile) { - return (node).statements; - } - if (node.kind === SyntaxKind.ModuleDeclaration && (node).body.kind === SyntaxKind.ModuleBlock) { - return ((node).body).statements; - } - return emptyArray; - } - function hasExportedMembers(moduleSymbol: Symbol) { for (var id in moduleSymbol.exports) { if (id !== "export=") { @@ -15396,20 +15286,6 @@ namespace ts { return symbol && getExportSymbolOfValueSymbolIfExported(symbol).valueDeclaration; } - function instantiateSingleCallFunctionType(functionType: Type, typeArguments: Type[]): Type { - if (functionType === unknownType) { - return unknownType; - } - - const signature = getSingleCallSignature(functionType); - if (!signature) { - return unknownType; - } - - const instantiatedSignature = getSignatureInstantiation(signature, typeArguments); - return getOrCreateTypeFromSignature(instantiatedSignature); - } - function createResolver(): EmitResolver { return { getReferencedExportContainer, @@ -16458,25 +16334,6 @@ namespace ts { } } - function isIntegerLiteral(expression: Expression): boolean { - if (expression.kind === SyntaxKind.PrefixUnaryExpression) { - const unaryExpression = expression; - if (unaryExpression.operator === SyntaxKind.PlusToken || unaryExpression.operator === SyntaxKind.MinusToken) { - expression = unaryExpression.operand; - } - } - if (expression.kind === SyntaxKind.NumericLiteral) { - // Allows for scientific notation since literalExpression.text was formed by - // coercing a number to a string. Sometimes this coercion can yield a string - // in scientific notation. - // We also don't need special logic for hex because a hex integer is converted - // to decimal when it is coerced. - return /^[0-9]+([eE]\+?[0-9]+)?$/.test((expression).text); - } - - return false; - } - function hasParseDiagnostics(sourceFile: SourceFile): boolean { return sourceFile.parseDiagnostics.length > 0; } @@ -16505,11 +16362,6 @@ namespace ts { } } - function isEvalOrArgumentsIdentifier(node: Node): boolean { - return node.kind === SyntaxKind.Identifier && - ((node).text === "eval" || (node).text === "arguments"); - } - function checkGrammarConstructorTypeParameters(node: ConstructorDeclaration) { if (node.typeParameters) { return grammarErrorAtPos(getSourceFileOfNode(node), node.typeParameters.pos, node.typeParameters.end - node.typeParameters.pos, Diagnostics.Type_parameters_cannot_appear_on_a_constructor_declaration); From d7c5e18cb3439c3d5a07b721239615536429f1f5 Mon Sep 17 00:00:00 2001 From: Daniel Rosenwasser Date: Thu, 17 Dec 2015 14:53:46 -0800 Subject: [PATCH 147/177] Removed unused declarations in 'parser.ts'. --- src/compiler/parser.ts | 34 ---------------------------------- 1 file changed, 34 deletions(-) diff --git a/src/compiler/parser.ts b/src/compiler/parser.ts index 62d98337102..7f5d052a7e7 100644 --- a/src/compiler/parser.ts +++ b/src/compiler/parser.ts @@ -771,10 +771,6 @@ namespace ts { return doInsideOfContext(ParserContextFlags.Yield, func); } - function doOutsideOfYieldContext(func: () => T): T { - return doOutsideOfContext(ParserContextFlags.Yield, func); - } - function doInDecoratorContext(func: () => T): T { return doInsideOfContext(ParserContextFlags.Decorator, func); } @@ -791,10 +787,6 @@ namespace ts { return doInsideOfContext(ParserContextFlags.Yield | ParserContextFlags.Await, func); } - function doOutsideOfYieldAndAwaitContext(func: () => T): T { - return doOutsideOfContext(ParserContextFlags.Yield | ParserContextFlags.Await, func); - } - function inContext(flags: ParserContextFlags) { return (contextFlags & flags) !== 0; } @@ -851,10 +843,6 @@ namespace ts { return token = scanner.scan(); } - function getTokenPos(pos: number): number { - return skipTrivia(sourceText, pos); - } - function reScanGreaterToken(): SyntaxKind { return token = scanner.reScanGreaterToken(); } @@ -2644,10 +2632,6 @@ namespace ts { isStartOfExpression(); } - function allowInAndParseExpression(): Expression { - return allowInAnd(parseExpression); - } - function parseExpression(): Expression { // Expression[in]: // AssignmentExpression[in] @@ -3962,7 +3946,6 @@ namespace ts { const asteriskToken = parseOptionalToken(SyntaxKind.AsteriskToken); const tokenIsIdentifier = isIdentifier(); - const nameToken = token; const propertyName = parsePropertyName(); // Disallowing of optional property assignments happens in the grammar checker. @@ -5104,10 +5087,6 @@ namespace ts { return undefined; } - function parseHeritageClausesWorker() { - return parseList(ParsingContext.HeritageClauses, parseHeritageClause); - } - function parseHeritageClause() { if (token === SyntaxKind.ExtendsKeyword || token === SyntaxKind.ImplementsKeyword) { const node = createNode(SyntaxKind.HeritageClause); @@ -5253,12 +5232,6 @@ namespace ts { return nextToken() === SyntaxKind.SlashToken; } - function nextTokenIsCommaOrFromKeyword() { - nextToken(); - return token === SyntaxKind.CommaToken || - token === SyntaxKind.FromKeyword; - } - function parseImportDeclarationOrImportEqualsDeclaration(fullStart: number, decorators: NodeArray, modifiers: ModifiersArray): ImportEqualsDeclaration | ImportDeclaration { parseExpected(SyntaxKind.ImportKeyword); const afterImportPos = scanner.getStartPos(); @@ -5751,13 +5724,6 @@ namespace ts { return finishNode(parameter); } - function parseJSDocOptionalType(type: JSDocType): JSDocOptionalType { - const result = createNode(SyntaxKind.JSDocOptionalType, type.pos); - nextToken(); - result.type = type; - return finishNode(result); - } - function parseJSDocTypeReference(): JSDocTypeReference { const result = createNode(SyntaxKind.JSDocTypeReference); result.name = parseSimplePropertyName(); From 11acb7bf16b123841dc256002c9bbb6848f1139c Mon Sep 17 00:00:00 2001 From: Daniel Rosenwasser Date: Thu, 17 Dec 2015 14:54:19 -0800 Subject: [PATCH 148/177] Removed unused declarations in 'sourcemap.ts'. --- src/compiler/sourcemap.ts | 1 - 1 file changed, 1 deletion(-) diff --git a/src/compiler/sourcemap.ts b/src/compiler/sourcemap.ts index d98dc233c16..50644201544 100644 --- a/src/compiler/sourcemap.ts +++ b/src/compiler/sourcemap.ts @@ -14,7 +14,6 @@ namespace ts { reset(): void; } - const nop = <(...args: any[]) => any>Function.prototype; let nullSourceMapWriter: SourceMapWriter; export function getNullSourceMapWriter(): SourceMapWriter { From 66cf6be6d84cb79d4433723d71d73dca72542e92 Mon Sep 17 00:00:00 2001 From: Daniel Rosenwasser Date: Thu, 17 Dec 2015 14:55:08 -0800 Subject: [PATCH 149/177] Removed unused declarations in 'emitter.ts'. --- src/compiler/emitter.ts | 10 ---------- 1 file changed, 10 deletions(-) diff --git a/src/compiler/emitter.ts b/src/compiler/emitter.ts index f0b49854734..622ec14caa8 100644 --- a/src/compiler/emitter.ts +++ b/src/compiler/emitter.ts @@ -779,12 +779,6 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, Promi } } - function emitTrailingCommaIfPresent(nodeList: NodeArray): void { - if (nodeList.hasTrailingComma) { - write(","); - } - } - function emitLinePreservingList(parent: Node, nodes: NodeArray, allowTrailingComma: boolean, spacesBetweenBraces: boolean) { Debug.assert(nodes.length > 0); @@ -3248,10 +3242,6 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, Promi } } - function emitDownLevelForOfStatement(node: ForOfStatement) { - emitLoop(node, emitDownLevelForOfStatementWorker); - } - function emitDownLevelForOfStatementWorker(node: ForOfStatement, loop: ConvertedLoop) { // The following ES6 code: // From 9e801c21ae368658ca5df9bcfcf2db890badb294 Mon Sep 17 00:00:00 2001 From: Daniel Rosenwasser Date: Thu, 17 Dec 2015 15:01:05 -0800 Subject: [PATCH 150/177] Removed unused declarations in 'harness.ts'. --- src/harness/harness.ts | 14 -------------- 1 file changed, 14 deletions(-) diff --git a/src/harness/harness.ts b/src/harness/harness.ts index 15f3813e54d..117be8a9afb 100644 --- a/src/harness/harness.ts +++ b/src/harness/harness.ts @@ -31,7 +31,6 @@ // this will work in the browser via browserify var _chai: typeof chai = require("chai"); var assert: typeof _chai.assert = _chai.assert; -var expect: typeof _chai.expect = _chai.expect; declare var __dirname: string; // Node-specific var global = Function("return this").call(null); /* tslint:enable:no-var-keyword */ @@ -513,7 +512,6 @@ namespace Harness { } const folder: any = fso.GetFolder(path); - const paths: string[] = []; return filesInFolder(folder, path); }; @@ -627,18 +625,6 @@ namespace Harness { } /// Ask the server to use node's path.resolve to resolve the given path - function getResolvedPathFromServer(path: string) { - const xhr = new XMLHttpRequest(); - try { - xhr.open("GET", path + "?resolve", /*async*/ false); - xhr.send(); - } - catch (e) { - return { status: 404, responseText: null }; - } - - return waitForXHR(xhr); - } export interface XHRResponse { status: number; From 3dee60f6ef219860202622d8560d9a883c12e4b3 Mon Sep 17 00:00:00 2001 From: Daniel Rosenwasser Date: Thu, 17 Dec 2015 15:01:48 -0800 Subject: [PATCH 151/177] Removed unused declarations in 'harnessLanguageService.ts'. --- src/harness/harnessLanguageService.ts | 7 ------- 1 file changed, 7 deletions(-) diff --git a/src/harness/harnessLanguageService.ts b/src/harness/harnessLanguageService.ts index 3c7814df562..fb5b6ce92aa 100644 --- a/src/harness/harnessLanguageService.ts +++ b/src/harness/harnessLanguageService.ts @@ -315,13 +315,6 @@ namespace Harness.LanguageService { class LanguageServiceShimProxy implements ts.LanguageService { constructor(private shim: ts.LanguageServiceShim) { } - private unwrappJSONCallResult(result: string): any { - const parsedResult = JSON.parse(result); - if (parsedResult.error) { - throw new Error("Language Service Shim Error: " + JSON.stringify(parsedResult.error)); - } - return parsedResult.result; - } cleanupSemanticCache(): void { this.shim.cleanupSemanticCache(); } From 4a07ee730adc0ca75242325e84ef0513985fbec4 Mon Sep 17 00:00:00 2001 From: Daniel Rosenwasser Date: Thu, 17 Dec 2015 15:02:20 -0800 Subject: [PATCH 152/177] Removed unused declarations in 'compilerRunner.ts'. --- src/harness/compilerRunner.ts | 1 - 1 file changed, 1 deletion(-) diff --git a/src/harness/compilerRunner.ts b/src/harness/compilerRunner.ts index 8ee287b2637..d1566c05d4e 100644 --- a/src/harness/compilerRunner.ts +++ b/src/harness/compilerRunner.ts @@ -251,7 +251,6 @@ class CompilerBaselineRunner extends RunnerBase { const allFiles = toBeCompiled.concat(otherFiles).filter(file => !!program.getSourceFile(file.unitName)); const fullWalker = new TypeWriterWalker(program, /*fullTypeCheck*/ true); - const pullWalker = new TypeWriterWalker(program, /*fullTypeCheck*/ false); const fullResults: ts.Map = {}; const pullResults: ts.Map = {}; From 125f0a1a232c4ffa879590775e62346cd47b59aa Mon Sep 17 00:00:00 2001 From: Daniel Rosenwasser Date: Thu, 17 Dec 2015 15:03:38 -0800 Subject: [PATCH 153/177] Removed unused declarations in 'loggedIO.ts'. --- src/harness/loggedIO.ts | 19 ------------------- 1 file changed, 19 deletions(-) diff --git a/src/harness/loggedIO.ts b/src/harness/loggedIO.ts index 0bae91f7976..3d51682f745 100644 --- a/src/harness/loggedIO.ts +++ b/src/harness/loggedIO.ts @@ -305,25 +305,6 @@ namespace Playback { } } - const pathEquivCache: any = {}; - function pathsAreEquivalent(left: string, right: string, wrapper: { resolvePath(s: string): string }) { - const key = left + "-~~-" + right; - function areSame(a: string, b: string) { - return ts.normalizeSlashes(a).toLowerCase() === ts.normalizeSlashes(b).toLowerCase(); - } - function check() { - if (Harness.Path.getFileName(left).toLowerCase() === Harness.Path.getFileName(right).toLowerCase()) { - return areSame(left, right) || areSame(wrapper.resolvePath(left), right) || areSame(left, wrapper.resolvePath(right)) || areSame(wrapper.resolvePath(left), wrapper.resolvePath(right)); - } - } - if (pathEquivCache.hasOwnProperty(key)) { - return pathEquivCache[key]; - } - else { - return pathEquivCache[key] = check(); - } - } - function noOpReplay(name: string) { // console.log("Swallowed write operation during replay: " + name); } From 7fd6aa4318db062346ebea005364efca0b868498 Mon Sep 17 00:00:00 2001 From: Daniel Rosenwasser Date: Thu, 17 Dec 2015 15:07:37 -0800 Subject: [PATCH 154/177] Removed unused declarations in 'editorServices.ts'. --- src/server/editorServices.ts | 36 ++++++------------------------------ 1 file changed, 6 insertions(+), 30 deletions(-) diff --git a/src/server/editorServices.ts b/src/server/editorServices.ts index 0305b7595c2..d023a9827ee 100644 --- a/src/server/editorServices.ts +++ b/src/server/editorServices.ts @@ -263,13 +263,11 @@ namespace ts.server { } resolvePath(path: string): string { - const start = new Date().getTime(); const result = this.host.resolvePath(path); return result; } fileExists(path: string): boolean { - const start = new Date().getTime(); const result = this.host.fileExists(path); return result; } @@ -325,32 +323,6 @@ namespace ts.server { } } - // assumes normalized paths - function getAbsolutePath(filename: string, directory: string) { - const rootLength = ts.getRootLength(filename); - if (rootLength > 0) { - return filename; - } - else { - const splitFilename = filename.split("/"); - const splitDir = directory.split("/"); - let i = 0; - let dirTail = 0; - const sflen = splitFilename.length; - while ((i < sflen) && (splitFilename[i].charAt(0) == ".")) { - const dots = splitFilename[i]; - if (dots == "..") { - dirTail++; - } - else if (dots != ".") { - return undefined; - } - i++; - } - return splitDir.slice(0, splitDir.length - dirTail).concat(splitFilename.slice(i)).join("/"); - } - } - export interface ProjectOptions { // these fields can be present in the project file files?: string[]; @@ -583,7 +555,9 @@ namespace ts.server { } handleProjectFilelistChanges(project: Project) { - const { succeeded, projectOptions, error } = this.configFileToProjectOptions(project.projectFilename); + // TODO: Ignoring potentially returned 'error' and 'succeeded' condition + const { projectOptions } = this.configFileToProjectOptions(project.projectFilename); + const newRootFiles = projectOptions.files.map((f => this.getCanonicalFileName(f))); const currentRootFiles = project.getRootFiles().map((f => this.getCanonicalFileName(f))); @@ -611,7 +585,9 @@ namespace ts.server { this.log("Detected newly added tsconfig file: " + fileName); - const { succeeded, projectOptions, error } = this.configFileToProjectOptions(fileName); + // TODO: Ignoring potentially returned 'error' and 'succeeded' condition + const { projectOptions } = this.configFileToProjectOptions(fileName); + const rootFilesInTsconfig = projectOptions.files.map(f => this.getCanonicalFileName(f)); const openFileRoots = this.openFileRoots.map(s => this.getCanonicalFileName(s.fileName)); From 172d509c74e4376d840eb64a48254f738a638a8a Mon Sep 17 00:00:00 2001 From: Daniel Rosenwasser Date: Thu, 17 Dec 2015 15:09:12 -0800 Subject: [PATCH 155/177] Removed unused declarations in 'session.ts'. --- src/server/session.ts | 10 +--------- 1 file changed, 1 insertion(+), 9 deletions(-) diff --git a/src/server/session.ts b/src/server/session.ts index dae2384ce54..78686b79118 100644 --- a/src/server/session.ts +++ b/src/server/session.ts @@ -129,9 +129,6 @@ namespace ts.server { export class Session { protected projectService: ProjectService; - private pendingOperation = false; - private fileHash: ts.Map = {}; - private nextFileId = 1; private errorTimer: any; /*NodeJS.Timer | number*/ private immediateId: any; private changeSeq = 0; @@ -239,11 +236,6 @@ namespace ts.server { } } - private errorCheck(file: string, project: Project) { - this.syntacticCheck(file, project); - this.semanticCheck(file, project); - } - private reloadProjects() { this.projectService.reloadProjects(); } @@ -901,7 +893,7 @@ namespace ts.server { } getDiagnosticsForProject(delay: number, fileName: string) { - const { configFileName, fileNames } = this.getProjectInfo(fileName, /*needFileNameList*/ true); + const { fileNames } = this.getProjectInfo(fileName, /*needFileNameList*/ true); // No need to analyze lib.d.ts let fileNamesInProject = fileNames.filter((value, index, array) => value.indexOf("lib.d.ts") < 0); From 7637f4d2a0d6fccbb200a8411359ad6b034e8237 Mon Sep 17 00:00:00 2001 From: Daniel Rosenwasser Date: Thu, 17 Dec 2015 15:09:39 -0800 Subject: [PATCH 156/177] Removed unused declarations in 'server.ts'. --- src/server/server.ts | 2 -- 1 file changed, 2 deletions(-) diff --git a/src/server/server.ts b/src/server/server.ts index e29e79ac6ed..d9f078ac0eb 100644 --- a/src/server/server.ts +++ b/src/server/server.ts @@ -4,9 +4,7 @@ /* tslint:disable:no-null */ namespace ts.server { - const nodeproto: typeof NodeJS._debugger = require("_debugger"); const readline: NodeJS.ReadLine = require("readline"); - const path: NodeJS.Path = require("path"); const fs: typeof NodeJS.fs = require("fs"); const rl = readline.createInterface({ From 50542946f7051726bd9b8b26c566c0abdfdd18c9 Mon Sep 17 00:00:00 2001 From: Daniel Rosenwasser Date: Thu, 17 Dec 2015 15:12:25 -0800 Subject: [PATCH 157/177] Removed unused declarations in 'harness/fourslash.ts'. --- src/harness/fourslash.ts | 13 ------------- 1 file changed, 13 deletions(-) diff --git a/src/harness/fourslash.ts b/src/harness/fourslash.ts index 24f3319285b..e8d985d40a6 100644 --- a/src/harness/fourslash.ts +++ b/src/harness/fourslash.ts @@ -321,11 +321,6 @@ namespace FourSlash { PlaceOpenBraceOnNewLineForControlBlocks: false, }; - this.testData.files.forEach(file => { - const fileName = file.fileName.replace(Harness.IO.directoryName(file.fileName), "").substr(1); - const fileNameWithoutExtension = fileName.substr(0, fileName.lastIndexOf(".")); - }); - // Open the first file by default this.openFile(0); } @@ -762,10 +757,6 @@ namespace FourSlash { return this.languageService.getReferencesAtPosition(this.activeFile.fileName, this.currentCaretPosition); } - private assertionMessage(name: string, actualValue: any, expectedValue: any) { - return "\nActual " + name + ":\n\t" + actualValue + "\nExpected value:\n\t" + expectedValue; - } - public getSyntacticDiagnostics(expected: string) { const diagnostics = this.languageService.getSyntacticDiagnostics(this.activeFile.fileName); this.testDiagnostics(expected, diagnostics); @@ -910,7 +901,6 @@ namespace FourSlash { } public verifyCurrentParameterSpanIs(parameter: string) { - const activeSignature = this.getActiveSignatureHelpItem(); const activeParameter = this.getActiveParameter(); assert.equal(ts.displayPartsToString(activeParameter.displayParts), parameter); } @@ -2189,9 +2179,6 @@ namespace FourSlash { } } - // TOOD: should these just use the Harness's stdout/stderr? - const fsOutput = new Harness.Compiler.WriterAggregator(); - const fsErrors = new Harness.Compiler.WriterAggregator(); export function runFourSlashTest(basePath: string, testType: FourSlashTestType, fileName: string) { const content = Harness.IO.readFile(fileName); runFourSlashTestContent(basePath, testType, content, fileName); From d59831b4e86b102a28ca045ee0a61778873df1c8 Mon Sep 17 00:00:00 2001 From: Nathan Shively-Sanders Date: Thu, 17 Dec 2015 15:38:02 -0800 Subject: [PATCH 158/177] Get rid of list and map abstractions to reduce GC pressure --- src/compiler/checker.ts | 21 +++++++++------------ 1 file changed, 9 insertions(+), 12 deletions(-) diff --git a/src/compiler/checker.ts b/src/compiler/checker.ts index 8d9fe1f7ba5..488549cb180 100644 --- a/src/compiler/checker.ts +++ b/src/compiler/checker.ts @@ -5762,22 +5762,19 @@ namespace ts { target.symbol.flags & SymbolFlags.ConstEnum) { return Ternary.False; } - const targetNames = arrayToMap(getEnumMembersOfEnumType(target), member => member.name); - for (const member of getEnumMembersOfEnumType(source)) { - if (!hasProperty(targetNames, member.name)) { - reportError(Diagnostics.Property_0_is_missing_in_type_1, - member.name, - typeToString(target, /*enclosingDeclaration*/ undefined, TypeFormatFlags.UseFullyQualifiedType)); - return Ternary.False; + for (const property of getPropertiesOfType(getTypeOfSymbol(source.symbol))) { + if (property.flags & SymbolFlags.EnumMember) { + const targetProperty = getPropertyOfType(getTypeOfSymbol(target.symbol), property.name); + if (!targetProperty || !(targetProperty.flags & SymbolFlags.EnumMember)) { + reportError(Diagnostics.Property_0_is_missing_in_type_1, + property.name, + typeToString(target, /*enclosingDeclaration*/ undefined, TypeFormatFlags.UseFullyQualifiedType)); + return Ternary.False; + } } } return Ternary.True; } - - function getEnumMembersOfEnumType(type: Type) { - return filter(resolveStructuredTypeMembers(getTypeOfSymbol(type.symbol)).properties, - property => !!(property.flags & SymbolFlags.EnumMember)); - } } // Return true if the given type is part of a deeply nested chain of generic instantiations. We consider this to be the case From 5a53c613e4322d28a9931aca67a10735843cbf16 Mon Sep 17 00:00:00 2001 From: Yui T Date: Thu, 17 Dec 2015 15:51:00 -0800 Subject: [PATCH 159/177] Add assertion to check that ranges-array is not empty so it doesn't silently fail --- src/harness/fourslash.ts | 4 ++++ .../findAllRefsParameterPropertyDeclaration1.ts | 13 ++++++++----- .../findAllRefsParameterPropertyDeclaration2.ts | 1 + .../findAllRefsParameterPropertyDeclaration3.ts | 7 ++++--- tests/cases/fourslash/fourslash.ts | 1 + .../renameParameterPropertyDeclaration1.ts | 3 ++- .../renameParameterPropertyDeclaration2.ts | 3 ++- .../renameParameterPropertyDeclaration3.ts | 3 ++- .../renameParameterPropertyDeclaration4.ts | 3 ++- .../renameParameterPropertyDeclaration5.ts | 3 ++- 10 files changed, 28 insertions(+), 13 deletions(-) diff --git a/src/harness/fourslash.ts b/src/harness/fourslash.ts index 9d729345781..729d2052a92 100644 --- a/src/harness/fourslash.ts +++ b/src/harness/fourslash.ts @@ -2768,6 +2768,10 @@ namespace FourSlashInterface { this.state.verifyCompletionListItemsCountIsGreaterThan(count, this.negative); } + public assertRangesEmpty(ranges: FourSlash.Range[]) { + assert(ranges.length !== 0, "Ranges array is expected to be non-empty"); + } + public completionListIsEmpty() { this.state.verifyCompletionListIsEmpty(this.negative); } diff --git a/tests/cases/fourslash/findAllRefsParameterPropertyDeclaration1.ts b/tests/cases/fourslash/findAllRefsParameterPropertyDeclaration1.ts index 5034a57ae1d..828b143a4ce 100644 --- a/tests/cases/fourslash/findAllRefsParameterPropertyDeclaration1.ts +++ b/tests/cases/fourslash/findAllRefsParameterPropertyDeclaration1.ts @@ -7,12 +7,15 @@ //// } //// } -let ranges = test.ranges(); -for (let range of ranges) { +const ranges = test.ranges(); +verify.assertRangesEmpty(ranges); +for (const range of ranges) { goTo.position(range.start); - verify.referencesCountIs(ranges.length); - for (let expectedRange of ranges) { - verify.referencesAtPositionContains(expectedRange); + if (ranges.length) { + verify.referencesCountIs(ranges.length); + for (const expectedRange of ranges) { + verify.referencesAtPositionContains(expectedRange); + } } } \ No newline at end of file diff --git a/tests/cases/fourslash/findAllRefsParameterPropertyDeclaration2.ts b/tests/cases/fourslash/findAllRefsParameterPropertyDeclaration2.ts index 7db5ba13585..6b15b334c28 100644 --- a/tests/cases/fourslash/findAllRefsParameterPropertyDeclaration2.ts +++ b/tests/cases/fourslash/findAllRefsParameterPropertyDeclaration2.ts @@ -8,6 +8,7 @@ //// } let ranges = test.ranges(); +verify.assertRangesEmpty(ranges); for (let range of ranges) { goTo.position(range.start); diff --git a/tests/cases/fourslash/findAllRefsParameterPropertyDeclaration3.ts b/tests/cases/fourslash/findAllRefsParameterPropertyDeclaration3.ts index c2d8a06f658..1310841eed4 100644 --- a/tests/cases/fourslash/findAllRefsParameterPropertyDeclaration3.ts +++ b/tests/cases/fourslash/findAllRefsParameterPropertyDeclaration3.ts @@ -7,12 +7,13 @@ //// } //// } -let ranges = test.ranges(); -for (let range of ranges) { +const ranges = test.ranges(); +verify.assertRangesEmpty(ranges); +for (const range of ranges) { goTo.position(range.start); verify.referencesCountIs(ranges.length); - for (let expectedRange of ranges) { + for (const expectedRange of ranges) { verify.referencesAtPositionContains(expectedRange); } } \ No newline at end of file diff --git a/tests/cases/fourslash/fourslash.ts b/tests/cases/fourslash/fourslash.ts index b9b379bd465..fcb221e8233 100644 --- a/tests/cases/fourslash/fourslash.ts +++ b/tests/cases/fourslash/fourslash.ts @@ -137,6 +137,7 @@ declare namespace FourSlashInterface { verifyDefinitionsName(name: string, containerName: string): void; } class verify extends verifyNegatable { + assertRangesEmpty(ranges: FourSlash.Range[]): void; caretAtMarker(markerName?: string): void; indentationIs(numberOfSpaces: number): void; indentationAtPositionIs(fileName: string, position: number, numberOfSpaces: number, indentStyle?: ts.IndentStyle): void; diff --git a/tests/cases/fourslash/renameParameterPropertyDeclaration1.ts b/tests/cases/fourslash/renameParameterPropertyDeclaration1.ts index 4ca09b71e4b..37db51447ca 100644 --- a/tests/cases/fourslash/renameParameterPropertyDeclaration1.ts +++ b/tests/cases/fourslash/renameParameterPropertyDeclaration1.ts @@ -7,7 +7,8 @@ //// } //// } -let ranges = test.ranges() +let ranges = test.ranges(); +verify.assertRangesEmpty(ranges); for (let range of ranges) { goTo.position(range.start); verify.renameLocations(/*findInStrings*/ false, /*findInComments*/ false); diff --git a/tests/cases/fourslash/renameParameterPropertyDeclaration2.ts b/tests/cases/fourslash/renameParameterPropertyDeclaration2.ts index 695e3729f94..c5e44438ee3 100644 --- a/tests/cases/fourslash/renameParameterPropertyDeclaration2.ts +++ b/tests/cases/fourslash/renameParameterPropertyDeclaration2.ts @@ -7,7 +7,8 @@ //// } //// } -let ranges = test.ranges() +let ranges = test.ranges(); +verify.assertRangesEmpty(ranges); for (let range of ranges) { goTo.position(range.start); verify.renameLocations(/*findInStrings*/ false, /*findInComments*/ false); diff --git a/tests/cases/fourslash/renameParameterPropertyDeclaration3.ts b/tests/cases/fourslash/renameParameterPropertyDeclaration3.ts index 23971f0be27..2ca284f38d9 100644 --- a/tests/cases/fourslash/renameParameterPropertyDeclaration3.ts +++ b/tests/cases/fourslash/renameParameterPropertyDeclaration3.ts @@ -7,7 +7,8 @@ //// } //// } -let ranges = test.ranges() +let ranges = test.ranges(); +verify.assertRangesEmpty(ranges); for (let range of ranges) { goTo.position(range.start); verify.renameLocations(/*findInStrings*/ false, /*findInComments*/ false); diff --git a/tests/cases/fourslash/renameParameterPropertyDeclaration4.ts b/tests/cases/fourslash/renameParameterPropertyDeclaration4.ts index 4646de6123c..35d268532b9 100644 --- a/tests/cases/fourslash/renameParameterPropertyDeclaration4.ts +++ b/tests/cases/fourslash/renameParameterPropertyDeclaration4.ts @@ -6,7 +6,8 @@ //// } //// } -let ranges = test.ranges() +let ranges = test.ranges(); +verify.assertRangesEmpty(ranges); for (let range of ranges) { goTo.position(range.start); verify.renameLocations(/*findInStrings*/ false, /*findInComments*/ false); diff --git a/tests/cases/fourslash/renameParameterPropertyDeclaration5.ts b/tests/cases/fourslash/renameParameterPropertyDeclaration5.ts index 6d73c7af072..d32e69ad0c5 100644 --- a/tests/cases/fourslash/renameParameterPropertyDeclaration5.ts +++ b/tests/cases/fourslash/renameParameterPropertyDeclaration5.ts @@ -6,7 +6,8 @@ //// } //// } -let ranges = test.ranges() +let ranges = test.ranges(); +verify.assertRangesEmpty(ranges); for (let range of ranges) { goTo.position(range.start); verify.renameLocations(/*findInStrings*/ false, /*findInComments*/ false); From b04bd66bb2a11ddfe7a7c17d35ea87ea4e9160cb Mon Sep 17 00:00:00 2001 From: Nathan Shively-Sanders Date: Thu, 17 Dec 2015 16:18:55 -0800 Subject: [PATCH 160/177] Get type of target enum outside the lookup loop --- src/compiler/checker.ts | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/compiler/checker.ts b/src/compiler/checker.ts index 488549cb180..f65a10b266a 100644 --- a/src/compiler/checker.ts +++ b/src/compiler/checker.ts @@ -5762,9 +5762,10 @@ namespace ts { target.symbol.flags & SymbolFlags.ConstEnum) { return Ternary.False; } + const targetEnumType = getTypeOfSymbol(target.symbol); for (const property of getPropertiesOfType(getTypeOfSymbol(source.symbol))) { if (property.flags & SymbolFlags.EnumMember) { - const targetProperty = getPropertyOfType(getTypeOfSymbol(target.symbol), property.name); + const targetProperty = getPropertyOfType(targetEnumType, property.name); if (!targetProperty || !(targetProperty.flags & SymbolFlags.EnumMember)) { reportError(Diagnostics.Property_0_is_missing_in_type_1, property.name, From 65571426bf9e47b1d364060b72cdd48039f77d74 Mon Sep 17 00:00:00 2001 From: Daniel Rosenwasser Date: Thu, 17 Dec 2015 16:47:00 -0800 Subject: [PATCH 161/177] Remove missed unused declaration from 'harness.ts'. --- src/harness/harness.ts | 1 - 1 file changed, 1 deletion(-) diff --git a/src/harness/harness.ts b/src/harness/harness.ts index 117be8a9afb..7fd81973172 100644 --- a/src/harness/harness.ts +++ b/src/harness/harness.ts @@ -615,7 +615,6 @@ namespace Harness { export const getExecutingFilePath = () => ""; export const exit = (exitCode: number) => {}; - const supportsCodePage = () => false; export let log = (s: string) => console.log(s); namespace Http { From f6253177094cb2fb1e32c1572a7227d96269bf36 Mon Sep 17 00:00:00 2001 From: Daniel Rosenwasser Date: Thu, 17 Dec 2015 17:04:45 -0800 Subject: [PATCH 162/177] Added missing require for 'session' tests that relied on 'harness.ts'. --- tests/cases/unittests/session.ts | 30 ++++++++++++++++-------------- 1 file changed, 16 insertions(+), 14 deletions(-) diff --git a/tests/cases/unittests/session.ts b/tests/cases/unittests/session.ts index c1dfd508942..1251fb7215f 100644 --- a/tests/cases/unittests/session.ts +++ b/tests/cases/unittests/session.ts @@ -1,5 +1,7 @@ /// +var expect: typeof _chai.expect = _chai.expect; + namespace ts.server { let lastWrittenToHost: string; const mockHost: ServerHost = { @@ -28,7 +30,7 @@ namespace ts.server { endGroup(): void {}, msg(s: string, type?: string): void {}, }; - + describe("the Session class", () => { let session: Session; let lastSent: protocol.Message; @@ -204,7 +206,7 @@ namespace ts.server { .to.throw(`Protocol handler already exists for command "${command}"`); }); }); - + describe("event", () => { it("can format event responses and send them", () => { const evt = "notify-test"; @@ -315,7 +317,7 @@ namespace ts.server { responseRequired: true })); } - + send(msg: protocol.Message) { this.client.handle(msg); } @@ -323,7 +325,7 @@ namespace ts.server { enqueue(msg: protocol.Request) { this.queue.unshift(msg); } - + handleRequest(msg: protocol.Request) { let response: protocol.Response; try { @@ -345,7 +347,7 @@ namespace ts.server { } } } - + class InProcClient { private server: InProcSession; private seq = 0; @@ -379,7 +381,7 @@ namespace ts.server { connect(session: InProcSession): void { this.server = session; } - + execute(command: string, args: any, callback: (resp: protocol.Response) => void): void { if (!this.server) { return; @@ -394,7 +396,7 @@ namespace ts.server { this.callbacks[this.seq] = callback; } }; - + it("can be constructed and respond to commands", (done) => { const cli = new InProcClient(); const session = new InProcSession(cli); @@ -402,23 +404,23 @@ namespace ts.server { data: true }; const toEvent = { - data: false + data: false }; let responses = 0; // Connect the client cli.connect(session); - + // Add an event handler cli.on("testevent", (eventinfo) => { expect(eventinfo).to.equal(toEvent); responses++; expect(responses).to.equal(1); }); - + // Trigger said event from the server session.event(toEvent, "testevent"); - + // Queue an echo command cli.execute("echo", toEcho, (resp) => { assert(resp.success, resp.message); @@ -426,7 +428,7 @@ namespace ts.server { expect(responses).to.equal(2); expect(resp.body).to.deep.equal(toEcho); }); - + // Queue a configure command cli.execute("configure", { hostInfo: "unit test", @@ -436,10 +438,10 @@ namespace ts.server { }, (resp) => { assert(resp.success, resp.message); responses++; - expect(responses).to.equal(3); + expect(responses).to.equal(3); done(); }); - + // Consume the queue and trigger the callbacks session.consumeQueue(); }); From e4e6f7072d798c593a0f59eeb2a8d4d9453c3dd1 Mon Sep 17 00:00:00 2001 From: Yui T Date: Thu, 17 Dec 2015 17:27:00 -0800 Subject: [PATCH 163/177] Update assert msg --- src/harness/fourslash.ts | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/harness/fourslash.ts b/src/harness/fourslash.ts index 729d2052a92..796dc1134a1 100644 --- a/src/harness/fourslash.ts +++ b/src/harness/fourslash.ts @@ -2769,7 +2769,7 @@ namespace FourSlashInterface { } public assertRangesEmpty(ranges: FourSlash.Range[]) { - assert(ranges.length !== 0, "Ranges array is expected to be non-empty"); + assert(ranges.length !== 0, "Array of ranges is expected to be non-empty"); } public completionListIsEmpty() { @@ -3291,4 +3291,4 @@ namespace FourSlashInterface { }; } } -} +} From 2ec97a2d2e5ba40483f2e466ce414cb25e18314c Mon Sep 17 00:00:00 2001 From: Yui T Date: Thu, 17 Dec 2015 18:00:53 -0800 Subject: [PATCH 164/177] Address PR feed back --- Jakefile.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Jakefile.js b/Jakefile.js index 91bd805a27b..288472a697b 100644 --- a/Jakefile.js +++ b/Jakefile.js @@ -925,7 +925,7 @@ var lintTargets = compilerSources .concat(harnessCoreSources) .concat(serverCoreSources) .concat(scriptSources) - .concat([path.join(servicesDirectory,"services.ts")]); + .concat([path.join(servicesDirectory, "services.ts")]); desc("Runs tslint on the compiler sources"); task("lint", ["build-rules"], function() { From 03be649b1c086801c17a84f74a714188c8ae92e7 Mon Sep 17 00:00:00 2001 From: Yui T Date: Thu, 17 Dec 2015 18:14:04 -0800 Subject: [PATCH 165/177] Address feedback --- src/harness/fourslash.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/harness/fourslash.ts b/src/harness/fourslash.ts index 796dc1134a1..d5e1687b305 100644 --- a/src/harness/fourslash.ts +++ b/src/harness/fourslash.ts @@ -2768,7 +2768,7 @@ namespace FourSlashInterface { this.state.verifyCompletionListItemsCountIsGreaterThan(count, this.negative); } - public assertRangesEmpty(ranges: FourSlash.Range[]) { + public assertHasRanges(ranges: FourSlash.Range[]) { assert(ranges.length !== 0, "Array of ranges is expected to be non-empty"); } From 7499c7c279933ac2fd35aa5ce11e82d319ec1a59 Mon Sep 17 00:00:00 2001 From: Yui T Date: Thu, 17 Dec 2015 18:34:21 -0800 Subject: [PATCH 166/177] Address feedback --- src/harness/fourslash.ts | 2 +- .../cases/fourslash/findAllRefsParameterPropertyDeclaration1.ts | 2 +- .../cases/fourslash/findAllRefsParameterPropertyDeclaration2.ts | 2 +- .../cases/fourslash/findAllRefsParameterPropertyDeclaration3.ts | 2 +- tests/cases/fourslash/fourslash.ts | 2 +- tests/cases/fourslash/renameParameterPropertyDeclaration1.ts | 2 +- tests/cases/fourslash/renameParameterPropertyDeclaration2.ts | 2 +- tests/cases/fourslash/renameParameterPropertyDeclaration3.ts | 2 +- tests/cases/fourslash/renameParameterPropertyDeclaration4.ts | 2 +- tests/cases/fourslash/renameParameterPropertyDeclaration5.ts | 2 +- 10 files changed, 10 insertions(+), 10 deletions(-) diff --git a/src/harness/fourslash.ts b/src/harness/fourslash.ts index 796dc1134a1..d5e1687b305 100644 --- a/src/harness/fourslash.ts +++ b/src/harness/fourslash.ts @@ -2768,7 +2768,7 @@ namespace FourSlashInterface { this.state.verifyCompletionListItemsCountIsGreaterThan(count, this.negative); } - public assertRangesEmpty(ranges: FourSlash.Range[]) { + public assertHasRanges(ranges: FourSlash.Range[]) { assert(ranges.length !== 0, "Array of ranges is expected to be non-empty"); } diff --git a/tests/cases/fourslash/findAllRefsParameterPropertyDeclaration1.ts b/tests/cases/fourslash/findAllRefsParameterPropertyDeclaration1.ts index 828b143a4ce..4018698f4ef 100644 --- a/tests/cases/fourslash/findAllRefsParameterPropertyDeclaration1.ts +++ b/tests/cases/fourslash/findAllRefsParameterPropertyDeclaration1.ts @@ -8,7 +8,7 @@ //// } const ranges = test.ranges(); -verify.assertRangesEmpty(ranges); +verify.assertHasRanges(ranges); for (const range of ranges) { goTo.position(range.start); diff --git a/tests/cases/fourslash/findAllRefsParameterPropertyDeclaration2.ts b/tests/cases/fourslash/findAllRefsParameterPropertyDeclaration2.ts index 6b15b334c28..a450a77e2dc 100644 --- a/tests/cases/fourslash/findAllRefsParameterPropertyDeclaration2.ts +++ b/tests/cases/fourslash/findAllRefsParameterPropertyDeclaration2.ts @@ -8,7 +8,7 @@ //// } let ranges = test.ranges(); -verify.assertRangesEmpty(ranges); +verify.assertHasRanges(ranges); for (let range of ranges) { goTo.position(range.start); diff --git a/tests/cases/fourslash/findAllRefsParameterPropertyDeclaration3.ts b/tests/cases/fourslash/findAllRefsParameterPropertyDeclaration3.ts index 1310841eed4..82fd67dfc9b 100644 --- a/tests/cases/fourslash/findAllRefsParameterPropertyDeclaration3.ts +++ b/tests/cases/fourslash/findAllRefsParameterPropertyDeclaration3.ts @@ -8,7 +8,7 @@ //// } const ranges = test.ranges(); -verify.assertRangesEmpty(ranges); +verify.assertHasRanges(ranges); for (const range of ranges) { goTo.position(range.start); diff --git a/tests/cases/fourslash/fourslash.ts b/tests/cases/fourslash/fourslash.ts index fcb221e8233..dd443e942cf 100644 --- a/tests/cases/fourslash/fourslash.ts +++ b/tests/cases/fourslash/fourslash.ts @@ -137,7 +137,7 @@ declare namespace FourSlashInterface { verifyDefinitionsName(name: string, containerName: string): void; } class verify extends verifyNegatable { - assertRangesEmpty(ranges: FourSlash.Range[]): void; + assertHasRanges(ranges: FourSlash.Range[]): void; caretAtMarker(markerName?: string): void; indentationIs(numberOfSpaces: number): void; indentationAtPositionIs(fileName: string, position: number, numberOfSpaces: number, indentStyle?: ts.IndentStyle): void; diff --git a/tests/cases/fourslash/renameParameterPropertyDeclaration1.ts b/tests/cases/fourslash/renameParameterPropertyDeclaration1.ts index 37db51447ca..42bfbf63a47 100644 --- a/tests/cases/fourslash/renameParameterPropertyDeclaration1.ts +++ b/tests/cases/fourslash/renameParameterPropertyDeclaration1.ts @@ -8,7 +8,7 @@ //// } let ranges = test.ranges(); -verify.assertRangesEmpty(ranges); +verify.assertHasRanges(ranges); for (let range of ranges) { goTo.position(range.start); verify.renameLocations(/*findInStrings*/ false, /*findInComments*/ false); diff --git a/tests/cases/fourslash/renameParameterPropertyDeclaration2.ts b/tests/cases/fourslash/renameParameterPropertyDeclaration2.ts index c5e44438ee3..e7ef9d1c1a2 100644 --- a/tests/cases/fourslash/renameParameterPropertyDeclaration2.ts +++ b/tests/cases/fourslash/renameParameterPropertyDeclaration2.ts @@ -8,7 +8,7 @@ //// } let ranges = test.ranges(); -verify.assertRangesEmpty(ranges); +verify.assertHasRanges(ranges); for (let range of ranges) { goTo.position(range.start); verify.renameLocations(/*findInStrings*/ false, /*findInComments*/ false); diff --git a/tests/cases/fourslash/renameParameterPropertyDeclaration3.ts b/tests/cases/fourslash/renameParameterPropertyDeclaration3.ts index 2ca284f38d9..9446e2aeb75 100644 --- a/tests/cases/fourslash/renameParameterPropertyDeclaration3.ts +++ b/tests/cases/fourslash/renameParameterPropertyDeclaration3.ts @@ -8,7 +8,7 @@ //// } let ranges = test.ranges(); -verify.assertRangesEmpty(ranges); +verify.assertHasRanges(ranges); for (let range of ranges) { goTo.position(range.start); verify.renameLocations(/*findInStrings*/ false, /*findInComments*/ false); diff --git a/tests/cases/fourslash/renameParameterPropertyDeclaration4.ts b/tests/cases/fourslash/renameParameterPropertyDeclaration4.ts index 35d268532b9..7fb4b8c757d 100644 --- a/tests/cases/fourslash/renameParameterPropertyDeclaration4.ts +++ b/tests/cases/fourslash/renameParameterPropertyDeclaration4.ts @@ -7,7 +7,7 @@ //// } let ranges = test.ranges(); -verify.assertRangesEmpty(ranges); +verify.assertHasRanges(ranges); for (let range of ranges) { goTo.position(range.start); verify.renameLocations(/*findInStrings*/ false, /*findInComments*/ false); diff --git a/tests/cases/fourslash/renameParameterPropertyDeclaration5.ts b/tests/cases/fourslash/renameParameterPropertyDeclaration5.ts index d32e69ad0c5..b7c47a4c0d7 100644 --- a/tests/cases/fourslash/renameParameterPropertyDeclaration5.ts +++ b/tests/cases/fourslash/renameParameterPropertyDeclaration5.ts @@ -7,7 +7,7 @@ //// } let ranges = test.ranges(); -verify.assertRangesEmpty(ranges); +verify.assertHasRanges(ranges); for (let range of ranges) { goTo.position(range.start); verify.renameLocations(/*findInStrings*/ false, /*findInComments*/ false); From 75678de6d99ecffec583804fd6ce52cc83c46618 Mon Sep 17 00:00:00 2001 From: Daniel Rosenwasser Date: Thu, 17 Dec 2015 19:47:01 -0800 Subject: [PATCH 167/177] Removed unused declarations from 'services.ts'. --- src/services/services.ts | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/src/services/services.ts b/src/services/services.ts index 8f9028486aa..10f404dbcad 100644 --- a/src/services/services.ts +++ b/src/services/services.ts @@ -2987,7 +2987,6 @@ namespace ts { function getCompletionData(fileName: string, position: number) { const typeChecker = program.getTypeChecker(); - const syntacticStart = new Date().getTime(); const sourceFile = getValidSourceFile(fileName); const isJavaScriptFile = isSourceFileJavaScript(sourceFile); @@ -6166,10 +6165,6 @@ namespace ts { return ts.NavigateTo.getNavigateToItems(program, cancellationToken, searchValue, maxResultCount); } - function containErrors(diagnostics: Diagnostic[]): boolean { - return forEach(diagnostics, diagnostic => diagnostic.category === DiagnosticCategory.Error); - } - function getEmitOutput(fileName: string): EmitOutput { synchronizeHostData(); @@ -7045,7 +7040,6 @@ namespace ts { * be performed. */ function getDocCommentTemplateAtPosition(fileName: string, position: number): TextInsertion { - const start = new Date().getTime(); const sourceFile = syntaxTreeCache.getCurrentSourceFile(fileName); // Check if in a context where we don't want to perform any insertion @@ -7339,11 +7333,17 @@ namespace ts { if (declarations && declarations.length > 0) { // Disallow rename for elements that are defined in the standard TypeScript library. const defaultLibFileName = host.getDefaultLibFileName(host.getCompilationSettings()); + const canonicalDefaultLibName = getCanonicalFileName(ts.normalizePath(defaultLibFileName)); if (defaultLibFileName) { for (const current of declarations) { const sourceFile = current.getSourceFile(); + // TODO (drosen): When is there no source file? + if (!sourceFile) { + continue; + } + const canonicalName = getCanonicalFileName(ts.normalizePath(sourceFile.fileName)); - if (sourceFile && getCanonicalFileName(ts.normalizePath(sourceFile.fileName)) === getCanonicalFileName(ts.normalizePath(defaultLibFileName))) { + if (canonicalName === canonicalDefaultLibName) { return getRenameInfoError(getLocaleSpecificMessage(Diagnostics.You_cannot_rename_elements_that_are_defined_in_the_standard_TypeScript_library)); } } From a5c632cd5a104935a737b58eb41adb79e57cbc84 Mon Sep 17 00:00:00 2001 From: Yui T Date: Thu, 17 Dec 2015 21:08:11 -0800 Subject: [PATCH 168/177] Fix merge error --- src/services/services.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/services/services.ts b/src/services/services.ts index d171724d7ff..4109a4eb345 100644 --- a/src/services/services.ts +++ b/src/services/services.ts @@ -5934,7 +5934,7 @@ namespace ts { function populateSearchSymbolSet(symbol: Symbol, location: Node): Symbol[] { // The search set contains at least the current symbol - const result = [symbol]; + let result = [symbol]; // If the symbol is an alias, add what it alaises to the list if (isImportOrExportSpecifierImportSymbol(symbol)) { From 287b316937b3976067c22a9ec2b93fce2710a35a Mon Sep 17 00:00:00 2001 From: Daniel Rosenwasser Date: Thu, 17 Dec 2015 22:00:04 -0800 Subject: [PATCH 169/177] Addressed CR feedback. --- src/server/editorServices.ts | 2 -- tests/cases/unittests/session.ts | 2 +- 2 files changed, 1 insertion(+), 3 deletions(-) diff --git a/src/server/editorServices.ts b/src/server/editorServices.ts index d023a9827ee..80fbc573ff2 100644 --- a/src/server/editorServices.ts +++ b/src/server/editorServices.ts @@ -555,7 +555,6 @@ namespace ts.server { } handleProjectFilelistChanges(project: Project) { - // TODO: Ignoring potentially returned 'error' and 'succeeded' condition const { projectOptions } = this.configFileToProjectOptions(project.projectFilename); const newRootFiles = projectOptions.files.map((f => this.getCanonicalFileName(f))); @@ -585,7 +584,6 @@ namespace ts.server { this.log("Detected newly added tsconfig file: " + fileName); - // TODO: Ignoring potentially returned 'error' and 'succeeded' condition const { projectOptions } = this.configFileToProjectOptions(fileName); const rootFilesInTsconfig = projectOptions.files.map(f => this.getCanonicalFileName(f)); diff --git a/tests/cases/unittests/session.ts b/tests/cases/unittests/session.ts index 1251fb7215f..41f4bc599f6 100644 --- a/tests/cases/unittests/session.ts +++ b/tests/cases/unittests/session.ts @@ -1,6 +1,6 @@ /// -var expect: typeof _chai.expect = _chai.expect; +const expect: typeof _chai.expect = _chai.expect; namespace ts.server { let lastWrittenToHost: string; From a8f87bb2cafc7228c8badc3fd85d43cbf2291ce9 Mon Sep 17 00:00:00 2001 From: Vladimir Matveev Date: Fri, 18 Dec 2015 11:21:31 -0800 Subject: [PATCH 170/177] only '++' and '--' unary operators can change exports --- src/compiler/emitter.ts | 3 +- ...prefixUnaryOperatorsOnExportedVariables.js | 58 +++++++++++++++++++ ...xUnaryOperatorsOnExportedVariables.symbols | 42 ++++++++++++++ ...fixUnaryOperatorsOnExportedVariables.types | 51 ++++++++++++++++ ...prefixUnaryOperatorsOnExportedVariables.ts | 32 ++++++++++ 5 files changed, 185 insertions(+), 1 deletion(-) create mode 100644 tests/baselines/reference/prefixUnaryOperatorsOnExportedVariables.js create mode 100644 tests/baselines/reference/prefixUnaryOperatorsOnExportedVariables.symbols create mode 100644 tests/baselines/reference/prefixUnaryOperatorsOnExportedVariables.types create mode 100644 tests/cases/compiler/prefixUnaryOperatorsOnExportedVariables.ts diff --git a/src/compiler/emitter.ts b/src/compiler/emitter.ts index 622ec14caa8..ab775ba9fc6 100644 --- a/src/compiler/emitter.ts +++ b/src/compiler/emitter.ts @@ -2445,7 +2445,8 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, Promi } function emitPrefixUnaryExpression(node: PrefixUnaryExpression) { - const exportChanged = isNameOfExportedSourceLevelDeclarationInSystemExternalModule(node.operand); + const exportChanged = (node.operator === SyntaxKind.PlusPlusToken || node.operator === SyntaxKind.MinusMinusToken) && + isNameOfExportedSourceLevelDeclarationInSystemExternalModule(node.operand); if (exportChanged) { // emit diff --git a/tests/baselines/reference/prefixUnaryOperatorsOnExportedVariables.js b/tests/baselines/reference/prefixUnaryOperatorsOnExportedVariables.js new file mode 100644 index 00000000000..5d414c97d05 --- /dev/null +++ b/tests/baselines/reference/prefixUnaryOperatorsOnExportedVariables.js @@ -0,0 +1,58 @@ +//// [prefixUnaryOperatorsOnExportedVariables.ts] + +export var x = false; +export var y = 1; +if (!x) { + +} + +if (+x) { + +} + +if (-x) { + +} + +if (~x) { + +} + +if (void x) { + +} + +if (typeof x) { + +} + +if (++y) { + +} + +//// [prefixUnaryOperatorsOnExportedVariables.js] +System.register([], function(exports_1) { + "use strict"; + var x, y; + return { + setters:[], + execute: function() { + exports_1("x", x = false); + exports_1("y", y = 1); + if (!x) { + } + if (+x) { + } + if (-x) { + } + if (~x) { + } + if (void x) { + } + if (typeof x) { + } + if (exports_1("y", ++y)) { + } + } + } +}); diff --git a/tests/baselines/reference/prefixUnaryOperatorsOnExportedVariables.symbols b/tests/baselines/reference/prefixUnaryOperatorsOnExportedVariables.symbols new file mode 100644 index 00000000000..c8293ef1902 --- /dev/null +++ b/tests/baselines/reference/prefixUnaryOperatorsOnExportedVariables.symbols @@ -0,0 +1,42 @@ +=== tests/cases/compiler/prefixUnaryOperatorsOnExportedVariables.ts === + +export var x = false; +>x : Symbol(x, Decl(prefixUnaryOperatorsOnExportedVariables.ts, 1, 10)) + +export var y = 1; +>y : Symbol(y, Decl(prefixUnaryOperatorsOnExportedVariables.ts, 2, 10)) + +if (!x) { +>x : Symbol(x, Decl(prefixUnaryOperatorsOnExportedVariables.ts, 1, 10)) + +} + +if (+x) { +>x : Symbol(x, Decl(prefixUnaryOperatorsOnExportedVariables.ts, 1, 10)) + +} + +if (-x) { +>x : Symbol(x, Decl(prefixUnaryOperatorsOnExportedVariables.ts, 1, 10)) + +} + +if (~x) { +>x : Symbol(x, Decl(prefixUnaryOperatorsOnExportedVariables.ts, 1, 10)) + +} + +if (void x) { +>x : Symbol(x, Decl(prefixUnaryOperatorsOnExportedVariables.ts, 1, 10)) + +} + +if (typeof x) { +>x : Symbol(x, Decl(prefixUnaryOperatorsOnExportedVariables.ts, 1, 10)) + +} + +if (++y) { +>y : Symbol(y, Decl(prefixUnaryOperatorsOnExportedVariables.ts, 2, 10)) + +} diff --git a/tests/baselines/reference/prefixUnaryOperatorsOnExportedVariables.types b/tests/baselines/reference/prefixUnaryOperatorsOnExportedVariables.types new file mode 100644 index 00000000000..c75ba492c31 --- /dev/null +++ b/tests/baselines/reference/prefixUnaryOperatorsOnExportedVariables.types @@ -0,0 +1,51 @@ +=== tests/cases/compiler/prefixUnaryOperatorsOnExportedVariables.ts === + +export var x = false; +>x : boolean +>false : boolean + +export var y = 1; +>y : number +>1 : number + +if (!x) { +>!x : boolean +>x : boolean + +} + +if (+x) { +>+x : number +>x : boolean + +} + +if (-x) { +>-x : number +>x : boolean + +} + +if (~x) { +>~x : number +>x : boolean + +} + +if (void x) { +>void x : undefined +>x : boolean + +} + +if (typeof x) { +>typeof x : string +>x : boolean + +} + +if (++y) { +>++y : number +>y : number + +} diff --git a/tests/cases/compiler/prefixUnaryOperatorsOnExportedVariables.ts b/tests/cases/compiler/prefixUnaryOperatorsOnExportedVariables.ts new file mode 100644 index 00000000000..58b05bb513a --- /dev/null +++ b/tests/cases/compiler/prefixUnaryOperatorsOnExportedVariables.ts @@ -0,0 +1,32 @@ +// @target: ES5 +// @module: system + +export var x = false; +export var y = 1; +if (!x) { + +} + +if (+x) { + +} + +if (-x) { + +} + +if (~x) { + +} + +if (void x) { + +} + +if (typeof x) { + +} + +if (++y) { + +} \ No newline at end of file From cc5334eb89812dcc0c180089c84fbf4292a85fe3 Mon Sep 17 00:00:00 2001 From: Daniel Rosenwasser Date: Fri, 18 Dec 2015 14:06:08 -0800 Subject: [PATCH 171/177] Made 'expression' non-optional in 'CaseClause'. --- src/compiler/types.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/compiler/types.ts b/src/compiler/types.ts index a8c4ee211c3..24f70373a8a 100644 --- a/src/compiler/types.ts +++ b/src/compiler/types.ts @@ -1195,7 +1195,7 @@ namespace ts { // @kind(SyntaxKind.CaseClause) export interface CaseClause extends Node { - expression?: Expression; + expression: Expression; statements: NodeArray; } From aba197cd4b009016063e2ca5855bedb272c4ddba Mon Sep 17 00:00:00 2001 From: Dan Corder Date: Wed, 16 Dec 2015 23:21:00 +0000 Subject: [PATCH 172/177] Fix issue #5810 doubled comment on functions in array literals --- src/compiler/emitter.ts | 9 +++-- .../reference/arrayLiteralComments.js | 31 ++++++++++++++++ .../reference/arrayLiteralComments.symbols | 21 +++++++++++ .../reference/arrayLiteralComments.types | 36 +++++++++++++++++++ tests/cases/compiler/arrayLiteralComments.ts | 14 ++++++++ 5 files changed, 108 insertions(+), 3 deletions(-) create mode 100644 tests/baselines/reference/arrayLiteralComments.js create mode 100644 tests/baselines/reference/arrayLiteralComments.symbols create mode 100644 tests/baselines/reference/arrayLiteralComments.types create mode 100644 tests/cases/compiler/arrayLiteralComments.ts diff --git a/src/compiler/emitter.ts b/src/compiler/emitter.ts index ab775ba9fc6..88d9d20c4c0 100644 --- a/src/compiler/emitter.ts +++ b/src/compiler/emitter.ts @@ -4280,9 +4280,12 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, Promi // TODO (yuisu) : we should not have special cases to condition emitting comments // but have one place to fix check for these conditions. - if (node.kind !== SyntaxKind.MethodDeclaration && node.kind !== SyntaxKind.MethodSignature && - node.parent && node.parent.kind !== SyntaxKind.PropertyAssignment && - node.parent.kind !== SyntaxKind.CallExpression) { + if (node.kind !== SyntaxKind.MethodDeclaration && + node.kind !== SyntaxKind.MethodSignature && + node.parent && + node.parent.kind !== SyntaxKind.PropertyAssignment && + node.parent.kind !== SyntaxKind.CallExpression && + node.parent.kind !== SyntaxKind.ArrayLiteralExpression) { // 1. Methods will emit the comments as part of emitting method declaration // 2. If the function is a property of object literal, emitting leading-comments diff --git a/tests/baselines/reference/arrayLiteralComments.js b/tests/baselines/reference/arrayLiteralComments.js new file mode 100644 index 00000000000..4f13df1c828 --- /dev/null +++ b/tests/baselines/reference/arrayLiteralComments.js @@ -0,0 +1,31 @@ +//// [arrayLiteralComments.ts] +var testArrayWithFunc = [ + // Function comment + function() { + let x = 1; + }, + // String comment + '1', + // Numeric comment + 2, + // Object comment + { a: 1 }, + // Array comment + [1, 2, 3] +] + +//// [arrayLiteralComments.js] +var testArrayWithFunc = [ + // Function comment + function () { + var x = 1; + }, + // String comment + '1', + // Numeric comment + 2, + // Object comment + { a: 1 }, + // Array comment + [1, 2, 3] +]; diff --git a/tests/baselines/reference/arrayLiteralComments.symbols b/tests/baselines/reference/arrayLiteralComments.symbols new file mode 100644 index 00000000000..c1c173d741f --- /dev/null +++ b/tests/baselines/reference/arrayLiteralComments.symbols @@ -0,0 +1,21 @@ +=== tests/cases/compiler/arrayLiteralComments.ts === +var testArrayWithFunc = [ +>testArrayWithFunc : Symbol(testArrayWithFunc, Decl(arrayLiteralComments.ts, 0, 3)) + + // Function comment + function() { + let x = 1; +>x : Symbol(x, Decl(arrayLiteralComments.ts, 3, 11)) + + }, + // String comment + '1', + // Numeric comment + 2, + // Object comment + { a: 1 }, +>a : Symbol(a, Decl(arrayLiteralComments.ts, 10, 5)) + + // Array comment + [1, 2, 3] +] diff --git a/tests/baselines/reference/arrayLiteralComments.types b/tests/baselines/reference/arrayLiteralComments.types new file mode 100644 index 00000000000..a8c32b48e41 --- /dev/null +++ b/tests/baselines/reference/arrayLiteralComments.types @@ -0,0 +1,36 @@ +=== tests/cases/compiler/arrayLiteralComments.ts === +var testArrayWithFunc = [ +>testArrayWithFunc : ((() => void) | string | number | { a: number; } | number[])[] +>[ // Function comment function() { let x = 1; }, // String comment '1', // Numeric comment 2, // Object comment { a: 1 }, // Array comment [1, 2, 3]] : ((() => void) | string | number | { a: number; } | number[])[] + + // Function comment + function() { +>function() { let x = 1; } : () => void + + let x = 1; +>x : number +>1 : number + + }, + // String comment + '1', +>'1' : string + + // Numeric comment + 2, +>2 : number + + // Object comment + { a: 1 }, +>{ a: 1 } : { a: number; } +>a : number +>1 : number + + // Array comment + [1, 2, 3] +>[1, 2, 3] : number[] +>1 : number +>2 : number +>3 : number + +] diff --git a/tests/cases/compiler/arrayLiteralComments.ts b/tests/cases/compiler/arrayLiteralComments.ts new file mode 100644 index 00000000000..131cecc1d95 --- /dev/null +++ b/tests/cases/compiler/arrayLiteralComments.ts @@ -0,0 +1,14 @@ +var testArrayWithFunc = [ + // Function comment + function() { + let x = 1; + }, + // String comment + '1', + // Numeric comment + 2, + // Object comment + { a: 1 }, + // Array comment + [1, 2, 3] +] \ No newline at end of file From 9badf0c0261e803638d50a3b31bd5024fe4711db Mon Sep 17 00:00:00 2001 From: Daniel Rosenwasser Date: Fri, 18 Dec 2015 14:48:35 -0800 Subject: [PATCH 173/177] filelist -> fileList --- src/server/editorServices.ts | 21 ++++++++++----------- 1 file changed, 10 insertions(+), 11 deletions(-) diff --git a/src/server/editorServices.ts b/src/server/editorServices.ts index 80fbc573ff2..5a1c85fc13c 100644 --- a/src/server/editorServices.ts +++ b/src/server/editorServices.ts @@ -486,7 +486,7 @@ namespace ts.server { // number becomes 0 for a watcher, then we should close it. directoryWatchersRefCount: ts.Map = {}; hostConfiguration: HostConfiguration; - timerForDetectingProjectFilelistChanges: Map = {}; + timerForDetectingProjectFileListChanges: Map = {}; constructor(public host: ServerHost, public psLogger: Logger, public eventHandler?: ProjectServiceEventHandler) { // ts.disableIncrementalParsing = true; @@ -541,20 +541,20 @@ namespace ts.server { } this.log("Detected source file changes: " + fileName); - this.startTimerForDetectingProjectFilelistChanges(project); + this.startTimerForDetectingProjectFileListChanges(project); } - startTimerForDetectingProjectFilelistChanges(project: Project) { - if (this.timerForDetectingProjectFilelistChanges[project.projectFilename]) { - clearTimeout(this.timerForDetectingProjectFilelistChanges[project.projectFilename]); + startTimerForDetectingProjectFileListChanges(project: Project) { + if (this.timerForDetectingProjectFileListChanges[project.projectFilename]) { + clearTimeout(this.timerForDetectingProjectFileListChanges[project.projectFilename]); } - this.timerForDetectingProjectFilelistChanges[project.projectFilename] = setTimeout( - () => this.handleProjectFilelistChanges(project), + this.timerForDetectingProjectFileListChanges[project.projectFilename] = setTimeout( + () => this.handleProjectFileListChanges(project), 250 ); } - handleProjectFilelistChanges(project: Project) { + handleProjectFileListChanges(project: Project) { const { projectOptions } = this.configFileToProjectOptions(project.projectFilename); const newRootFiles = projectOptions.files.map((f => this.getCanonicalFileName(f))); @@ -1083,7 +1083,6 @@ namespace ts.server { * Close file whose contents is managed by the client * @param filename is absolute pathname */ - closeClientFile(filename: string) { const info = ts.lookUp(this.filenameToScriptInfo, filename); if (info) { @@ -1739,9 +1738,9 @@ namespace ts.server { } getLineMapper() { - return ((line: number) => { + return (line: number) => { return this.index.lineNumberToInfo(line).offset; - }); + }; } getTextChangeRangeSinceVersion(scriptVersion: number) { From 3969b89b234cc642ccbc40f8fbebe3b29c74a80d Mon Sep 17 00:00:00 2001 From: Daniel Rosenwasser Date: Mon, 21 Dec 2015 13:40:59 -0800 Subject: [PATCH 174/177] Fixups for #6163. --- src/compiler/emitter.ts | 34 +++++++++++++++++++--------------- 1 file changed, 19 insertions(+), 15 deletions(-) diff --git a/src/compiler/emitter.ts b/src/compiler/emitter.ts index 88d9d20c4c0..996dac118ef 100644 --- a/src/compiler/emitter.ts +++ b/src/compiler/emitter.ts @@ -4280,25 +4280,29 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, Promi // TODO (yuisu) : we should not have special cases to condition emitting comments // but have one place to fix check for these conditions. - if (node.kind !== SyntaxKind.MethodDeclaration && - node.kind !== SyntaxKind.MethodSignature && - node.parent && - node.parent.kind !== SyntaxKind.PropertyAssignment && - node.parent.kind !== SyntaxKind.CallExpression && - node.parent.kind !== SyntaxKind.ArrayLiteralExpression) { - // 1. Methods will emit the comments as part of emitting method declaration - + const { kind, parent } = node; + if (kind !== SyntaxKind.MethodDeclaration && + kind !== SyntaxKind.MethodSignature && + parent && + parent.kind !== SyntaxKind.PropertyAssignment && + parent.kind !== SyntaxKind.CallExpression && + parent.kind !== SyntaxKind.ArrayLiteralExpression) { + // 1. Methods will emit comments at their assignment declaration sites. + // // 2. If the function is a property of object literal, emitting leading-comments - // is done by emitNodeWithoutSourceMap which then call this function. - // In particular, we would like to avoid emit comments twice in following case: - // For example: + // is done by emitNodeWithoutSourceMap which then call this function. + // In particular, we would like to avoid emit comments twice in following case: + // // var obj = { // id: // /*comment*/ () => void // } - + // // 3. If the function is an argument in call expression, emitting of comments will be - // taken care of in emit list of arguments inside of emitCallexpression + // taken care of in emit list of arguments inside of 'emitCallExpression'. + // + // 4. If the function is in an array literal, 'emitLinePreservingList' will take care + // of leading comments. emitLeadingComments(node); } @@ -4325,12 +4329,12 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, Promi } emitSignatureAndBody(node); - if (modulekind !== ModuleKind.ES6 && node.kind === SyntaxKind.FunctionDeclaration && node.parent === currentSourceFile && node.name) { + if (modulekind !== ModuleKind.ES6 && kind === SyntaxKind.FunctionDeclaration && parent === currentSourceFile && node.name) { emitExportMemberAssignments((node).name); } emitEnd(node); - if (node.kind !== SyntaxKind.MethodDeclaration && node.kind !== SyntaxKind.MethodSignature) { + if (kind !== SyntaxKind.MethodDeclaration && kind !== SyntaxKind.MethodSignature) { emitTrailingComments(node); } } From 73de79c68c42d21da57fa7c1609b353173bac472 Mon Sep 17 00:00:00 2001 From: Daniel Rosenwasser Date: Mon, 21 Dec 2015 13:42:24 -0800 Subject: [PATCH 175/177] Added positive test case suggested in #6129. --- .../class/method/decoratorOnClassMethodOverload2.ts | 9 +++++++++ 1 file changed, 9 insertions(+) create mode 100644 tests/cases/conformance/decorators/class/method/decoratorOnClassMethodOverload2.ts diff --git a/tests/cases/conformance/decorators/class/method/decoratorOnClassMethodOverload2.ts b/tests/cases/conformance/decorators/class/method/decoratorOnClassMethodOverload2.ts new file mode 100644 index 00000000000..ee5a3f33bf1 --- /dev/null +++ b/tests/cases/conformance/decorators/class/method/decoratorOnClassMethodOverload2.ts @@ -0,0 +1,9 @@ +// @target: ES5 +// @experimentaldecorators: true +declare function dec(target: any, propertyKey: string, descriptor: TypedPropertyDescriptor): TypedPropertyDescriptor; + +class C { + method() + @dec + method() { } +} \ No newline at end of file From b262c04e669404494bed9c83d630f3d5566127c1 Mon Sep 17 00:00:00 2001 From: Daniel Rosenwasser Date: Mon, 21 Dec 2015 13:46:14 -0800 Subject: [PATCH 176/177] Accepted baselines. --- .../decoratorOnClassMethodOverload2.js | 25 +++++++++++++++++++ .../decoratorOnClassMethodOverload2.symbols | 24 ++++++++++++++++++ .../decoratorOnClassMethodOverload2.types | 24 ++++++++++++++++++ 3 files changed, 73 insertions(+) create mode 100644 tests/baselines/reference/decoratorOnClassMethodOverload2.js create mode 100644 tests/baselines/reference/decoratorOnClassMethodOverload2.symbols create mode 100644 tests/baselines/reference/decoratorOnClassMethodOverload2.types diff --git a/tests/baselines/reference/decoratorOnClassMethodOverload2.js b/tests/baselines/reference/decoratorOnClassMethodOverload2.js new file mode 100644 index 00000000000..eafa5da7110 --- /dev/null +++ b/tests/baselines/reference/decoratorOnClassMethodOverload2.js @@ -0,0 +1,25 @@ +//// [decoratorOnClassMethodOverload2.ts] +declare function dec(target: any, propertyKey: string, descriptor: TypedPropertyDescriptor): TypedPropertyDescriptor; + +class C { + method() + @dec + method() { } +} + +//// [decoratorOnClassMethodOverload2.js] +var __decorate = (this && this.__decorate) || function (decorators, target, key, desc) { + var c = arguments.length, r = c < 3 ? target : desc === null ? desc = Object.getOwnPropertyDescriptor(target, key) : desc, d; + if (typeof Reflect === "object" && typeof Reflect.decorate === "function") r = Reflect.decorate(decorators, target, key, desc); + else for (var i = decorators.length - 1; i >= 0; i--) if (d = decorators[i]) r = (c < 3 ? d(r) : c > 3 ? d(target, key, r) : d(target, key)) || r; + return c > 3 && r && Object.defineProperty(target, key, r), r; +}; +var C = (function () { + function C() { + } + C.prototype.method = function () { }; + __decorate([ + dec + ], C.prototype, "method", null); + return C; +}()); diff --git a/tests/baselines/reference/decoratorOnClassMethodOverload2.symbols b/tests/baselines/reference/decoratorOnClassMethodOverload2.symbols new file mode 100644 index 00000000000..f05dd624345 --- /dev/null +++ b/tests/baselines/reference/decoratorOnClassMethodOverload2.symbols @@ -0,0 +1,24 @@ +=== tests/cases/conformance/decorators/class/method/decoratorOnClassMethodOverload2.ts === +declare function dec(target: any, propertyKey: string, descriptor: TypedPropertyDescriptor): TypedPropertyDescriptor; +>dec : Symbol(dec, Decl(decoratorOnClassMethodOverload2.ts, 0, 0)) +>T : Symbol(T, Decl(decoratorOnClassMethodOverload2.ts, 0, 21)) +>target : Symbol(target, Decl(decoratorOnClassMethodOverload2.ts, 0, 24)) +>propertyKey : Symbol(propertyKey, Decl(decoratorOnClassMethodOverload2.ts, 0, 36)) +>descriptor : Symbol(descriptor, Decl(decoratorOnClassMethodOverload2.ts, 0, 57)) +>TypedPropertyDescriptor : Symbol(TypedPropertyDescriptor, Decl(lib.d.ts, --, --)) +>T : Symbol(T, Decl(decoratorOnClassMethodOverload2.ts, 0, 21)) +>TypedPropertyDescriptor : Symbol(TypedPropertyDescriptor, Decl(lib.d.ts, --, --)) +>T : Symbol(T, Decl(decoratorOnClassMethodOverload2.ts, 0, 21)) + +class C { +>C : Symbol(C, Decl(decoratorOnClassMethodOverload2.ts, 0, 126)) + + method() +>method : Symbol(method, Decl(decoratorOnClassMethodOverload2.ts, 2, 9), Decl(decoratorOnClassMethodOverload2.ts, 3, 12)) + + @dec +>dec : Symbol(dec, Decl(decoratorOnClassMethodOverload2.ts, 0, 0)) + + method() { } +>method : Symbol(method, Decl(decoratorOnClassMethodOverload2.ts, 2, 9), Decl(decoratorOnClassMethodOverload2.ts, 3, 12)) +} diff --git a/tests/baselines/reference/decoratorOnClassMethodOverload2.types b/tests/baselines/reference/decoratorOnClassMethodOverload2.types new file mode 100644 index 00000000000..7002d74a821 --- /dev/null +++ b/tests/baselines/reference/decoratorOnClassMethodOverload2.types @@ -0,0 +1,24 @@ +=== tests/cases/conformance/decorators/class/method/decoratorOnClassMethodOverload2.ts === +declare function dec(target: any, propertyKey: string, descriptor: TypedPropertyDescriptor): TypedPropertyDescriptor; +>dec : (target: any, propertyKey: string, descriptor: TypedPropertyDescriptor) => TypedPropertyDescriptor +>T : T +>target : any +>propertyKey : string +>descriptor : TypedPropertyDescriptor +>TypedPropertyDescriptor : TypedPropertyDescriptor +>T : T +>TypedPropertyDescriptor : TypedPropertyDescriptor +>T : T + +class C { +>C : C + + method() +>method : () => any + + @dec +>dec : (target: any, propertyKey: string, descriptor: TypedPropertyDescriptor) => TypedPropertyDescriptor + + method() { } +>method : () => any +} From 39605fe5f823c0c987d57252ed029cee38d0e54d Mon Sep 17 00:00:00 2001 From: vladima Date: Mon, 21 Dec 2015 21:43:51 -0800 Subject: [PATCH 177/177] report pre-emit diagnostics that blocked emit --- src/compiler/program.ts | 7 +++++-- .../DeclarationErrorsNoEmitOnError.errors.txt | 11 +++++++++++ .../cases/compiler/DeclarationErrorsNoEmitOnError.ts | 8 ++++++++ 3 files changed, 24 insertions(+), 2 deletions(-) create mode 100644 tests/baselines/reference/DeclarationErrorsNoEmitOnError.errors.txt create mode 100644 tests/cases/compiler/DeclarationErrorsNoEmitOnError.ts diff --git a/src/compiler/program.ts b/src/compiler/program.ts index da6f7ab0ee7..d5c8b9f913f 100644 --- a/src/compiler/program.ts +++ b/src/compiler/program.ts @@ -573,8 +573,11 @@ namespace ts { // If the noEmitOnError flag is set, then check if we have any errors so far. If so, // immediately bail out. Note that we pass 'undefined' for 'sourceFile' so that we // get any preEmit diagnostics, not just the ones - if (options.noEmitOnError && getPreEmitDiagnostics(program, /*sourceFile:*/ undefined, cancellationToken).length > 0) { - return { diagnostics: [], sourceMaps: undefined, emitSkipped: true }; + if (options.noEmitOnError) { + const preEmitDiagnostics = getPreEmitDiagnostics(program, /*sourceFile:*/ undefined, cancellationToken); + if (preEmitDiagnostics.length > 0) { + return { diagnostics: preEmitDiagnostics, sourceMaps: undefined, emitSkipped: true }; + } } // Create the emit resolver outside of the "emitTime" tracking code below. That way diff --git a/tests/baselines/reference/DeclarationErrorsNoEmitOnError.errors.txt b/tests/baselines/reference/DeclarationErrorsNoEmitOnError.errors.txt new file mode 100644 index 00000000000..1f442e98d12 --- /dev/null +++ b/tests/baselines/reference/DeclarationErrorsNoEmitOnError.errors.txt @@ -0,0 +1,11 @@ +tests/cases/compiler/DeclarationErrorsNoEmitOnError.ts(4,8): error TS4033: Property 'f' of exported interface has or is using private name 'T'. + + +==== tests/cases/compiler/DeclarationErrorsNoEmitOnError.ts (1 errors) ==== + + type T = { x : number } + export interface I { + f: T; + ~ +!!! error TS4033: Property 'f' of exported interface has or is using private name 'T'. + } \ No newline at end of file diff --git a/tests/cases/compiler/DeclarationErrorsNoEmitOnError.ts b/tests/cases/compiler/DeclarationErrorsNoEmitOnError.ts new file mode 100644 index 00000000000..ef8711e7110 --- /dev/null +++ b/tests/cases/compiler/DeclarationErrorsNoEmitOnError.ts @@ -0,0 +1,8 @@ +// @module: commonjs +// @declaration: true +// @noEmitOnError: true + +type T = { x : number } +export interface I { + f: T; +} \ No newline at end of file